]> Shamusworld >> Repos - thunder/blobdiff - src/thunder.cpp
Code cleanup.
[thunder] / src / thunder.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 3a9d8ae..d3134ed
@@ -1,17 +1,18 @@
 //
 // Thunder: A Rolling Thunder Emulator w/6809 debugger
 //
-// by James L. Hammons
-// (c) 2004, 2009 Underground Software
+// by James Hammons
+// (C) 2004, 2014 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
-// ---  ----------  ------------------------------------------------------------
+// ---  ----------  -----------------------------------------------------------
 // JLH  07/23/2009  Added changelog ;-)
+// JLH  08/12/2009  Stabilized emulation so that it works
 //
 
-#define THUNDER_VERSION       "0.9.9"
+#define THUNDER_VERSION                "1.0.0"
 
 #include <iostream>
 #include <iomanip>
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 //#include <conio.h>                   // For getch()
 #include <curses.h>                    // For getch()
 #include <time.h>
-#include "SDL.h"                                                                               // Get yer SDL out...!
-#include "types.h"
+#include "SDL.h"                                                               // Get yer SDL out...!
 #include "v6809.h"
 #include "screen.h"
 #include "gui.h"
 #include "log.h"
 
-using namespace std;                                                                   // Yes!
+using namespace std;                                                   // Yes!
+
 
-#if 0
-#define ROM1  "RT3-1B.ROM"
-#define ROM2  "RT3-2B.ROM"
-#define ROM3  "RT3-3.ROM"
-#define ROM4  "RT3-4.ROM"
-#define ROM5  "RT1-5.ROM"
-#define ROM6  "RT1-6.ROM"
-#define ROM7  "RT1-7.ROM"
-#define ROM8  "RT1-8.ROM"
-#define ROM9  "RT1-9.ROM"
-#define ROM10 "RT1-10.ROM"
-#define ROM11 "RT1-11.ROM"
-#define ROM12 "RT1-12.ROM"
-#define ROM13 "RT1-13.ROM"
-#define ROM14 "RT1-14.ROM"
-#define ROM15 "RT1-15.ROM"
-#define ROM16 "RT1-16.ROM"
-#define ROM17 "RT1-17.ROM"
-#define ROM18 "RT1-18.ROM"
-#define ROM19 "RT3-19.ROM"
-#define ROM20 "RT3-20.ROM"
-#define ROM21 "RT1-21.ROM"
-#define ROM22 "RT2-22.ROM"
-#define PROM1 "RT1-1.BIN"
-#define PROM2 "RT1-2.BIN"
-#define PROM3 "RT1-3.BIN"
-#define PROM4 "RT1-4.BIN"
-#define PROM5 "RT1-5.BIN"
-#else
 #define ROM1   "rt3-1b.9c"
 #define ROM2   "rt3-2b.12c"
 #define ROM3   "rt3-3.12d"
@@ -89,56 +62,44 @@ using namespace std;                                                                        // Yes!
 #define PROM4  "mb7138h.6v"
 #define PROM5  "mb7112e.6u"
 #define MCUROM "rt1-mcu.bin"
-#endif
+
 
 // Global defines
 
 SDL_Surface * screen;
 
-uint8 * gram, * grom;                                                  // Allocate RAM & ROM pointers
-uint8 gram1[0x10000], gram2[0x10000], grom1[0x10000], grom2[0x10000];  // Actual memory
-uint8 grom3[0x8000], grom4[0x8000], data_rom[0x40000], spr_rom[0x80000], voice_rom[0x20000];
-uint8 chr_rom[0x60000];                                                        // Character ROM pointer
-/*
-  gram1 = new uint8[0x10000];
-  grom1 = new uint8[0x10000];
-  gram2 = new uint8[0x10000];
-  grom2 = new uint8[0x10000];
-  chr_rom = new uint8[0x60000];
-  grom3 = new uint8[0x8000];
-  grom4 = new uint8[0x8000];
-  data_rom = new uint8[0x40000];
-  spr_rom = new uint8[0x80000];
-  voice_rom = new uint8[0x20000];
-*/
+uint8_t * gram, * grom;                                // Allocate RAM & ROM pointers
+uint8_t gram1[0x10000], gram2[0x10000], grom1[0x10000], grom2[0x10000];        // Actual memory
+uint8_t grom3[0x8000], grom4[0x8000], data_rom[0x40000], spr_rom[0x80000], voice_rom[0x20000];
+uint8_t chr_rom[0x60000];                      // Character ROM pointer
 
 V6809REGS cpu1, cpu2;
 
-bool trace1 = false;                 // ditto...
-bool looking_at_rom = true;         // true = R1, false = R2
-uint32 banksw1, banksw2;             // Bank switch addresses
-uint16 game_over_switch;              // Game over delay
-uint16 dpc;                           // Debug pc reg...
-bool show_scr = true;            // Whether or not to show background
-bool enable_cpu = true;          // Whether or not to enable CPUs
-bool irqGoA = true;              // IRQ switch for CPU #1
-bool irqGoB = true;              // IRQ switch for CPU #2
-
-uint16 refresh_ = 0;                // Crappy global screen stuff...
+bool trace1 = false;                           // ditto...
+bool looking_at_rom = true;                    // true = R1, false = R2
+uint32_t banksw1, banksw2;                     // Bank switch addresses
+uint16_t game_over_switch;                     // Game over delay
+uint16_t dpc;                                          // Debug pc reg...
+bool show_scr = true;                          // Whether or not to show background
+bool enable_cpu = true;                                // Whether or not to enable CPUs
+bool irqGoA = true;                                    // IRQ switch for CPU #1
+bool irqGoB = true;                                    // IRQ switch for CPU #2
+
+uint16_t refresh_ = 0;                         // Crappy global screen stuff...
 bool refresh2 = true;
 
