diff --git a/6811.py b/6811.py index 8ce847a..b3e04ef 100755 --- a/6811.py +++ b/6811.py @@ -19,9 +19,12 @@ addressModeTable = { "immediate" : "#${0:02X}", "immediatex" : "#${0:02X}{1:02X}", "direct" : "${0:02X}", +"direct2" : "${0:02X} ${1:02X}", "extended" : "${0:02X}{1:02X}", -"indexedx" : "${0:02X},X", -"indexedy" : "${0:02X},Y", +"indexedx" : "${0:02X},x", +"indexedy" : "${0:02X},y", +"indexedx2" : "${0:02X},x ${1:02X}", +"indexedy2" : "${0:02X},y ${1:02X}", "relative" : "${0:04X}", } @@ -84,6 +87,34 @@ opcodeTable = { 0x47 : [ 1, "asra", "inherent" ], 0x57 : [ 1, "asrb", "inherent" ], 0x24 : [ 2, "bcc", "relative", pcr ], +0x15 : [ 3, "bclr", "direct2", ], +0x1d : [ 3, "bclr", "indexedx2", ], +0x181d : [ 4, "bclr", "indexedy2", ], +0x25 : [ 2, "bcs", "relative", pcr ], +0x27 : [ 2, "beq", "relative", pcr ], +0x2c : [ 2, "bge", "relative", pcr ], +0x2e : [ 2, "bgt", "relative", pcr ], +0x22 : [ 2, "bhi", "relative", pcr ], +0x24 : [ 2, "bhs", "relative", pcr ], +0x85 : [ 2, "bita", "immediate" ], +0x95 : [ 2, "bita", "direct" ], +0xb5 : [ 3, "bita", "extended" ], +0xa5 : [ 2, "bita", "indexedx" ], +0x18a5 : [ 3, "bita", "indexedy" ], +0xc5 : [ 2, "bitb", "immediate" ], +0xd5 : [ 2, "bitb", "direct" ], +0xf5 : [ 3, "bitb", "extended" ], +0xe5 : [ 2, "bitb", "indexedx" ], +0x18e5 : [ 3, "bitb", "indexedy" ], +0x2f : [ 2, "ble", "relative", pcr ], +0x25 : [ 2, "blo", "relative", pcr ], +0x23 : [ 2, "bls", "relative", pcr ], +0x2d : [ 2, "blt", "relative", pcr ], +0x2b : [ 2, "bmi", "relative", pcr ], +0x26 : [ 2, "bne", "relative", pcr ], +0x2a : [ 2, "bpl", "relative", pcr ], +0x20 : [ 2, "bra", "relative", pcr ], + @@ -91,7 +122,6 @@ opcodeTable = { 0x01 : [ 1, "nop", "inherent" ], 0x02 : [ 2, "ora", "direct" ], 0x03 : [ 3, "jmp", "extended" ], -0x20 : [ 2, "bra", "relative", pcr ], 0x86 : [ 2, "ldaa", "immediate" ], 0x8f : [ 1, "xgdx", "inherent" ], 0x188f : [ 2, "xgdy", "inherent" ],