//
// Apple 2 SDL Portable Apple Emulator
//
-// by James L. Hammons
+// by James Hammons
// (C) 2005 Underground Software
//
// Loosely based on AppleWin by Tom Charlesworth which was based on AppleWin by
// also derived from ApplePC. Too bad it was closed source--it could have been
// *the* premier Apple II emulator out there.
//
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
//
// WHO WHEN WHAT
// --- ---------- ------------------------------------------------------------
// JLH 11/18/2005 Wired up graphic soft switches
// JLH 12/02/2005 Setup timer subsystem for more accurate time keeping
// JLH 12/12/2005 Added preliminary state saving support
+// JLH 09/24/2013 Added //e support
//
// STILL TO DO:
// - GUI goodies
// - Weed out unneeded functions [DONE]
// - Disk I/O [DONE]
-// - 128K IIe related stuff
+// - 128K IIe related stuff [DONE]
// - State loading/saving
//
#include "timing.h"
#include "floppy.h"
#include "firmware.h"
+#include "mmu.h"
#include "gui/gui.h"
#include "gui/window.h"
#define THREADED_65C02
#define CPU_THREAD_OVERFLOW_COMPENSATION
-//#define DEBUG_LC
+#define DEBUG_LC
//#define CPU_CLOCK_CHECKING
-#define THREAD_DEBUGGING
+//#define THREAD_DEBUGGING
+#define SOFT_SWITCH_DEBUGGING
// Global variables
uint8_t ram[0x10000], rom[0x10000]; // RAM & ROM spaces
-uint8_t ram2[0x10000];
-uint8_t diskRom[0x100]; // Disk ROM space
+uint8_t ram2[0x10000]; // Auxillary RAM
+//uint8_t diskRom[0x100]; // Disk ROM space
V65C02REGS mainCPU; // v65C02 execution context
-uint8_t appleType = APPLE_TYPE_II;
+uint8_t appleType = APPLE_TYPE_IIE;
FloppyDrive floppyDrive;
// Local variables
-static uint8_t lastKeyPressed = 0;
-static bool keyDown = false;
-static bool openAppleDown = false;
-static bool closedAppleDown = false;
+uint8_t lastKeyPressed = 0;
+bool keyDown = false;
+bool openAppleDown = false;
+bool closedAppleDown = false;
+bool store80Mode = false;
+bool vbl = false;
+bool slotCXROM = false;
+bool slotC3ROM = false;
+bool ramrd = false;
+bool ramwrt = false;
+bool altzp = false;
+bool ioudis = true;
+bool dhires = false;
//static FloppyDrive floppyDrive;
static bool running = true; // Machine running state flag...
static uint32_t startTicks;
+static bool pauseMode = false;
static GUI * gui = NULL;
static bool cpuFinished = false;
static bool cpuSleep = false;
+// NB: Apple //e Manual sez 6502 is running @ 1,022,727 Hz
+
// Let's try a thread...
/*
Here's how it works: Execute 1 frame's worth, then sleep.
#endif
SDL_SemWait(mainSem);
+// There are exactly 800 slices of 21.333 cycles per frame, so it works out
+// evenly.
+#if 0
uint32_t cycles = 17066;
#ifdef CPU_THREAD_OVERFLOW_COMPENSATION
// ODD! It's closer *without* this overflow compensation. ??? WHY ???
WriteLog("CPU: AdjustLastToggleCycles(mainCPU.clock);\n");
#endif
AdjustLastToggleCycles(mainCPU.clock);
+#else
+#ifdef THREAD_DEBUGGING
+WriteLog("CPU: Execute65C02(&mainCPU, cycles);\n");
+#endif
+ for(int i=0; i<800; i++)
+ {
+ uint32_t cycles = 21;
+ overflow += 0.333333334;
+
+ if (overflow > 1.0)
+ {
+ cycles++;
+ overflow -= 1.0;
+ }
+
+ Execute65C02(&mainCPU, cycles);
+ WriteSampleToBuffer();
+
+ // Dunno if this is correct (seems to be close enough)...
+ vbl = (i < 670 ? true : false);
+ }
+#endif
#ifdef THREAD_DEBUGGING
WriteLog("CPU: SDL_mutexP(cpuMutex);\n");
#endif
SDL_mutexP(cpuMutex);
-#if 0
- if (SDL_CondWait(cpuCond, cpuMutex) != 0)
- {
- printf("SDL_CondWait != 0! (Error: '%s')\n", SDL_GetError());
- exit(-1);
- }
-#else
// increment mainSem...
#ifdef THREAD_DEBUGGING
WriteLog("CPU: SDL_SemPost(mainSem);\n");
#endif
-SDL_SemPost(mainSem);
-// SDL_CondSignal(mainCond); // In case something is waiting on us...
-
+ SDL_SemPost(mainSem);
#ifdef THREAD_DEBUGGING
WriteLog("CPU: SDL_CondWait(cpuCond, cpuMutex);\n");
#endif
SDL_CondWait(cpuCond, cpuMutex);
-#endif
#ifdef THREAD_DEBUGGING
WriteLog("CPU: SDL_mutexV(cpuMutex);\n");
#endif
}
#endif
+
// Test GUI function
Element * TestWindow(void)
return win;
}
+
Element * QuitEmulator(void)
{
gui->Stop();
return NULL;
}
+
/*
Small Apple II memory map:
{
return lastKeyPressed | (keyDown ? 0x80 : 0x00);
}
- else if ((addr & 0xFFF0) == 0xC010) // Read $C010-$C01F
+// else if ((addr & 0xFFF8) == 0xC010) // Read $C010-$C01F
+ else if (addr == 0xC010)
{
//This is bogus: keyDown is set to false, so return val NEVER is set...
//Fixed...
keyDown = false;
return retVal;
}
+ // These are //e locations
+ else if (addr == 0xC011)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RDBANK2 (read)\n");
+#endif
+ return (visibleBank == LC_BANK_2 ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC012)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RDLCRAM (read)\n");
+#endif
+ return (readRAM ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC013)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RAMRD (read)\n");
+#endif
+ return (ramrd ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC014)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RAMWRT (read)\n");
+#endif
+ return (ramwrt ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC015)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("SLOTCXROM (read)\n");
+#endif
+ return (slotCXROM ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC016)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("ALTZP (read)\n");
+#endif
+ return (altzp ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC017)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("SLOTC3ROM (read)\n");
+#endif
+ return (slotC3ROM ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC018)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("80STORE (read)\n");
+#endif
+ return (store80Mode ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC019)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("VBL (read)\n");
+#endif
+// NB: The doco suggests that this signal goes LOW when in the VBI.
+// Which means that we need to control this by counting lines somewhere.
+ return (vbl ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC01A)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("TEXT (read)\n");
+#endif
+ return (textMode ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC01B)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("MIXED (read)\n");
+#endif
+ return (mixedMode ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC01C)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("PAGE2 (read)\n");
+#endif
+ return (displayPage2 ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC01D)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("HIRES (read)\n");
+#endif
+ return (hiRes ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC01E)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("ALTCHARSET (read)\n");
+#endif
+ return (alternateCharset ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC01F)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("80COL (read)\n");
+#endif
+ return (col80Mode ? 0x80 : 0x00);
+ }
else if ((addr & 0xFFF0) == 0xC030) // Read $C030-$C03F
{
-/*
-This is problematic, mainly because the v65C02 removes actual cycles run after each call.
-Therefore, we don't really have a reliable method of sending a timestamp to the sound routine.
-How to fix?
-
-What we need to send is a delta T value but related to the IRQ buffer routine. E.g., if the buffer
-hasn't had any changes in it then we just fill it with the last sample value and are done. Then
-we need to adjust our delta T accordingly. What we could do is keep a running total of time since the
-last change and adjust it accordingly, i.e., whenever a sound IRQ happens.
-How to keep track?
-
-Have deltaT somewhere. Then, whenever there's a toggle, backfill buffer with last spkr state and reset
-deltaT to zero. In the sound IRQ, if deltaT > buffer size, then subtract buffer size from deltaT. (?)
-
-
-
-*/
- ToggleSpeaker(GetCurrentV65C02Clock());
+ ToggleSpeaker();
//should it return something else here???
return 0x00;
}
else if (addr == 0xC050) // Read $C050
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("TEXT off (read)\n");
+#endif
textMode = false;
}
else if (addr == 0xC051) // Read $C051
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("TEXT on (read)\n");
+#endif
textMode = true;
}
else if (addr == 0xC052) // Read $C052
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("MIXED off (read)\n");
+#endif
mixedMode = false;
}
else if (addr == 0xC053) // Read $C053
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("MIXED on (read)\n");
+#endif
mixedMode = true;
}
else if (addr == 0xC054) // Read $C054
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("PAGE2 off (read)\n");
+#endif
displayPage2 = false;
}
else if (addr == 0xC055) // Read $C055
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("PAGE2 on (read)\n");
+#endif
displayPage2 = true;
}
else if (addr == 0xC056) // Read $C056
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("HIRES off (read)\n");
+#endif
hiRes = false;
}
else if (addr == 0xC057) // Read $C057
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("HIRES on (read)\n");
+#endif
hiRes = true;
}
+ else if (addr == 0xC05E)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("DHIRES on (read)\n");
+#endif
+ if (ioudis)
+ dhires = true;
+ }
+ else if (addr == 0xC05F)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("DHIRES off (read)\n");
+#endif
+ if (ioudis)
+ dhires = false;
+ }
else if (addr == 0xC061) // Read $C061
{
// Open Apple key (or push button 0)
// Open Apple key (or push button 0)
return (closedAppleDown ? 0x80 : 0x00);
}
+ // The way the paddles work is that a strobe is written (or read) to $C070,
+ // then software counts down the time that it takes for the paddle outputs
+ // to have bit 7 return to 0. If there are no paddles connected, bit 7
+ // stays at 1.
+ else if (addr == 0xC064) // Paddles 0-3
+ {
+ return 0xFF;
+ }
+ else if (addr == 0xC065)
+ {
+ return 0xFF;
+ }
+ else if (addr == 0xC066)
+ {
+ return 0xFF;
+ }
+ else if (addr == 0xC067)
+ {
+ return 0xFF;
+ }
+ else if (addr == 0xC07E)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("IOUDIS (read)\n");
+#endif
+ return (ioudis ? 0x80 : 0x00);
+ }
+ else if (addr == 0xC07F)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("DHIRES (read)\n");
+#endif
+ return (dhires ? 0x80 : 0x00);
+ }
//Note that this is a kludge: The $D000-$DFFF 4K space is shared (since $C000-$CFFF is
//memory mapped) between TWO banks, and that that $E000-$FFFF RAM space is a single bank.
showpath = true;
#endif
//This sux...
- if (addr >= 0xC100 && addr <= 0xCFFF) // The $C000-$CFFF block is *never* RAM
-#ifdef LC_DEBUGGING
+ if (addr >= 0xC100 && addr <= 0xC7FF) // The $C000-$CFFF block is *never* RAM
{
-#endif
- b = rom[addr];
+// Looks like the ][e ref manual got this one wrong: slotCXROM set should mean
+// use internal ROM, NOT slot ROM. :-/
+// (fixed now, by setting the switch correctly in the write mem section :-P)
+ if (!slotCXROM)
+// if (slotCXROM)
+ b = rom[addr];
+ else
+ {
+ if (addr >= 0xC100 && addr <= 0xC1FF)
+ b = parallelROM[addr & 0xFF];
+ else if (addr >= 0xC600 && addr <= 0xC6FF)
+ b = diskROM[addr & 0xFF];
+ else if (addr >= 0xC300 && addr <= 0xC3FF && !slotC3ROM)
+ b = rom[addr];
+ else
+ b = 0xFF;
+// b = rom[addr];
+ }
#ifdef LC_DEBUGGING
if (showpath)
WriteLog("b is from $C100-$CFFF block...\n");
- }
#endif
+ }
+ else if (addr >= 0xC800 && addr <= 0xCFFF) // 2K peripheral or OS ROM
+ {
+ b = rom[addr];
+ }
else if (addr >= 0xD000)
{
if (readRAM)
{
if (addr <= 0xDFFF && visibleBank == LC_BANK_1)
#ifdef LC_DEBUGGING
- {
+ {
#endif
- b = ram[addr - 0x1000];
+// b = ram[addr - 0x1000];
+ b = (altzp ? ram2[addr - 0x1000] : ram[addr - 0x1000]);
#ifdef LC_DEBUGGING
if (showpath)
WriteLog("b is from LC bank #1 (ram[addr - 0x1000])...\n");
- }
+ }
#endif
else
#ifdef LC_DEBUGGING
- {
+ {
#endif
- b = ram[addr];
+// b = ram[addr];
+ b = (altzp ? ram2[addr] : ram[addr]);
#ifdef LC_DEBUGGING
if (showpath)
WriteLog("b is from LC bank #2 (ram[addr])...\n");
- }
+ }
#endif
}
else
#ifdef LC_DEBUGGING
- {
+ {
#endif
b = rom[addr];
#ifdef LC_DEBUGGING
if (showpath)
WriteLog("b is from LC ROM (rom[addr])...\n");
- }
+ }
#endif
}
else
-#ifdef LC_DEBUGGING
{
+// 80STORE only works for WRITING, not READING!
+#if 0
+ // Check for 80STORE mode (STORE80 takes precedence over RAMRD/WRT)...
+ if ((((addr >= 0x0400) && (addr <= 0x07FF)) || ((addr >= 0x2000) && (addr <= 0x3FFF))) && store80Mode)
+ {
+ if (displayPage2)
+ b = ram2[addr];
+ else
+ b = ram[addr];
+
+ return b;
+ }
#endif
- b = ram[addr];
+
+ // Finally, check for auxillary/altzp write switches
+ if (addr < 0x0200)
+ b = (altzp ? ram2[addr] : ram[addr]);
+ else
+ b = (ramrd ? ram2[addr] : ram[addr]);
#ifdef LC_DEBUGGING
if (showpath)
WriteLog("b is from ram[addr]...\n");
- }
#endif
+ }
#ifdef LC_DEBUGGING
if (addr >= 0xD000 && addr <= 0xD00F)
CLRALTCH = $C00E ;use main char set- norm LC, Flash UC (WR-only)
SETALTCH = $C00F ;use alt char set- norm inverse, LC; no Flash (WR-only)
*/
- if (addr == 0xC00E)
+ if (addr == 0xC000)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("80STORE off (write)\n");
+#endif
+ store80Mode = false;
+ }
+ else if (addr == 0xC001)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("80STORE on (write)\n");
+#endif
+ store80Mode = true;
+ }
+ else if (addr == 0xC002)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RAMRD off (write)\n");
+#endif
+ ramrd = false;
+ }
+ else if (addr == 0xC003)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RAMRD on (write)\n");
+#endif
+ ramrd = true;
+ }
+ else if (addr == 0xC004)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RAMWRT off (write)\n");
+#endif
+ ramwrt = false;
+ }
+ else if (addr == 0xC005)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("RAMWRT on (write)\n");
+#endif
+ ramwrt = true;
+ }
+ else if (addr == 0xC006)
+ {
+ // This is the only soft switch that breaks the usual convention.
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("SLOTCXROM on (write)\n");
+#endif
+ slotCXROM = true;
+ }
+ else if (addr == 0xC007)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("SLOTCXROM off (write)\n");
+#endif
+ slotCXROM = false;
+ }
+ else if (addr == 0xC008)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("ALTZP off (write)\n");
+#endif
+ altzp = false;
+ }
+ else if (addr == 0xC009)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("ALTZP on (write)\n");
+#endif
+ altzp = true;
+ }
+ else if (addr == 0xC00A)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("SLOTC3ROM off (write)\n");
+#endif
+ slotC3ROM = false;
+ }
+ else if (addr == 0xC00B)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("SLOTC3ROM on (write)\n");
+#endif
+ slotC3ROM = true;
+ }
+ else if (addr == 0xC00C)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("80COL off (write)\n");
+#endif
+ col80Mode = false;
+ }
+ else if (addr == 0xC00D)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("80COL on (write)\n");
+#endif
+ col80Mode = true;
+ }
+ else if (addr == 0xC00E)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("ALTCHARSET off (write)\n");
+#endif
alternateCharset = false;
}
else if (addr == 0xC00F)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("ALTCHARSET on (write)\n");
+#endif
alternateCharset = true;
}
else if ((addr & 0xFFF0) == 0xC010) // Keyboard strobe
//But leaving this out seems to fuck up the key handling of some games...
keyDown = false;
}
+ else if ((addr & 0xFFF0) == 0xC030) // Read $C030-$C03F
+ {
+//Likewise, the speaker is supposed to do nothing if you write to it, and
+//for the same reason. But without this, you get no sound in David's
+//Midnight Magic...
+ ToggleSpeaker();
+ }
else if (addr == 0xC050)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("TEXT off (write)\n");
+#endif
textMode = false;
}
else if (addr == 0xC051)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("TEXT on (write)\n");
+#endif
textMode = true;
}
else if (addr == 0xC052)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("MIXED off (write)\n");
+#endif
mixedMode = false;
}
else if (addr == 0xC053)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("MIXED on (write)\n");
+#endif
mixedMode = true;
}
else if (addr == 0xC054)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("PAGE2 off (write)\n");
+#endif
displayPage2 = false;
}
else if (addr == 0xC055)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("PAGE2 on (write)\n");
+#endif
displayPage2 = true;
}
else if (addr == 0xC056)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("HIRES off (write)\n");
+#endif
hiRes = false;
}
else if (addr == 0xC057)
{
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("HIRES on (write)\n");
+#endif
hiRes = true;
}
+ else if (addr == 0xC05E)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("DHIRES on (write)\n");
+#endif
+ if (ioudis)
+ dhires = true;
+
+//static int goDumpDis = 0;
+//goDumpDis++;
+//if (goDumpDis == 2)
+// dumpDis = true;
+ }
+ else if (addr == 0xC05F)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("DHIRES off (write)\n");
+#endif
+ if (ioudis)
+ dhires = false;
+ }
+ else if (addr == 0xC07E)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("IOUDIS on (write)\n");
+#endif
+ ioudis = true;
+ }
+ else if (addr == 0xC07F)
+ {
+#ifdef SOFT_SWITCH_DEBUGGING
+WriteLog("IOUDIS off (write)\n");
+#endif
+ ioudis = false;
+ }
else if ((addr & 0xFFFB) == 0xC080)
{
#ifdef DEBUG_LC
{
floppyDrive.SetWriteMode();
}
-//Still need to add missing I/O switches here...
-//DEEE: BD 10 BF LDA $BF10,X [PC=DEF1, SP=01F4, CC=--.B-IZ-, A=00, X=0C, Y=07]
-#if 0
-if (addr >= 0xD000 && addr <= 0xD00F)
-{
- WriteLog("*** Write to $%04X: $%02X (writeRAM=%s, PC=%04X, ram$D000=%02X)\n", addr, b, (writeRAM ? "T" : "F"), mainCPU.pc, ram[0xC000]);
-}
-#endif
if (addr >= 0xC000 && addr <= 0xCFFF)
return; // Protect LC bank #1 from being written to!
{
if (writeRAM)
{
+#if 0
if (addr <= 0xDFFF && visibleBank == LC_BANK_1)
ram[addr - 0x1000] = b;
else
ram[addr] = b;
+#else
+ if (addr <= 0xDFFF && visibleBank == LC_BANK_1)
+ {
+ if (altzp)
+ ram2[addr - 0x1000] = b;
+ else
+ ram[addr - 0x1000] = b;
+ }
+ else
+ {
+ if (altzp)
+ ram2[addr] = b;
+ else
+ ram[addr] = b;
+ }
+#endif
}
return;
}
- ram[addr] = b;
+ // Check for 80STORE mode (STORE80 takes precedence over RAMRD/WRT)...
+ if ((((addr >= 0x0400) && (addr <= 0x07FF)) || ((addr >= 0x2000) && (addr <= 0x3FFF))) && store80Mode)
+ {
+ if (displayPage2)
+ ram2[addr] = b;
+ else
+ ram[addr] = b;
+
+ return;
+ }
+
+ // Finally, check for auxillary/altzp write switches
+#if 0
+ if (ramwrt)
+ ram2[addr] = b;
+ else
+ {
+ if (altzp)
+ ram2[addr] = b;
+ else
+ ram[addr] = b;
+ }
+#else
+ if (addr < 0x0200)
+// if (addr < 0x0200 || addr >= 0xD000)
+ {
+#if 0
+if (addr == 0x38)
+ WriteLog("Write $38: $%02X\n", b);
+else if (addr == 0x39)
+ WriteLog("Write $39: $%02X\n", b);
+#endif
+ if (altzp)
+ ram2[addr] = b;
+ else
+ ram[addr] = b;
+ }
+ else
+ {
+ if (ramwrt)
+ ram2[addr] = b;
+ else
+ ram[addr] = b;
+ }
+#endif
}
+
//
// Load a file into RAM/ROM image space
//
return true;
}
+
static void SaveApple2State(const char * filename)
{
}
+
static bool LoadApple2State(const char * filename)
{
return false;
}
+
#ifdef CPU_CLOCK_CHECKING
uint8_t counter = 0;
uint32_t totalCPU = 0;
srand(time(NULL)); // Initialize RNG
// Zero out memory
-//Need to bankify this stuff for the IIe emulation...
memset(ram, 0, 0x10000);
memset(rom, 0, 0x10000);
memset(ram2, 0, 0x10000);
+#if 1
+ // Set up MMU
+ SetupAddressMap();
+
// Set up V65C02 execution context
memset(&mainCPU, 0, sizeof(V65C02REGS));
+ mainCPU.RdMem = AppleReadMem;
+ mainCPU.WrMem = AppleWriteMem;
+#else
mainCPU.RdMem = RdMem;
mainCPU.WrMem = WrMem;
+#endif
mainCPU.cpuFlags |= V65C02_ASSERT_LINE_RESET;
- if (!LoadImg(settings.BIOSPath, rom + 0xD000, 0x3000))
+// alternateCharset = true;
+// if (!LoadImg(settings.BIOSPath, rom + 0xD000, 0x3000))
+ if (!LoadImg(settings.BIOSPath, rom + 0xC000, 0x4000))
{
WriteLog("Could not open file '%s'!\n", settings.BIOSPath);
return -1;
//Kill the DOS ROM in slot 6 for now...
//not
- memcpy(rom + 0xC600, diskROM, 0x100);
+// memcpy(rom + 0xC600, diskROM, 0x100);
// memcpy(rom + 0xC700, diskROM, 0x100); // Slot 7???
WriteLog("About to initialize video...\n");
#ifdef THREADED_65C02
cpuCond = SDL_CreateCond();
+ mainSem = SDL_CreateSemaphore(1);
cpuThread = SDL_CreateThread(CPUThreadFunc, NULL, NULL);
//Hmm... CPU does POST (+1), wait, then WAIT (-1)
- mainSem = SDL_CreateSemaphore(1);
// SDL_sem * mainMutex = SDL_CreateMutex();
#endif
return 0;
}
+
/*
Apple II keycodes
-----------------
ESC $9B $9B $9B $9B No xlation
*/
+//static uint64_t lastCPUCycles = 0;
+static uint32_t frameCount = 0;
static void FrameCallback(void)
{
SDL_Event event;
{
switch (event.type)
{
+// Problem with using SDL_TEXTINPUT is that it causes key delay. :-/
case SDL_TEXTINPUT:
//Need to do some key translation here, and screen out non-apple keys as well...
//(really, could do it all in SDL_KEYDOWN, would just have to get symbols &
//kludge: should have a caps lock thingy here...
//or all uppercase for ][+...
- if (lastKeyPressed >= 'a' && lastKeyPressed <='z')
- lastKeyPressed &= 0xDF; // Convert to upper case...
+// if (lastKeyPressed >= 'a' && lastKeyPressed <='z')
+// lastKeyPressed &= 0xDF; // Convert to upper case...
break;
case SDL_KEYDOWN:
lastKeyPressed = 0x15, keyDown = true;
else if (event.key.keysym.sym == SDLK_LEFT)
lastKeyPressed = 0x08, keyDown = true;
+ else if (event.key.keysym.sym == SDLK_UP)
+ lastKeyPressed = 0x0B, keyDown = true;
+ else if (event.key.keysym.sym == SDLK_DOWN)
+ lastKeyPressed = 0x0A, keyDown = true;
else if (event.key.keysym.sym == SDLK_RETURN)
lastKeyPressed = 0x0D, keyDown = true;
else if (event.key.keysym.sym == SDLK_ESCAPE)
lastKeyPressed = 0x1B, keyDown = true;
+ else if (event.key.keysym.sym == SDLK_BACKSPACE)
+ lastKeyPressed = 0x7F, keyDown = true;
// Fix CTRL+key combo...
if (event.key.keysym.mod & KMOD_CTRL)
if (event.key.keysym.sym == SDLK_q && (event.key.keysym.mod & KMOD_ALT))
running = false;
+ if (event.key.keysym.sym == SDLK_PAUSE)
+ {
+ pauseMode = !pauseMode;
+
+ if (pauseMode)
+ {
+ SoundPause();
+ SpawnMessage("*** PAUSED ***");
+ }
+ else
+ {
+ SoundResume();
+ SpawnMessage("*** RESUME ***");
+ }
+ }
+
// Paddle buttons 0 & 1
if (event.key.keysym.sym == SDLK_INSERT)
openAppleDown = true;
}
}
-#warning "!!! Taking MAJOR time hit with the video frame rendering !!!"
+//#warning "!!! Taking MAJOR time hit with the video frame rendering !!!"
RenderVideoFrame();
SetCallbackTime(FrameCallback, 16666.66666667);
//Actually, slows things down too much...
//SDL_Delay(10);
// while (SDL_GetTicks() - startTicks < 16); // Wait for next frame...
- while (SDL_GetTicks() - startTicks < 16)
+
+// This is the problem: If you set the interval to 16, it runs faster than
+// 1/60s per frame. If you set it to 17, it runs slower. What we need is to
+// have it do 16 for one frame, then 17 for two others. Then it should average
+// out to 1/60s per frame every 3 frames.
+ frameCount = (frameCount + 1) % 3;
+
+ uint32_t waitFrameTime = 17 - (frameCount == 0 ? 1 : 0);
+
+ while (SDL_GetTicks() - startTicks < waitFrameTime)
SDL_Delay(1); // Wait for next frame...
startTicks = SDL_GetTicks();
+#if 0
+ uint64_t cpuCycles = GetCurrentV65C02Clock();
+ uint32_t cyclesBurned = (uint32_t)(cpuCycles - lastCPUCycles);
+ WriteLog("FrameCallback: used %i cycles\n", cyclesBurned);
+ lastCPUCycles = cpuCycles;
+#endif
+
//let's wait, then signal...
//works longer, but then still falls behind...
#ifdef THREADED_65C02
- SDL_CondSignal(cpuCond);//OK, let the CPU go another frame...
+ if (!pauseMode)
+ SDL_CondSignal(cpuCond);//OK, let the CPU go another frame...
#endif
}
+
static void BlinkTimer(void)
{
flash = !flash;
SetCallbackTime(BlinkTimer, 250000); // Set up blinking at 1/4 sec intervals
}
+
/*
Next problem is this: How to have events occur and synchronize with the rest
of the threads?
projects / apple2 / blobdiff