casa-mp-base
Public
Source
--- processors/6502.c.sav 2007-11-29 08:56:32.000000000 -0500+++ processors/6502.c 2007-11-29 08:58:43.000000000 -0500@@ -28,39 +28,41 @@ // enumerated addressing modes-#define OT_IMPLIED 0 // no operands-#define OT_IMMEDIATE 1 // #xx-#define OT_ZP 2 // xx-#define OT_ZP_OFF_X 3 // xx,X-#define OT_ZP_OFF_Y 4 // xx,Y+#define OT_IMPLIED 0 // no operands+#define OT_IMMEDIATE 1 // #xx+#define OT_ZP 2 // xx+#define OT_ZP_OFF_X 3 // xx,X+#define OT_ZP_OFF_Y 4 // xx,Y // (xx,X) // (xx),Y-#define OT_ZP_INDIRECT 7 // (xx)-#define OT_EXTENDED 8 // xxxx-#define OT_EXTENDED_OFF_X 9 // xxxx,X-#define OT_EXTENDED_OFF_Y 10 // xxxx,Y+#define OT_ZP_INDIRECT 7 // (xx)+#define OT_EXTENDED 8 // xxxx+#define OT_EXTENDED_OFF_X 9 // xxxx,X+#define OT_EXTENDED_OFF_Y 10 // xxxx,Y // (xxxx)-#define OT_RELATIVE 12 // one byte relative offset-#define OT_IMPLIED_2 13 // two-byte implied opcode (second byte is ignored)+#define OT_RELATIVE 12 // one byte relative offset+#define OT_IMPLIED_2 13 // two-byte implied opcode (second byte is ignored)+#define OT_ZP_RELATIVE 14 // xx, relative offset-#define OT_NUM OT_IMPLIED_2+1 // number of addressing modes+#define OT_NUM OT_ZP_RELATIVE+1 // number of addressing modes // masks for the various addressing modes-#define M_IMPLIED (1<<OT_IMPLIED)-#define M_IMMEDIATE (1<<OT_IMMEDIATE)-#define M_ZP (1<<OT_ZP)-#define M_ZP_OFF_X (1<<OT_ZP_OFF_X)-#define M_ZP_OFF_Y (1<<OT_ZP_OFF_Y)+#define M_IMPLIED (1<<OT_IMPLIED)+#define M_IMMEDIATE (1<<OT_IMMEDIATE)+#define M_ZP (1<<OT_ZP)+#define M_ZP_OFF_X (1<<OT_ZP_OFF_X)+#define M_ZP_OFF_Y (1<<OT_ZP_OFF_Y)-#define M_EXTENDED (1<<OT_EXTENDED)+#define M_EXTENDED (1<<OT_EXTENDED)-#define M_RELATIVE (1<<OT_RELATIVE)-#define M_IMPLIED_2 (1<<OT_IMPLIED_2)+#define M_RELATIVE (1<<OT_RELATIVE)+#define M_IMPLIED_2 (1<<OT_IMPLIED_2)+#define M_ZP_RELATIVE (1<<OT_ZP_RELATIVE) struct OPCODE {@@ -94,141 +96,174 @@ // This macro creates the typeFlags and baseOpcode list. For each non-white entry in the baseOpcode // list, a bit is set in typeFlags.-#define OP_ENTRY(a,b,c,d,e,f,g,h,i,j,k,l,m,n) OP_FLAG(a,M_IMPLIED)|OP_FLAG(b,M_IMMEDIATE)|OP_FLAG(c,M_ZP)|OP_FLAG(d,M_ZP_OFF_X)|OP_FLAG(e,M_ZP_OFF_Y)|OP_FLAG(f,M_ZP_INDIRECT_OFF_X)|OP_FLAG(g,M_ZP_INDIRECT_OFF_Y)|OP_FLAG(h,M_ZP_INDIRECT)|OP_FLAG(i,M_EXTENDED)|OP_FLAG(j,M_EXTENDED_OFF_X)|OP_FLAG(k,M_EXTENDED_OFF_Y)|OP_FLAG(l,M_EXTENDED_INDIRECT)|OP_FLAG(m,M_RELATIVE)|OP_FLAG(n,M_IMPLIED_2),{OP_VAL(a),OP_VAL(b),OP_VAL(c),OP_VAL(d),OP_VAL(e),OP_VAL(f),OP_VAL(g),OP_VAL(h),OP_VAL(i),OP_VAL(j),OP_VAL(k),OP_VAL(l),OP_VAL(m),OP_VAL(n)}+#define OP_ENTRY(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) OP_FLAG(a,M_IMPLIED)|OP_FLAG(b,M_IMMEDIATE)|OP_FLAG(c,M_ZP)|OP_FLAG(d,M_ZP_OFF_X)|OP_FLAG(e,M_ZP_OFF_Y)|OP_FLAG(f,M_ZP_INDIRECT_OFF_X)|OP_FLAG(g,M_ZP_INDIRECT_OFF_Y)|OP_FLAG(h,M_ZP_INDIRECT)|OP_FLAG(i,M_EXTENDED)|OP_FLAG(j,M_EXTENDED_OFF_X)|OP_FLAG(k,M_EXTENDED_OFF_Y)|OP_FLAG(l,M_EXTENDED_INDIRECT)|OP_FLAG(m,M_RELATIVE)|OP_FLAG(n,M_IMPLIED_2)|OP_FLAG(o,M_ZP_RELATIVE),{OP_VAL(a),OP_VAL(b),OP_VAL(c),OP_VAL(d),OP_VAL(e),OP_VAL(f),OP_VAL(g),OP_VAL(h),OP_VAL(i),OP_VAL(j),OP_VAL(k),OP_VAL(l),OP_VAL(m),OP_VAL(n),OP_VAL(o)} static OPCODE opcodes6502[]= {-// imp imm zp zpx zpy indx indy (zp) ext extx exty (ext) rel impl2- {"adc", OP_ENTRY( ,0x69,0x65,0x75, ,0x61,0x71, ,0x6D,0x7D,0x79, , , )},- {"and", OP_ENTRY( ,0x29,0x25,0x35, ,0x21,0x31, ,0x2D,0x3D,0x39, , , )},- {"asl", OP_ENTRY(0x0A, ,0x06,0x16, , , , ,0x0E,0x1E, , , , )},- {"bcc", OP_ENTRY( , , , , , , , , , , , ,0x90, )},- {"bcs", OP_ENTRY( , , , , , , , , , , , ,0xB0, )},- {"beq", OP_ENTRY( , , , , , , , , , , , ,0xF0, )},- {"bit", OP_ENTRY( , ,0x24, , , , , ,0x2C, , , , , )},- {"bmi", OP_ENTRY( , , , , , , , , , , , ,0x30, )},- {"bne", OP_ENTRY( , , , , , , , , , , , ,0xD0, )},- {"bpl", OP_ENTRY( , , , , , , , , , , , ,0x10, )},- {"brk", OP_ENTRY( , , , , , , , , , , , , ,0x00)},- {"bvc", OP_ENTRY( , , , , , , , , , , , ,0x50, )},- {"bvs", OP_ENTRY( , , , , , , , , , , , ,0x70, )},- {"clc", OP_ENTRY(0x18, , , , , , , , , , , , , )},- {"cld", OP_ENTRY(0xD8, , , , , , , , , , , , , )},- {"cli", OP_ENTRY(0x58, , , , , , , , , , , , , )},