From 52838e4a6d49cd27a1f4edc2336aa1c28e9b29f2 Mon Sep 17 00:00:00 2001
From: Guy Perfect <guytpk@gmail.com>
Date: Wed, 30 Oct 2024 14:54:13 -0500
Subject: [PATCH] Disassembler adjustments

---
 makefile            | 4 ++--
 util/disassembler.c | 2 +-
 util/vbu.h          | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index 659176f..82de1d8 100644
--- a/makefile
+++ b/makefile
@@ -62,9 +62,9 @@ util:
 
 .PHONY: wasm
 wasm:
-	@emcc -o web/core.wasm web/wasm.c core/vb.c -I core \
+	@emcc -o web/core.wasm web/wasm.c core/vb.c util/vbu.c -I core -I util \
         -D VB_LITTLE_ENDIAN -D VB_SIGNED_PROPAGATE \
-        -D "VBAPI=__attribute__((used))" \
+        -D "VBAPI=__attribute__((used))" -D "VBUAPI=__attribute__((used))" \
         --no-entry -O2 -flto -s WASM=1 -s WARN_ON_UNDEFINED_SYMBOLS=0 \
         -s EXPORTED_RUNTIME_METHODS=[] -s ALLOW_MEMORY_GROWTH \
         -s MAXIMUM_MEMORY=4GB -fno-strict-aliasing
diff --git a/util/disassembler.c b/util/disassembler.c
index 721499a..3970211 100644
--- a/util/disassembler.c
+++ b/util/disassembler.c
@@ -381,7 +381,7 @@ static void dasmOpSystem(char*dest, VBU_DasmConfig*config, VBU_DasmLine*line) {
         return;
     }
     strcpy(dest, text);
-    if (config->programCase == VBU_LOWER)
+    if (config->systemCase == VBU_LOWER)
         dasmToLower(dest);
 }
 
diff --git a/util/vbu.h b/util/vbu.h
index ab80d5e..dc02f01 100644
--- a/util/vbu.h
+++ b/util/vbu.h
@@ -18,7 +18,6 @@ extern "C" {
 
 /* Disassembler options */
 #define VBU_0X         0
-#define VBU_ABSOLUTE   0
 #define VBU_C          1
 #define VBU_DEST_FIRST 1
 #define VBU_DEST_LAST  0
@@ -32,7 +31,6 @@ extern "C" {
 #define VBU_NAMES      1
 #define VBU_NUMBERS    0
 #define VBU_OUTSIDE    0
-#define VBU_RELATIVE   1
 #define VBU_SPLIT      1
 #define VBU_UPPER      0
 #define VBU_Z          1
@@ -44,7 +42,6 @@ extern "C" {
 /* Disassembler text options */
 typedef struct {               /* Defaults listed first */
     uint8_t bcondNotation;     /* JOINED, SPLIT */
-    uint8_t branchNotation;    /* ABSOLUTE, RELATIVE */
     uint8_t conditionCase;     /* LOWER, UPPER */
     uint8_t conditionCL;       /* L, C */
     uint8_t conditionEZ;       /* Z, E */