Fix botched disassembler backport

util/disassembler.c

@@ -572,7 +572,7 @@ static uint32_t dasmLine(DasmOutput *ret, unsigned index,
     line->isPC    = isPC;
 
     /* Fetch first code halfword */
-    code[0] = vbFetch(sim, address);
+    code[0] = vbRead(sim, address, VB_U16);
     line->code[0] = code[0];
     line->code[1] = code[0] >> 8;
 
@@ -583,7 +583,7 @@ static uint32_t dasmLine(DasmOutput *ret, unsigned index,
 
     /* Fetch second code halfword if necessary */
     if (line->codeLength == 4) {
-        code[1]       = vbFetch(sim, address + 2);
+        code[1]       = vbRead(sim, address + 2, VB_U16);
         line->code[2] = code[1];
         line->code[3] = code[1] >> 8;
     } else {

util/isx.c

@@ -257,7 +257,7 @@ static void* isxFrom(uint8_t *bytes, size_t length, size_t *romLength) {
         src < lowMax + 0x1000001 - highMin;
         src <<= 1
     );
-    rom = VBU_REALLOC(NULL, src);
+    rom = VBU_MEMMGR(NULL, src);
     if (rom == NULL)
         return NULL;
     *romLength = src;

util/vbu.c

@@ -5,28 +5,28 @@
 #include <string.h>
 #include <vbu.h>
 
-/* Memory management */
-#ifndef VBU_REALLOC
-    #include <stdlib.h>
-    #define VBU_REALLOC realloc
-#else
-    extern void* VBU_REALLOC(void *, size_t);
-#endif
-
 
 
 /***************************** Library Functions *****************************/
 
-/* Sign-extend an integer of variable width */
+/* Memory manager */
-static int32_t SignExtend(int32_t value, int32_t bits) {
+#ifdef VBU_MEMMGR
-    #ifndef VB_SIGNED_PROPAGATE
+extern void* VBU_MEMMGR(void *ptr, size_t size);
-        value &= ~((uint32_t) 0xFFFFFFFF << bits);
+#else
-        bits   = (int32_t) 1 << (bits - (int32_t) 1);
+#include <stdlib.h>
-        return (value ^ bits) - bits;
+static void* VBU_MEMMGR(void *ptr, size_t size) {
-    #else
+
-        return value << (32 - bits) >> (32 - bits);
+    /* Free a buffer */
-    #endif
+    if (size == 0) {
+        if (ptr != NULL)
+            free(ptr);
+        return NULL;
+    }
+
+    /* Create or resize a buffer */
+    return realloc(ptr, size);
 }
+#endif