-uint32 psg_lens[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8 * psg_adrs[16];
-uint32 voc_lens[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+uint32_t psg_lens[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+uint8_t * psg_adrs[16];
+uint32_t voc_lens[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8 * voc_adrs[32];
-uint32 fm_lens[14] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8 * fm_adrs[14];
+uint8_t * voc_adrs[32];
+uint32_t fm_lens[14] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+uint8_t * fm_adrs[14];
 
-fstream tr;    // Tracelog hook
-uint16    pcx;   // Where we at?
+fstream tr;                                                    // Tracelog hook
+uint16_t pcx;                                          // Where we at?
 
-static uint8 * keys;                                                   // SDL raw keyboard matrix
+static uint8_t * keys;                         // SDL raw keyboard matrix
 
 static char op_mat1[256] = {
   1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1,
@@ -295,12 +256,15 @@ tregs[16][3] = {
   "A",  "B", "CC", "DP", "??", "??", "??", "??" },
 iregs[4][2] = {"X", "Y", "U", "S" };
 
+
 //
 // Read a byte from memory (without touching PC. Not a Fetch!)
 //
-uint8 RdMem(uint16 addr)
+uint8_t RdMem(uint16_t addr)
 {
-       uint8 b;
+       uint8_t b;
+
+       // $4000-4300 is RAM shared with the microcontroller...
 
        if (addr < 0x8000)
        {
@@ -315,31 +279,39 @@ uint8 RdMem(uint16 addr)
        return b;
 }
 
+
 //
 // Write a byte to memory
 //
-void WrMem(uint16 addr, uint8 b)
+void WrMem(uint16_t addr, uint8_t b)
 {
+       extern bool disasm;
        extern bool charbase;                                                           // Needed for screen. Extern it in it??
-  //extern uint16 sr, ur, xr, yr;            // Needed for tracelog
-  //extern uint16 pcr;
+  //extern uint16_t sr, ur, xr, yr;            // Needed for tracelog
+  //extern uint16_t pcr;
 /*  if ((addr>0x40FF) && (addr<0x4390))
   {
     tr << hex << addr << ":" << (int)b;
     //for(int i=0; i<32; i++)
     //{
     //  if (gram1[0x4400+i]<0x10)  tr << "0";
-    //  tr << hex << (uint16)gram1[0x4400+i] << " ";
+    //  tr << hex << (uint16_t)gram1[0x4400+i] << " ";
     //}
     tr << endl;
   }//*/
+#if 0
+       if (addr == 0x4182)
+       {
+               WriteLog("\nWriteMem: CPU #1 writing $%02X to $4182!\n\n", b);
+       }
+#endif
 
        if (addr == 0x6000)
                SpawnSound(GAMESOUND, gram1[0x6200], 0);                // Do voice chan 1
        if (addr == 0x6400)
                SpawnSound(GAMESOUND, gram1[0x6600], 1);                // Do voice chan 2
        if (addr == 0x6800)
-               banksw1 = (uint32)b << 13;                                              // Set char data bankswitch base address
+               banksw1 = (uint32_t)b << 13;                                            // Set char data bankswitch base address
        if (addr > 0x4284 && addr < 0x42A5 && b)
                SpawnSound(PSGSOUND, addr - 0x4285);                    // Do PSG sound on chans 2, 3
        if (addr == 0x4380)
@@ -361,18 +333,24 @@ void WrMem(uint16 addr, uint8 b)
                        BlitChar(screen, chr_rom, gram1);
                        refresh_ = (refresh2 ? 1 : 0);                          // 60/30 Hz...
                }
-//             irqGoA = true; // Will this work??? no...
-               cpu1.cpuFlags |= V6809_ASSERT_LINE_IRQ;//wil wok???
+
+               // IRQ Ack (may also be frame go...
+               ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);
+#if 1
+       if (disasm)
+               WriteLog("WriteMem: CPU #1 Acknowledging IRQ...\n", b);
+#endif
        }
 }
 
+
 //
 // Read a byte from memory (without touching PC. Not a Fetch!) (2nd processor)
 //
-uint8 RdMemB(uint16 addr)
+uint8_t RdMemB(uint16_t addr)
 {
-//  extern uint16 cpu2.s, cpu2.u, cpu2.x, cpu2.y;            // Needed for tracelog
-       uint8 b;
+//  extern uint16_t cpu2.s, cpu2.u, cpu2.x, cpu2.y;            // Needed for tracelog
+       uint8_t b;
 
        if (addr < 0x8000)
        {
@@ -396,28 +374,33 @@ uint8 RdMemB(uint16 addr)
        return b;
 }
 
+
 //
 // Write a byte to memory (2nd processor)
 //
-void WrMemB(uint16 addr, uint8 b)
+void WrMemB(uint16_t addr, uint8_t b)
 {
+       extern bool disasm;
        extern bool charbase;
-  //extern uint16 sr, ur, xr, yr;            // Needed for tracelog
-  //extern uint16 pcr;
+  //extern uint16_t sr, ur, xr, yr;            // Needed for tracelog
+  //extern uint16_t pcr;
 /*  if ((addr>0x00FF) && (addr<0x0390))
   {
     tr << hex << addr << ":" << (int)b;
     //for(int i=0; i<32; i++)
     //{
     //  if (gram1[0x4400+i]<0x10)  tr << "0";
-    //  tr << hex << (uint16)gram1[0x4400+i] << " ";
+    //  tr << hex << (uint16_t)gram1[0x4400+i] << " ";
     //}
     tr << endl;
   }//*/
+#if 0
+       if (addr == 0x0182)
+       {
+               WriteLog("\nWriteMem: CPU #2 writing $%02X to $0182 ($4182)!\n\n", b);
+       }
+#endif
 
-       if (addr == 0x8800)
-//             irqGoB = true;                                                                  // Will it work??? no...
-               cpu2.cpuFlags |= V6809_ASSERT_LINE_IRQ;//wil wok???
        if (addr == 0x6000)
                SpawnSound(GAMESOUND, gram1[0x6200], 0);                // Do voice chan 1
        if (addr == 0x6400)
@@ -425,7 +408,7 @@ void WrMemB(uint16 addr, uint8 b)
        if (addr > 0x0284 && addr < 0x02A5 && b)
                SpawnSound(PSGSOUND, addr - 0x0285);                    // Do PSG sound on chans 2, 3
        if (addr == 0xD803)
-               banksw2 = (uint32)(b & 0x03) << 13;                             // Set sprite data bank switch
+               banksw2 = (uint32_t)(b & 0x03) << 13;                           // Set sprite data bank switch
        if (addr == 0x0380)
        {
                SpawnSound(FMSOUND, b);                                                 // Do FM sound on chan 4
@@ -441,414 +424,473 @@ void WrMemB(uint16 addr, uint8 b)
                if (addr > 0x5FFF)
                        gram1[addr] = b;
        }
+       if (addr == 0x8800)
+       {
+               // IRQ Ack (may also be frame go...)
+               ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);
+#if 1
+       if (disasm)
+               WriteLog("WriteMem: CPU #2 Acknowledging IRQ...\n", b);
+#endif
+       }
 }
 
+
 //
 // Display bytes in mem in hex
 //
-void DisplayBytes(uint16 src, unsigned long dst)
+void DisplayBytes(uint16_t src, unsigned long dst)
 {
-  uint8 cnt;
-  unsigned long i;
+       uint8_t cnt = 0;
+       WriteLog("%04X: ", src);
 
-  printf("%04X: ", src);
-  cnt = 0;                               // Init counter...
-  if (src > dst)  dst += 0x10000;        // That should fix the FFFF bug...
-  for(i=src; i<dst; i++)
-  {
-    printf("%02X ", (uint8)(looking_at_rom ? RdMem(i) : RdMemB(i)));
-    cnt++;                               // Bump counter...
-  }
-  for(i=cnt; i<5; i++)                   // Pad the leftover spaces...
-  {
-    cout << "   ";
-  }
+       if (src > dst)
+               dst += 0x10000;        // That should fix the FFFF bug...
+
+       for(unsigned long i=src; i<dst; i++)
+       {
+               WriteLog("%02X ", (uint8_t)(looking_at_rom ? RdMem(i) : RdMemB(i)));
+               cnt++;
+       }
+
+       // Pad the leftover spaces...
+       for(unsigned long i=cnt; i<5; i++)
+               WriteLog("   ");
 }
 
+
 // temp crap...
-uint8 Fetch(void) { return 0; }
-uint16 FetchW(void) { return 0; }
-uint8 FetchB(void) { return 0; }
-uint16 FetchWB(void) { return 0; }
+uint8_t Fetch(void) { return RdMem(dpc); }
+uint16_t FetchW(void) { return (uint16_t)((RdMem(dpc) << 8) | RdMem(dpc+1)); }
+uint8_t FetchB(void) { return RdMemB(dpc); }
+uint16_t FetchWB(void) { return (uint16_t)((RdMemB(dpc) << 8) | RdMemB(dpc+1)); }
+
 
 //
 // Decode a 6809 instruction at 'addr'
 //
 void Decode_6809()
 {
-  uint8 (* DFetch)();           // Decode Fetch() pointer...
-  uint16 (* DFetchW)();          // Decode FetchW() pointer...
-  DFetch  = (looking_at_rom ? Fetch : FetchB);
-  DFetchW = (looking_at_rom ? FetchW : FetchWB);
-
-/*  extern*/ uint16 pcr, pcrB;              // Pull in 'pcr' from '6809.cpp'
-  uint16 pc_save = pcr, pcB_save = pcrB;
-  pcr  = dpc;  pcrB = dpc;
-  uint8 opcode = DFetch();             // Get the opcode ('fetch' cycle)
-  uint8 opcode2, operand;
-  uint16 loperand;
-  uint8 admode = op_mat1[opcode];     // addressing mode
-  char outbuf[80], mnem[6], tmp[30];
-
-  strcpy(mnem, mnemonics[opcode]);  // Copy page 1 opcode
-  if (opcode == 0x10)             // Extended opcode?
-  {
-    opcode2 = DFetch();     // Then get next byte
-    admode = op_mat2[opcode2];    // And use it as index into 'op_mat2'
-    strcpy(mnem, mnemonics2[opcode2]);  // Overwrite mnemonic
-  }
-  if (opcode == 0x11)             // Same as above...
-  {
-    opcode2 = DFetch();
-    admode = op_mat3[opcode2];
-    strcpy(mnem, mnemonics3[opcode2]);  // Overwrite mnemonic
-  }
-  switch(admode)                  // Decode it...
-  {
-    case 0:  // Illegal
-    { sprintf(outbuf, "???");  break; }
-    case 1:  // Zero page
-    { operand = DFetch();   // Get ZP address
-      sprintf(outbuf, "%s $%02X", mnem, operand);
-      break; }
-    case 2:  // Absolute
-    { loperand = DFetchW(); // Get ABS address
-      sprintf(outbuf, "%s $%04X", mnem, loperand);
-      break; }
-    case 3:  // Relative
-    { operand = DFetch();   // Get offset
-      uint16 tmpc = (looking_at_rom ? pcr : pcrB);
-      sprintf(outbuf, "%s $%04X", mnem, tmpc+(int16)(int8)operand);
-      break; }
-    case 4:  // Long Relative
-    { loperand = DFetchW(); // Get long offset
-      uint16 tmpc = (looking_at_rom ? pcr : pcrB);
-      sprintf(outbuf, "%s $%04X", mnem, tmpc+(int16)loperand);
-      break; }
-    case 5:  // Inherent
-    { sprintf(outbuf, "%s ", mnem);
-      break; }
-    case 6:  // Txfr/exchg/push/pull
-    { operand = DFetch();   // Get txfr/exg/push/pull byte
-      if ((opcode == 0x1E) || (opcode == 0x1F))  // Is it TXF/EXG?
-      {
-        sprintf(tmp, "%s,%s", tregs[operand>>4], tregs[operand&0x0F]);
-      }
-      else
-      {
-        tmp[0] = 0;
-        if (operand&0x01)  strcat(tmp, "CC ");
-        if (operand&0x02)  strcat(tmp, "A ");
-        if (operand&0x04)  strcat(tmp, "B ");
-        if (operand&0x08)  strcat(tmp, "DP ");
-        if (operand&0x10)  strcat(tmp, "X ");
-        if (operand&0x20)  strcat(tmp, "Y ");
-        if (operand&0x40)  (((opcode==0x34)||(opcode==0x35))
-                       ? strcat(tmp, "U ") : strcat(tmp, "S "));
-        if (operand&0x80)  strcat(tmp, "PC");
-      }
-      sprintf(outbuf, "%s %s", mnem, tmp);
-      break; }
-    case 7:  // Indexed (the tough one!)
-    { operand = DFetch();   // Get IDX byte
-      uint8 reg = ((operand & 0x60) >> 5), idxind = ((operand & 0x10) >> 4),
-           lo_nyb = (operand & 0x0F),  boff;
-      uint16 woff;
-
-      strcpy(tmp, "??");
-      if (!(operand & 0x80))      // Hi bit set? Then decode 4 bit offset
-      {
-        sprintf(tmp, "(%d),%s", (idxind ? -(16-lo_nyb) : lo_nyb),
-                iregs[reg]);
-      }
-      else   // Add the ($nnnn,R) code dude...
-      {
-        if (idxind)
-        {
-          switch(lo_nyb)
-          {
-            case 1:   sprintf(tmp, "(,%s++)", iregs[reg]);  break;
-            case 3:   sprintf(tmp, "(,--%s)", iregs[reg]);  break;
-            case 4:   sprintf(tmp, "(,%s)", iregs[reg]);  break;
-            case 5:   sprintf(tmp, "(B,%s)", iregs[reg]);  break;
-            case 6:   sprintf(tmp, "(A,%s)", iregs[reg]);  break;
-            case 8:
-            { boff = DFetch();  sprintf(tmp, "($%02X,%s)", boff,
-                                       iregs[reg]);  break; }
-            case 9:
-            { woff = DFetchW();  sprintf(tmp, "($%04X,%s)", woff,
-                                        iregs[reg]);  break; }
-            case 11:  sprintf(tmp, "(D,%s)", iregs[reg]);  break;
-            case 12:
-            { boff = DFetch();  sprintf(tmp, "($%02X,PC)", boff);  break; }
-            case 13:
-            { woff = DFetchW();  sprintf(tmp, "($%04X,PC)", woff);  break; }
-            case 15:
-            { woff = DFetchW();  sprintf(tmp, "[$%04X]", woff);  break; }
-            default:  strcpy(tmp, "??");
-          }
-        }
-        else
-        {
-          switch(lo_nyb)
-          {
-            case 0:   sprintf(tmp, ",%s+", iregs[reg]);  break;
-            case 1:   sprintf(tmp, ",%s++", iregs[reg]);  break;
-            case 2:   sprintf(tmp, ",-%s", iregs[reg]);  break;
-            case 3:   sprintf(tmp, ",--%s", iregs[reg]);  break;
-            case 4:   sprintf(tmp, ",%s", iregs[reg]);  break;
-            case 5:   sprintf(tmp, "(B),%s", iregs[reg]);  break;
-            case 6:   sprintf(tmp, "(A),%s", iregs[reg]);  break;
-            case 8:
-            { boff = DFetch();  sprintf(tmp, "($%02X),%s", boff,
-                                       iregs[reg]);  break; }
-            case 9:
-            { woff = DFetchW();  sprintf(tmp, "($%04X),%s", woff,
-                                       iregs[reg]);  break; }
-            case 11:  sprintf(tmp, "(D),%s", iregs[reg]);  break;
-            case 12:
-            { boff = DFetch();  sprintf(tmp, "($%02X),PC", boff);  break; }
-            case 13:
-            { woff = DFetchW();  sprintf(tmp, "($%04X),PC", woff);  break; }
-            default:  strcpy(tmp, "??");
-          }
-        }
-      }
-      sprintf(outbuf, "%s %s", mnem, tmp);
-      break; }
-    case 8:  // Immediate
-    { operand = DFetch();   // Get IMM byte
-      sprintf(outbuf, "%s #$%02X", mnem, operand);
-      break; }
-    case 9:  // Long Immediate
-    { loperand = DFetchW(); // Get IMM word
-      sprintf(outbuf, "%s #$%04X", mnem, loperand);
-      break; }
-  }
-  DisplayBytes(dpc, (looking_at_rom ? pcr : pcrB));  // Show bytes
-  cout << outbuf << endl;     // display opcode & addressing, etc
-  dpc = (looking_at_rom ? pcr : pcrB);  // Advance debug PC
-  pcr = pc_save;  pcrB = pcB_save;  // Restore PCs
+       uint8_t (* DFetch)();           // Decode Fetch() pointer...
+       uint16_t (* DFetchW)();          // Decode FetchW() pointer...
+       DFetch  = (looking_at_rom ? Fetch : FetchB);
+       DFetchW = (looking_at_rom ? FetchW : FetchWB);
+
+       /*  extern*/ uint16_t pcr, pcrB;              // Pull in 'pcr' from '6809.cpp'
+       uint16_t pc_save = pcr, pcB_save = pcrB;
+       pcr  = dpc;  pcrB = dpc;
+       uint8_t opcode = DFetch();             // Get the opcode ('fetch' cycle)
+       uint8_t opcode2, operand;
+       uint16_t loperand;
+       uint8_t admode = op_mat1[opcode];     // addressing mode
+       char outbuf[80], mnem[6], tmp[30];
+
+       strcpy(mnem, mnemonics[opcode]);  // Copy page 1 opcode
+
+       if (opcode == 0x10)             // Extended opcode?
+       {
+               opcode2 = DFetch();     // Then get next byte
+               admode = op_mat2[opcode2];    // And use it as index into 'op_mat2'
+               strcpy(mnem, mnemonics2[opcode2]);  // Overwrite mnemonic
+       }
+
+       if (opcode == 0x11)             // Same as above...
+       {
+               opcode2 = DFetch();
+               admode = op_mat3[opcode2];
+               strcpy(mnem, mnemonics3[opcode2]);  // Overwrite mnemonic
+       }
+
+       // Decode it...
+       switch (admode)
+       {
+       case 0:  // Illegal
+               sprintf(outbuf, "???");
+               break;
+       case 1:  // Zero page
+               operand = DFetch();   // Get ZP address
+               sprintf(outbuf, "%s $%02X", mnem, operand);
+               break;
+       case 2:  // Absolute
+               loperand = DFetchW(); // Get ABS address
+               sprintf(outbuf, "%s $%04X", mnem, loperand);
+               break;
+       case 3:  // Relative
+       {
+               operand = DFetch();   // Get offset
+               uint16_t tmpc = (looking_at_rom ? pcr : pcrB);
+               sprintf(outbuf, "%s $%04X", mnem, tmpc+(int16_t)(int8_t)operand);
+               break;
+       }
+       case 4:  // Long Relative
+       {
+               loperand = DFetchW(); // Get long offset
+               uint16_t tmpc = (looking_at_rom ? pcr : pcrB);
+               sprintf(outbuf, "%s $%04X", mnem, tmpc+(int16_t)loperand);
+               break;
+       }
+       case 5:  // Inherent
+               sprintf(outbuf, "%s ", mnem);
+               break;
+       case 6:  // Txfr/exchg/push/pull
+       {
+               operand = DFetch();   // Get txfr/exg/push/pull byte
+
+               if ((opcode == 0x1E) || (opcode == 0x1F))  // Is it TXF/EXG?
+               {
+                       sprintf(tmp, "%s,%s", tregs[operand>>4], tregs[operand&0x0F]);
+               }
+               else
+               {
+                       tmp[0] = 0;
+                       if (operand&0x01)  strcat(tmp, "CC ");
+                       if (operand&0x02)  strcat(tmp, "A ");
+                       if (operand&0x04)  strcat(tmp, "B ");
+                       if (operand&0x08)  strcat(tmp, "DP ");
+                       if (operand&0x10)  strcat(tmp, "X ");
+                       if (operand&0x20)  strcat(tmp, "Y ");
+                       if (operand&0x40)  (((opcode==0x34)||(opcode==0x35))
+                                               ? strcat(tmp, "U ") : strcat(tmp, "S "));
+                       if (operand&0x80)  strcat(tmp, "PC");
+               }
+               sprintf(outbuf, "%s %s", mnem, tmp);
+               break;
+       }
+       case 7:  // Indexed (the tough one!)
+       {
+               operand = DFetch();   // Get IDX byte
+               uint8_t reg = ((operand & 0x60) >> 5), idxind = ((operand & 0x10) >> 4),
+                       lo_nyb = (operand & 0x0F),  boff;
+               uint16_t woff;
+
+               strcpy(tmp, "??");
+
+               if (!(operand & 0x80))      // Hi bit set? Then decode 4 bit offset
+               {
+                       sprintf(tmp, "(%d),%s", (idxind ? -(16-lo_nyb) : lo_nyb),
+                                       iregs[reg]);
+               }
+               else   // Add the ($nnnn,R) code dude...
+               {
+                       if (idxind)
+                       {
+                               switch (lo_nyb)
+                               {
+                               case 1:   sprintf(tmp, "(,%s++)", iregs[reg]);  break;
+                               case 3:   sprintf(tmp, "(,--%s)", iregs[reg]);  break;
+                               case 4:   sprintf(tmp, "(,%s)", iregs[reg]);  break;
+                               case 5:   sprintf(tmp, "(B,%s)", iregs[reg]);  break;
+                               case 6:   sprintf(tmp, "(A,%s)", iregs[reg]);  break;
+                               case 8:
+                               { boff = DFetch();  sprintf(tmp, "($%02X,%s)", boff,
+                                                                               iregs[reg]);  break; }
+                               case 9:
+                               { woff = DFetchW();  sprintf(tmp, "($%04X,%s)", woff,
+                                                                                       iregs[reg]);  break; }
+                               case 11:  sprintf(tmp, "(D,%s)", iregs[reg]);  break;
+                               case 12:
+                               { boff = DFetch();  sprintf(tmp, "($%02X,PC)", boff);  break; }
+                               case 13:
+                               { woff = DFetchW();  sprintf(tmp, "($%04X,PC)", woff);  break; }
+                               case 15:
+                               { woff = DFetchW();  sprintf(tmp, "[$%04X]", woff);  break; }
+                               default:  strcpy(tmp, "??");
+                               }
+                       }
+                       else
+                       {
+                               switch (lo_nyb)
+                               {
+                               case 0:   sprintf(tmp, ",%s+", iregs[reg]);  break;
+                               case 1:   sprintf(tmp, ",%s++", iregs[reg]);  break;
+                               case 2:   sprintf(tmp, ",-%s", iregs[reg]);  break;
+                               case 3:   sprintf(tmp, ",--%s", iregs[reg]);  break;
+                               case 4:   sprintf(tmp, ",%s", iregs[reg]);  break;
+                               case 5:   sprintf(tmp, "(B),%s", iregs[reg]);  break;
+                               case 6:   sprintf(tmp, "(A),%s", iregs[reg]);  break;
+                               case 8:
+                               { boff = DFetch();  sprintf(tmp, "($%02X),%s", boff,
+                                                                               iregs[reg]);  break; }
+                               case 9:
+                               { woff = DFetchW();  sprintf(tmp, "($%04X),%s", woff,
+                                                                               iregs[reg]);  break; }
+                               case 11:  sprintf(tmp, "(D),%s", iregs[reg]);  break;
+                               case 12:
+                               { boff = DFetch();  sprintf(tmp, "($%02X),PC", boff);  break; }
+                               case 13:
+                               { woff = DFetchW();  sprintf(tmp, "($%04X),PC", woff);  break; }
+                               default:  strcpy(tmp, "??");
+                               }
+                       }
+               }
+
+               sprintf(outbuf, "%s %s", mnem, tmp);
+               break;
+       }
+       case 8:  // Immediate
+               operand = DFetch();   // Get IMM byte
+               sprintf(outbuf, "%s #$%02X", mnem, operand);
+               break;
+       case 9:  // Long Immediate
+               loperand = DFetchW(); // Get IMM word
+               sprintf(outbuf, "%s #$%04X", mnem, loperand);
+               break;
+       }
+
+       DisplayBytes(dpc, (looking_at_rom ? pcr : pcrB));  // Show bytes
+       WriteLog(outbuf);
+       WriteLog("\n");     // display opcode & addressing, etc
+       dpc = (looking_at_rom ? pcr : pcrB);  // Advance debug PC
+       pcr = pc_save;
+       pcrB = pcB_save;  // Restore PCs
 }
 
+
 //
 // Convert hex to dec
 //
-uint16 htod(char *str)
+uint16_t htod(char * str)
 {
-  uint16 value = 0;
-  int len = strlen(str);
+       uint16_t value = 0;
+       int len = strlen(str);
 
-  for(int i=0; i<len; i++)
-  {
-    if (str[i]>='0' && str[i]<='9')
-    {
-      value = (value<<4) | (unsigned)(str[i]-'0');
-    }
-    if (str[i]>='a' && str[i]<='f')
-    {
-      value = (value<<4) | (unsigned)(str[i]-'a')+10;
-    }
-    if (str[i]>='A' && str[i]<='F')
-    {
-      value = (value<<4) | (unsigned)(str[i]-'A')+10;
-    }
-  }
-  return(value);
+       for(int i=0; i<len; i++)
+       {
+               if (str[i] >= '0' && str[i] <= '9')
+               {
+                       value = (value << 4) | (unsigned)(str[i] - '0');
+               }
+               else if (str[i] >= 'a' && str[i] <= 'f')
+               {
+                       value = (value << 4) | (unsigned)((str[i] - 'a') + 10);
+               }
+               else if (str[i] >= 'A' && str[i] <= 'F')
+               {
+                       value = (value << 4) | (unsigned)((str[i] - 'A') + 10);
+               }
+       }
+
+       return value;
 }
 
+
 //
 // Load 32K file into ROM image space
 //
-bool Load32KImg(char * filename, uint16 address)
+bool Load32KImg(char * filename, uint16_t address)
 {
-  ifstream ff;
-  char ch;
+       ifstream ff;
+       char ch;
 
-  ff.open(filename, ios::binary | ios::in);  // Open 'da file...
-  if (ff)
-  {
-    for(long i=0; i<32768; i++)                // Read it in...
-    {
-      ff.get(ch);
-      grom[address+i] = ch;
-    }
-    ff.close();                                // Close 'da file...
-  }
-  return(ff);
+       ff.open(filename, ios::binary | ios::in);  // Open 'da file...
+
+       if (ff)
+       {
+               for(long i=0; i<32768; i++)                // Read it in...
+               {
+                       ff.get(ch);
+                       grom[address+i] = ch;
+               }
+
+               ff.close();                                // Close 'da file...
+       }
+
+       return ff;
 }
 
+
 //
 // Generic Load file into image space
 // (No error checking performed!  Responsibility of caller!)
 //
-bool LoadImg(const char * filename, uint8 * mem, uint32 address, uint32 length)
+bool LoadImg(const char * filename, uint8_t * mem, uint32_t address, uint32_t length)
 {
-  ifstream ff;
-  char path[80];
-  char ch;
+       ifstream ff;
+       char path[80];
+       char ch;
 
-  strcpy(path, "./ROMs/");
-  strcat(path, filename);
+       strcpy(path, "./ROMs/");
+       strcat(path, filename);
 //  ff.open(filename, ios::binary | ios::in);  // Open 'da file...
-  ff.open(path, ios::binary | ios::in);       // Open 'da file...
-  if (ff)
-  {
-    for(uint32 i=0; i<length; i++)             // Read it in...
-    {
-      ff.get(ch);
-      mem[address+i] = ch;
-    }
-    ff.close();                               // Close 'da file...
-  }
-  return(ff);
+       ff.open(path, ios::binary | ios::in);       // Open 'da file...
+
+       if (ff)
+       {
+               for(uint32_t i=0; i<length; i++)             // Read it in...
+               {
+                       ff.get(ch);
+                       mem[address+i] = ch;
+               }
+
+               ff.close();                               // Close 'da file...
+       }
+
+       return ff;
 }
 
+
 //
 // Read color PROMs
 //
 bool ReadColorPROMs(void)
 {
-  fstream ff1, ff2;
-//  uint8 ch;
-  char ch;
-  extern uint8 palette[768];     // Screen physical palette
-  extern uint8 ccolor[256][8];   // Character color PROM values
-  extern uint8 scolor[128][16];  // Sprite color PROM values
-
-  ff1.open("./ROMs/"PROM3, ios::binary|ios::in);
-  if (ff1)
-  {
-    for(int i=0; i<256; i++) // Load char pallete with PROM values
-    {
-      for(int j=0; j<8; j++)
-      {
-        ff1.get(ch);
-        ccolor[i][j] = (uint8)ch;
-      }
-    }
-    ff1.close();
-  }
-  ff1.open("./ROMs/"PROM4, ios::binary|ios::in);
-  if (ff1)
-  {
-    for(int i=0; i<128; i++) // Load sprite pallete with PROM values
-    {
-      for(int j=0; j<16; j++)
-      {
-        ff1.get(ch);
-        scolor[i][j] = (uint8)ch;
-      }
-    }
-    ff1.close();
-  }
-
-  ff1.open("./ROMs/"PROM1, ios::binary|ios::in);
-  ff2.open("./ROMs/"PROM2, ios::binary|ios::in);
-  if (ff1)    // If open was successful...
-  {
-    for(int i=0; i<768; i+=3)
-    {
-      ff1.get(ch);
-      palette[i]   = (uint8)(ch&0x0F);
-      palette[i+1] = (uint8)(ch>>4);
-      ff2.get(ch);
-      palette[i+2] = (uint8)ch;
-    }
-
-    // Do palette stretching here... I.e. add 0 to hinyb 0, 1 to hinyb 1, etc.
-
-    for(int i=0; i<768; i++)
-      palette[i] = ((palette[i]<<4)&0xF0) | (palette[i]&0x0F);
-
-    ff1.close();
-    ff2.close();
-  }
-  return ff1;
+       fstream ff1, ff2;
+       //  uint8_t ch;
+       char ch;
+       extern uint8_t palette[768];     // Screen physical palette
+       extern uint8_t ccolor[256][8];   // Character color PROM values
+       extern uint8_t scolor[128][16];  // Sprite color PROM values
+
+       ff1.open("./ROMs/"PROM3, ios::binary|ios::in);
+
+       if (ff1)
+       {
+               for(int i=0; i<256; i++) // Load char pallete with PROM values
+               {
+                       for(int j=0; j<8; j++)
+                       {
+                               ff1.get(ch);
+                               ccolor[i][j] = (uint8_t)ch;
+                       }
+               }
+
+               ff1.close();
+       }
+
+       ff1.open("./ROMs/"PROM4, ios::binary|ios::in);
+
+       if (ff1)
+       {
+               for(int i=0; i<128; i++) // Load sprite pallete with PROM values
+               {
+                       for(int j=0; j<16; j++)
+                       {
+                               ff1.get(ch);
+                               scolor[i][j] = (uint8_t)ch;
+                       }
+               }
+
+               ff1.close();
+       }
+
+       ff1.open("./ROMs/"PROM1, ios::binary|ios::in);
+       ff2.open("./ROMs/"PROM2, ios::binary|ios::in);
+
+       if (ff1)    // If open was successful...
+       {
+               for(int i=0; i<768; i+=3)
+               {
+                       ff1.get(ch);
+                       palette[i]   = (uint8_t)(ch&0x0F);
+                       palette[i+1] = (uint8_t)(ch>>4);
+                       ff2.get(ch);
+                       palette[i+2] = (uint8_t)ch;
+               }
+
+               // Do palette stretching here... I.e. add 0 to hinyb 0, 1 to hinyb 1, etc.
+
+               for(int i=0; i<768; i++)
+               palette[i] = ((palette[i]<<4)&0xF0) | (palette[i]&0x0F);
+
+               ff1.close();
+               ff2.close();
+       }
+
+       return ff1;
 }
 
+
 //
 // Unpack font data
 //
 bool UnpackFonts(void)
 {
-//  uint8 b1, b2, b3;
-  char b1, b2, b3;
-  fstream f1, f2;
-  //0x4000 $800 chars
-  f1.open("./ROMs/"ROM7, ios::binary | ios::in);
-  f2.open("./ROMs/"ROM8, ios::binary | ios::in);
-  if ((!f1) || (!f2))  return false;  // Return if not found...
-  for(long i=0; i<0x40000; i+=64)
-  {
-    for(int j=0; j<64; j+=8)
-    {
-      f1.get(b1);  f1.get(b2);  f2.get(b3);
-      b3 ^= 0xFF; // Invert top data...
-      chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
-      chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
-      chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
-      chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
-      chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
-      chr_rom[i+j+5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
-      chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
-      chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
-    }
-  }
-  f1.close();
-  f2.close();
-
-  f1.open("./ROMs/"ROM5, ios::binary | ios::in);
-  f2.open("./ROMs/"ROM6, ios::binary | ios::in);
-  for(long i=0x40000; i<0x60000; i+=64)
-  {
-    for(int j=0; j<64; j+=8)
-    {
-      f1.get(b1);  f1.get(b2);  f2.get(b3);
-      b3 ^= 0xFF;                             // Invert top data
-      chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
-      chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
-      chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
-      chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
-      chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
-      chr_rom[i+j+5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
-      chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
-      chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
-    }
-  }
-  f1.close();
-  f2.close();
-  return true;                                // Made it!
+//  uint8_t b1, b2, b3;
+       char b1, b2, b3;
+       fstream f1, f2;
+       //0x4000 $800 chars
+       f1.open("./ROMs/"ROM7, ios::binary | ios::in);
+       f2.open("./ROMs/"ROM8, ios::binary | ios::in);
+
+       if ((!f1) || (!f2))
+               return false;  // Return if not found...
+
+       for(long i=0; i<0x40000; i+=64)
+       {
+               for(int j=0; j<64; j+=8)
+               {
+                       f1.get(b1);  f1.get(b2);  f2.get(b3);
+                       b3 ^= 0xFF; // Invert top data...
+                       chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
+                       chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
+                       chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
+                       chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
+                       chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
+                       chr_rom[i+j+5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
+                       chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
+                       chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
+               }
+       }
+
+       f1.close();
+       f2.close();
+
+       f1.open("./ROMs/"ROM5, ios::binary | ios::in);
+       f2.open("./ROMs/"ROM6, ios::binary | ios::in);
+
+       for(long i=0x40000; i<0x60000; i+=64)
+       {
+               for(int j=0; j<64; j+=8)
+               {
+                       f1.get(b1);  f1.get(b2);  f2.get(b3);
+                       b3 ^= 0xFF;                             // Invert top data
+                       chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
+                       chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
+                       chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
+                       chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
+                       chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
+                       chr_rom[i+j+5] = (b3 & 0x04)        | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
+                       chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
+                       chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
+               }
+       }
+
+       f1.close();
+       f2.close();
+
+       return true;                                // Made it!
 }
 
+
 //
 // Get length of sample from WAV format
 //
-uint32 GetWAVLength(fstream &file)
+uint32_t GetWAVLength(fstream & file)
 {
        char ch;
-       uint32 len;
+       uint32_t len;
 
        file.ignore(16);                                                                        // Skip header BS
 
        for(int i=0; i<2; i++)
        {
-               file.get(ch);  len = (int)(uint8)ch;
-               file.get(ch);  len |= (int)(uint8)ch << 8;
-               file.get(ch);  len |= (int)(uint8)ch << 16;
-               file.get(ch);  len |= (int)(uint8)ch << 24;
+               file.get(ch);  len = (int)(uint8_t)ch;
+               file.get(ch);  len |= (int)(uint8_t)ch << 8;
+               file.get(ch);  len |= (int)(uint8_t)ch << 16;
+               file.get(ch);  len |= (int)(uint8_t)ch << 24;
 
                file.ignore(len + 4);                                                   // Skip intermediate data
        }
 
-       file.get(ch);  len = (int)(uint8)ch;                                    // & finally get length of data
-       file.get(ch);  len |= (int)(uint8)ch << 8;
-       file.get(ch);  len |= (int)(uint8)ch << 16;
-       file.get(ch);  len |= (int)(uint8)ch << 24;
+       file.get(ch);  len = (int)(uint8_t)ch;                                  // & finally get length of data
+       file.get(ch);  len |= (int)(uint8_t)ch << 8;
+       file.get(ch);  len |= (int)(uint8_t)ch << 16;
+       file.get(ch);  len |= (int)(uint8_t)ch << 24;
 
        return len;
 }
 
+
 //
 // Load PSG samples from disk
 //
@@ -856,7 +898,7 @@ void LoadPSGs(void)
 {
        char file[40];
        char ch;
-       uint32 len;
+       uint32_t len;
 
        for(int i=0; i<16; i++)
        {
@@ -870,8 +912,7 @@ void LoadPSGs(void)
                if (fp)
                {
                        len = GetWAVLength(fp);                                         // Get WAV data length...
-
-                       psg_adrs[i] = new uint8[len];                           // Attempt to allocate space...
+                       psg_adrs[i] = new uint8_t[len];                         // Attempt to allocate space...
 
                        if (psg_adrs[i] != NULL)
                        {
@@ -882,7 +923,8 @@ void LoadPSGs(void)
                                }
 
                                psg_lens[i] = len;
-                               cout << "Found sample file: " << file << " [Length: " << dec << len << "]" << endl;
+//                             cout << "Found sample file: " << file << "\t[Length: " << dec << len << "]" << endl;
+                               printf("Found sample file: %s\t[Length: %u]\n", file, len);
                        }
 
                        fp.close();
@@ -890,6 +932,7 @@ void LoadPSGs(void)
        }
 }
 
+
 //
 // Load FM samples from disk
 //
@@ -897,7 +940,7 @@ void LoadFMs(void)
 {
        char file[200];
        char ch;
-       uint32 len;
+       uint32_t len;
 
        for(int i=0; i<14; i++)
        {
@@ -911,8 +954,7 @@ void LoadFMs(void)
                if (fp)
                {
                        len = GetWAVLength(fp);                                         // Get WAV length...
-
-                       fm_adrs[i] = new uint8[len];                                    // Attempt to allocate space...
+                       fm_adrs[i] = new uint8_t[len];                                  // Attempt to allocate space...
 
                        if (fm_adrs[i] != NULL)
                        {
@@ -923,8 +965,8 @@ void LoadFMs(void)
                                }
 
                                fm_lens[i] = len;
-                               cout << "Found sample file: " << file << " [Length: " << dec << len
-                                       << "]" << endl;
+//                             cout << "Found sample file: " << file << " [Length: " << dec << len << "]" << endl;
+                               printf("Found sample file: %s\t[Length: %u]\n", file, len);
                        }
 
                        fp.close();
@@ -932,6 +974,7 @@ void LoadFMs(void)
        }
 }
 
+
 //
 // Main loop
 //
@@ -939,30 +982,31 @@ int main(int argc, char * argv[])
 {
        InitLog("thunder.log");
 
+extern bool disasm;    // From 'V6809.CPP'
        extern bool charbase;                                           // From 'SCREEN.CPP'
        charbase = false;
 
-  char lbuff[80];
-  fstream ff;                       // Declare fstream without file hooks...
-  bool brk = false, brk2 = false;   // Breakpoint set flag
-  uint16 brkpnt, brkpnt2;             // Where the breakpoint is...
-  bool running;                     // CPU running state flag...
-  bool self_test = false;           // Self-test switch
-  bool scr_type = false;            // false=chars, true=pixels
-  uint16 debounce = 0;                // Key de-bounce counter
-  uint16 fire_debounce = 0;           // Fire button debounce counter
+       char lbuff[80];
+       fstream ff;                       // Declare fstream without file hooks...
+       bool brk = false, brk2 = false;   // Breakpoint set flag
+       uint16_t brkpnt, brkpnt2;             // Where the breakpoint is...
+       bool running;                     // CPU running state flag...
+       bool self_test = false;           // Self-test switch
+       bool scr_type = false;            // false=chars, true=pixels
+       uint16_t debounce = 0;                // Key de-bounce counter
+       uint16_t fire_debounce = 0;           // Fire button debounce counter
 //  bool refresh2 = true;             // Default to 60 Hz...
-  uint8 x;                           // General placeholder...
-  bool active = true;                                          // Program running flag
+       uint8_t x;                           // General placeholder...
+       bool active = true;                                             // Program running flag
 
-  SDL_Event event;                                                             // SDL "event"
-  extern uint8 palette[768];                                   // Screen physical palette
-  uint32 ticks, oldTicks;
+       SDL_Event event;                                                                // SDL "event"
+       extern uint8_t palette[768];                                    // Screen physical palette
+       uint32_t ticks, oldTicks;
 
        cout << endl << "THUNDER v"THUNDER_VERSION" ";
        cout << "by James Hammons" << endl;
-       cout << "Serial #20090723 / Prerelease" << endl;
-       cout << "(C) 2003, 2009 Underground Software" << endl << endl;
+       cout << "Serial #20149404 / Prerelease" << endl;
+       cout << "© 2003, 2014 Underground Software" << endl << endl;
 
        cout << "This emulator is free software. If you paid for it you were RIPPED OFF"
                << endl << endl;
@@ -979,122 +1023,88 @@ int main(int argc, char * argv[])
 
        keys = SDL_GetKeyState(NULL);                           // Get the SDL keyboard matrix
 
-#if 0
-  cout << "Allocating memory..." << endl;
-//Does this anyway...  set_new_handler(0);    // Make 'new' return NULL on failure...
-  gram1 = new uint8[0x10000];
-  if (gram1 == NULL)  { cout << "Could not allocate RAM space #1!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  grom1 = new uint8[0x10000];
-  if (grom1 == NULL)  { cout << "Could not allocate ROM space #1!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  gram2 = new uint8[0x10000];
-  if (gram2 == NULL)  { cout << "Could not allocate RAM space #2!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  grom2 = new uint8[0x10000];
-  if (grom2 == NULL)  { cout << "Could not allocate ROM space #2!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  chr_rom = new uint8[0x60000];
-  if (chr_rom == NULL)  { cout << "Could not allocate character RAM!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  grom3 = new uint8[0x8000];
-  if (grom3 == NULL)  { cout << "Could not allocate ROM space #4!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  grom4 = new uint8[0x8000];
-  if (grom4 == NULL)  { cout << "Could not allocate ROM space #5!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  data_rom = new uint8[0x40000];
-  if (data_rom == NULL)  { cout << "Could not allocate ROM level data!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  spr_rom = new uint8[0x80000];
-  if (spr_rom == NULL)  { cout << "Could not allocate ROM sprite data!" << endl
-                      << "Aborting!" << endl;  return -1; }
-  voice_rom = new uint8[0x20000];
-  if (voice_rom == NULL)  { cout << "Could not allocate ROM voice data!" << endl
-                      << "Aborting!" << endl;  return -1; }
-#endif
+       gram = gram1;  grom = grom1;           // Needed only for debugger
 
-  gram = gram1;  grom = grom1;           // Needed only for debugger
+       for(long i=0; i<0x10000; i++)
+       {
+               gram[i] = 0;  grom[i] = 0;           // Zero out memory
+               gram2[i] = 0;  grom2[i] = 0;
+       }
 
-  for(long i=0; i<0x10000; i++)
-  {
-    gram[i] = 0;  grom[i] = 0;           // Zero out memory
-    gram2[i] = 0;  grom2[i] = 0;
-  }
-  game_over_switch = 0;   // Init game over delay
+       game_over_switch = 0;   // Init game over delay
 //  cpu1.a = 0; cpu1.b = 0; cpu1.cc = 0; cpu1.dp = 0; cpu1.x = 0; cpu1.y = 0; cpu1.s = 0; ur = 0; cpu1.pc = 0;
 
-  cout << "Loading ROMs..." << endl;
+       cout << "Loading ROMs..." << endl;
 //  LoadCMOS();                            // Load CMOS at $CC00-$CFFF
-  if (!ReadColorPROMs())                   // Load virtual PROMs
-  { cout << "Could not open PROM files!" << endl;  return -1; }
+       if (!ReadColorPROMs())                   // Load virtual PROMs
+       { cout << "Could not open PROM files!" << endl;  return -1; }
 
-  if (!LoadImg(ROM1, grom1, 0x8000, 0x8000)) // Load $8000-$FFFF 1st ROM
-  { cout << "Could not open file '" << ROM1 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM1, grom1, 0x8000, 0x8000)) // Load $8000-$FFFF 1st ROM
+       { cout << "Could not open file '" << ROM1 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM2, grom2, 0x8000, 0x8000)) // Load $8000-$FFFF 2nd ROM
-  { cout << "Could not open file '" << ROM2 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM2, grom2, 0x8000, 0x8000)) // Load $8000-$FFFF 2nd ROM
+       { cout << "Could not open file '" << ROM2 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM3, grom3, 0, 0x8000))      // Load 3rd ROM into its own space
-  { cout << "Could not open file '" << ROM3 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM3, grom3, 0, 0x8000))      // Load 3rd ROM into its own space
+       { cout << "Could not open file '" << ROM3 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM4, grom4, 0, 0x8000))      // Load 4rd ROM into its own space
-  { cout << "Could not open file '" << ROM4 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM4, grom4, 0, 0x8000))      // Load 4rd ROM into its own space
+       { cout << "Could not open file '" << ROM4 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM17, data_rom, 0,       0x10000))  // Load 17th ROM
-  { cout << "Could not open file '" << ROM17 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM17, data_rom, 0,       0x10000))  // Load 17th ROM
+       { cout << "Could not open file '" << ROM17 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM18, data_rom, 0x10000, 0x10000))  // Load 18th ROM
-  { cout << "Could not open file '" << ROM18 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM18, data_rom, 0x10000, 0x10000))  // Load 18th ROM
+       { cout << "Could not open file '" << ROM18 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM19, data_rom, 0x20000, 0x10000))  // Load 19th ROM
-  { cout << "Could not open file '" << ROM19 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM19, data_rom, 0x20000, 0x10000))  // Load 19th ROM
+       { cout << "Could not open file '" << ROM19 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM20, data_rom, 0x30000, 0x10000))  // Load 20th ROM
-  { cout << "Could not open file '" << ROM20 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM20, data_rom, 0x30000, 0x10000))  // Load 20th ROM
+       { cout << "Could not open file '" << ROM20 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM9,  spr_rom, 0,       0x10000))   // Load 9th ROM
-  { cout << "Could not open file '" << ROM9 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM9,  spr_rom, 0,       0x10000))   // Load 9th ROM
+       { cout << "Could not open file '" << ROM9 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM10, spr_rom, 0x10000, 0x10000))   // Load 10th ROM
-  { cout << "Could not open file '" << ROM10 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM10, spr_rom, 0x10000, 0x10000))   // Load 10th ROM
+       { cout << "Could not open file '" << ROM10 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM11, spr_rom, 0x20000, 0x10000))   // Load 11th ROM
-  { cout << "Could not open file '" << ROM11 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM11, spr_rom, 0x20000, 0x10000))   // Load 11th ROM
+       { cout << "Could not open file '" << ROM11 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM12, spr_rom, 0x30000, 0x10000))   // Load 12th ROM
-  { cout << "Could not open file '" << ROM12 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM12, spr_rom, 0x30000, 0x10000))   // Load 12th ROM
+       { cout << "Could not open file '" << ROM12 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM13, spr_rom, 0x40000, 0x10000))   // Load 13th ROM
-  { cout << "Could not open file '" << ROM13 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM13, spr_rom, 0x40000, 0x10000))   // Load 13th ROM
+       { cout << "Could not open file '" << ROM13 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM14, spr_rom, 0x50000, 0x10000))   // Load 14th ROM
-  { cout << "Could not open file '" << ROM14 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM14, spr_rom, 0x50000, 0x10000))   // Load 14th ROM
+       { cout << "Could not open file '" << ROM14 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM15, spr_rom, 0x60000, 0x10000))   // Load 15th ROM
-  { cout << "Could not open file '" << ROM15 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM15, spr_rom, 0x60000, 0x10000))   // Load 15th ROM
+       { cout << "Could not open file '" << ROM15 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM16, spr_rom, 0x70000, 0x10000))   // Load 16th ROM
-  { cout << "Could not open file '" << ROM16 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM16, spr_rom, 0x70000, 0x10000))   // Load 16th ROM
+       { cout << "Could not open file '" << ROM16 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM21, voice_rom, 0, 0x10000))  // Load 21st ROM
-  { cout << "Could not open file '" << ROM21 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM21, voice_rom, 0, 0x10000))  // Load 21st ROM
+       { cout << "Could not open file '" << ROM21 << "'!" << endl;  return -1; }
 
