Fix dup(2kr) and ovr(2kr) behaviour

6 files changed, 79 insertions, 39 deletions

diff --git a/src/config.c b/src/config.c
index d100233..9879ef1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -9,3 +9,5 @@
 #endif
 
 #define PROF_ENABLE 0
+#define TEXT_DISABLE 0
+#define SOUND_DISABLE 0
diff --git a/src/debug.c b/src/debug.c
index fd695cb..17c1c73 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -156,37 +156,46 @@ print_debug_info(u8 flags) {
             txt_printf("%02x ", uxn_ram[i]);
         }
     }
-    txt_printf("\nMOUSE");
-    for (size_t i = 0x90; i < (0x90 + 16); i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        txt_printf(" ");
-        txt_printf("%02x", device_data[i]);
-    }
-    txt_printf("\nRAM (ZP)");
-    for (size_t i = 0; i < 32; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        if (i % 2 == 0) {
-            txt_printf(" ");
-        }
-        txt_printf("%02x", uxn_ram[i]);
-    }
-    txt_printf("\nWST (");
-    txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
-    for (size_t i = 0; i < 64; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
+    if (flags == 0) {
+        txt_printf("\nRAM (ZP)");
+        for (size_t i = 0; i < 32; i++) {
+            if (i % 8 == 0) {
+                txt_printf("\n");
+            }
+            if (i % 2 == 0) {
+                txt_printf(" ");
+            }
+            txt_printf("%02x", uxn_ram[i]);
         }
-        if (i % 2 == 0) {
-            txt_printf(" ");
+        txt_printf("\nWST (");
+        txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
+        for (size_t i = 0; i < 32; i++) {
+            if (i % 8 == 0) {
+                txt_printf("\n");
+            }
+            if (i % 2 == 0) {
+                txt_printf(" ");
+            }
+            if (i >= (wst_ptr - (uintptr_t)wst)) {
+                txt_printf("%02x", 0);
+            } else {
+                txt_printf("%02x", wst[i]);
+            }
         }
-        if (i >= (wst_ptr - (uintptr_t)wst)) {
-            txt_printf("%02x", 0);
-        } else {
-            txt_printf("%02x", wst[i]);
+        txt_printf("\nRST (");
+        txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
+        for (size_t i = 0; i < 32; i++) {
+            if (i % 8 == 0) {
+                txt_printf("\n");
+            }
+            if (i % 2 == 0) {
+                txt_printf(" ");
+            }
+            if (i >= (rst_ptr - (uintptr_t)rst)) {
+                txt_printf("%02x", 0);
+            } else {
+                txt_printf("%02x", rst[i]);
+            }
         }
     }
 }
diff --git a/src/devices.c b/src/devices.c
index c65d79b..2146bd3 100644
--- a/src/devices.c
+++ b/src/devices.c
@@ -109,16 +109,18 @@ void
 deo_system(u8 *dev, u8 port) {
     switch(port) {
         case 0x3: {
-            // TODO: Rom bank switching (Needs testing).
+            // Rom bank switching (Needs testing).
             u16 addr = PEEK2(dev + 0x2);
             if(uxn_ram[addr] == 0x01) {
-                u16 i, length = PEEK2(uxn_ram + addr + 1);
+                u16 length = PEEK2(uxn_ram + addr + 1);
                 u16 a_page = PEEK2(uxn_ram + addr + 1 + 2);
                 u16 a_addr = PEEK2(uxn_ram + addr + 1 + 4);
+                u16 b_page = PEEK2(uxn_ram + addr + 1 + 6);
                 u16 b_addr = PEEK2(uxn_ram + addr + 1 + 8);
+                u8 *ram = uxn_ram;
                 u8 *rom = uxn_rom + (a_page % RAM_PAGES) * 0x10000;
-                for(i = 0; i < length; i++) {
-                    uxn_ram[(u16)(b_addr + i)] = rom[(u16)(a_addr + i)];
+                for(size_t i = 0; i < length; i++) {
+                    ram[b_addr + i] = rom[a_addr + i];
                 }
             }
         } break;
@@ -177,8 +179,8 @@ dei_datetime(u8 *dev, u8 port) {
         case 0x8: return t->tm_yday;
         case 0x9: return t->tm_yday >> 8;
         case 0xa: return t->tm_isdst;
-        default: return dev[port];
     }
+    return dev[port];
 }
 
 u16
diff --git a/src/input.c b/src/input.c
index 689479e..c78864d 100644
--- a/src/input.c
+++ b/src/input.c
@@ -5,9 +5,7 @@ typedef enum {
 } ControlMethod;
 
 const ControlMethod ctrl_methods[] = {
-    CONTROL_CONTROLLER,
-    CONTROL_MOUSE,
-    CONTROL_KEYBOARD,
+    CONTROL_METHODS
 };
 static ControlMethod ctrl_idx = 0;
 
diff --git a/src/main.c b/src/main.c
index 13a32c7..f296498 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,8 @@ init_uxn() {
     dma_fill(uxn_ram, fill, sizeof(uxn_ram), 3);
     uxn_rom = _binary_build_uxn_rom_start;
     uxn_rom_size = (size_t)_binary_build_uxn_rom_size;
-    memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, uxn_rom_size);
+    size_t size = MIN(0x10000 - PAGE_PROGRAM, uxn_rom_size);
+    memcpy(uxn_ram + PAGE_PROGRAM, uxn_rom, size);
 
     // Initialize stack and device memory.
     for (size_t i = 0; i < 256; i++) {
@@ -70,6 +71,7 @@ init_uxn() {
     dei_map[0xc] = (uintptr_t) dei_datetime;
     dei_map[0x9] = (uintptr_t) dei_mouse;
 }
+
 int
 main(void) {
     // Adjust system wait times.
@@ -86,7 +88,7 @@ main(void) {
     video_init();
 
     // Initialize text engine.
-#ifndef TEXT_DISABLE
+#if !defined(TEXT_DISABLE) ||  TEXT_DISABLE == 0
     txt_init(1, TEXT_LAYER);
     txt_position(0,0);
 #endif
@@ -95,13 +97,16 @@ main(void) {
     init_uxn();
 
     // Enable sound.
+#if !defined(SOUND_DISABLE) ||  SOUND_DISABLE == 0
     init_sound();
+#endif
 
     // Main loop.
     u8 frame_counter = 0;
     PROF(uxn_eval_asm(PAGE_PROGRAM), eval_cycles);
     while(true) {
         txt_position(0, 0);
+        // print_debug_info(0);
         bios_vblank_wait();
         FRAME_START();
         PROF(handle_input(), input_cycles);
diff --git a/src/uxn-core.s b/src/uxn-core.s
index 7d73b18..255bb99 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -1922,6 +1922,7 @@ rot2k:
 dupk:
     wpeek8  r3, #-1
     wpush8  r3
+    wpush8  r3
     b       uxn_decode
 
 dup2k:
@@ -1929,16 +1930,27 @@ dup2k:
     wpeek8  r4, #-1
     wpush8  r3
     wpush8  r4
+    wpush8  r3
+    wpush8  r4
     b       uxn_decode
 
 ovrk:
     wpeek8  r3, #-2
+    wpeek8  r4, #-1
+    wpush8  r3
+    wpush8  r4
     wpush8  r3
     b       uxn_decode
 
 ovr2k:
     wpeek8  r3, #-4
     wpeek8  r4, #-3
+    wpeek8  r5, #-2
+    wpeek8  r6, #-1
+    wpush8  r3
+    wpush8  r4
+    wpush8  r5
+    wpush8  r6
     wpush8  r3
     wpush8  r4
     b       uxn_decode
@@ -2342,6 +2354,7 @@ rot2kr:
 dupkr:
     rpeek8  r3, #-1
     rpush8  r3
+    rpush8  r3
     b       uxn_decode
 
 dup2kr:
@@ -2349,16 +2362,27 @@ dup2kr:
     rpeek8  r4, #-1
     rpush8  r3
     rpush8  r4
+    rpush8  r3
+    rpush8  r4
     b       uxn_decode
 
 ovrkr:
     rpeek8  r3, #-2
+    rpeek8  r4, #-1
+    rpush8  r3
+    rpush8  r4
     rpush8  r3
     b       uxn_decode
 
 ovr2kr:
     rpeek8  r3, #-4
     rpeek8  r4, #-3
+    rpeek8  r5, #-2
+    rpeek8  r6, #-1
+    rpush8  r3
+    rpush8  r4
+    rpush8  r5
+    rpush8  r6
     rpush8  r3
     rpush8  r4
     b       uxn_decode