fixed bug with instruction decoding in dcpu, fixed bugs in display

non-basic instructions had been consuming too many words.
display now draws on screen

diff --git a/Makefile b/Makefile
index 263c8e33bff371276c1e1a6af1ff872a98a8551b..2560edffac3bade1fde45492e063c4862c7cf018 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ endif
 
 PROGRAMS = as-dcpu16 vm-dcpu16
 SOURCES = common.c dcpu16.c as-dcpu16.c vm-dcpu16.c \
-                 hw_clock.c hw_keyboard.c hw_lem1802.c
+                 hw_clock.c hw_keyboard.c hw_lem1802.c hw_spc2000.c
 
 CPPFLAGS += -DDEBUG
 
@@ -40,7 +40,7 @@ depend:       .depend
 include .depend
 
 
-vm-dcpu16:     vm-dcpu16.o dcpu16.o common.o hw_clock.o hw_keyboard.o hw_lem1802.o
+vm-dcpu16:     vm-dcpu16.o dcpu16.o common.o hw_clock.o hw_keyboard.o hw_lem1802.o hw_spc2000.o
 
 as-dcpu16:     as-dcpu16.o dcpu16.o common.o
 

diff --git a/dcpu16.c b/dcpu16.c
index d7b3d4822eb25cf61edf0cd2c4b9fd1f5f6dbd48..ea0ee261d7c02398e8d4c26caf9a2fd5720545d1 100644 (file)
--- a/dcpu16.c
+++ b/dcpu16.c
@@ -180,8 +180,9 @@ void value_decode_(struct dcpu16 *vm, DCPU16_WORD value, unsigned int value_is_a
     DCPU16_WORD pc = (DCPU16_WORD)(vm->reg[DCPU16_REG_PC] + *pc_adjust),
                 sp = (DCPU16_WORD)(vm->reg[DCPU16_REG_PC] + *sp_adjust);
 
-    TRACE("%s: pc:0x%04x sp:0x%04x value_data:0x%04x\n", 
+    TRACE("%s>> is_a:%u pc:0x%04x sp:0x%04x value_data:0x%04x\n", 
           __func__,
+          value_is_a,
           pc,
           sp,
           value_data);
@@ -1113,9 +1114,9 @@ void instruction_decode_(DCPU16_WORD *mem, DCPU16_WORD addr,
     *a = (mem[addr] >> (OPCODE_BASIC_BITS + OPCODE_OPERAND_B_BITS)) & ((1 << OPCODE_OPERAND_A_BITS) - 1);
     *instr_len = 1;
 
-    if ( (*b >= 0x10 && *b <= 0x17) || *b == 0x1e || *b == 0x1f ) {
+    if ((*opcode != 0x0000) &&
+        ( (*b >= 0x10 && *b <= 0x17) || *b == 0x1e || *b == 0x1f ) ) {
         *b_data = mem + (DCPU16_WORD)(addr + *instr_len);
-        TRACE("**b_data:%hu", **b_data);
         *instr_len += 1;
     } else {
         *b_data = NULL;
@@ -1124,13 +1125,11 @@ void instruction_decode_(DCPU16_WORD *mem, DCPU16_WORD addr,
     if ( (*opcode != 0x0000 || (*opcode == 0 && *b != 0x0000) )
     &&   ( (*a >= 0x10 && *a <= 0x17) || *a == 0x1e || *a == 0x1f) ) {
         *a_data = mem + (DCPU16_WORD)(addr + *instr_len);
-        TRACE("**a_data:%hu", **a_data);
         *instr_len += 1;
     } else {
         *a_data = NULL;
     }
 
-#if 0
     TRACE("\n%s: [0x%04x]:0x%04x op:0x%02x b:0x%02x (b_data:0x%04x) a:0x%02x (a_data:0x%04x) len:0x%02x\n",
             __func__, 
             addr,
@@ -1141,7 +1140,6 @@ void instruction_decode_(DCPU16_WORD *mem, DCPU16_WORD addr,
             *a,
             *a_data ? **a_data : 0,
             *instr_len);
-#endif
 }
 
 /*  dcpu16_mnemonify_buf
@@ -1234,16 +1232,17 @@ void dcpu16_step(struct dcpu16 *vm) {
     size_t i;
     const struct opcode_entry *e;
 
-    if (!vm) return;
+    if (!vm)
+        return;
 
     /* signal interested parties that a new cycle has ticked */
-    TRACE("%s: sending global cycle event", __func__);
+    TRACE("%s>> sending global cycle event", __func__);
     acct_event_(vm, DCPU16_ACCT_EV_CYCLE, vm->reg[DCPU16_REG_PC]);
 
     /* signal attached hardware */
     for (i = 0; i < vm->hw_table_entries_; i++) {
         if (vm->hw_table_[i].cycle) {
-            TRACE("%s: sending cycle to %s", __func__, vm->hw_table_[i].name_);
+            TRACE("%s>> sending cycle to %s", __func__, vm->hw_table_[i].name_);
             vm->hw_table_[i].cycle(vm, vm->hw_table_[i].data);
         }
     }
@@ -1284,7 +1283,7 @@ void dcpu16_step(struct dcpu16 *vm) {
             message = interrupt_dequeue_(vm);
 
             if (vm->reg[DCPU16_REG_IA]) {
-                TRACE("servicing interrupt IA:0x%04x message:0x%04x \n", vm->reg[DCPU16_REG_IA], message);
+                TRACE("%s>> servicing interrupt IA:0x%04x message:0x%04x \n", __func__, vm->reg[DCPU16_REG_IA], message);
                 /* then service the next interrupt */
                 vm->interrupts_deferred_ = 1;
                 vm->ram[--vm->reg[DCPU16_REG_SP]] = vm->reg[DCPU16_REG_PC];
@@ -1292,7 +1291,7 @@ void dcpu16_step(struct dcpu16 *vm) {
                 vm->reg[DCPU16_REG_PC] = vm->reg[DCPU16_REG_IA];
                 vm->reg[DCPU16_REG_A] = message;
             } else {
-                TRACE("ignoring interrupt IA:0");
+                TRACE("%s>> ignoring interrupt IA:0", __func__);
             }
         }
     }
@@ -1349,6 +1348,13 @@ int dcpu16_hw_add(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     if (!vm || !hw)
         return -1;
 
+    TRACE("%s>> name:%s ID:0x%04x%04x MFG:0x%04x%04x VER:0x%04x",
+          __func__,
+          hw->name_,
+          hw->id_h, hw->id_l,
+          hw->mfg_l, hw->mfg_h,
+          hw->ver);
+
     if (vm->hw_table_entries_ == 0xffff) {
         WARN("maximum hardware entries reached");
         return -1;
@@ -1368,6 +1374,8 @@ int dcpu16_hw_add(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     memcpy(vm->hw_table_ + vm->hw_table_entries_, hw, sizeof *hw);
     vm->hw_table_entries_++;
 
+    TRACE("%s>> added hw entry %zu", __func__, vm->hw_table_entries_);
+
     return 0;
 }
 
@@ -1399,6 +1407,8 @@ int dcpu16_acct_add(struct dcpu16 *vm, dcpu16_acct_event mask, dcpu16_ev_cb_t *f
     memcpy(vm->cb_table_ + vm->cb_table_entries_, &cb, sizeof cb);
     vm->cb_table_entries_++;
 
+    TRACE("%s>> attached event callback %zu", __func__, vm->cb_table_entries_);
+
     return 0;
 }
 
@@ -1411,6 +1421,8 @@ void dcpu16_reset(struct dcpu16 *vm) {
     if (!vm)
         return;
 
+    TRACE("%s>> reset", __func__);
+
     vm->skip_ = 0;
     vm->interrupts_deferred_ = 0;
     vm->on_fire_ = 0;

diff --git a/hw_lem1802.c b/hw_lem1802.c
index 72af16ac769cb6525560402ad4e4a29371fb4e28..ae0c9dd3ae9b21eede8c12c01c8bd778dd8756cc 100644 (file)
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@ -17,6 +17,12 @@
 #include "chargen-4x8.h"
 #include "hw_lem1802.h"
 
+#ifdef DEBUG
+#define TRACE(...) do { printf("[debug] "); printf(__VA_ARGS__); printf("\n"); } while (0)
+#else /* DEBUG  */
+#define TRACE(...) do {} while (0)
+#endif /* DEBUG */
+
 static dcpu16_hw_signal_t lem1802_reset_;
 static dcpu16_hw_signal_t lem1802_cycle_;
 static dcpu16_hw_signal_t lem1802_hwi_;
@@ -33,11 +39,13 @@ static struct dcpu16_hw hw_ = {
     .data   = (struct lem1802_ *)NULL
 };
 
-#define PIX_X 160
-#define PIX_Y 128
-#define PIX_BORDER 16
+#define PIX_X 160       /* pixels in display */
+#define PIX_Y 128       /* pixels in display */
+#define PIX_BORDER 16   /* border pixels from edge to first tile */
 #define CELL_X_SZ 4
 #define CELL_Y_SZ 8
+#define CELL_X ((PIX_X - (2 * PIX_BORDER)) / CELL_X_SZ) /* tiles in display */
+#define CELL_Y ((PIX_Y - (2 * PIX_BORDER)) / CELL_Y_SZ) /* tiles in display */
 
 #define PALETTE_ENTRIES 16
 static const DCPU16_WORD palette_default_[PALETTE_ENTRIES] = {
@@ -98,6 +106,8 @@ static
 void pixbuf_border_paint_(struct pixel_ *pixbuf, struct pixel_ *border) {
     size_t x, y, i;
 
+    TRACE("%s>> painted border", __func__);
+
     /* top */
     for (y = 0; y < PIX_BORDER; y++) {
         for (x = 0; x < PIX_X; x++) {
@@ -122,6 +132,11 @@ void font_tile_paint_(struct pixel_ *p, struct pixel_ *fg, struct pixel_ *bg, DC
     size_t pix_x, pix_y;
     unsigned char *font_bitmap = (unsigned char *)tile;
 
+    TRACE("%s>> fg:(%u,%u,%u) bg:(%u,%u,%u) font_bitmap:%02x %02x %02x %02x", __func__,
+          fg->r, fg->g, fg->b,
+          bg->r, bg->g, bg->b,
+          font_bitmap[0], font_bitmap[1], font_bitmap[2], font_bitmap[3]);
+
     for (pix_x = 0; pix_x < CELL_X_SZ; pix_x++) {
         for (pix_y = 0; pix_y < CELL_Y_SZ; pix_y++) {
             if ((font_bitmap[pix_x] >> pix_y) & 0x01)
@@ -133,7 +148,7 @@ void font_tile_paint_(struct pixel_ *p, struct pixel_ *fg, struct pixel_ *bg, DC
 }
 
 static
-void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD addr, DCPU16_WORD *palette, DCPU16_WORD *tiles, unsigned int blink_state) {
+void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD base, DCPU16_WORD addr, DCPU16_WORD *palette, DCPU16_WORD *tiles, unsigned int blink_state) {
     struct pixel_ *tilestart = pixbuf; /* start of display */
     unsigned int cell_x = addr % (PIX_X / CELL_X_SZ),
                  cell_y = addr / (PIX_X / CELL_X_SZ);
@@ -141,8 +156,13 @@ void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD add
     DCPU16_WORD *font_bitmap;
     int blink;
 
-    cell_x = addr % (PIX_X / CELL_X_SZ);
-    cell_y = addr / (PIX_X / CELL_X_SZ);
+    cell_x = (addr - base) % CELL_X;
+    cell_y = (addr - base) / CELL_X;
+
+    TRACE("%s>> addr:0x%04x col:%u row:%u v:%hu",
+          __func__,
+          addr,
+          cell_x, cell_y, mem[addr]);
 
     blink = mem[addr] & 0x0080;
 
@@ -169,6 +189,8 @@ void lem1802_pixbuf_refresh_full_(struct lem1802_ *display, DCPU16_WORD *mem) {
     struct pixel_ border;
     size_t tile;
 
+    TRACE("%s>> video_base:0x%04x", __func__, display->video_base);
+
     if (display->video_base == 0) {
         /* disconnected, blank display.  static might be fun, too */
         memset(display->pixbuf, 0, PIX_X * PIX_Y * sizeof *display->pixbuf);
@@ -178,9 +200,10 @@ void lem1802_pixbuf_refresh_full_(struct lem1802_ *display, DCPU16_WORD *mem) {
     pixel_color_(&border, display->border_color);
     pixbuf_border_paint_(display->pixbuf, &border);
 
-    for (tile = 0; tile < (PIX_X / CELL_X_SZ) * (PIX_Y / CELL_Y_SZ); tile++) {
+    for (tile = 0; tile < CELL_X * CELL_Y; tile++) {
         pixbuf_addr_paint_(display->pixbuf,
                            mem,
+                           display->video_base,
                            display->video_base + tile,
                            display->palette_base ? mem + display->palette_base : palette_default_,
                            display->font_base ? mem + display->font_base : (unsigned short *)chargen_4x8_glyphs,
@@ -282,7 +305,7 @@ void *lem1802_vnc_init_data(int argc, char *argv[], struct dcpu16_hw *hw) {
         return NULL;
     }
 
-    s->rfbScreen->desktopName = "lem1802";
+    s->rfbScreen->desktopName = "NYA ELEKTRISKA LEM1802";
     s->rfbScreen->alwaysShared = TRUE;
 
 #if 0
@@ -296,6 +319,8 @@ void *lem1802_vnc_init_data(int argc, char *argv[], struct dcpu16_hw *hw) {
 
     rfbRunEventLoop(s->rfbScreen,-1,TRUE);
 
+    TRACE("%s>> initialized new vnc server", __func__);
+
     return s;
 }
 
@@ -309,6 +334,8 @@ int pixbuf_render_vnc_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) {
     /* derp */
     rfbMarkRectAsModified(s->rfbScreen,0,0,x,y);
 
+    TRACE("%s>>", __func__);
+
     return retval;
 }
 #endif /* HAVE_LIBVNCSERVER */
@@ -318,8 +345,9 @@ static
 void lem1802_reset_(struct dcpu16 *vm, void *data) {
     struct lem1802_ *display = (struct lem1802_ *)data;
 
-    display->cycle_activated = vm->cycle;
+    (void)vm;
 
+    display->cycle_activated = 0;
     display->video_base = 0;
     display->font_base = 0;
     display->palette_base = 0;
@@ -330,6 +358,10 @@ void lem1802_reset_(struct dcpu16 *vm, void *data) {
     display->refresh_tally_ = 0;
     display->blink_tally_ = 0;
     display->blink_state = 0;
+
+#if DEBUG
+    vm->trace_cb_("%s>>", __func__);
+#endif /* DEBUG */
 }
 
 static
@@ -347,20 +379,20 @@ void lem1802_cycle_(struct dcpu16 *vm, void *data) {
      */
 
     display->blink_tally_++;
-    if (display->blink_tally_ >= display->blink_rate)
+    if (display->blink_tally_ >= display->blink_rate) {
+        display->blink_tally_ = 0;
         display->blink_state ^= 1;
+        TRACE("%s>> blink:%u (%u cycles)", __func__, display->blink_state, display->blink_rate);
+    }
 
     display->refresh_tally_++;
     if (display->refresh_tally_ >= display->refresh_rate) {
         display->refresh_tally_ = 0;
         if (display->render)
+            TRACE("%s>> refresh", __func__);
+            lem1802_pixbuf_refresh_full_(display, vm->ram);
             display->render(display->renderer_data, display->pixbuf, PIX_X, PIX_Y);
     }
-
-    if (display->render) {
-        lem1802_pixbuf_refresh_full_(display, vm->ram);
-        display->render(display->renderer_data, display->pixbuf, PIX_X, PIX_Y);
-    }
 }
 
 static
@@ -370,12 +402,16 @@ void lem1802_hwi_(struct dcpu16 *vm, void *data) {
     DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B];
     size_t i;
 
+    TRACE("%s>> A:0x%04x B:0x%04x", __func__, reg_a, reg_b);
+
     switch (reg_a) {
         case 0: /* MEM_MAP_SCREEN */
             if (display->cycle_activated == 0 && reg_b) {
                 display->cycle_activated = vm->cycle;
             }
             display->video_base = reg_b;
+            if (reg_b == 0)
+                display->cycle_activated = 0;
             break;
 
         case 1: /* MEM_MAP_FONT */
@@ -435,6 +471,7 @@ int lem1802_renderer_set(struct dcpu16_hw *hw, const char *renderer, void *data)
         if (strcmp(renderer, r->name) == 0) {
             ((struct lem1802_ *)(hw->data))->render = r->renderer;
             ((struct lem1802_ *)(hw->data))->renderer_data = data;
+            TRACE("%s>> renderer set to %s", __func__, renderer);
             return 0;
         }
     }
@@ -488,6 +525,9 @@ struct dcpu16_hw *lem1802_new(struct dcpu16 *vm) {
         return NULL;
     }
 
+    ((struct lem1802_ *)(hw->data))->refresh_rate = 1666;
+    ((struct lem1802_ *)(hw->data))->blink_rate = 75000;
+
     return hw;
 }