Fix handler address for FIV exception

core/bus.c

@@ -159,6 +159,8 @@ static void busRead(VB *sim, uint32_t address, int type, int32_t *value) {
 
         case 2: /* Misc. I/O */
             *value = busReadMisc(sim, address, type);
+            if (type == VB_S8)
+                *value = (int8_t) *value;
             break;
 
         case 3: break; /* Unmapped */

core/cpu.c

@@ -495,7 +495,7 @@ static int cpuException(VB *sim) {
         sim->cpu.eipc     = sim->cpu.pc;
         sim->cpu.psw.ep   = 1;
         sim->cpu.nextPC   = 0xFFFF0000 |
-            ((cause & 0xFFF0) == 0xFF60 ? 0xFF60 : cause & 0xFFF0);
+            ((cause & 0xFFF0) == 0xFF70 ? 0xFF60 : cause & 0xFFF0);
     }
 
     /* All exceptions */
@@ -1637,6 +1637,7 @@ static void cpuSUBF_S(VB *sim) {
 /* TRAP */
 static void cpuTRAP(VB *sim) {
     sim->cpu.clocks += cpuClocks(15);
+    sim->cpu.pc     += 2;
     cpuThrow(sim, 0xFFA0 + cpuGetImm5U(sim));
 }
 

core/timer.c

@@ -5,6 +5,15 @@
 
 /***************************** Module Functions ******************************/
 
+/* Compute clocks until the next decrement to zero */
+static uint32_t tmrGetUntil(VB *sim) {
+    uint32_t fullTick = sim->tmr.t_clk_sel ? 400 : 2000;
+    uint32_t thisTick = sim->tmr.clocks +
+        (sim->tmr.t_clk_sel ? 0 : 400 * (4 - sim->tmr.tick20));
+    return thisTick + fullTick *
+        (sim->tmr.counter == 0 ? sim->tmr.reload : sim->tmr.counter - 1);
+}
+
 /* Update the counter to a new value */
 static void tmrUpdate(VB *sim, uint16_t value) {
     if (value == 0 && sim->tmr.counter != 0) {
@@ -23,10 +32,6 @@ static void tmrUpdate(VB *sim, uint16_t value) {
 /* Process component */
 static void tmrEmulate(VB *sim, uint32_t clocks) {
 
-    /* Timer is disabled */
-    if (!sim->tmr.t_enb)
-        return;
-
     /* Process all clocks */
     for (;;) {
 
@@ -40,13 +45,20 @@ static void tmrEmulate(VB *sim, uint32_t clocks) {
         /* Advance forward the component's number of clocks */
         clocks          -= sim->tmr.clocks;
         sim->tmr.until  -= sim->tmr.clocks;
-        sim->tmr.clocks = sim->tmr.t_clk_sel ? 400 : 2000;
+        sim->tmr.clocks  = 400;
+        sim->tmr.tick20 += sim->tmr.tick20 == 4 ? -4 : 1;
+
+        /* Do not decrement counter */
+        if (
+            !sim->tmr.t_enb ||
+            (!sim->tmr.t_clk_sel && sim->tmr.tick20 != 0)
+        ) continue;
 
         /* Advance to the next counter value */
         tmrUpdate(sim, sim->tmr.counter == 0 ?
             sim->tmr.reload : sim->tmr.counter - 1);
         if (sim->tmr.counter == 0)
-            sim->tmr.until = sim->tmr.clocks * ((uint32_t)sim->tmr.reload + 1);
+            sim->tmr.until = tmrGetUntil(sim);
     }
 
 }
@@ -71,8 +83,10 @@ static void tmrReset(VB *sim) {
     sim->tmr.z_stat    = 0;
 
     /* Other */
+    sim->tmr.clocks  = 400;
     sim->tmr.counter = 0xFFFF;
     sim->tmr.reload  = 0x0000;
+    sim->tmr.tick20  = 0;
 }
 
 /* Determine how many clocks are guaranteed to process */
@@ -88,14 +102,27 @@ static void tmrWriteControl(VB *sim, uint8_t value) {
     if (
         (value & 0x04) && /* Z-Stat-Clr */
         (
-            sim->tmr.counter != 0 ||
-            !sim->tmr.t_enb
+            !sim->tmr.t_enb ||
+            (
+                sim->tmr.counter != 0 &&
+                !(value & 0x01) /* T-Enb */
+            )
         )
     ) {
         sim->tmr.z_stat = sim->tmr.counter != 0;
         sim->cpu.irq   &= ~0x0002;
     }
 
+    /* Hardware bug: decrement on switch to 20us mode */
+    if (
+        !sim->tmr.t_clk_sel &&
+        (value & 0x10)      && /* T-Clk-Sel */
+        sim->tmr.tick20 != 0
+    ) {
+        tmrUpdate(sim, sim->tmr.counter == 0 ?
+            sim->tmr.reload : sim->tmr.counter - 1);
+    }
+
     /* Parse fields */
     sim->tmr.t_clk_sel = value >> 4 & 1;
     sim->tmr.tim_z_int = value >> 3 & 1;
@@ -105,10 +132,8 @@ static void tmrWriteControl(VB *sim, uint8_t value) {
     if (!sim->tmr.tim_z_int)
         sim->cpu.irq &= ~0x0002;
 
-    /* Configure countdowns */
-    sim->tmr.clocks = sim->tmr.t_clk_sel ? 400 : 2000;
-    sim->tmr.until  = sim->tmr.clocks * (sim->tmr.counter == 0 ?
-        (uint32_t) sim->tmr.reload + 1 : sim->tmr.counter);
+    /* Configure state */
+    sim->tmr.until = tmrGetUntil(sim);
 
     /* TODO: Will Z-Stat raise an interrupt when Tim-Z-Int is set? */
 }
@@ -117,12 +142,14 @@ static void tmrWriteControl(VB *sim, uint8_t value) {
 static void tmrWriteHigh(VB *sim, uint8_t value) {
     sim->tmr.reload = (uint16_t) value << 8 | (sim->tmr.reload & 0x00FF);
     tmrUpdate(sim, sim->tmr.reload);
+    sim->tmr.until  = tmrGetUntil(sim);
 }
 
 /* Write to the low data register */
 static void tmrWriteLow(VB *sim, uint8_t value) {
     sim->tmr.reload = (sim->tmr.reload & 0xFF00) | value;
     tmrUpdate(sim, sim->tmr.reload);
+    sim->tmr.until  = tmrGetUntil(sim);
 }
 
 

core/vb.c

@@ -8,8 +8,11 @@
 
 /*********************************** Types ***********************************/
 
-/* Output image */
-typedef uint8_t Pixels[2][384*224];
+/* VIP BG map cell */
+typedef struct {
+    uint8_t *palette; /* Points to a VB.vip.gplt */
+    uint8_t *pixels;  /* Points to a VB.vip.characters */
+} Cell;
 
 /* VSU channel */
 typedef struct {
@@ -26,6 +29,7 @@ typedef struct {
 
         /* Other state */
         uint32_t clocks;  /* Clocks until modification */
+        uint8_t  modmask; /* Modifications masked */
         uint8_t  reload;  /* Automatic reload value */
     } env;
 
@@ -69,6 +73,53 @@ typedef struct {
     uint32_t until;   /* Clocks until channel component update */
 } Channel;
 
+/* VIP character (hflp << 1 | vflp) */
+typedef uint8_t Character[4][64];
+
+/* VIP object */
+typedef struct {
+    Cell    cell; /* BG map-like attributes */
+    int16_t jp;   /* Parallax */
+    int16_t jx;   /* Screen base X */
+    int16_t jy;   /* Screen Y */
+    uint8_t lron; /* Visible in left and right images */
+} Object;
+
+/* Output image */
+typedef uint8_t Pixels[2][384*224];
+
+/* VIP world */
+typedef struct {
+
+    /* Attributes */
+    uint8_t  bgm;       /* Mode */
+    uint8_t  end;       /* Control world */
+    int16_t  gp;        /* World parallax */
+    int16_t  gx;        /* World base X */
+    int16_t  gy;        /* World Y */
+    int16_t  mx;        /* Scroll base X */
+    int16_t  mp;        /* Scroll parallax */
+    int16_t  my;        /* Scroll Y */
+    uint8_t  over;      /* Use overplane */
+    Cell    *overplane; /* Overplane cell */
+
+    /* Non-attributes */
+    Cell    *bg[64];    /* Background arrangement */
+    int32_t  bgHeight;  /* Height of background in pixels */
+    uint32_t bgMaskX;   /* Horizontal background mask */
+    uint32_t bgMaskY;   /* Vertical background mask */
+    uint32_t bgShift;   /* Bits to shift when selecting a BG map */
+    int32_t  bgWidth;   /* Width of background in pixels */
+    uint32_t hAffine;   /* H for affine mode */
+    uint32_t hNaffine;  /* H for not affine mode */
+    uint32_t height;    /* Height of world in pixels */
+    uint8_t  lron;      /* Visible in left and right images */
+    uint32_t paramBase; /* H-bias and affine parameter address */
+    uint32_t wAffine;   /* W for affine mode */
+    uint32_t wNaffine;  /* W for not affine mode */
+    uint32_t width;     /* Width of world in pixels */
+} World;
+
 /* Simulation state */
 struct VB {
 
@@ -201,6 +252,7 @@ struct VB {
         uint32_t clocks;  /* Master clocks to wait */
         uint16_t counter; /* Current counter value */
         uint16_t reload;  /* Reload counter value */
+        uint8_t  tick20;  /* Current 20-microsecond tick */
         uint32_t until;   /* Clocks until interrupt condition */
     } tmr;
 
@@ -261,6 +313,7 @@ struct VB {
             int      frame;    /* FRMCYC counter */
             int32_t  halfword; /* Current output halfword offset */
             int      step;     /* Processing phase */
+            uint8_t  toggle;   /* Switch frame buffers next frame */
             uint32_t until;    /* Clocks until interrupt condition */
         } xp;
 
@@ -275,12 +328,17 @@ struct VB {
         uint16_t spt[4];     /* Object control */
 
         /* Rendering shadow memory */
+        uint8_t  buffer;            /* Output buffer */
         uint16_t halfwords[384*28]; /* Output timing by 1x8 halfword */
         Pixels   output[2];         /* Output images, row-major */
         Pixels   shadow;            /* Drawing shadow image, column-major */
 
         /* Other state */
+        Cell      cells[0x10000];   /* Pre-computed BG map attributes */
+        Character characters[2048]; /* Pre-computed character pixels */
+        Object    objects[1024];    /* Pre-computed object attributes */
         uint8_t   ram[0x40000];     /* Video memory */
+        World     worlds[32];       /* Pre-computed world attributes */
     } vip;
 
     /* VSU */
@@ -303,6 +361,8 @@ struct VB {
 
             /* Other state */
             uint32_t clocks;   /* Clocks until modification */
+            uint8_t  freqmask; /* Frequency mask */
+            uint8_t  modmask;  /* Modifications masked */
             uint16_t next;     /* Next frequency value */
             int      sample;   /* Current sample index */
         } freqmod;
@@ -577,7 +637,7 @@ VBAPI void vbGetPixels(VB *sim, void *left, int leftStrideX, int leftStrideY,
             continue;
 
         /* Transfer pixels to the destination */
-        src = sim->vip.output[sim->vip.dp.buffer ^ 1][i];
+        src = sim->vip.output[sim->vip.buffer][i];
         for (y = 0; y < 224; y++, dest += yStride)
         for (x = offset = 0; x < 384; x++, offset += xStride)
             dest[offset] = *src++;

core/vb.h

@@ -126,7 +126,6 @@ typedef int  (*vbOnWrite    )(VB *sim, uint32_t address, int type, int32_t *valu
 
 VBAPI int           vbEmulate             (VB *sim, uint32_t *clocks);
 VBAPI int           vbEmulateEx           (VB **sims, unsigned count, uint32_t *clocks);
-VBAPI void*         vbGetCallback         (VB *sim, int id);
 VBAPI void*         vbGetCartRAM          (VB *sim, uint32_t *size);
 VBAPI void*         vbGetCartROM          (VB *sim, uint32_t *size);
 VBAPI vbOnException vbGetExceptionCallback(VB *sim);

core/vsu.c

@@ -45,9 +45,28 @@ static void vsuOnSamples(VB *sim) {
 
 /***************************** Module Functions ******************************/
 
+/* Determine while frequency modifications should be processed */
+static uint8_t vsuCheckFreqMod(VB *sim) {
+    return
+        sim->vsu.freqmod.enb           &&
+        sim->vsu.freqmod.interval != 0 && (
+            sim->vsu.freqmod.modmask != 2 || (
+                sim->vsu.freqmod.func == 1 &&
+                sim->vsu.freqmod.rep
+            )
+        )
+    ;
+}
+
 /* Stage the next frequency modification value */
 static void vsuNextFreqMod(VB *sim, Channel *chan) {
-    uint16_t next;
+    int32_t next;
+
+    /* Modulation mask control */
+    if (sim->vsu.freqmod.modmask == 1 && sim->vsu.freqmod.func == 1) {
+        sim->vsu.freqmod.modmask = 2;
+        chan->freqmod = vsuCheckFreqMod(sim);
+    }
 
     /* Sweep */
     if (sim->vsu.freqmod.func == 0) {
@@ -57,25 +76,37 @@ static void vsuNextFreqMod(VB *sim, Channel *chan) {
         else next = chan->freq.current + next;
         if (next > 2047)
             chan->int_.enb = 0;
+        if (next < 0)
+            next = 0;
     }
 
     /* Modulation */
     else {
-        next = (chan->freq.written +
-            sim->vsu.modulation[sim->vsu.freqmod.sample]) & 2047;
-        if (sim->vsu.freqmod.sample != 31)
-            sim->vsu.freqmod.sample++;
-        else if (sim->vsu.freqmod.rep)
-            sim->vsu.freqmod.sample = 0;
+        next = ((int32_t) chan->freq.written +
+            sim->vsu.modulation[sim->vsu.freqmod.sample]) & 0x7FF;
+        if (sim->vsu.freqmod.freqmask == 1)
+            next = (next & 0x700) | (chan->freq.written & 0x0FF);
+        else if (sim->vsu.freqmod.freqmask == 2)
+            next = (next & 0x0FF) | (chan->freq.written & 0x700);
     }
 
     /* Configure state */
+    if (chan->freqmod)
         sim->vsu.freqmod.next = next;
 }
 
+/* Advance the noise channel's shift register */
+static void vsuNextNoise(VB *sim) {
+    uint32_t bit = ((
+        sim->vsu.noise.register_ >> NOISE_TAPS[sim->vsu.noise.tap] ^
+        sim->vsu.noise.register_ >> 7
+    ) & 1) ^ 1;
+    sim->vsu.noise.register_ = bit |
+        (sim->vsu.noise.register_ << 1 & 0x7FFE);
+}
+
 /* Process one channel */
-static void vsuEmulateChannel(VB *sim, Channel *chan, uint32_t clocks) {
-    uint32_t bit; /* Pseudorandom bit */
+static void vsuEmulateChannel(VB *sim, Channel *chan) {
 
     /* Automatic shutoff */
     if (chan->int_.auto_ && chan->int_.clocks == 0) {
@@ -95,37 +126,57 @@ static void vsuEmulateChannel(VB *sim, Channel *chan, uint32_t clocks) {
         /* Noise */
         else {
             chan->clocks = 40 * (2048 - (uint32_t) chan->freq.current);
-            bit = ((
-                sim->vsu.noise.register_ >> NOISE_TAPS[sim->vsu.noise.tap]^
-                sim->vsu.noise.register_ >> 7
-            ) & 1) ^ 1;
-            sim->vsu.noise.register_ = bit |
-                (sim->vsu.noise.register_ << 1 & 0x7FFE);
+            vsuNextNoise(sim);
         }
 
     }
 
     /* Envelope modification */
-    if (chan->env.enb && chan->env.clocks == 0) {
+    if (chan->env.enb && !chan->env.modmask && chan->env.clocks == 0) {
         if (chan->env.dir == 0 && chan->env.value != 0)
             chan->env.value--;
         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;
         chan->env.clocks = ((uint32_t) chan->env.interval + 1) * 307220;
     }
 
     /* Frequency modification */
-    if (chan->freqmod && sim->vsu.freqmod.clocks == 0) {
+    if (chan == &sim->vsu.channels[4] && sim->vsu.freqmod.clocks == 0) {
+
+        /* Apply previously computed frequency modification */
+        if (chan->freqmod)
             chan->freq.current = sim->vsu.freqmod.next;
-        vsuNextFreqMod(sim, chan);
+
+        /* Channel itself is disabled */
         if (!chan->int_.enb)
             return;
+
+        /* Frequency modifications are enabled */
+        if (chan->freqmod) {
+
+            /* Not the final modulation sample */
+            if (sim->vsu.freqmod.sample != 31)
+                sim->vsu.freqmod.sample++;
+
+            /* Last modulation sample processed */
+            else {
+                sim->vsu.freqmod.modmask = 1;
+                if (sim->vsu.freqmod.rep)
+                    sim->vsu.freqmod.sample = 0;
+            }
+
+            /* Schedule next modification */
             sim->vsu.freqmod.clocks = (uint32_t) sim->vsu.freqmod.interval *
                 (sim->vsu.freqmod.clk == 0 ? 19200 : 153600);
         }
 
+        /* Always process and validate next frequency value */
+        vsuNextFreqMod(sim, chan);
+    }
+
 }
 
 /* Produce output for a channel */
@@ -164,8 +215,10 @@ 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 (index == 4)
+    if (index == 4) {
+        chan->freqmod = vsuCheckFreqMod(sim);
         vsuNextFreqMod(sim, chan);
+    }
 
     /* Configure state */
     chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1);
@@ -186,14 +239,14 @@ static void vsuWriteEV1(VB *sim, int index, uint8_t value) {
             sim->vsu.freqmod.enb  = value >> 6 & 1;
             sim->vsu.freqmod.func = value >> 4 & 1;
             sim->vsu.freqmod.rep  = value >> 5 & 1;
+            chan->freqmod         = vsuCheckFreqMod(sim);
             vsuNextFreqMod(sim, chan);
-            chan->freqmod =
-                sim->vsu.freqmod.enb && sim->vsu.freqmod.interval != 0;
             break;
 
         case 5: /* Channel 6 */
             sim->vsu.noise.tap       = value >> 4 & 7;
             sim->vsu.noise.register_ = 0x0000;
+            vsuNextNoise(sim);
     }
 
 }
@@ -204,7 +257,9 @@ static void vsuWriteFQH(VB *sim, int index, uint16_t value) {
     value = value << 8 & 0x0700;
     chan->freq.current = (chan->freq.current & 0x00FF) | value;
     chan->freq.written = (chan->freq.written & 0x00FF) | value;
-    if (index == 4)
+    if (index != 4)
+        return;
+    sim->vsu.freqmod.freqmask = 2;
     vsuNextFreqMod(sim, chan);
 }
 
@@ -213,7 +268,9 @@ static void vsuWriteFQL(VB *sim, int index, uint8_t value) {
     Channel *chan = &sim->vsu.channels[index];
     chan->freq.current = (chan->freq.current & 0x0700) | value;
     chan->freq.written = (chan->freq.written & 0x0700) | value;
-    if (index == 4)
+    if (index != 4)
+        return;
+    sim->vsu.freqmod.freqmask = 1;
     vsuNextFreqMod(sim, chan);
 }
 
@@ -228,6 +285,7 @@ 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 (index != 5) {
@@ -235,12 +293,16 @@ static void vsuWriteINT(VB *sim, int index, uint8_t value) {
         chan->clocks =  4 * (2048 - (uint32_t) chan->freq.current);
     } else {
         sim->vsu.noise.register_ = 0x0000;
+        vsuNextNoise(sim);
         chan->clocks = 40 * (2048 - (uint32_t) chan->freq.current);
     }
     if (index == 4) {
         sim->vsu.freqmod.clocks = (uint32_t) sim->vsu.freqmod.interval *
             (sim->vsu.freqmod.clk == 0 ? 19200 : 153600);
+        sim->vsu.freqmod.modmask = 0;
         sim->vsu.freqmod.sample  = 0;
+        chan->freqmod = vsuCheckFreqMod(sim);
+        vsuNextFreqMod(sim, chan);
     }
 
 }
@@ -272,8 +334,8 @@ static void vsuWriteSWP(VB *sim, uint8_t value) {
         (sim->vsu.freqmod.clk == 0 ? 19200 : 153600);
     if (clocks < sim->vsu.freqmod.clocks)
         sim->vsu.freqmod.clocks = clocks;
-    sim->vsu.channels[4].freqmod =
-        sim->vsu.freqmod.enb && sim->vsu.freqmod.interval != 0;
+    sim->vsu.channels[4].freqmod = vsuCheckFreqMod(sim);
+    vsuNextFreqMod(sim, &sim->vsu.channels[4]);
 }
 
 
@@ -315,7 +377,8 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
 
                     /* Clocks until next state change */
                     chan->until = chan->clocks;
-                    if (chan->env.enb && chan->env.clocks < chan->until)
+                    if (chan->env.enb && !chan->env.modmask &&
+                        chan->env.clocks < chan->until)
                         chan->until = chan->env.clocks;
                     if (chan->int_.auto_ && chan->int_.clocks < chan->until)
                         chan->until = chan->int_.clocks;
@@ -324,7 +387,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
 
                     /* Manage clocks */
                     chan->clocks -= chan->until;
-                    if (chan->env.enb)
+                    if (chan->env.enb && !chan->env.modmask)
                         chan->env.clocks -= chan->until;
                     if (chan->int_.auto_)
                         chan->int_.clocks -= chan->until;
@@ -343,7 +406,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
 
                 /* Update channel state */
                 if (chan->until == 0)
-                    vsuEmulateChannel(sim, chan, chan->until);
+                    vsuEmulateChannel(sim, chan);
             }
 
         }
@@ -427,6 +490,7 @@ static void vsuReset(VB *sim) {
         chan->env.enb       = 0;
         chan->env.dir       = 0;
         chan->env.interval  = 0;
+        chan->env.modmask   = 0;
         chan->env.reload    = 0;
         chan->env.rep       = 0;
         chan->env.value     = 0;
@@ -447,8 +511,10 @@ static void vsuReset(VB *sim) {
     sim->vsu.freqmod.clocks   = 0;
     sim->vsu.freqmod.dir      = 0;
     sim->vsu.freqmod.enb      = 0;
+    sim->vsu.freqmod.freqmask = 0;
     sim->vsu.freqmod.func     = 0;
     sim->vsu.freqmod.interval = 0;
+    sim->vsu.freqmod.modmask  = 0;
     sim->vsu.freqmod.next     = 0;
     sim->vsu.freqmod.rep      = 0;
     sim->vsu.freqmod.sample   = 0;
@@ -475,11 +541,14 @@ static void vsuWrite(VB*sim,uint32_t address,int type,int32_t value,int debug){
     }
 
     /* Unmapped */
-    if (address & 3)
+    if (address & 1)
         return;
 
     /* Working variables */
-    address &= 0x7FF;
+    address &= 0x7FC;
+
+    /* Clear frequency mask */
+    sim->vsu.freqmod.freqmask = 0;
 
     /* Wave memory */
     if (address < 0x280) {

util/disassembler.c

@@ -1,4 +1,4 @@
-/* This file is included into vb.c and cannot be compiled on its own. */
+/* This file is included into vbu.c and cannot be compiled on its own. */
 #ifdef VBUAPI
 
 
@@ -449,12 +449,6 @@ static VBU_DasmLine* dasmGrow(
     return *lines == NULL ? NULL : &(*lines)[index];
 }
 
-/* Determine the size of an instruction */
-static uint32_t dasmInstSize(VB *sim, uint32_t address) {
-    unsigned opcode = vbRead(sim, address, VB_U16) >> 10 & 63;
-    return opcode < 0x20 || opcode == 0x32 || opcode == 0x36 ? 2 : 4;
-}
-
 /* Format an operand */
 static void dasmOperand(char *dest, VBU_DasmConfig *config,
     VBU_DasmLine *line, uint8_t type) {
@@ -515,10 +509,12 @@ static int dasmLine(VB *sim, uint32_t *address, uint32_t pc,
     /* Process non-text members */
     line = &(*lines)[index];
     line->address    = *address;
-    line->codeLength = dasmInstSize(sim, *address);
+    line->codeLength = vbuCodeSize(sim, *address);
     line->isPC       = *address == pc;
     for (x = 0; x < line->codeLength; x++)
         line->code[x] = vbRead(sim, *address + x, VB_U8);
+
+    /* Advance to the next instruction or PC, whichever is sooner */
     *address += pc != *address && pc - *address < line->codeLength ?
         pc - *address : line->codeLength;
 
@@ -660,9 +656,11 @@ static VBU_DasmLine* dasmDisassemble(VB *sim, uint32_t address,
         }
 
         /* Check if the instruction contains the reference address */
-        size = dasmInstSize(sim, addr);
+        size = vbuCodeSize(sim, addr);
         if (address - addr < size)
             break;
+
+        /* Advance to the next instruction or PC, whichever is sooner */
         addr += addr != pc && pc - addr < size ? pc - addr : size;
     }
 
@@ -674,7 +672,7 @@ static VBU_DasmLine* dasmDisassemble(VB *sim, uint32_t address,
 
     /* Keep decoding until the first line of output */
     else for (; line < 0; line++)
-        addr += dasmInstSize(sim, addr);
+        addr += vbuCodeSize(sim, addr);
 
     /* Working variables */
     size   = length * sizeof (VBU_DasmLine);

util/isx.c

@@ -0,0 +1,297 @@
+/* This file is included into vbu.c and cannot be compiled on its own. */
+#ifdef VBUAPI
+
+
+
+/********************************* Constants *********************************/
+
+/* Range types */
+/*
+0x41 ('A')   8-bit integer (.db), string
+0x42 ('B')   8-bit integer (.db), numeric
+0x43 ('C')   Compiled C code
+0x44 ('D')   16-bit integer (.dd, high byte first)
+0x45 ('E')   65C816 code (8-bit accumulator, 8-bit index)
+0x46 ('F')   65C816 code (8-bit accumulator, 16-bit index)
+0x47 ('G')   65C816 code (16-bit accumulator, 8-bit index)
+0x48 ('H')   65C816 code (16-bit accumulator, 16-bit index)
+0x4C ('L')   32-bit integer (.dl SNES, .dw Virtual Boy, low byte first)
+0x53 ('S')   Size reservation, as in .bss allocation (.ds)
+0x57 ('W')   16-bit integer (.dw SNES, .dh Virtual Boy, low byte first)
+*/
+
+
+
+/***************************** Module Functions ******************************/
+
+/* Skip ISX record type 0x01 */
+static size_t isx01(uint8_t *bytes, size_t length, size_t src) {
+    /*
+      u8   Type         =0x01
+      u8   Bank         Cartridge bank number
+      u8   BankHigh     Only if Bank >= 0x80
+      u16  Address      CPU bus address
+      u16  DataLength   Number of bytes in Data
+      u8[] Data         Code bytes
+    */
+
+    /* Bank field is not present */
+    if (src + 2 > length)
+        return (size_t) -1;
+
+    /* Advance to DataLength field */
+    src += bytes[src + 1] >= 0x80 ? 5 : 4;
+
+    /* DataLength field is not present */
+    if (src + 2 > length)
+        return (size_t) -1;
+
+    /* Advance past Data field */
+    return src + 2 + ((uint16_t) bytes[src + 1] << 8 | bytes[src]);
+}
+
+/* Decode ISX record type 0x11 */
+static size_t isx11(uint8_t *bytes, size_t length, size_t src,
+    uint32_t *address, uint32_t *size) {
+    /*
+      u8   Type         =0x11
+      u32  Address      CPU bus address
+      u32  DataLength   Number of bytes in Data
+      u8[] Data         Code bytes
+    */
+
+    /* DataLength field is not present */
+    if (src + 9 > length)
+        return (size_t) -1;
+
+    /* Parse Address and DataLength fields */
+    *address = (uint32_t) bytes[src+4] << 24 | (uint32_t) bytes[src+3] << 16 |
+               (uint32_t) bytes[src+2] <<  8 |            bytes[src+1];
+    *size    = (uint32_t) bytes[src+8] << 24 | (uint32_t) bytes[src+7] << 16 |
+               (uint32_t) bytes[src+6] <<  8 |            bytes[src+5];
+
+    /* Advance past Data field */
+    return src + 9 + *size;
+}
+
+/* Skip ISX range records */
+static size_t isxRange(uint8_t *bytes,size_t length,size_t src,size_t size) {
+    /*
+      u8      Type            =0x03 (SNES) or 0x13 (Virtual Boy)
+      u16     Count           Number of ranges
+      Range[] Ranges
+       === SNES fields ===
+       u8      Bank           Cartridge bank number
+       u16     StartAddress   Lowest CPU bus address
+       u16     EndAddress     Highest CPU bus address
+       u8      RangeType      See range types
+       === Virtual Boy fields ===
+       u32     StartAddress   Lowest CPU bus address
+       u32     EndAddress     Highest CPU bus address
+       u8      RangeType      See range types
+    */
+
+    /* Count field is not present */
+    if (src + 3 > length)
+        return (size_t) -1;
+
+    /* Advance past Ranges field */
+    return src + 3 + size * ((uint16_t) bytes[src + 2] << 8 | bytes[src + 1]);
+}
+
+/* Skip ISX symbol record */
+static size_t isxSymbol(uint8_t *bytes,size_t length,size_t src,size_t size) {
+    size_t count; /* Number of symbols */
+    size_t x;     /* Iterator */
+
+    /*
+      u8       Type          =0x04 (SNES) or 0x14 (Virtual Boy)
+      u16      Count         Number of symbols
+      Symbol[] Symbols
+       u8       NameLength   Number of bytes in Name
+       u8[]     Name         Symbol name
+       === SNES fields ===
+       u8       Flags        Undocumented
+       u8       Bank         Cartridge bank number
+       u16      Address      CPU bus address
+       === Virtual Boy fields ===
+       u16      Flags        Undocumented
+       u32      Address      CPU bus address
+    */
+
+    /* Count field is not present */
+    if (src + 3 > length)
+        return (size_t) -1;
+
+    /* Working variables */
+    count = (uint16_t) bytes[src + 2] << 8 | bytes[src + 1];
+    src  += 3;
+
+    /* Process all symbols */
+    for (x = 0; x < count; x++) {
+
+        /* NameLength field is not present */
+        if (src > length)
+            return (size_t) -1;
+
+        /* Advance past remainder of symbol */
+        src += size + bytes[src];
+
+        /* Remainder of symbol is not present */
+        if (src > length)
+            return (size_t) -1;
+    }
+
+    return src;
+}
+
+/* Skip ISX system record */
+static size_t isxSystem(uint8_t *bytes, size_t length, size_t src) {
+    /*
+      u8   Type         =0x20, 0x21 or 0x22
+      u32  DataLength   Number of bytes in Data
+      u8[] Data         Record data
+    */
+
+    /* DataLength field is not present */
+    if (src + 5 > length)
+        return (size_t) -1;
+
+    /* Advance past Data field */
+    return src + 5 + (
+        (uint32_t) bytes[src + 4] << 24 | (uint32_t) bytes[src + 3] << 16 |
+        (uint32_t) bytes[src + 2] <<  8 |            bytes[src + 1]
+    );
+}
+
+
+
+/***************************** Library Functions *****************************/
+
+/* Decode an ISX debugger file to a Virtual Boy ROM */
+static void* isxFrom(uint8_t *bytes, size_t length, size_t *romLength) {
+    uint32_t addr;    /* Code record base address */
+    uint32_t highMin; /* Lowest address in upper half of ROM */
+    uint32_t lowMax;  /* Highest address in lower half of ROM */
+    uint8_t *rom;     /* Output ROM */
+    uint32_t size;    /* Code record size in bytes */
+    size_t   src;     /* Input position */
+    size_t   start;   /* Offset of first record */
+
+    /* Error checking */
+    if (length < 3)
+        return NULL;
+
+    /* Working variables */
+    highMin = 0xFFFFFF;
+    lowMax  = 0x000000;
+    size    = 0;
+    start   = strncmp((char *) bytes, "ISX", 3) ? 0 : 32;
+
+    /* First pass: determine the size of the ROM */
+    for (src = start; src < length;) {
+        switch (bytes[src]) {
+
+            case 0x11: /* Code (Virtual Boy) */
+
+                /* Decode record fields */
+                src = isx11(bytes, length, src, &addr, &size);
+                if (src > length)
+                    return NULL;
+
+                /* Validate address and data size */
+                addr &= 0x07FFFFFF;
+                if (
+                    addr < 0x07000000 ||
+                    0x08000000 - addr < size
+                ) return NULL;
+                addr &= 0x00FFFFFF;
+
+                /* Requires 16 MiB */
+                if (addr < 0x800000 && addr + size > 0x800000) {
+                    highMin = 0x800000;
+                    lowMax  = 0x7FFFFF;
+                }
+
+                /* Map from top of ROM space */
+                else if (addr & 0x800000) {
+                    if (addr < highMin)
+                        highMin = addr;
+                }
+
+                /* Map from bottom of ROM space */
+                else {
+                    addr += size - 1;
+                    if (addr > lowMax)
+                        lowMax = addr;
+                }
+ 
+                break;
+
+            case 0x01: /* Code (SNES) */
+                src = isx01    (bytes, length, src   ); break;
+            case 0x03: /* Range (SNES) */
+                src = isxRange (bytes, length, src, 6); break;
+            case 0x04: /* Symbol (SNES) */
+                src = isxSymbol(bytes, length, src, 5); break;
+            case 0x13: /* Range (Virtual Boy) */
+                src = isxRange (bytes, length, src, 9); break;
+            case 0x14: /* Symbol (Virtual Boy) */
+                src = isxSymbol(bytes, length, src, 7); break;
+            case 0x20: /* System (undocumented) */
+            case 0x21: /* System (undocumented) */
+            case 0x22: /* System (undocumented) */
+                src = isxSystem(bytes, length, src    ); break;
+            default: /* Invalid record type */
+                return NULL;
+        }
+
+        /* Record contains invalid data */
+        if (src > length)
+            return NULL;
+    }
+
+    /* Produce a ROM buffer of minimal size to fit all the code records */
+    for (
+        src = 1;
+        src < lowMax + 0x1000001 - highMin;
+        src <<= 1
+    );
+    rom = VBU_REALLOC(NULL, src);
+    if (rom == NULL)
+        return NULL;
+    *romLength = src;
+    memset(rom, 0x00, src);
+
+    /* Second pass: fill the ROM buffer with the code records */
+    for (src = start; src < length;) {
+        switch (bytes[src]) {
+
+            case 0x11: /* Code (Virtual Boy) */
+                src = isx11(bytes, length, src, &addr, &size);
+                memcpy(&rom[addr & (*romLength-1)], &bytes[src - size], size);
+                break;
+
+            case 0x01: /* Code (SNES) */
+                src = isx01    (bytes, length, src    ); break;
+            case 0x03: /* Range (SNES) */
+                src = isxRange (bytes, length, src,  9); break;
+            case 0x04: /* Symbol (SNES) */
+                src = isxSymbol(bytes, length, src,  5); break;
+            case 0x13: /* Range (Virtual Boy) */
+                src = isxRange (bytes, length, src, 12); break;
+            case 0x14: /* Symbol (Virtual Boy) */
+                src = isxSymbol(bytes, length, src,  7); break;
+            case 0x20: /* System (undocumented) */
+            case 0x21: /* System (undocumented) */
+            case 0x22: /* System (undocumented) */
+                src = isxSystem(bytes, length, src    ); break;
+        }
+    }
+
+    return rom;
+}
+
+
+
+#endif /* VBUAPI */

util/vbu.c

@@ -33,11 +33,18 @@ static int32_t SignExtend(int32_t value, int32_t bits) {
 /******************************** Sub-Modules ********************************/
 
 #include "disassembler.c"
+#include "isx.c"
 
 
 
 /******************************* API Commands ********************************/
 
+/* Determine the size in bytes of an instruction */
+VBUAPI int vbuCodeSize(VB *sim, uint32_t address) {
+    int opcode = vbRead(sim, address, VB_U16) >> 10 & 63;
+    return opcode < 0x20 || opcode == 0x32 || opcode == 0x36 ? 2 : 4;
+}
+
 /* Initialize disassembler options with default settings */
 VBUAPI VBU_DasmConfig* vbuDasmInit(VBU_DasmConfig *config) {
     config->bcondNotation     = VBU_JOINED;
@@ -64,3 +71,8 @@ VBUAPI VBU_DasmLine* vbuDisassemble(VB *sim, uint32_t address,
     VBU_DasmConfig *config, unsigned length, int line) {
     return dasmDisassemble(sim, address, config, length, line);
 }
+
+/* Decode an ISX debugger file to a Virtual Boy ROM */
+VBUAPI void* vbuFromISX(void *bytes, size_t length, size_t *romLength) {
+    return isxFrom(bytes, length, romLength);
+}

util/vbu.h

@@ -85,8 +85,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);
 
 
 

web/Audio.js

@@ -1,7 +1,5 @@
 "use strict";
 
-//////////////////////////////////// Audio ////////////////////////////////////
-
 // Dedicated audio output processor
 class Audio extends AudioWorkletProcessor {
 

web/Constants.js

@@ -1,4 +1,5 @@
-let Constants = {
+"use strict";
+export default {
 
     // Core
     VB: {
@@ -85,5 +86,3 @@ let Constants = {
     }
 
 };
-
-export { Constants };

web/Core.js

@@ -1,5 +1,5 @@
 "use strict";
-import { Constants } from "./Constants.js";
+import Constants from /***/"./Constants.js";
 
 
 
@@ -87,10 +87,7 @@ new class Core {
             this.sims.set(sim.pointer, sim);
 
             // Video
-            sim.pixels = this.#noalloc(
-                this.GetExtPixels(sim.pointer),
-                384*224*4, sim, "pixels", Uint8ClampedArray
-            );
+            sim.pixels = this.#getPixels(sim);
             sim.image  = new ImageData(sim.pixels, 384, 224);
 
             // Audio
@@ -261,6 +258,47 @@ new class Core {
         });
     }
 
+    // Attempt to produce a ROM from an ISX debugger file
+    fromISX(message) {
+
+        // Transfer the input data into WebAssembly memory
+        let input = new Uint8Array(message.data);
+        let inPtr = this.Realloc(0, input.length);
+        let inMem = new Uint8Array(this.memory.buffer, inPtr, input.length);
+        for (let x = 0; x < input.length; x++)
+            inMem[x] = input[x];
+
+        // Attempt to decode the ISX file as a ROM
+        let outPtr = this.FromISX(inPtr, input.length);
+        this.Realloc(inPtr, 0);
+
+        // The data is not an ISX file
+        if (outPtr == 0) {
+            this.dom.postMessage({ promised: true, data: null });
+            return;
+        }
+
+        // Transfer the decoded ROM from WebAssembly memory
+        let output = new Uint8Array(this.GetISXLength(outPtr));
+        let outMem = new Uint8Array(this.memory.buffer,
+            this.GetISXROM(outPtr), output.length);
+        for (let x = 0; x < output.length; x++)
+            output[x] = outMem[x];
+        this.Realloc(outPtr, 0);
+
+        // Notify DOM thread
+        this.dom.postMessage({
+            promised: true,
+            data    : output.buffer
+        }, [ output.buffer ]);
+    }
+
+    // Reset simulation state
+    reset(message) {
+        this.vbReset(message.sim);
+        this.dom.postMessage({ promised: true });
+    }
+
     // Specify anaglyph colors
     setAnaglyph(message) {
         this.SetAnaglyph(message.sim, message.left, message.right);
@@ -364,9 +402,11 @@ new class Core {
             this.mallocs.set(buffer.pointer, buffer);
             this.#updateTarget(buffer);
         }
-        for (let sim of this.sims)
+        for (let sim of this.sims.values()) {
+            sim.pixels = this.#getPixels(sim);
             sim.image  = new ImageData(sim.pixels, 384, 224);
         }
+    }
 
 
 
@@ -436,6 +476,14 @@ new class Core {
         this.Realloc(buffer.pointer, 0);
     }
 
+    // Register a sim's pixel buffer
+    #getPixels(sim) {
+        return this.#noalloc(
+            this.GetExtPixels(sim.pointer),
+            384*224*4, sim, "pixels", Uint8ClampedArray
+        );
+    }
+
     // Allocate memory in WebAssembly and register the buffer
     #malloc(count, target = null, assign = null, type = Uint8ClampedArray) {
         return this.#noalloc(

web/VB.js

@@ -1,5 +1,5 @@
 "use strict";
-import { Constants } from "./Constants.js";
+import Constants from /**/"./Constants.js";
 
 // Instantiation guard
 const GUARD = Symbol();
@@ -436,8 +436,17 @@ class Sim extends HTMLElement {
             response.lines.map(l=>new DasmLine(GUARD, l));
     }
 
+    // Reset simulation state
+    reset() {
+        return this.#core.toCore({
+            command : "reset",
+            promised: true,
+            sim     : this.#pointer
+        });
+    }
+
     // Specify anaglyph colors
-    async setAnaglyph(left, right) {
+    setAnaglyph(left, right) {
 
         // Error checking
         if (!Number.isSafeInteger(left ) || left  < 0 || left  > 0xFFFFFF)
@@ -455,7 +464,7 @@ class Sim extends HTMLElement {
         this.#anaglyph[1] = right;
 
         // Send the colors to the core
-        await this.#core.toCore({
+        return this.#core.toCore({
             command : "setAnaglyph",
             promised: true,
             sim     : this.#pointer,
@@ -475,7 +484,7 @@ class Sim extends HTMLElement {
     }
 
     // Specify new game pad keys
-    async setKeys(keys) {
+    setKeys(keys) {
 
         // Error checking
         if (!Number.isSafeInteger(keys) || keys < 0 || keys > 0xFFFF)
@@ -487,7 +496,7 @@ class Sim extends HTMLElement {
         this.#keys = keys;
 
         // Send the keys to the core
-        await this.#core.toCore({
+        return this.#core.toCore({
             command : "setKeys",
             promised: true,
             sim     : this.#pointer,
@@ -496,7 +505,7 @@ class Sim extends HTMLElement {
     }
 
     // Specify audio panning
-    async setPanning(panning) {
+    setPanning(panning) {
 
         // Error checking
         if (!Number.isFinite(panning) ||panning < -1 || panning > +1) {
@@ -508,7 +517,7 @@ class Sim extends HTMLElement {
         this.#panning = panning;
 
         // Send the panning to the core
-        await this.#core.toCore({
+        return this.#core.toCore({
             command : "setPanning",
             promised: true,
             sim     : this.#pointer,
@@ -529,7 +538,7 @@ class Sim extends HTMLElement {
     }
 
     // Specify audio volume
-    async setVolume(volume) {
+    setVolume(volume) {
 
         // Error checking
         if (!Number.isFinite(volume) ||volume < 0 || volume > 10) {
@@ -541,7 +550,7 @@ class Sim extends HTMLElement {
         this.#volume = volume;
 
         // Send the volume to the core
-        await this.#core.toCore({
+        return this.#core.toCore({
             command : "setVolume",
             promised: true,
             sim     : this.#pointer,
@@ -596,7 +605,7 @@ class VB {
     #commands;  // Computed method table
     #core;      // Core worker
     #proxy;     // Self proxy for sim access
-    #sims;      // All sims
+    #sims;      // Mapping of Sim|pointer -> proxy
     #state;     // Operations state
 
 
@@ -683,8 +692,8 @@ class VB {
     ///////////////////////////// Static Methods //////////////////////////////
 
     // Create a core instance
-    static async create(options) {
-        return await new VB(GUARD).#construct(options);
+    static create(options) {
+        return new VB(GUARD).#construct(options);
     }
 
 
@@ -769,6 +778,16 @@ class VB {
 
 
 
+    /////////////////////////////// Properties ////////////////////////////////
+
+    // Number of managed simulations
+    get size() { return this.#sims.size / 2; }
+
+    // Managed simulations
+    get sims() { return [... this.#sims.keys()].filter(s=>s instanceof Sim); }
+
+
+
     ///////////////////////////// Public Methods //////////////////////////////
 
     // Create one or more sims
@@ -809,7 +828,7 @@ class VB {
         if (
             !Array.isArray(sims) ||
             sims.length == 0     ||
-            sims.find(s=>!this.#sims.has(s))
+            sims.some(s=>!this.#sims.has(s))
         ) {
             throw new TypeError("Must specify a Sim or array of Sims " +
                 "that belong to this core.");
@@ -864,6 +883,28 @@ class VB {
         return true;
     }
 
+    // Decode an ISX debugger file to a Virtual Boy ROM
+    async fromISX(data) {
+
+        // Validation
+        if (data instanceof ArrayBuffer)
+            data = new Uint8Array(data);
+        if (
+            !(data instanceof Uint8Array) &&
+            !(data instanceof Uint8ClampedArray)
+        ) data = Uint8Array.from(data);
+
+        // Send the memory to the core
+        data = data.slice();
+        let response = await this.#toCore({
+            command  : "fromISX",
+            promised : true,
+            data     : data.buffer,
+            transfers: [ data.buffer ]
+        });
+        return response.data == null ? null : new Uint8Array(response.data);
+    }
+
     // Suspend automatic emulation
     async suspend() {
 
@@ -932,4 +973,4 @@ class VB {
 
 }
 
-export { VB };
+export default VB;