Fix botched disassembler backport

Reviewed-on: #1

core/cpu.c

@@ -234,7 +234,7 @@ static int cpuOnExecute(VB *sim) {
     #define VB_ON_READ VB_DIRECT_READ
 #endif
 static int cpuRead(VB *sim, uint32_t address, int type, int32_t *value) {
-    uint32_t cycles = 4; /* TODO: Research this */
+    uint32_t cycles = 0; /* TODO: Research this */
 
     /* Retrieve the value from the simulation state directly */
     busRead(sim, address, type, value);
@@ -289,7 +289,7 @@ static int cpuReadFetch(VB *sim, int fetch, uint32_t address, int32_t *value) {
 #endif
 static int cpuWrite(VB *sim, uint32_t address, int type, int32_t value) {
     int      cancel = 0;
-    uint32_t cycles = 3; /* TODO: Research this */
+    uint32_t cycles = 0; /* TODO: Research this */
 
     /* Reset pseudo-halt */
     if (sim->ph.enabled)

core/vb.c

@@ -900,7 +900,7 @@ VBAPI vbOnWrite vbSetWriteCallback(VB *sim, vbOnWrite callback) {
 }
 
 /* Determine the size of a simulation instance */
-VBAPI size_t vbSizeOf() {
+VBAPI size_t vbSizeOf(void) {
     return sizeof (VB);
 }
 

core/vb.h

@@ -166,7 +166,7 @@ VBAPI vbOnSamples   vbSetSamplesCallback  (VB *sim, vbOnSamples callback);
 VBAPI uint32_t      vbSetSystemRegister   (VB *sim, unsigned index, uint32_t value);
 VBAPI void*         vbSetUserData         (VB *sim, void *tag);
 VBAPI vbOnWrite     vbSetWriteCallback    (VB *sim, vbOnWrite callback);
-VBAPI size_t        vbSizeOf              ();
+VBAPI size_t        vbSizeOf              (void);
 VBAPI int32_t       vbWrite               (VB *sim, uint32_t address, int type, int32_t value);
 
 

core/vip.c

@@ -41,16 +41,17 @@ static const uint8_t BG_TEMPLATES[][64] = {
 };
 
 /* 8-bit color magnitude by brightness level */
+/* Generated as BRIGHT8[n] = round((n / 132) ** 1.6 * 255) */
 static const uint8_t BRIGHT8[] = {
-      0,  1,  3,  5,  7,  9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 28,
-     30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 57, 59,
-     61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 86, 88, 90,
-     92, 94, 96, 98,100,102,104,106,108,110,112,113,115,117,119,121,
-    123,125,127,129,131,133,135,137,139,141,142,144,146,148,150,152,
-    154,156,158,160,162,164,166,168,170,171,173,175,177,179,181,183,
-    185,187,189,191,193,195,197,198,200,202,204,206,208,210,212,214,
-    216,218,220,222,224,226,227,229,231,233,235,237,239,241,243,245,
-    247,249,251,253,255
+      0, 12, 19, 24, 29, 33, 37, 41, 44, 48, 51, 54, 57, 60, 63, 65,
+     68, 71, 73, 76, 78, 81, 83, 86, 88, 90, 92, 95, 97, 99,101,103,
+    105,107,109,111,113,115,117,119,121,123,125,127,128,130,132,134,
+    136,137,139,141,142,144,146,148,149,151,153,154,156,157,159,161,
+    162,164,165,167,168,170,172,173,175,176,178,179,181,182,184,185,
+    186,188,189,191,192,194,195,197,198,199,201,202,203,205,206,208,
+    209,210,212,213,214,216,217,218,220,221,222,224,225,226,228,229,
+    230,231,233,234,235,236,238,239,240,242,243,244,245,246,248,249,
+    250,251,253,254,255
 };
 
 
@@ -319,6 +320,7 @@ static void vipWriteWorld(VB *sim, uint32_t offset, int type, int32_t value) {
     uint32_t base;  /* Base BG map index */
     uint8_t *bg;    /* Background template */
     uint32_t count; /* Number of BG maps in background */
+    int32_t  width; /* Computed affine width */
     World   *world; /* World state */
     uint32_t z;     /* Iterator */
 
@@ -380,10 +382,10 @@ static void vipWriteWorld(VB *sim, uint32_t offset, int type, int32_t value) {
         case 5: world->mp = SignExtend(value, 15); break;
         case 6: world->my = SignExtend(value, 13); break;
         case 7: /* W */
-            value = SignExtend(value, 13) + 1;
-            world->wNaffine = value < 0 ? 0 : value;
-            value = SignExtend(value, 10) + 1;
-            world->wAffine  = value < 0 ? 0 : value;
+            width = SignExtend(value, 13) + 1;
+            world->wNaffine = width < 0 ? 0 : width;
+            width = SignExtend(value, 10) + 1;
+            world->wAffine  = width < 0 ? 0 : width;
             world->width = world->bgm != 2 ? world->wNaffine : world->wAffine;
             break;
         case 8: /* H */
@@ -984,7 +986,7 @@ static void vipDrawHBias(VB *sim, World *world) {
         /* Process all visible lines */
         param = &sim->vip.ram[world->paramBase +
             ((y1 - world->gy) << 2) + (i << 1)];
-        for (y = y1; y < y2; y++, param += 2) {
+        for (y = y1; y < y2; y++, param += 4) {
 
             /* Configure window bounds */
             wnd.y1 = y;
@@ -992,7 +994,7 @@ static void vipDrawHBias(VB *sim, World *world) {
 
             /* Draw the background into the window */
             vipDrawBackground(sim->vip.shadow[i], &wnd, world,
-                mx + busReadBuffer(param, VB_S16), my);
+                mx - busReadBuffer(param, VB_S16), my);
         }
 
     }
@@ -1004,7 +1006,7 @@ static void vipDrawAffine(VB *sim, World *world) {
     Cell    *cell;               /* Source cell */
     uint8_t *col, *row;          /* Output pixel */
     uint8_t  pixel;              /* Character pixel value */
-    uint8_t *param;              /* World parameter memory */
+    uint32_t param;              /* World parameter memory */
     int32_t  px, py;             /* Pixel source coordinates */
     int32_t  dx, dy, mp, mx, my; /* Affine parameters */
     int32_t  wx;                 /* Base world X coordinate */
@@ -1051,21 +1053,26 @@ static void vipDrawAffine(VB *sim, World *world) {
         wx = x1 - wx;
 
         /* Process all visible rows */
-        param = &sim->vip.ram[world->paramBase | (y1 - world->gy) << 4];
+        param = world->paramBase + ((y1 - world->gy) << 4);
         row   = &sim->vip.shadow[i][x1 * 224 + y1];
         for (y = y1; y < y2; y++, param += 16, row++) {
 
             /* Parse line parameters */
-            mx = (int32_t) busReadBuffer(param + 0, VB_S16) << 6;
-            mp = (int32_t) busReadBuffer(param + 2, VB_S16);
-            my = (int32_t) busReadBuffer(param + 4, VB_S16) << 6;
-            dx = (int32_t) busReadBuffer(param + 6, VB_S16);
-            dy = (int32_t) busReadBuffer(param + 8, VB_S16);
+            mx = (int32_t) busReadBuffer(&sim->vip.ram[param | 0], VB_S16) << 6;
+            mp = (int32_t) busReadBuffer(&sim->vip.ram[param | 2], VB_S16);
+            my = (int32_t) busReadBuffer(&sim->vip.ram[param | 4], VB_S16) << 6;
+            dx = (int32_t) busReadBuffer(&sim->vip.ram[param | 6], VB_S16);
+            dy = (int32_t) busReadBuffer(&sim->vip.ram[param | 8], VB_S16);
 
             /* Adjust left-edge parameters */
             if ((mp < 0) ^ i) {
-                mx += dx * (wx + mp);
-                my += dy * (wx + mp);
+                if (mp < 0) {
+                    mx += dx * (wx - mp);
+                    my += dy * (wx - mp);
+                } else {
+                    mx += dx * (wx + mp);
+                    my += dy * (wx + mp);
+                }
             } else {
                 mx += dx * wx;
                 my += dy * wx;

core/vsu.c

@@ -132,14 +132,19 @@ static void vsuEmulateChannel(VB *sim, Channel *chan) {
     }
 
     /* Envelope modification */
-    if (chan->env.enb && !chan->env.modmask && chan->env.clocks == 0) {
+    if (chan->env.clocks == 0) {
+        uint8_t new_envelope = chan->env.value;
         if (chan->env.dir == 0 && chan->env.value != 0)
-            chan->env.value--;
+            new_envelope--;
         else if (chan->env.dir == 1 && chan->env.value != 15)
-            chan->env.value++;
-        else if (chan->env.rep)
-            chan->env.value = chan->env.reload;
-        else chan->env.modmask = 1;
+            new_envelope++;
+        else if (chan->env.rep && chan->env.modmask != 2) {
+            new_envelope = chan->env.reload;
+            chan->env.modmask = 0;
+        } else if (!chan->env.modmask)
+            chan->env.modmask = 1;
+        if (chan->env.enb && !chan->env.modmask)
+            chan->env.value = new_envelope;
         chan->env.clocks = ((uint32_t) chan->env.interval + 1) * 307220;
     }
 
@@ -215,6 +220,7 @@ static void vsuWriteEV0(VB *sim, int index, uint8_t value) {
     chan->env.interval = value      &  7;
     chan->env.value    = value >> 4 & 15;
     chan->env.reload   = chan->env.value;
+    if (chan->env.modmask == 1) chan->env.modmask = 2;
     if (index == 4) {
         chan->freqmod = vsuCheckFreqMod(sim);
         vsuNextFreqMod(sim, chan);
@@ -231,6 +237,12 @@ static void vsuWriteEV1(VB *sim, int index, uint8_t value) {
     /* Parse fields */
     chan->env.enb = value      & 1;
     chan->env.rep = value >> 1 & 1;
+    if (
+        !chan->env.rep && (
+            (chan->env.reload ==  0 && chan->env.dir == 0) ||
+            (chan->env.reload == 15 && chan->env.dir == 1)
+        )
+    ) chan->env.modmask = 1;
 
     /* Processing by channel */
     switch (index) {
@@ -286,8 +298,13 @@ static void vsuWriteINT(VB *sim, int index, uint8_t value) {
     /* Update state */
     chan->int_.clocks = 76805 * ((uint32_t) chan->int_.interval + 1);
     chan->env.modmask = 0;
-    if (chan->env.enb)
-        chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1);
+    if (
+        !chan->env.rep && (
+            (chan->env.reload ==  0 && chan->env.dir == 0) ||
+            (chan->env.reload == 15 && chan->env.dir == 1)
+        )
+    ) chan->env.modmask = 1;
+    chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1);
     if (index != 5) {
         chan->wave.sample = 0;
         chan->clocks =  4 * (2048 - (uint32_t) chan->freq.current);
@@ -377,7 +394,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
 
                     /* Clocks until next state change */
                     chan->until = chan->clocks;
-                    if (chan->env.enb && !chan->env.modmask &&
+                    if (chan->env.enb && chan->env.modmask != 2 &&
                         chan->env.clocks < chan->until)
                         chan->until = chan->env.clocks;
                     if (chan->int_.auto_ && chan->int_.clocks < chan->until)
@@ -387,7 +404,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
 
                     /* Manage clocks */
                     chan->clocks -= chan->until;
-                    if (chan->env.enb && !chan->env.modmask)
+                    if (chan->env.enb && chan->env.modmask != 2)
                         chan->env.clocks -= chan->until;
                     if (chan->int_.auto_)
                         chan->int_.clocks -= chan->until;
@@ -531,14 +548,7 @@ static void vsuReset(VB *sim) {
 
 /* Write a typed value to the VSU bus */
 static void vsuWrite(VB*sim,uint32_t address,int type,int32_t value,int debug){
-
-    /* Only byte writes are allowed */
-    switch (type) {
-        case VB_S16:
-        case VB_U16:
-        case VB_S32:
-            return;
-    }
+    (void) type;
 
     /* Unmapped */
     if (address & 1)

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 */
-static int32_t SignExtend(int32_t value, int32_t bits) {
-    #ifndef VB_SIGNED_PROPAGATE
-        value &= ~((uint32_t) 0xFFFFFFFF << bits);
-        bits   = (int32_t) 1 << (bits - (int32_t) 1);
-        return (value ^ bits) - bits;
-    #else
-        return value << (32 - bits) >> (32 - bits);
-    #endif
+/* Memory manager */
+#ifdef VBU_MEMMGR
+extern void* VBU_MEMMGR(void *ptr, size_t size);
+#else
+#include <stdlib.h>
+static void* VBU_MEMMGR(void *ptr, size_t size) {
+
+    /* Free a buffer */
+    if (size == 0) {
+        if (ptr != NULL)
+            free(ptr);
+        return NULL;
+    }
+
+    /* Create or resize a buffer */
+    return realloc(ptr, size);
 }
+#endif
 
 
 
@@ -46,14 +46,21 @@ VBUAPI int vbuCodeSize(VB *sim, uint32_t address) {
 }
 
 /* Initialize disassembler options with default settings */
-VBUAPI VBU_DasmConfig* vbuDasmInit(VBU_DasmConfig *config) {
+VBUAPI VBU_DasmConfig* vbuDasmDefaults(VBU_DasmConfig *config) {
+
+    /* Error checking */
+    if (config == NULL)
+        return NULL;
+
+    /* Supply default configuration */
     config->bcondNotation     = VBU_JOINED;
+    config->branchNotation    = VBU_ABSOLUTE;
     config->conditionCase     = VBU_LOWER;
     config->conditionCL       = VBU_L;
     config->conditionEZ       = VBU_Z;
     config->conditionNotation = VBU_NAMES;
     config->hexCase           = VBU_UPPER;
-    config->hexNotation       = VBU_0X;
+    config->hexNotation       = VBU_PREFIX_0X;
     config->immediateNotation = VBU_NONE;
     config->memoryNotation    = VBU_OUTSIDE;
     config->mnemonicCase      = VBU_UPPER;
@@ -69,6 +76,17 @@ VBUAPI VBU_DasmConfig* vbuDasmInit(VBU_DasmConfig *config) {
 /* Disassemble from a simulation */
 VBUAPI VBU_DasmLine* vbuDisassemble(VB *sim, uint32_t address,
     VBU_DasmConfig *config, unsigned length, int line) {
+    VBU_DasmConfig defs; /* Default settings */
+
+    /* Error checking */
+    if (sim == NULL || length == 0)
+        return NULL;
+
+    /* Supply default configuration */
+    if (config == NULL)
+        config = vbuDasmDefaults(&defs);
+
+    /* Disassemble instructions */
     return dasmDisassemble(sim, address, config, length, line);
 }
 

util/vbu.h

@@ -17,25 +17,27 @@ extern "C" {
 /********************************* Constants *********************************/
 
 /* Disassembler options */
-#define VBU_0X         0
-#define VBU_C          1
-#define VBU_DEST_FIRST 1
-#define VBU_DEST_LAST  0
-#define VBU_DOLLAR     1
-#define VBU_E          0
-#define VBU_H          2
-#define VBU_INSIDE     1
-#define VBU_JOINED     0
-#define VBU_L          0
-#define VBU_LOWER      1
-#define VBU_NAMES      1
-#define VBU_NONE       0
-#define VBU_NUMBER     1
-#define VBU_NUMBERS    0
-#define VBU_OUTSIDE    0
-#define VBU_SPLIT      1
-#define VBU_UPPER      0
-#define VBU_Z          1
+#define VBU_ABSOLUTE      0
+#define VBU_C             1
+#define VBU_DEST_FIRST    1
+#define VBU_DEST_LAST     0
+#define VBU_E             0
+#define VBU_INSIDE        1
+#define VBU_JOINED        0
+#define VBU_L             0
+#define VBU_LOWER         1
+#define VBU_NAMES         1
+#define VBU_NONE          0
+#define VBU_NUMBERS       0
+#define VBU_OUTSIDE       0
+#define VBU_PREFIX_0X     0
+#define VBU_PREFIX_DOLLAR 1
+#define VBU_PREFIX_NUMBER 1
+#define VBU_RELATIVE      1
+#define VBU_SPLIT         1
+#define VBU_SUFFIX_H      2
+#define VBU_UPPER         0
+#define VBU_Z             1
 
 
 
@@ -44,13 +46,14 @@ 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 */
     uint8_t conditionNotation; /* NAMES, NUMBERS */
     uint8_t hexCase;           /* UPPER, LOWER */
-    uint8_t hexNotation;       /* 0X, H, DOLLAR */
-    uint8_t immediateNotation; /* NONE, NUMBER */
+    uint8_t hexNotation;       /* PREFIX_0X, SUFFIX_H, PREFIX_DOLLAR */
+    uint8_t immediateNotation; /* NONE, SUFFIX_NUMBER */
     uint8_t memoryNotation;    /* OUTSIDE, INSIDE */
     uint8_t mnemonicCase;      /* UPPER, LOWER */
     uint8_t operandOrder;      /* DEST_LAST, DEST_FIRST */
@@ -66,7 +69,7 @@ typedef struct {
 
     /* Parsed */
     uint32_t address;    /* Memory address */
-    uint16_t code[4];    /* Instruction bytes */
+    uint8_t  code[4];    /* Instruction bytes */
     uint8_t  codeLength; /* Number of items in code */
     uint8_t  isPC;       /* Set if PC is on this line */
 
@@ -85,10 +88,10 @@ typedef struct {
 
 /******************************* API Commands ********************************/
 
-VBUAPI int             vbuCodeSize   (VB *sim, uint32_t address);
-VBUAPI VBU_DasmConfig* vbuDasmInit   (VBU_DasmConfig *config);
-VBUAPI VBU_DasmLine*   vbuDisassemble(VB *sim, uint32_t address, VBU_DasmConfig *config, unsigned length, int line);
-VBUAPI void*           vbuFromISX    (void *bytes, size_t length, size_t *romLength);
+VBUAPI int             vbuCodeSize    (VB *sim, uint32_t address);
+VBUAPI VBU_DasmConfig* vbuDasmDefaults(VBU_DasmConfig *config);
+VBUAPI VBU_DasmLine*   vbuDisassemble (VB *sim, uint32_t address, VBU_DasmConfig *config, unsigned length, int line);
+VBUAPI void*           vbuFromISX     (void *bytes, size_t length, size_t *romLength);