ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

First pass at tracking GFX sections within the emulation core. This is 

currently done by remembering the addresses accessed on execution of
LDA/LDX/LDY, and marking them as GFX during a zero-page STA/STX/STY.
This is obviously as WIP and required much more testing, but I'm
pleasantly surprised by how useful it is so far.

Bumped version # for AtariAge test release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2147 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-10-11 00:44:25 +00:00
parent cb5a943928
commit 3ec26d3a29
5 changed files with 351 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Version.hxx
View File

@ -22,7 +22,7 @@
#include <cstdlib> #include <cstdlib>
#define STELLA_VERSION "3.3_test6" #define STELLA_VERSION "3.3_test7"
#define STELLA_BUILD atoi("$Rev$" + 6) #define STELLA_BUILD atoi("$Rev$" + 6)
#endif #endif

11
src/emucore/M6502.cxx
View File

@ -54,7 +54,10 @@ M6502::M6502(uInt32 systemCyclesPerProcessorCycle)
myNumberOfDistinctAccesses(0), myNumberOfDistinctAccesses(0),
myLastAddress(0), myLastAddress(0),
myLastPeekAddress(0), myLastPeekAddress(0),
myLastPokeAddress(0) myLastPokeAddress(0),
myLastPeekAddressA(0),
myLastPeekAddressX(0),
myLastPeekAddressY(0)
{ {
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
myDebugger = NULL; myDebugger = NULL;
@ -113,6 +116,9 @@ void M6502::reset()
PC = (uInt16)mySystem->peek(0xfffc) | ((uInt16)mySystem->peek(0xfffd) << 8); PC = (uInt16)mySystem->peek(0xfffc) | ((uInt16)mySystem->peek(0xfffd) << 8);
myTotalInstructionCount = 0; myTotalInstructionCount = 0;
myLastAddress = myLastPeekAddress = myLastPokeAddress = 0;
myLastPeekAddressA = myLastPeekAddressX = myLastPeekAddressY = 0;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -255,7 +261,7 @@ bool M6502::execute(uInt32 number)
return true; return true;
} }
#endif #endif
uInt16 operandAddress = 0; uInt16 operandAddress = 0, intermediateAddress = 0;
uInt8 operand = 0; uInt8 operand = 0;
// Reset the peek/poke address pointers // Reset the peek/poke address pointers
@ -265,7 +271,6 @@ bool M6502::execute(uInt32 number)
IR = peek(PC++, DISASM_CODE); // This address represents a code section IR = peek(PC++, DISASM_CODE); // This address represents a code section
#ifdef DEBUG_OUTPUT #ifdef DEBUG_OUTPUT
if(PC >= 0xfafe && PC <= 0xfb10)
debugStream << ::hex << setw(2) << (int)A << " " debugStream << ::hex << setw(2) << (int)A << " "
<< ::hex << setw(2) << (int)X << " " << ::hex << setw(2) << (int)X << " "
<< ::hex << setw(2) << (int)Y << " " << ::hex << setw(2) << (int)Y << " "

4
src/emucore/M6502.hxx
View File

@ -301,6 +301,10 @@ class M6502 : public Serializable
/// by a peek or poke command /// by a peek or poke command
uInt16 myLastPeekAddress, myLastPokeAddress; uInt16 myLastPeekAddress, myLastPokeAddress;
/// Indicates the last address which was accessed by a peek command
/// for the CPU registers (A/X/Y)
uInt16 myLastPeekAddressA, myLastPeekAddressX, myLastPeekAddressY;
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
/// Pointer to the debugger for this processor or the null pointer /// Pointer to the debugger for this processor or the null pointer
Debugger* myDebugger; Debugger* myDebugger;

394
src/emucore/M6502.ins
View File