-  if (!LoadImg(ROM22, voice_rom, 0x10000, 0x10000))  // Load 22nd ROM
-  { cout << "Could not open file '" << ROM22 << "'!" << endl;  return -1; }
+       if (!LoadImg(ROM22, voice_rom, 0x10000, 0x10000))  // Load 22nd ROM
+       { cout << "Could not open file '" << ROM22 << "'!" << endl;  return -1; }
 
-  if (!UnpackFonts())                         // Load 5, 6, 7, 8th ROMs
-  {
-    cout << "Could not open font files!" << endl;
-    return -1;
-  }
+       if (!UnpackFonts())                         // Load 5, 6, 7, 8th ROMs
+       {
+               cout << "Could not open font files!" << endl;
+               return -1;
+       }
 
        // Load samples if they're there...
        LoadPSGs();
        LoadFMs();
 
   // Quick 'n' Dirty voice dump (sound 0x0E)
-/*  uint32 adc = (voice_rom[26]<<8) | voice_rom[27];
+/*  uint32_t adc = (voice_rom[26]<<8) | voice_rom[27];
   bool doneWitIt = false;
   int crh = 0;
   while (!doneWitIt)
@@ -1142,7 +1152,7 @@ WriteLog("About to go to the main loop...\n");
                                dpc = htod(lbuff);
                        }
                        printf("%04X: ", dpc);
-                       uint16 pc_save = cpu1.pc, pcB_save = cpu2.pc;
+                       uint16_t pc_save = cpu1.pc, pcB_save = cpu2.pc;
                        cpu1.pc = dpc;  cpu2.pc = dpc;
                        for(int i=0; i<16; i++)
                                printf("%02X ", (looking_at_rom ? Fetch() : FetchB()));
@@ -1150,7 +1160,7 @@ WriteLog("About to go to the main loop...\n");
                        cpu1.pc = dpc;  cpu2.pc = dpc;
                        for(int i=0; i<16; i++)
                        {
-                               uint8 a = (looking_at_rom ? Fetch() : FetchB());
+                               uint8_t a = (looking_at_rom ? Fetch() : FetchB());
                                if (a<10)             cout << (char)(a+48);
                                if ((a>9) && (a<37))  cout << (char)(a+55);
                                if (a>36)             cout << ".";
@@ -1167,7 +1177,7 @@ WriteLog("About to go to the main loop...\n");
                                dpc = htod(lbuff);
                        }
                        printf("%04X: ", dpc);
-                       for(int i=0; i<16; i++)  printf("%02X ", (uint8)gram[dpc++]);
+                       for(int i=0; i<16; i++)  printf("%02X ", (uint8_t)gram[dpc++]);
                        cout << endl;
                }
                else if (lbuff[0] == 'l')
@@ -1211,50 +1221,55 @@ WriteLog("About to go to the main loop...\n");
                else if ((lbuff[0] == 'r') || (lbuff[0] == 'c')) // Run/continue...
                {
 WriteLog("Executing 'run' command...\n");
-                       uint32 my_clock = 0;
+                       uint32_t my_clock = 0;
                        running = true;                                                         // Set running status...
                        trace1 = false;
                        SetRefreshRate(refresh2);                                       // Tell GUI our refresh rate
-      //for(uint16 i=0; i<0x8000; i++)  gram2[i] = grom3[i]; //Temp
+      //for(uint16_t i=0; i<0x8000; i++)  gram2[i] = grom3[i]; //Temp
 
                        if (lbuff[0] == 'r')                                            // If run, then reset CPUs
                        {
 WriteLog("Executing secondary 'run' command...\n");
+#if 1
+                               // This is data that is supposed to come from the MCU... So that's why it hangs
                                gram1[0x4182] = 0xA6;          // Temp kludge
                                gram1[0x4184] = 0xA6;
                                gram1[0x4183] = 0x00;          // More of the same
                                gram1[0x4185] = 0x00;
+#endif
                                banksw1 = 0;                   // Will this work?
                                banksw2 = 0;
 //        iclock = 0;                // Reset instr clock #1...
                                InitGUI();                 // Reset # of coins
 
-/*        cpu1.pc = ((grom1[0xFFFE]<<8) | grom1[0xFFFF]); // Reset 6809 #1
-        if (lbuff[1] != 0)
-        {
-          lbuff[0] = 32;  cpu1.pc = htod(lbuff);
-        }
-        else  cpu1.cc = 0xFF;                         // Set CC register
-
-        cpu2.pc = ((grom2[0xFFFE]<<8) | grom2[0xFFFF]); // Reset 6809 #2
-        cpu2.cc = 0xFF;                              // Set CC register
-        while(iclock < 8000)  // was 17000, 20000, 5000
-        {
-          Execute6809(&cpu1, 1);  Execute6809(&cpu2, 1);
-        }*/
+#if 0
+                               cpu1.pc = ((grom1[0xFFFE]<<8) | grom1[0xFFFF]); // Reset 6809 #1
+                               if (lbuff[1] != 0)
+                               {
+                               lbuff[0] = 32;  cpu1.pc = htod(lbuff);
+                               }
+                               else  cpu1.cc = 0xFF;                         // Set CC register
+
+                               cpu2.pc = ((grom2[0xFFFE]<<8) | grom2[0xFFFF]); // Reset 6809 #2
+                               cpu2.cc = 0xFF;                              // Set CC register
+                               while(iclock < 8000)  // was 17000, 20000, 5000
+                               {
+                               Execute6809(&cpu1, 1);  Execute6809(&cpu2, 1);
+                               }
+#endif
+#if 0
 WriteLog("--> CPU clock #1: %u\n", cpu1.clock);
-                               // Will *this* help video sync?
+                               // Will *this* help video sync? NO
                                while (cpu1.clock < 8000)                               // was 17000, 20000, 5000
                                {
                                        Execute6809(&cpu1, 1);
                                        Execute6809(&cpu2, 1);
                                }
+#endif
                        }
 
 WriteLog("About to set up screen...\n");
-//      if (!SetVESA2())  running = false;        // Set up screen
-                       // Set up screen (windowed)
-                       screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE); //video_bpp, videoflags);
+                       screen = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH * 2, VIRTUAL_SCREEN_HEIGHT * 2, 8, SDL_SWSURFACE  | SDL_DOUBLEBUF);
                        if (screen == NULL)
                        {
                                cout << "Failed to initialize screen!" << endl;
@@ -1262,23 +1277,25 @@ WriteLog("About to set up screen...\n");
                        }
 
                        SDL_Color colors[256];
+
                        for(int i=0; i<256; i++)
                        {
                                colors[i].r = palette[i*3+0];
                                colors[i].g = palette[i*3+1];
                                colors[i].b = palette[i*3+2];
                        }
+
                        SDL_SetPalette(screen, SDL_LOGPAL | SDL_PHYSPAL, colors, 0, 256);
 
-#if 1
+#if 0
        // This confirms that we're getting video to the screen...
        SDL_LockSurface(screen);
 
-       uint8 pixel = 0;
-       uint8 * pixels = (uint8 *)(screen->pixels);
+       uint8_t pixel = 0;
+       uint8_t * pixels = (uint8_t *)(screen->pixels);
 
-       for(uint32 y=0; y<480; y++)
-               for(uint32 x=0; x<640; x++)
+       for(uint32_t y=0; y<480; y++)
+               for(uint32_t x=0; x<640; x++)
                        pixels[(y * 640) + x] = pixel++;
 
        SDL_UnlockSurface(screen);
@@ -1305,6 +1322,7 @@ WriteLog("About to set up audio...\n");
                                cout << "Couldn't open audio: " << SDL_GetError() << endl;
                                return -1;
                        }
+
                        SDL_PauseAudio(0);                                                      // Get that audio going!
 
 WriteLog("About to enter main loop...\n");
@@ -1317,6 +1335,8 @@ WriteLog("About to enter main loop...\n");
                                        if (game_over_switch == 0)
                                                gram1[0x4380] = 0; // Kill music!
                                }
+//testing... (works)
+//gram1[0x423D] = 1;
                                //gram1[0x423D] = self_test;                    // Reset DSW1-1
                                gram1[0x4268] = 0;                                              // Reset Video test
                                gram1[0x427A] = 0;  gram1[0x427C] = 0;
@@ -1432,7 +1452,7 @@ WriteLog("About to enter main loop...\n");
                                }
                                if (keys[SDLK_RETURN])                                                  // Return
                                {
-                                       uint8 retval = UserSelectedSomething();
+                                       uint8_t retval = UserSelectedSomething();
                                        if (retval == EXIT)
                                                running = false;
                                        if (retval == REFRESH)
@@ -1497,37 +1517,53 @@ WriteLog("About to enter main loop...\n");
                                        Execute6809(&cpu2, 10);
                                }
 //                     }
-
-//                             if (enable_cpu)
-                               if (true)
+//F12 is used above, but the values are ignored. So we'll do it here too.
+                               if (keys[SDLK_F12])
                                {
+                                       cpu1.cpuFlags |= V6809_ASSERT_LINE_RESET;
+                                       cpu2.cpuFlags |= V6809_ASSERT_LINE_RESET;
+                               }
+                               if (keys[SDLK_d])                               // (D) start disassembly
+                                       disasm = true;
 #if 0
-//                                     if (irqGoA)
-                                               cpu1.cpuFlags |= V6809_ASSERT_LINE_IRQ;
-
-                                       Execute6809(&cpu1, 25000);
-                                       cpu1.clock -= 25000;                            // Remove 25K ticks from clock (in case it overflowed)
+       if (keys[SDLK_k])
+               gram1[0x5606] = 0x00;
+       if (keys[SDLK_l])
+       {
+               gram1[0x5607] = 0x01; // Hangs here... (CPU #1 waiting...)
+               WriteLog("\nMAIN: Stuffed $01 in $5607!!!\n\n");
+       }
+       if (keys[SDLK_o])
+       {
+               gram1[0x5FF3] = 0x02;
+               WriteLog("\nMAIN: Stuffed $02 in $5FF3!!!\n\n");
+       }
+#endif
 
