Merge branch 'master' of https://github.com/cc65/cc65 into c1p
This commit is contained in:
Stephan Mühlstrasser
@@ -215,7 +215,7 @@ static const struct {
|
||||
/* Instruction table for the 6502 with illegal instructions */
|
||||
static const struct {
|
||||
unsigned Count;
|
||||
InsDesc Ins[70];
|
||||
InsDesc Ins[75];
|
||||
} InsTab6502X = {
|
||||
sizeof (InsTab6502X.Ins) / sizeof (InsTab6502X.Ins[0]),
|
||||
{
|
||||
@@ -223,6 +223,7 @@ static const struct {
|
||||
{ "ALR", 0x0800000, 0x4B, 0, PutAll }, /* X */
|
||||
{ "ANC", 0x0800000, 0x0B, 0, PutAll }, /* X */
|
||||
{ "AND", 0x080A26C, 0x20, 0, PutAll },
|
||||
{ "ANE", 0x0800000, 0x8B, 0, PutAll }, /* X */
|
||||
{ "ARR", 0x0800000, 0x6B, 0, PutAll }, /* X */
|
||||
{ "ASL", 0x000006e, 0x02, 1, PutAll },
|
||||
{ "AXS", 0x0800000, 0xCB, 0, PutAll }, /* X */
|
||||
@@ -256,12 +257,12 @@ static const struct {
|
||||
{ "JMP", 0x0000808, 0x4c, 6, PutJMP },
|
||||
{ "JSR", 0x0000008, 0x20, 7, PutAll },
|
||||
{ "LAS", 0x0000200, 0xBB, 0, PutAll }, /* X */
|
||||
{ "LAX", 0x000A30C, 0xA3, 1, PutAll }, /* X */
|
||||
{ "LAX", 0x080A30C, 0xA3, 11, PutAll }, /* X */
|
||||
{ "LDA", 0x080A26C, 0xa0, 0, PutAll },
|
||||
{ "LDX", 0x080030C, 0xa2, 1, PutAll },
|
||||
{ "LDY", 0x080006C, 0xa0, 1, PutAll },
|
||||
{ "LSR", 0x000006F, 0x42, 1, PutAll },
|
||||
{ "NOP", 0x0000001, 0xea, 0, PutAll },
|
||||
{ "NOP", 0x080006D, 0x00, 10, PutAll }, /* X */
|
||||
{ "ORA", 0x080A26C, 0x00, 0, PutAll },
|
||||
{ "PHA", 0x0000001, 0x48, 0, PutAll },
|
||||
{ "PHP", 0x0000001, 0x08, 0, PutAll },
|
||||
@@ -278,11 +279,15 @@ static const struct {
|
||||
{ "SEC", 0x0000001, 0x38, 0, PutAll },
|
||||
{ "SED", 0x0000001, 0xf8, 0, PutAll },
|
||||
{ "SEI", 0x0000001, 0x78, 0, PutAll },
|
||||
{ "SHA", 0x0002200, 0x93, 1, PutAll }, /* X */
|
||||
{ "SHX", 0x0000200, 0x9e, 1, PutAll }, /* X */
|
||||
{ "SHY", 0x0000040, 0x9c, 1, PutAll }, /* X */
|
||||
{ "SLO", 0x000A26C, 0x03, 0, PutAll }, /* X */
|
||||
{ "SRE", 0x000A26C, 0x43, 0, PutAll }, /* X */
|
||||
{ "STA", 0x000A26C, 0x80, 0, PutAll },
|
||||
{ "STX", 0x000010c, 0x82, 1, PutAll },
|
||||
{ "STY", 0x000002c, 0x80, 1, PutAll },
|
||||
{ "TAS", 0x0000200, 0x9b, 0, PutAll }, /* X */
|
||||
{ "TAX", 0x0000001, 0xaa, 0, PutAll },
|
||||
{ "TAY", 0x0000001, 0xa8, 0, PutAll },
|
||||
{ "TSX", 0x0000001, 0xba, 0, PutAll },
|
||||
@@ -783,9 +788,9 @@ static const InsTable* InsTabs[CPU_COUNT] = {
|
||||
const InsTable* InsTab = (const InsTable*) &InsTab6502;
|
||||
|
||||
/* Table to build the effective 65xx opcode from a base opcode and an
|
||||
** addressing mode.
|
||||
** addressing mode. (The value in the table is ORed with the base opcode)
|
||||
*/
|
||||
static unsigned char EATab[10][AM65I_COUNT] = {
|
||||
static unsigned char EATab[12][AM65I_COUNT] = {
|
||||
{ /* Table 0 */
|
||||
0x00, 0x00, 0x05, 0x0D, 0x0F, 0x15, 0x1D, 0x1F,
|
||||
0x00, 0x19, 0x12, 0x00, 0x07, 0x11, 0x17, 0x01,
|
||||
@@ -846,6 +851,18 @@ static unsigned char EATab[10][AM65I_COUNT] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00
|
||||
},
|
||||
{ /* Table 10 (NOPs) */
|
||||
0xea, 0x00, 0x04, 0x0c, 0x00, 0x14, 0x1c, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
|
||||
0x00, 0x00, 0x00
|
||||
},
|
||||
{ /* Table 11 (LAX) */
|
||||
0x08, 0x08, 0x04, 0x0C, 0x00, 0x14, 0x1C, 0x00,
|
||||
0x14, 0x1C, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
|
||||
0x00, 0x00, 0x80
|
||||
},
|
||||
};
|
||||
|
||||
/* Table to build the effective SWEET16 opcode from a base opcode and an
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "brk", 1, flNone, OH_Implicit }, /* $00 */
|
||||
{ "ora", 2, flUseLabel, OH_DirectXIndirect }, /* $01 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $02 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $02 */
|
||||
{ "slo", 2, flUseLabel, OH_DirectXIndirect }, /* $03 */
|
||||
{ "nop", 2, flUseLabel, OH_Direct }, /* $04 */
|
||||
{ "ora", 2, flUseLabel, OH_Direct }, /* $05 */
|
||||
@@ -67,7 +67,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "slo", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $0f */
|
||||
{ "bpl", 2, flLabel, OH_Relative }, /* $10 */
|
||||
{ "ora", 2, flUseLabel, OH_DirectIndirectY }, /* $11 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $12 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $12 */
|
||||
{ "slo", 2, flUseLabel, OH_DirectIndirectY }, /* $13 */
|
||||
{ "nop", 2, flUseLabel, OH_DirectX }, /* $14 */
|
||||
{ "ora", 2, flUseLabel, OH_DirectX }, /* $15 */
|
||||
@@ -83,7 +83,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "slo", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $1f */
|
||||
{ "jsr", 3, flLabel, OH_Absolute }, /* $20 */
|
||||
{ "and", 2, flUseLabel, OH_DirectXIndirect }, /* $21 */
|
||||
{ "kil", 1, flNone, OH_Implicit, }, /* $22 */
|
||||
{ "jam", 1, flNone, OH_Implicit, }, /* $22 */
|
||||
{ "rla", 2, flUseLabel, OH_DirectXIndirect }, /* $23 */
|
||||
{ "bit", 2, flUseLabel, OH_Direct }, /* $24 */
|
||||
{ "and", 2, flUseLabel, OH_Direct }, /* $25 */
|
||||
@@ -99,7 +99,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "rla", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $2f */
|
||||
{ "bmi", 2, flLabel, OH_Relative }, /* $30 */
|
||||
{ "and", 2, flUseLabel, OH_DirectIndirectY }, /* $31 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $32 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $32 */
|
||||
{ "rla", 2, flUseLabel, OH_DirectIndirectY }, /* $33 */
|
||||
{ "nop", 2, flUseLabel, OH_DirectX }, /* $34 */
|
||||
{ "and", 2, flUseLabel, OH_DirectX }, /* $35 */
|
||||
@@ -115,7 +115,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "rla", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $3f */
|
||||
{ "rti", 1, flNone, OH_Rts }, /* $40 */
|
||||
{ "eor", 2, flUseLabel, OH_DirectXIndirect }, /* $41 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $42 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $42 */
|
||||
{ "sre", 2, flUseLabel, OH_DirectXIndirect }, /* $43 */
|
||||
{ "nop", 2, flUseLabel, OH_Direct }, /* $44 */
|
||||
{ "eor", 2, flUseLabel, OH_Direct }, /* $45 */
|
||||
@@ -131,7 +131,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "sre", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $4f */
|
||||
{ "bvc", 2, flLabel, OH_Relative }, /* $50 */
|
||||
{ "eor", 2, flUseLabel, OH_DirectIndirectY }, /* $51 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $52 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $52 */
|
||||
{ "sre", 2, flUseLabel, OH_DirectIndirectY }, /* $53 */
|
||||
{ "nop", 2, flUseLabel, OH_DirectX }, /* $54 */
|
||||
{ "eor", 2, flUseLabel, OH_DirectX }, /* $55 */
|
||||
@@ -147,7 +147,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "sre", 3, flUseLabel|flAbsOverride, OH_AbsoluteX }, /* $5f */
|
||||
{ "rts", 1, flNone, OH_Rts }, /* $60 */
|
||||
{ "adc", 2, flUseLabel, OH_DirectXIndirect }, /* $61 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $62 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $62 */
|
||||
{ "rra", 2, flUseLabel, OH_DirectXIndirect }, /* $63 */
|
||||
{ "nop", 2, flUseLabel, OH_Direct }, /* $64 */
|
||||
{ "adc", 2, flUseLabel, OH_Direct }, /* $65 */
|
||||
@@ -163,7 +163,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "rra", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $6f */
|
||||
{ "bvs", 2, flLabel, OH_Relative }, /* $70 */
|
||||
{ "adc", 2, flUseLabel, OH_DirectIndirectY }, /* $71 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $72 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $72 */
|
||||
{ "rra", 2, flUseLabel, OH_DirectIndirectY }, /* $73 */
|
||||
{ "nop", 2, flUseLabel, OH_DirectX }, /* $74 */
|
||||
{ "adc", 2, flUseLabel, OH_DirectX }, /* $75 */
|
||||
@@ -195,7 +195,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "sax", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $8f */
|
||||
{ "bcc", 2, flLabel, OH_Relative }, /* $90 */
|
||||
{ "sta", 2, flUseLabel, OH_DirectIndirectY }, /* $91 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $92 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $92 */
|
||||
{ "ahx", 2, flUseLabel, OH_DirectIndirectY }, /* $93 */
|
||||
{ "sty", 2, flUseLabel, OH_DirectX }, /* $94 */
|
||||
{ "sta", 2, flUseLabel, OH_DirectX }, /* $95 */
|
||||
@@ -227,7 +227,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "lax", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $af */
|
||||
{ "bcs", 2, flLabel, OH_Relative }, /* $b0 */
|
||||
{ "lda", 2, flUseLabel, OH_DirectIndirectY }, /* $b1 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $b2 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $b2 */
|
||||
{ "lax", 2, flUseLabel, OH_DirectIndirectY }, /* $b3 */
|
||||
{ "ldy", 2, flUseLabel, OH_DirectX }, /* $b4 */
|
||||
{ "lda", 2, flUseLabel, OH_DirectX }, /* $b5 */
|
||||
@@ -259,7 +259,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "dcp", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $cf */
|
||||
{ "bne", 2, flLabel, OH_Relative }, /* $d0 */
|
||||
{ "cmp", 2, flUseLabel, OH_DirectIndirectY }, /* $d1 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $d2 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $d2 */
|
||||
{ "dcp", 2, flUseLabel, OH_DirectIndirectY }, /* $d3 */
|
||||
{ "nop", 2, flUseLabel, OH_DirectX }, /* $d4 */
|
||||
{ "cmp", 2, flUseLabel, OH_DirectX }, /* $d5 */
|
||||
@@ -291,7 +291,7 @@ const OpcDesc OpcTable_6502X[256] = {
|
||||
{ "isc", 3, flUseLabel|flAbsOverride, OH_Absolute }, /* $ef */
|
||||
{ "beq", 2, flLabel, OH_Relative }, /* $f0 */
|
||||
{ "sbc", 2, flUseLabel, OH_DirectIndirectY }, /* $f1 */
|
||||
{ "kil", 1, flNone, OH_Implicit }, /* $f2 */
|
||||
{ "jam", 1, flNone, OH_Implicit }, /* $f2 */
|
||||
{ "isc", 2, flUseLabel, OH_DirectIndirectY }, /* $f3 */
|
||||
{ "nop", 2, flUseLabel, OH_DirectX }, /* $f4 */
|
||||
{ "sbc", 2, flUseLabel, OH_DirectX }, /* $f5 */
|
||||
|
||||
@@ -60,7 +60,8 @@
|
||||
/* Name of program file */
|
||||
const char* ProgramFile;
|
||||
|
||||
|
||||
/* exit simulator after MaxCycles Cycles */
|
||||
unsigned long MaxCycles = 0;
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
@@ -75,6 +76,7 @@ static void Usage (void)
|
||||
" -h\t\t\tHelp (this text)\n"
|
||||
" -v\t\t\tIncrease verbosity\n"
|
||||
" -V\t\t\tPrint the simulator version number\n"
|
||||
" -x <num>\t\tExit simulator after <num> cycles\n"
|
||||
"\n"
|
||||
"Long options:\n"
|
||||
" --help\t\tHelp (this text)\n"
|
||||
@@ -111,7 +113,12 @@ static void OptVersion (const char* Opt attribute ((unused)),
|
||||
fprintf (stderr, "sim65 V%s\n", GetVersionAsString ());
|
||||
}
|
||||
|
||||
|
||||
static void OptQuitXIns (const char* Opt attribute ((unused)),
|
||||
const char* Arg attribute ((unused)))
|
||||
/* quit after MaxCycles cycles */
|
||||
{
|
||||
MaxCycles = strtoul(Arg, NULL, 0);
|
||||
}
|
||||
|
||||
static void ReadProgramFile (void)
|
||||
/* Load program into memory */
|
||||
@@ -197,6 +204,10 @@ int main (int argc, char* argv[])
|
||||
OptVersion (Arg, 0);
|
||||
break;
|
||||
|
||||
case 'x':
|
||||
OptQuitXIns (Arg, GetArg (&I, 2));
|
||||
break;
|
||||
|
||||
default:
|
||||
UnknownOption (Arg);
|
||||
break;
|
||||
@@ -225,6 +236,11 @@ int main (int argc, char* argv[])
|
||||
|
||||
while (1) {
|
||||
ExecuteInsn ();
|
||||
if (MaxCycles && (GetCycles () >= MaxCycles)) {
|
||||
Error ("Maximum number of cycles reached.");
|
||||
exit (-99); /* do not ues EXIT_FAILURE to avoid conflicts with the
|
||||
same value being used in a test program */
|
||||
}
|
||||
}
|
||||
|
||||
/* Return an apropriate exit code */
|
||||
|
||||
Reference in New Issue
Block a user