@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of // See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: M6502.m4 2145 2010-10-10 20:24:22Z stephena $ // $Id: M6502.m4 2146 2010-10-10 22:06:54Z stephena $
//============================================================================ //============================================================================
/** /**
@ -24,7 +24,7 @@
'm4 M6502.m4 > M6502.ins' 'm4 M6502.m4 > M6502.ins'
@author Bradford W. Mott @author Bradford W. Mott
@version $Id: M6502.m4 2145 2010-10-10 20:24:22Z stephena $ @version $Id: M6502.m4 2146 2010-10-10 22:06:54Z stephena $
*/ */
#ifndef NOTSAMEPAGE #ifndef NOTSAMEPAGE
@ -359,9 +359,9 @@ break;
case 0x6d: case 0x6d:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
if(!D) if(!D)
@ -399,9 +399,13 @@ case 0x7d:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
if(!D) if(!D)
@ -439,9 +443,13 @@ case 0x79:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
if(!D) if(!D)
@ -480,9 +488,9 @@ case 0x61:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
if(!D) if(!D)
@ -521,9 +529,13 @@ case 0x71:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
if(!D) if(!D)
@ -628,9 +640,9 @@ break;
case 0x2d: case 0x2d:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A &= operand; A &= operand;
@ -643,9 +655,13 @@ case 0x3d:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A &= operand; A &= operand;
@ -658,9 +674,13 @@ case 0x39:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A &= operand; A &= operand;
@ -674,9 +694,9 @@ case 0x21:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A &= operand; A &= operand;
@ -690,9 +710,13 @@ case 0x31:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A &= operand; A &= operand;
@ -922,9 +946,9 @@ break;
case 0x2C: case 0x2C:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
notZ = (A & operand); notZ = (A & operand);
@ -1121,9 +1145,9 @@ break;
case 0xcd: case 0xcd:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
uInt16 value = (uInt16)A - (uInt16)operand; uInt16 value = (uInt16)A - (uInt16)operand;
@ -1138,9 +1162,13 @@ case 0xdd:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
uInt16 value = (uInt16)A - (uInt16)operand; uInt16 value = (uInt16)A - (uInt16)operand;
@ -1155,9 +1183,13 @@ case 0xd9:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
uInt16 value = (uInt16)A - (uInt16)operand; uInt16 value = (uInt16)A - (uInt16)operand;
@ -1173,9 +1205,9 @@ case 0xc1:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
uInt16 value = (uInt16)A - (uInt16)operand; uInt16 value = (uInt16)A - (uInt16)operand;
@ -1191,9 +1223,13 @@ case 0xd1:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
uInt16 value = (uInt16)A - (uInt16)operand; uInt16 value = (uInt16)A - (uInt16)operand;
@ -1233,9 +1269,9 @@ break;
case 0xec: case 0xec:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
uInt16 value = (uInt16)X - (uInt16)operand; uInt16 value = (uInt16)X - (uInt16)operand;
@ -1275,9 +1311,9 @@ break;
case 0xcc: case 0xcc:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
uInt16 value = (uInt16)Y - (uInt16)operand; uInt16 value = (uInt16)Y - (uInt16)operand;
@ -1557,9 +1593,9 @@ break;
case 0x4d: case 0x4d:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A ^= operand; A ^= operand;
@ -1572,9 +1608,13 @@ case 0x5d:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A ^= operand; A ^= operand;
@ -1587,9 +1627,13 @@ case 0x59:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A ^= operand; A ^= operand;
@ -1603,9 +1647,9 @@ case 0x41:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A ^= operand; A ^= operand;
@ -1619,9 +1663,13 @@ case 0x51:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A ^= operand; A ^= operand;
@ -2053,9 +2101,13 @@ case 0xbb:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A = X = SP = SP & operand; A = X = SP = SP & operand;
@ -2067,9 +2119,9 @@ break;
case 0xaf: case 0xaf:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A = operand; A = operand;
@ -2083,9 +2135,13 @@ case 0xbf:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A = operand; A = operand;
@ -2127,9 +2183,9 @@ case 0xa3:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A = operand; A = operand;
@ -2144,9 +2200,13 @@ case 0xb3:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A = operand; A = operand;
@ -2157,10 +2217,13 @@ case 0xb3:
break; break;
//////////////////////////////////////////////////
// LDA
case 0xa9: case 0xa9:
{ {
operand = peek(PC++, DISASM_CODE); operand = peek(PC++, DISASM_CODE);
} }
myLastPeekAddressA = 0;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2172,6 +2235,7 @@ case 0xa5:
{ {
operand = peek(peek(PC++, DISASM_CODE), DISASM_DATA); operand = peek(peek(PC++, DISASM_CODE), DISASM_DATA);
} }
myLastPeekAddressA = 0;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2186,6 +2250,7 @@ case 0xb5:
address += X; address += X;
operand = peek(address, DISASM_DATA); operand = peek(address, DISASM_DATA);
} }
myLastPeekAddressA = 0;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2195,10 +2260,11 @@ break;
case 0xad: case 0xad:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
myLastPeekAddressA = intermediateAddress;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2210,10 +2276,15 @@ case 0xbd:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
myLastPeekAddressA = intermediateAddress;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2225,10 +2296,15 @@ case 0xb9:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
myLastPeekAddressA = intermediateAddress;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2241,10 +2317,11 @@ case 0xa1:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
myLastPeekAddressA = intermediateAddress;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
@ -2257,22 +2334,31 @@ case 0xb1:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
myLastPeekAddressA = intermediateAddress;
{ {
A = operand; A = operand;
notZ = A; notZ = A;
N = A & 0x80; N = A & 0x80;
} }
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// LDX
case 0xa2: case 0xa2:
{ {
operand = peek(PC++, DISASM_CODE); operand = peek(PC++, DISASM_CODE);
} }
myLastPeekAddressX = 0;
{ {
X = operand; X = operand;
notZ = X; notZ = X;
@ -2284,6 +2370,7 @@ case 0xa6:
{ {
operand = peek(peek(PC++, DISASM_CODE), DISASM_DATA); operand = peek(peek(PC++, DISASM_CODE), DISASM_DATA);
} }
myLastPeekAddressX = 0;
{ {
X = operand; X = operand;
notZ = X; notZ = X;
@ -2298,6 +2385,7 @@ case 0xb6:
address += Y; address += Y;
operand = peek(address, DISASM_DATA); operand = peek(address, DISASM_DATA);
} }
myLastPeekAddressX = 0;
{ {
X = operand; X = operand;
notZ = X; notZ = X;
@ -2307,10 +2395,11 @@ break;
case 0xae: case 0xae:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
myLastPeekAddressX = intermediateAddress;
{ {
X = operand; X = operand;
notZ = X; notZ = X;
@ -2322,22 +2411,31 @@ case 0xbe:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
myLastPeekAddressX = intermediateAddress;
{ {
X = operand; X = operand;
notZ = X; notZ = X;
N = X & 0x80; N = X & 0x80;
} }
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// LDY
case 0xa0: case 0xa0:
{ {
operand = peek(PC++, DISASM_CODE); operand = peek(PC++, DISASM_CODE);
} }
myLastPeekAddressY = 0;
{ {
Y = operand; Y = operand;
notZ = Y; notZ = Y;
@ -2349,6 +2447,7 @@ case 0xa4:
{ {
operand = peek(peek(PC++, DISASM_CODE), DISASM_DATA); operand = peek(peek(PC++, DISASM_CODE), DISASM_DATA);
} }
myLastPeekAddressY = 0;
{ {
Y = operand; Y = operand;
notZ = Y; notZ = Y;
@ -2363,6 +2462,7 @@ case 0xb4:
address += X; address += X;
operand = peek(address, DISASM_DATA); operand = peek(address, DISASM_DATA);
} }
myLastPeekAddressY = 0;
{ {
Y = operand; Y = operand;
notZ = Y; notZ = Y;
@ -2372,10 +2472,11 @@ break;
case 0xac: case 0xac:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
myLastPeekAddressY = intermediateAddress;
{ {
Y = operand; Y = operand;
notZ = Y; notZ = Y;
@ -2387,16 +2488,22 @@ case 0xbc:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
myLastPeekAddressY = intermediateAddress;
{ {
Y = operand; Y = operand;
notZ = Y; notZ = Y;
N = Y & 0x80; N = Y & 0x80;
} }
break; break;
//////////////////////////////////////////////////
case 0x4a: case 0x4a:
@ -2563,9 +2670,9 @@ break;
case 0x0c: case 0x0c:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
} }
@ -2580,9 +2687,13 @@ case 0xfc:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
} }
@ -2627,9 +2738,9 @@ break;
case 0x0d: case 0x0d:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A |= operand; A |= operand;
@ -2642,9 +2753,13 @@ case 0x1d:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A |= operand; A |= operand;
@ -2657,9 +2772,13 @@ case 0x19:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A |= operand; A |= operand;
@ -2673,9 +2792,9 @@ case 0x01:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
A |= operand; A |= operand;
@ -2689,9 +2808,13 @@ case 0x11:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
A |= operand; A |= operand;
@ -3606,9 +3729,9 @@ break;
case 0xed: case 0xed:
{ {
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
// N, V, Z, C flags are the same in either mode (C calculated at the end) // N, V, Z, C flags are the same in either mode (C calculated at the end)
@ -3643,9 +3766,13 @@ case 0xfd:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
// N, V, Z, C flags are the same in either mode (C calculated at the end) // N, V, Z, C flags are the same in either mode (C calculated at the end)
@ -3680,9 +3807,13 @@ case 0xf9:
{ {
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
// N, V, Z, C flags are the same in either mode (C calculated at the end) // N, V, Z, C flags are the same in either mode (C calculated at the end)
@ -3718,9 +3849,9 @@ case 0xe1:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
} }
{ {
// N, V, Z, C flags are the same in either mode (C calculated at the end) // N, V, Z, C flags are the same in either mode (C calculated at the end)
@ -3756,9 +3887,13 @@ case 0xf1:
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
} }
{ {
// N, V, Z, C flags are the same in either mode (C calculated at the end) // N, V, Z, C flags are the same in either mode (C calculated at the end)
@ -4213,10 +4348,14 @@ case 0x53:
break; break;
//////////////////////////////////////////////////
// STA
case 0x85: case 0x85:
{ {
operandAddress = peek(PC++, DISASM_CODE); operandAddress = peek(PC++, DISASM_CODE);
} }
if((operandAddress == 0x1B || operandAddress == 0x1C) && myLastPeekAddressA)
mySystem->setAddressDisasmType(myLastPeekAddressA, DISASM_GFX);
{ {
poke(operandAddress, A); poke(operandAddress, A);
} }
@ -4292,12 +4431,17 @@ case 0x91:
poke(operandAddress, A); poke(operandAddress, A);
} }
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// STX
case 0x86: case 0x86:
{ {
operandAddress = peek(PC++, DISASM_CODE); operandAddress = peek(PC++, DISASM_CODE);
} }
if((operandAddress == 0x1B || operandAddress == 0x1C) && myLastPeekAddressX)
mySystem->setAddressDisasmType(myLastPeekAddressX, DISASM_GFX);
{ {
poke(operandAddress, X); poke(operandAddress, X);
} }
@ -4323,12 +4467,17 @@ case 0x8e:
poke(operandAddress, X); poke(operandAddress, X);
} }
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// STY
case 0x84: case 0x84:
{ {
operandAddress = peek(PC++, DISASM_CODE); operandAddress = peek(PC++, DISASM_CODE);
} }
if((operandAddress == 0x1B || operandAddress == 0x1C) && myLastPeekAddressY)
mySystem->setAddressDisasmType(myLastPeekAddressY, DISASM_GFX);
{ {
poke(operandAddress, Y); poke(operandAddress, Y);
} }
@ -4354,6 +4503,7 @@ case 0x8c:
poke(operandAddress, Y); poke(operandAddress, Y);
} }
break; break;
//////////////////////////////////////////////////
case 0xaa: case 0xaa:

78
src/emucore/M6502.m4
View File

@ -40,9 +40,9 @@ define(M6502_IMMEDIATE_READ, `{
}') }')
define(M6502_ABSOLUTE_READ, `{ define(M6502_ABSOLUTE_READ, `{
uInt16 address = peek(PC++, DISASM_CODE); intermediateAddress = peek(PC++, DISASM_CODE);
address |= ((uInt16)peek(PC++, DISASM_CODE) << 8); intermediateAddress |= ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
}') }')
define(M6502_ABSOLUTE_WRITE, `{ define(M6502_ABSOLUTE_WRITE, `{
@ -60,9 +60,13 @@ define(M6502_ABSOLUTE_READMODIFYWRITE, `{
define(M6502_ABSOLUTEX_READ, `{ define(M6502_ABSOLUTEX_READ, `{
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + X), DISASM_DATA); intermediateAddress = high | (uInt8)(low + X);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + X) > 0xFF) if((low + X) > 0xFF)
operand = peek((high | low) + X, DISASM_DATA); {
intermediateAddress = (high | low) + X;
operand = peek(intermediateAddress, DISASM_DATA);
}
}') }')
define(M6502_ABSOLUTEX_WRITE, `{ define(M6502_ABSOLUTEX_WRITE, `{
@ -84,9 +88,13 @@ define(M6502_ABSOLUTEX_READMODIFYWRITE, `{
define(M6502_ABSOLUTEY_READ, `{ define(M6502_ABSOLUTEY_READ, `{
uInt16 low = peek(PC++, DISASM_CODE); uInt16 low = peek(PC++, DISASM_CODE);
uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8); uInt16 high = ((uInt16)peek(PC++, DISASM_CODE) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
}') }')
define(M6502_ABSOLUTEY_WRITE, `{ define(M6502_ABSOLUTEY_WRITE, `{
@ -176,9 +184,9 @@ define(M6502_INDIRECTX_READ, `{
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
peek(pointer, DISASM_DATA); peek(pointer, DISASM_DATA);
pointer += X; pointer += X;
uInt16 address = peek(pointer++, DISASM_DATA); intermediateAddress = peek(pointer++, DISASM_DATA);
address |= ((uInt16)peek(pointer, DISASM_DATA) << 8); intermediateAddress |= ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(address, DISASM_DATA); operand = peek(intermediateAddress, DISASM_DATA);
}') }')
define(M6502_INDIRECTX_WRITE, `{ define(M6502_INDIRECTX_WRITE, `{
@ -203,9 +211,13 @@ define(M6502_INDIRECTY_READ, `{
uInt8 pointer = peek(PC++, DISASM_CODE); uInt8 pointer = peek(PC++, DISASM_CODE);
uInt16 low = peek(pointer++, DISASM_DATA); uInt16 low = peek(pointer++, DISASM_DATA);
uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8); uInt16 high = ((uInt16)peek(pointer, DISASM_DATA) << 8);
operand = peek(high | (uInt8)(low + Y), DISASM_DATA); intermediateAddress = high | (uInt8)(low + Y);
operand = peek(intermediateAddress, DISASM_DATA);
if((low + Y) > 0xFF) if((low + Y) > 0xFF)
operand = peek((high | low) + Y, DISASM_DATA); {
intermediateAddress = (high | low) + Y;
operand = peek(intermediateAddress, DISASM_DATA);
}
}') }')
define(M6502_INDIRECTY_WRITE, `{ define(M6502_INDIRECTY_WRITE, `{
@ -1488,97 +1500,124 @@ M6502_LAX
break; break;
//////////////////////////////////////////////////
// LDA
case 0xa9: case 0xa9:
M6502_IMMEDIATE_READ M6502_IMMEDIATE_READ
myLastPeekAddressA = 0;
M6502_LDA M6502_LDA
break; break;
case 0xa5: case 0xa5:
M6502_ZERO_READ M6502_ZERO_READ
myLastPeekAddressA = 0;
M6502_LDA M6502_LDA
break; break;
case 0xb5: case 0xb5:
M6502_ZEROX_READ M6502_ZEROX_READ
myLastPeekAddressA = 0;
M6502_LDA M6502_LDA
break; break;
case 0xad: case 0xad:
M6502_ABSOLUTE_READ M6502_ABSOLUTE_READ
myLastPeekAddressA = intermediateAddress;
M6502_LDA M6502_LDA
break; break;
case 0xbd: case 0xbd:
M6502_ABSOLUTEX_READ M6502_ABSOLUTEX_READ
myLastPeekAddressA = intermediateAddress;
M6502_LDA M6502_LDA
break; break;
case 0xb9: case 0xb9:
M6502_ABSOLUTEY_READ M6502_ABSOLUTEY_READ
myLastPeekAddressA = intermediateAddress;
M6502_LDA M6502_LDA
break; break;
case 0xa1: case 0xa1:
M6502_INDIRECTX_READ M6502_INDIRECTX_READ
myLastPeekAddressA = intermediateAddress;
M6502_LDA M6502_LDA
break; break;
case 0xb1: case 0xb1:
M6502_INDIRECTY_READ M6502_INDIRECTY_READ
myLastPeekAddressA = intermediateAddress;
M6502_LDA M6502_LDA
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// LDX
case 0xa2: case 0xa2:
M6502_IMMEDIATE_READ M6502_IMMEDIATE_READ
myLastPeekAddressX = 0;
M6502_LDX M6502_LDX
break; break;
case 0xa6: case 0xa6:
M6502_ZERO_READ M6502_ZERO_READ
myLastPeekAddressX = 0;
M6502_LDX M6502_LDX
break; break;
case 0xb6: case 0xb6:
M6502_ZEROY_READ M6502_ZEROY_READ
myLastPeekAddressX = 0;
M6502_LDX M6502_LDX
break; break;
case 0xae: case 0xae:
M6502_ABSOLUTE_READ M6502_ABSOLUTE_READ
myLastPeekAddressX = intermediateAddress;
M6502_LDX M6502_LDX
break; break;
case 0xbe: case 0xbe:
M6502_ABSOLUTEY_READ M6502_ABSOLUTEY_READ
myLastPeekAddressX = intermediateAddress;
M6502_LDX M6502_LDX
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// LDY
case 0xa0: case 0xa0:
M6502_IMMEDIATE_READ M6502_IMMEDIATE_READ
myLastPeekAddressY = 0;
M6502_LDY M6502_LDY
break; break;
case 0xa4: case 0xa4:
M6502_ZERO_READ M6502_ZERO_READ
myLastPeekAddressY = 0;
M6502_LDY M6502_LDY
break; break;
case 0xb4: case 0xb4:
M6502_ZEROX_READ M6502_ZEROX_READ
myLastPeekAddressY = 0;
M6502_LDY M6502_LDY
break; break;
case 0xac: case 0xac:
M6502_ABSOLUTE_READ M6502_ABSOLUTE_READ
myLastPeekAddressY = intermediateAddress;
M6502_LDY M6502_LDY
break; break;
case 0xbc: case 0xbc:
M6502_ABSOLUTEX_READ M6502_ABSOLUTEX_READ
myLastPeekAddressY = intermediateAddress;
M6502_LDY M6502_LDY
break; break;
//////////////////////////////////////////////////
case 0x4a: case 0x4a:
@ -2057,8 +2096,12 @@ M6502_SRE
break; break;
//////////////////////////////////////////////////
// STA
case 0x85: case 0x85:
M6502_ZERO_WRITE M6502_ZERO_WRITE
if((operandAddress == 0x1B || operandAddress == 0x1C) && myLastPeekAddressA)
mySystem->setAddressDisasmType(myLastPeekAddressA, DISASM_GFX);
M6502_STA M6502_STA
break; break;
@ -2091,10 +2134,15 @@ case 0x91:
M6502_INDIRECTY_WRITE M6502_INDIRECTY_WRITE
M6502_STA M6502_STA
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// STX
case 0x86: case 0x86:
M6502_ZERO_WRITE M6502_ZERO_WRITE
if((operandAddress == 0x1B || operandAddress == 0x1C) && myLastPeekAddressX)
mySystem->setAddressDisasmType(myLastPeekAddressX, DISASM_GFX);
M6502_STX M6502_STX
break; break;
@ -2107,10 +2155,15 @@ case 0x8e:
M6502_ABSOLUTE_WRITE M6502_ABSOLUTE_WRITE
M6502_STX M6502_STX
break; break;
//////////////////////////////////////////////////
//////////////////////////////////////////////////
// STY
case 0x84: case 0x84:
M6502_ZERO_WRITE M6502_ZERO_WRITE
if((operandAddress == 0x1B || operandAddress == 0x1C) && myLastPeekAddressY)
mySystem->setAddressDisasmType(myLastPeekAddressY, DISASM_GFX);
M6502_STY M6502_STY
break; break;
@ -2123,6 +2176,7 @@ case 0x8c:
M6502_ABSOLUTE_WRITE M6502_ABSOLUTE_WRITE
M6502_STY M6502_STY
break; break;
//////////////////////////////////////////////////
case 0xaa: case 0xaa: