65C02 opcodes. The cpu core passes nearly all the tests (fuck you decimal mode). Minor fixes here and there. Lo-res fixes and stuff.

source/cpu.h

@@ -6,5 +6,14 @@ void cpu_reset ();
 void cpu_nmi ();
 extern u32 cpu_regs[6];
 
+enum {
+    RF = 0,
+    RY,
+    RX,
+    RA,
+    RSP,
+    RPC,
+};
+
 
 #endif

source/emu.c

@@ -9,7 +9,6 @@ void irq_vblank ()
     if (vblanks++ == 60) {
         consoleClear();
         iprintf("FPS %i\n", frames_done);
-        // iprintf("keybd_latch : %02x\n", keybd_latch);
         frames_done = 0;
         vblanks = 0;
     }
@@ -27,6 +26,7 @@ int valid_rom_crc (const u16 crc)
     const u16 known_crcs[] = {
         0xAC8F, // 12288 BASIC.ROM 
         0x3F44, // 12288 apple.rom
+        0x9CB5, // 12288 A2ROM.BIN
     };
     int i;
 
@@ -42,14 +42,15 @@ void emu_init ()
     u16 crc;
     int valid_crc;
 
-    keyboardShow();
+    keysSetRepeat(30, 10);
+    /*keyboardShow();*/
 
     // Set some sane defaults
-    emu_vsync = 1;
+    emu_vsync = 0;
 
     // Setup the video hardware
     video_init();
-
+#if 1
     // Load the appropriate bios
     if (load_bin("BASIC.ROM", 0xD000, 0x3000, &crc)) {
         valid_crc = valid_rom_crc(crc);
@@ -64,6 +65,16 @@ void emu_init ()
 
     // Load the disk rom in place
     load_buf(disk_rom, 0xc600, 0x100);
+#else
+    if (load_bin("6502_functional_test.bin", 0x0, -1, NULL) > 0) {
+        const u16 reset_patch = 0x0400;
+        iprintf("Test rom loaded\n");
+        iprintf("PC : %04x\n", mainram[0xFFFD]<<8|mainram[0xFFFC]);
+        iprintf("Routing the reset vector to %04x\n", reset_patch);
+        mainram[0xFFFC] = reset_patch&0xFF;
+        mainram[0xFFFD] = (reset_patch>>8)&0xFF;
+    }
+#endif
 
     basename = NULL;
 

source/input.c

@@ -23,11 +23,13 @@ void update_input ()
     int kbd_key;
 
     scanKeys();
-    keys = keysHeld()&0xfff;
+    keys = (keysDownRepeat()|keysDown())&0xfff;
 
     // Send keyboard scancodes when a key is pressed
     if (emu_input == INPUT_KBD && keys) {
-        keybd_latch = 0x80 ^ key_map[__builtin_ctz(keys)];
+        int bit_set = __builtin_ffs(keys);
+        if (bit_set)
+            keybd_latch = 0x80 ^ key_map[bit_set-1];
     } 
     
     if (emu_input == INPUT_JSTK) {

source/main.c

@@ -13,20 +13,21 @@ int main(int argc, char **argv)
     keyboardDemoInit();
 
     fatInitDefault();
-    /*nitroFSInit(NULL);*/
+    nitroFSInit(NULL);
 
     soundEnable();
 
-	iprintf("-- grape\n");
+    iprintf("-- grape\n");
     
     emu_init();
 
     if (argc != 2) {
+        /*load_disk("Airheart (1986)(Broderbund)[cr].dsk");*/
         // Slow loading
         /*load_disk("PACMAN.DSK");*/
         /*load_disk("Karateka (1984)(Broderbund).dsk");*/
         // Awesome!
-        /*load_disk("lode.dsk");*/
+        load_disk("lode.dsk");
         // AppleII+
         /*load_disk("Prince of Persia (1989)(Broderbund)(Disk 1 of 3)[cr].dsk");*/
         // Gfx heavy
@@ -36,13 +37,14 @@ int main(int argc, char **argv)
         /*load_disk("Round About (1983)(Datamost).dsk");*/
         /*load_disk("Bug Attack (1981)(Cavalier Computer).dsk");*/
         // Scroller
-        load_disk("TetrisII.DSK");
+        /*load_disk("TetrisII.DSK");*/
         // Mixed mode
         /*load_disk("tetris48k.nib");*/
         // Lowres
         /*load_disk("Fracas (1980)(Quality Software).dsk");*/
         /*load_disk("Colorix.dsk");*/
         /*load_disk("LoRes Games.DSK");*/
+        /*load_disk("LoRes Hijinks.DSK");*/
         // SP Crash
         /*load_disk("Apple II Business Graphics 1.0 (1981).nib");*/
     } else {

source/mem.h

@@ -16,8 +16,8 @@ u8 readb (u16 addr);
 void writeb (u16 addr, u8 val);
 void mem_reset (void);
 
-int load_bin (char *file, u16 addr, u16 len, u16 *crc);
-int load_buf (const u8 *buf, u16 addr, u16 len);
+ssize_t load_bin (const char *file, const u32 addr, ssize_t len, u16 *crc);
+ssize_t load_buf (const u8 *buf, const u32 addr, ssize_t len);
 
 
 #endif

source/memutil.c

@@ -4,36 +4,48 @@
 #include "cpu.h"
 #include "mem.h"
 
-int load_buf (const u8 *buf, u16 addr, u16 len)
+ssize_t load_buf (const u8 *buf, const u32 addr, const ssize_t len)
 {
     if (addr + len > 0x10000) {
         iprintf("oob\n");
-        return 0;
+        return -1;
     }
     memcpy(mainram + addr, buf, len);
 
-    return 1;
+    return len;
 }
 
-int load_bin (char *file, u16 addr, u16 len, u16 *crc)
+ssize_t load_bin (const char *file, const u32 addr, const ssize_t len, u16 *crc)
 {
     FILE *f;
+    size_t read, bin_len;
 
-    if (addr + len > 0x10000) {
-        iprintf("oob\n");
-        return 0;
-    }
     f = fopen(file, "rb");
     if (!f) {
         iprintf("Can't open %s\n", file);
-        return 0;
+        return -1;
     }
-    fread(mainram + addr, 1, len, f);
+
+    if (len < 0) {
+        fseek(f, 0, SEEK_END);
+        bin_len = ftell(f);
+        fseek(f, 0, SEEK_SET);
+    } else
+        bin_len = len;
+
+    if (addr + bin_len > 0x10000) {
+        bin_len = 0x4000;
+        iprintf("oob\n");
+        fclose(f);
+        return -1;
+    }
+    read = fread(mainram + addr, 1, bin_len, f);
     fclose(f);
+    iprintf("Read %x to %x\n", read, addr);
 
     if (crc)
-        *crc = swiCRC16(0xffff, mainram + addr, len);
+        *crc = swiCRC16(0xffff, mainram + addr, read);
 
-    return 1;
+    return read;
 }
 

source/menu.c

@@ -75,18 +75,18 @@ void menu_print_page (const page_t *page, int *opts)
         if (sel_entry->opts_no) {
             if (keys&KEY_LEFT && opts[cur] > 0) {
                 opts[cur]--;
-                if (sel_entry->cb) sel_entry->cb(opts[cur]);
+                /*if (sel_entry->cb) sel_entry->cb(opts[cur]);*/
             }
             if (keys&KEY_RIGHT && opts[cur] < sel_entry->opts_no - 1) {
                 opts[cur]++;
-                if (sel_entry->cb) sel_entry->cb(opts[cur]);
+                /*if (sel_entry->cb) sel_entry->cb(opts[cur]);*/
             }
         }
 
         if (keys&KEY_A) {
             if (sel_entry->cb)
-                sel_entry->cb(opts[cur]); // TODO : Handle errors
-            return;
+                if (sel_entry->cb(opts[cur]))
+                    return;
         }
 
         // Use keysDown to avoid bouncing
@@ -97,4 +97,10 @@ void menu_print_page (const page_t *page, int *opts)
     }
 }
 
+void print_msg (const char *msg)
+{
+    iprintf("\n-- %s\n", msg);
+    swiDelay(10000000);
+}
+
 void pause_menu () { menu_print_page(&paused_pg, (int *)&paused_pg_opt); }

source/state.c

@@ -11,7 +11,7 @@ typedef struct state_hdr_t {
 
 #define STATE_MAGIC (0x47525033)
 
-char *build_path (int slot)
+char *build_path (const int slot)
 {
     static char tmp[1024];
     if (basename)
@@ -21,14 +21,18 @@ char *build_path (int slot)
     return tmp;
 }
 
-int state_save (int slot)
+int state_save (const int slot)
 {
     FILE *f;
     state_hdr_t h;
+    const char *path;
 
-    f = fopen(build_path(slot), "w+");
-    if (f)
+    path = build_path(slot+1);
+    f = fopen(path, "wb");
+    if (!f) {
+        print_msg("Save failed!");
         return 0;
+    }
 
     h.magic = STATE_MAGIC;
     h.ver = 1;
@@ -56,22 +60,27 @@ int state_save (int slot)
     return 1;
 }
 
-int state_load (int slot)
+int state_load (const int slot)
 {
     FILE *f;
     state_hdr_t h;
+    const char *path;
 
-    f = fopen(build_path(slot), "w+");
-    if (f)
+    path = build_path(slot+1);
+    f = fopen(path, "rb");
+    if (!f) {
+        print_msg("Load failed!");
         return 0;
-
-    h.magic = STATE_MAGIC;
-    h.ver = 1;
-    h.flags = 0;
-    h.resv = 0;
+    }
 
     fread(&h, 1, sizeof(state_hdr_t), f);
 
+    if (h.magic != STATE_MAGIC) {
+        fclose(f);
+        print_msg("Invalid save file!");
+        return 0;
+    }
+
     fread(&cpu_regs, 6, 4, f);
     fread(&mainram, 1, sizeof(mainram), f);
     fread(&lcram, 1, sizeof(lcram), f);

source/video.c

@@ -112,11 +112,11 @@ u8 video_io_read (u16 addr)
     switch (addr&0xf) {
         case 0x0:
             text_mode = 0;
-            mixed_mode = 0;
+            /*mixed_mode = 0;*/
             break;
         case 0x1:
             text_mode = 1;
-            mixed_mode = 0;
+            /*mixed_mode = 0;*/
             break;
         case 0x2:
             mixed_mode = 0;
@@ -132,11 +132,9 @@ u8 video_io_read (u16 addr)
             break;
         case 0x6:
             hires = 0;
-            mixed_mode = 0;
             break;
         case 0x7:
             hires = 1;
-            mixed_mode = 0;
             break;
         // Annunciators
         case 0x8:
@@ -176,12 +174,13 @@ void draw_lores_scr (u16 *map)
             *map++ = col_a << 8 | col_a;
             *map++ = col_a << 8 | col_a;
             *map++ = col_a << 8 | col_a;
-            *map++ = col_b << 8 | col_a;
+            *map++ = col_a << 8 | col_a;
+            *map++ = col_b << 8 | col_b;
             *map++ = col_b << 8 | col_b;
             *map++ = col_b << 8 | col_b;
             *map++ = col_b << 8 | col_b;
         }
-        map += 232/2;
+        map += 192/2;
     }
 }
 
@@ -320,24 +319,25 @@ void video_draw ()
 
 int video_set_scale (int mode) 
 {
-    int scale_x;
+    int scaleg_x, scalet_x;
     int scale_y;
 
     switch (mode) {
         default:
         case 0:
-            scale_x = floatToFixed(1., 8);
+            scaleg_x = scalet_x = floatToFixed(1., 8);
             scale_y = floatToFixed(1., 8);
             break;
         case 1:
             // 280 / 256 = 1.09
-            scale_x = floatToFixed(1.09, 8);
+            scaleg_x = floatToFixed(1.09, 8);
+            scalet_x = floatToFixed(1.25, 8);
             scale_y = floatToFixed(1., 8);
             break;
     }
 
-    bgSetScale(gfx_bg, scale_x, scale_y);
-    bgSetScale(text_bg, scale_x, scale_y);
+    bgSetScale(gfx_bg, scaleg_x, scale_y);
+    bgSetScale(text_bg, scalet_x, scale_y);
 
     return 1;
 }