-//                                     if (irqGoB)
-                                               cpu2.cpuFlags |= V6809_ASSERT_LINE_IRQ;
 
-                                       Execute6809(&cpu2, 25000);
-                                       cpu2.clock -= 25000;                            // Remove 25K ticks from clock (in case it overflowed)//*/
-#else
+                               if (enable_cpu)
+//                             if (true)
+                               {
+                                       // We can do this here because we're not executing the cores yet.
                                        cpu1.cpuFlags |= V6809_ASSERT_LINE_IRQ;
                                        cpu2.cpuFlags |= V6809_ASSERT_LINE_IRQ;
 //                                     while (cpu1.clock < 25000)
-                                       for(uint32 i=0; i<250; i++)
+// 1.538 MHz = 25633.333... cycles per frame (1/60 s)
+// 25600 cycles/frame
+// Setting interleave to 25 and below causes the V6809 core to hang...
+// 32 gets to the title screen before hanging...
+// 40 works, until it doesn't... :-P
+// 640 * 40
+// 800 * 32
+// Interesting, putting IRQs at 30 Hz makes it run at the correct speed. Still hangs in the demo, though.
+                                       for(uint32_t i=0; i<640; i++)
+//                                     for(uint32_t i=0; i<1280; i++)
                                        {
                                                // Gay, but what are ya gonna do?
                                                // There's better ways, such as keeping track of when slave writes to master, etc...
-                                               Execute6809(&cpu1, 100);
-                                               Execute6809(&cpu2, 100);
+                                               Execute6809(&cpu1, 40);
+                                               Execute6809(&cpu2, 40);
                                        }
-
-                                       cpu1.clock -= 25000;                            // Remove 25K ticks from clock (in case it overflowed)
-                                       cpu2.clock -= 25000;                            // Remove 25K ticks from clock (in case it overflowed)//*/
-#endif
                                } // END: enable_cpu
 
 //        if (refresh_++ == 1)                // 30 Hz...
@@ -1539,11 +1575,13 @@ WriteLog("About to enter main loop...\n");
 //          refresh_ = (refresh2 ? 1 : 0);    // 60/30 Hz...
 //        }
 
+#if 0
 //temp, for testing...
 BlitChar(screen, chr_rom, gram1);
-
+#endif
                                // Speed throttling happens here...
                                while (SDL_GetTicks() - oldTicks < 16)  // Actually, it's 16.66... Need to account for that somehow
+//                             while (SDL_GetTicks() - oldTicks < 32)  // Actually, it's 16.66... Need to account for that somehow
                                        SDL_Delay(1);                           // Release our timeslice...
 
                                oldTicks = SDL_GetTicks();
@@ -1593,61 +1631,68 @@ BlitChar(screen, chr_rom, gram1);
                }
                else if (lbuff[0] == 'i')  // Inspect registers
                {
-      printf("CPU1: A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
-              cpu1.a, cpu1.b, cpu1.cc, cpu1.dp, cpu1.x, cpu1.y, cpu1.s, cpu1.u, cpu1.pc);
-      cout << " iclk=" << dec << cpu1.clock << endl;
-      printf("CPU2: A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
-              cpu2.a, cpu2.b, cpu2.cc, cpu2.dp, cpu2.x, cpu2.y, cpu2.s, cpu2.u, cpu2.pc);
-      cout << " iclk=" << dec << cpu2.clock << endl;
-      if (brk)
-        cout << "Breakpoint #1 set at " << hex << brkpnt << dec << endl;
-      if (brk2)
-        cout << "Breakpoint #2 set at " << hex << brkpnt2 << dec << endl;
-    }
+                       printf("CPU1: A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
+                                       cpu1.a, cpu1.b, cpu1.cc, cpu1.dp, cpu1.x, cpu1.y, cpu1.s, cpu1.u, cpu1.pc);
+                       cout << " iclk=" << dec << cpu1.clock << endl;
+                       printf("CPU2: A=%02X B=%02X CC=%02X DP=%02X X=%04X Y=%04X S=%04X U=%04X PC=%04X",
+                                       cpu2.a, cpu2.b, cpu2.cc, cpu2.dp, cpu2.x, cpu2.y, cpu2.s, cpu2.u, cpu2.pc);
+                       cout << " iclk=" << dec << cpu2.clock << endl;
+
+                       if (brk)
+                               cout << "Breakpoint #1 set at " << hex << brkpnt << dec << endl;
+
+                       if (brk2)
+                               cout << "Breakpoint #2 set at " << hex << brkpnt2 << dec << endl;
+               }
                else if (strncmp(lbuff, "swap", 4) == 0)  // Swap ROMs
-    {
-      looking_at_rom = !looking_at_rom;
-      cout << "Swapped:  Looking at ";
-      (looking_at_rom ? cout << "ROM #1" : cout << "ROM #2");
-      cout << endl;
-    }
+               {
+                       looking_at_rom = !looking_at_rom;
+                       cout << "Swapped:  Looking at ";
+                       (looking_at_rom ? cout << "ROM #1" : cout << "ROM #2");
+                       cout << endl;
+               }
                else if (strncmp(lbuff, "seek", 4) == 0)  // Seek non-zero bytes in RAM
-    {
-      if (lbuff[4] != 0)
-      {
-        for(int i=0; i<4; i++)
-          lbuff[i] = 32;
-        dpc = htod(lbuff);
-      }
-      do
-      {
-        x = gram1[dpc++];
-      }
-      while ((x == 0) && (dpc != 0xFFFF)); // Keep going until something found
-      dpc--;
-
-      printf("%04X: ", dpc);       // Show data found...
-      for(int i=0; i<16; i++)
-        printf("%02X ", gram1[(uint16)(dpc+i)]);
-      cout << " ";
-      for(int i=0; i<16; i++)
-      {
-        uint8 a = gram1[dpc++];
-        if (a<10)
-          cout << (char)(a+48);
-        if ((a>9) && (a<37))
-          cout << (char)(a+55);
-        if (a>36)
-          cout << ".";
-      }
-      cout << endl;
-    }
+               {
+
+                       if (lbuff[4] != 0)
+                       {
+                               for(int i=0; i<4; i++)
+                               lbuff[i] = 32;
+                               dpc = htod(lbuff);
+                       }
+
+                       do
+                       {
+                               x = gram1[dpc++];
+                       }
+                       while ((x == 0) && (dpc != 0xFFFF)); // Keep going until something found
+                       dpc--;
+
+                       printf("%04X: ", dpc);       // Show data found...
+
+                       for(int i=0; i<16; i++)
+                               printf("%02X ", gram1[(uint16_t)(dpc+i)]);
+
+                       cout << " ";
+
+                       for(int i=0; i<16; i++)
+                       {
+                               uint8_t a = gram1[dpc++];
+
+                               if (a<10)
+                                       cout << (char)(a+48);
+                               if ((a>9) && (a<37))
+                                       cout << (char)(a+55);
+                               if (a>36)
+                                       cout << ".";
+                       }
+
+                       cout << endl;
+               }
                else if (lbuff[0] == 'v')    // View screen
                {
-//                     SetVESA2();                           // Set up screen
                        BlitChar(screen, chr_rom, gram1);
                        getch();
-//                     RestoreOldMode();
                }
 
                if (lbuff[0] == 'q')
@@ -1656,19 +1701,6 @@ BlitChar(screen, chr_rom, gram1);
 
        SDL_Quit();                                                                     // Shut down SDL
 
-#if 0
-       delete[] gram1;                                                                         // Deallocate RAM & ROM spaces
-       delete[] grom1;
-       delete[] gram2;
-       delete[] grom2;
-       delete[] chr_rom;
-       delete[] grom3;
-       delete[] grom4;
-       delete[] data_rom;
-       delete[] spr_rom;
-       delete[] voice_rom;
-#endif
-
        for(int i=0; i<16; i++)
                if (psg_adrs[i])
                        delete[] psg_adrs[i];                           // Deallocate if loaded
@@ -1681,3 +1713,133 @@ BlitChar(screen, chr_rom, gram1);
 
        return 1;
 }
+
+#if 0
+Hitachi uC runs at 6.144 MHz
+YM2151 runs at 3.579580 MHz
+
+
+Rolling Thunder Memory map
+--------------------------
+Most of the decoding is done by custom chips (CUS47 and CUS41), so the memory
+map is inferred by program behaviour. The customs also handle internally irq
+and watchdog.
+
+The main CPU memory map is the same in all games because CUS47 is used by all
+games. The sub CPU and sound CPU, on the other hand, change because CUS41 is
+replaced by other chips.
+
+All RAM is shared between main and sub CPU, except for sound RAM which is
+shared between main and sound CPU; the portion of object RAM that is overlapped
+by sound RAM is used exclusively by the sub CPU.
+
+MAIN CPU:
+
+Address             Dir Data     Name      Description
+------------------- --- -------- --------- -----------------------
+000x xxxx xxxx xxxx R/W xxxxxxxx SCROLL0   tilemap 0/1 RAM (shared with sub CPU)
+001x xxxx xxxx xxxx R/W xxxxxxxx SCROLL1   tilemap 2/3 RAM (shared with sub CPU)
+0100 00xx xxxx xxxx R/W xxxxxxxx SOUND     sound RAM (through CUS30, shared with MCU)
+0100 0000 xxxx xxxx R/W xxxxxxxx           portion holding the sound wave data
+0100 0001 00xx xxxx R/W xxxxxxxx           portion holding the sound registers
+010x xxxx xxxx xxxx R/W xxxxxxxx OBJECT    work RAM (shared with sub CPU) [1]
+0101 1xxx xxxx xxxx R/W xxxxxxxx           portion holding sprite registers
+011x xxxx xxxx xxxx R   xxxxxxxx ROM 9D    program ROM (banked) [2]
+1xxx xxxx xxxx xxxx R   xxxxxxxx ROM 9C    program ROM
+1000 00-- ---- ----   W --------           watchdog reset (RES generated by CUS47)
+1000 01-- ---- ----   W --------           main CPU irq acknowledge (IRQ generated by CUS47)
+1000 1x-- ---- ----   W -------- BANK      tile gfx bank select (data is in A10) (latch in CUS47)
+1001 00-- ---- -x0x   W xxxxxxxx LATCH0    tilemap 0/1 X scroll + priority
+1001 00-- ---- -x10   W xxxxxxxx LATCH0    tilemap 0/1 Y scroll
+1001 00-- ---- --11   W ------xx BAMNKM    ROM 9D bank select
+1001 01-- ---- -x0x   W xxxxxxxx LATCH1    tilemap 2/3 X scroll + priority
+1001 01-- ---- -x10   W xxxxxxxx LATCH1    tilemap 2/3 Y scroll
+1001 01-- ---- --11   W ------xx BAMNKS    ROM 12D bank select
+1100 00-- ---- ----   W xxxxxxxx BACKCOLOR background color
+
+[1] Note that this is partially overlapped by sound RAM
+[2] In Rolling Thunder and others, replaced by the ROM/voice expansion board
+
+
+SUB CPU:
+
+Address             Dir Data     Name      Description
+------------------- --- -------- --------- -----------------------
+000x xxxx xxxx xxxx R/W xxxxxxxx SUBOBJ    work RAM (shared with main CPU)
+0001 1xxx xxxx xxxx R/W xxxxxxxx           portion holding sprite registers
+001x xxxx xxxx xxxx R/W xxxxxxxx SUBSCR0   tilemap 0/1 RAM (shared with main CPU)
+010x xxxx xxxx xxxx R/W xxxxxxxx SUBSCR1   tilemap 2/3 RAM (shared with main CPU)
+011x xxxx xxxx xxxx R   xxxxxxxx ROM 12D   program ROM (banked) [1]
+1xxx xxxx xxxx xxxx R   xxxxxxxx ROM 12C   program ROM
+1000 0--- ---- ----   W --------           watchdog reset (MRESET generated by CUS41)
+1000 1--- ---- ----   W --------           main CPU irq acknowledge (generated by CUS41)
+1101 0--- ---- -x0x   W xxxxxxxx LATCH0    tilemap 0/1 X scroll + priority
+1101 0--- ---- -x10   W xxxxxxxx LATCH0    tilemap 0/1 Y scroll
+1101 0--- ---- --11   W ------xx BAMNKM    ROM 9D bank select
+1101 1--- ---- -x0x   W xxxxxxxx LATCH1    tilemap 2/3 X scroll + priority
+1101 1--- ---- -x10   W xxxxxxxx LATCH1    tilemap 2/3 Y scroll
+1101 1--- ---- --11   W ------xx BAMNKS    ROM 12D bank select
+
+[1] Only used by Rolling Thunder
+
+
+MCU:
+
+Address             Dir Data     Name      Description
+------------------- --- -------- --------- -----------------------
+0000 0000 xxxx xxxx                        MCU internal registers, timers, ports and RAM
+0001 xxxx xxxx xxxx R/W xxxxxxxx RAM 3F    sound RAM (through CUS30, partially shared with main CPU)
+0001 0000 xxxx xxxx R/W xxxxxxxx           portion holding the sound wave data
+0001 0001 00xx xxxx R/W xxxxxxxx           portion holding the sound registers
+0010 0--- --00 ---x R/W xxxxxxxx YMCS      YM2151
+0010 0--- --01 ----                        n.c.
+0010 0--- --10 ---- R   xxxxxxxx PORTA     switch inputs
+0010 0--- --11 ---- R   xxxxxxxx PORTB     dip switches
+01xx xxxx xxxx xxxx R   xxxxxxxx ROM 6B    program ROM (lower half)
+10xx xxxx xxxx xxxx R   xxxxxxxx ROM 6B    program ROM (upper half)
+1011 0--- ---- ----   W                    unknown (CUS41)
+1011 1--- ---- ----   W                    unknown (CUS41)
+1111 xxxx xxxx xxxx R   xxxxxxxx           MCU internal ROM
+
+
+Notes:
+-----
+- we are using an unusually high CPU interleave factor (800) to avoid hangs
+  in rthunder. The two 6809 in this game synchronize using a semaphore at
+  5606/5607 (CPU1) 1606/1607 (CPU2). CPU1 clears 5606, does some quick things,
+  and then increments 5606. While it does its quick things (which require
+  about 40 clock cycles) it expects CPU2 to clear 5607.
+  Raising the interleave factor to 1000 makes wndrmomo crash during attract
+  mode. I haven't investigated on the cause.
+
+- There are two watchdogs, one per CPU (or maybe three). Handling them
+  separately is necessary to allow entering service mode without manually
+  resetting in rthunder and genpeitd: only one of the CPUs stops writing to
+  the watchdog.
+
+- The sprite hardware buffers spriteram: the program writes the sprite list to
+  offsets 4-9 of every 16-byte block, then at the end writes to offset 0x1ff2 of
+  sprite RAM to signal the chip that the list is complete. The chip will copy
+  the list from 4-9 to 10-15 and use it from there. This has not been verified
+  on the real hardware, but it is the most logical way of doing it.
+  Emulating this behaviour and not using an external buffer is important in
+  rthunder: when you insert a coin, the whole sprite RAM is cleared, but 0x1ff2
+  is not written to. If we buffered spriteram to an external buffer, this would
+  cause dangling sprites because the buffer would not be updated.
+
+- spriteram buffering fixes sprite lag, but causes a glitch in rthunder when
+  entering a door. The *closed* door is made of tiles, but the *moving* door is
+  made of sprites. Since sprites are delayed by 1 frame, when you enter a door
+  there is one frame where neither the tile-based closed door nor the
+  sprite-based moving door is shown, so it flickers. This behavior has been
+  confirmed on a real PCB.
+
+TODO:
+----
+- The two unknown writes for the MCU are probably watchdog reset and irq acknowledge,
+  but they don't seem to work as expected. During the first few frames they are
+  written out of order and hooking them up in the usual way causes the MCU to
+  stop receiving interrupts.
+
+#endif
+