6502/py65
1
0
Fork 0
mirror of https://github.com/mnaberez/py65.git synced 2025-01-01 11:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Raise an exception when assembly fails

Browse Source
This commit is contained in:
Mike Naberezny 2012-11-18 17:05:12 -08:00
parent a5b82cf534
commit 11a66ec69c
2 changed files with 167 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py65/assembler.py
View File

@ -68,7 +68,7 @@ class Assembler:
def assemble(self, statement, pc=0000):
""" Assemble the given assembly language statement. If the statement
uses relative addressing, the program counter (pc) must also be given.
The result is a list of bytes, or None if the assembly failed.
The result is a list of bytes. Raises when assembly fails.
"""
opcode, operands = self.normalize_and_split(statement)
@ -99,7 +99,7 @@ class Assembler:
return bytes
# assembly failed
return None
raise SyntaxError(statement)
def normalize_and_split(self, statement):
""" Given an assembly language statement like "lda $c12,x", normalize

318
py65/tests/test_assembler.py
View File

@ -5,23 +5,35 @@ from py65.assembler import Assembler
from py65.utils.addressing import AddressParser
class AssemblerTests(unittest.TestCase):
def test_assemble_bad_syntax_raises_syntaxerror(self):
self.assertRaises(SyntaxError,
self.assemble, 'foo')
def test_assemble_bad_label_raises_keyerror(self):
self.assertRaises(KeyError,
self.assemble, 'lda foo')
def test_assemble_bad_number_raises_overflowerror(self):
self.assertRaises(OverflowError,
self.assemble, 'lda #$fff')
def test_assembles_00(self):
self.assertEqual([0x00],
self.assertEqual([0x00],
self.assemble('BRK'))
def test_assembles_01(self):
self.assertEqual([0x01, 0x44],
self.assertEqual([0x01, 0x44],
self.assemble('ORA ($44,X)'))
def dont_test_assembles_02(self):
pass
def dont_test_assembles_03(self):
pass
def dont_test_assembles_04(self):
pass
def test_assembles_05(self):
self.assertEqual([0x05, 0x44],
self.assemble('ORA $44'))
@ -29,32 +41,32 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_06(self):
self.assertEqual([0x06, 0x44],
self.assemble('ASL $44'))
def dont_test_assembles_07(self):
pass
def test_assembles_08(self):
self.assertEqual([0x08],
self.assemble('PHP'))
def test_assembles_09(self):
self.assertEqual([0x09, 0x44],
self.assemble('ORA #$44'))
def test_assembles_0a(self):
self.assertEqual([0x0a],
self.assemble('ASL A'))
def dont_test_assembles_0b(self):
pass
def dont_test_assembles_0c(self):
pass
def test_assembles_0d(self):
self.assertEqual([0x0d, 0x00, 0x44],
self.assemble('ORA $4400'))
def test_assembles_0e(self):
self.assertEqual([0x0e, 0x00, 0x44],
self.assemble('ASL $4400'))
@ -65,157 +77,157 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_10(self):
self.assertEqual([0x10, 0x44],
self.assemble('BPL $0046'))
def test_assembles_11(self):
self.assertEqual([0x11, 0x44],
self.assemble('ORA ($44),Y'))
def dont_test_assembles_12(self):
pass
def dont_test_assembles_13(self):
pass
def dont_test_assembles_14(self):
pass
def test_assembles_15(self):
self.assertEqual([0x15, 0x44],
self.assemble('ORA $44,X'))
def test_assembles_16(self):
self.assertEqual([0x16, 0x44],
self.assemble('ASL $44,X'))
def dont_test_assembles_17(self):
pass
def test_assembles_18(self):
self.assertEqual([0x18],
self.assemble('CLC'))
def test_assembles_19(self):
self.assertEqual([0x19, 0x00, 0x44],
self.assemble('ORA $4400,Y'))
def dont_test_assembles_1a(self):
pass
def dont_test_assembles_1b(self):
pass
def test_assembles_1c(self):
pass
def test_assembles_1d(self):
self.assertEqual([0x1d, 0x00, 0x44],
self.assemble('ORA $4400,X'))
def test_assembles_1e(self):
self.assertEqual([0x1e, 0x00, 0x44],
self.assemble('ASL $4400,X'))
def dont_test_assembles_1f(self):
pass
def test_assembles_20(self):
self.assertEqual([0x20, 0x97, 0x55],
self.assemble('JSR $5597'))
def test_assembles_21(self):
self.assertEqual([0x21, 0x44],
self.assemble('AND ($44,X)'))
def dont_test_assembles_22(self):
pass
def dont_test_assembles_23(self):
pass
def test_assembles_24(self):
self.assertEqual([0x24, 0x44],
self.assemble('BIT $44'))
def test_assembles_25(self):
self.assertEqual([0x25, 0x44],
self.assemble('AND $44'))
def test_assembles_26(self):
self.assertEqual([0x26, 0x44],
self.assemble('ROL $44'))
def dont_test_assembles_23(self):
pass
def dont_test_assembles_27(self):
pass
def test_assembles_28(self):
self.assertEqual([0x28],
self.assemble('PLP'))
def test_assembles_29(self):
self.assertEqual([0x29, 0x44],
self.assemble('AND #$44'))
def test_assembles_2a(self):
self.assertEqual([0x2a],
self.assemble('ROL A'))
def dont_test_assembles_2b(self):
pass
def test_assembles_2c(self):
self.assertEqual([0x2c, 0x00, 0x44],
self.assemble('BIT $4400'))
def test_assembles_2d(self):
self.assertEqual([0x2d, 0x00, 0x44],
self.assemble('AND $4400'))
def test_assembles_2e(self):
self.assertEqual([0x2e, 0x00, 0x44],
self.assemble('ROL $4400'))
def dont_test_assembles_2f(self):
pass
def test_assembles_30(self):
self.assertEqual([0x30, 0x44],
self.assemble('BMI $0046'))
def test_assembles_31(self):
self.assertEqual([0x31, 0x44],
self.assemble('AND ($44),Y'))
def dont_test_assembles_32(self):
pass
def dont_test_assembles_33(self):
pass
def dont_test_assembles_34(self):
pass
def test_assembles_35(self):
self.assertEqual([0x35, 0x44],
self.assemble('AND $44,X'))
def test_assembles_36(self):
self.assertEqual([0x36, 0x44],
self.assemble('ROL $44,X'))
def dont_test_assembles_37(self):
pass
def test_assembles_38(self):
self.assertEqual([0x38],
self.assemble('SEC'))
def test_assembles_39(self):
self.assertEqual([0x39, 0x00, 0x44],
self.assemble('AND $4400,Y'))
def dont_test_assembles_3a(self):
pass
@ -228,50 +240,50 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_3d(self):
self.assertEqual([0x3d, 0x00, 0x44],
self.assemble('AND $4400,X'))
def test_assembles_3e(self):
self.assertEqual([0x3e, 0x00, 0x44],
self.assemble('ROL $4400,X'))
def dont_test_assembles_3f(self):
pass
def test_assembles_40(self):
self.assertEqual([0x40],
self.assemble('RTI'))
def test_assembles_41(self):
self.assertEqual([0x41, 0x44],
self.assemble('EOR ($44,X)'))
def dont_test_assembles_42(self):
pass
def dont_test_assembles_43(self):
pass
def dont_test_assembles_44(self):
pass
def test_assembles_45(self):
self.assertEqual([0x45, 0x44],
self.assemble('EOR $44'))
def test_assembles_46(self):
self.assertEqual([0x46, 0x44],
self.assemble('LSR $44'))
def dont_test_assembles_47(self):
pass
def test_assembles_48(self):
self.assertEqual([0x48],
self.assemble('PHA'))
def test_assembles_49(self):
self.assertEqual([0x49, 0x44],
self.assemble('EOR #$44'))
def test_assembles_4a(self):
self.assertEqual([0x4a],
self.assemble('LSR A'))
@ -282,26 +294,26 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_4c(self):
self.assertEqual([0x4c, 0x97, 0x55],
self.assemble('JMP $5597'))
def test_assembles_4d(self):
self.assertEqual([0x4d, 0x00, 0x44],
self.assemble('EOR $4400'))
def test_assembles_4e(self):
self.assertEqual([0x4e, 0x00, 0x44],
self.assemble('LSR $4400'))
def dont_test_assembles_4f(self):
pass
def test_assembles_50(self):
self.assertEqual([0x50, 0x44],
self.assemble('BVC $0046'))
def test_assembles_51(self):
self.assertEqual([0x51, 0x44],
self.assemble('EOR ($44),Y'))
def dont_test_assembles_52(self):
pass
@ -310,26 +322,26 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_54(self):
pass
def test_assembles_55(self):
self.assertEqual([0x55, 0x44],
self.assemble('EOR $44,X'))
def test_assembles_56(self):
self.assertEqual([0x56, 0x44],
self.assemble('LSR $44,X'))
def dont_test_assembles_57(self):
pass
def test_assembles_58(self):
self.assertEqual([0x58],
self.assemble('CLI'))
def test_assembles_59(self):
self.assertEqual([0x59, 0x00, 0x44],
self.assemble('EOR $4400,Y'))
def dont_test_assembles_5a(self):
pass
@ -338,18 +350,18 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_5c(self):
pass
def test_assembles_5d(self):
self.assertEqual([0x5d, 0x00, 0x44],
self.assemble('EOR $4400,X'))
def test_assembles_5e(self):
self.assertEqual([0x5e, 0x00, 0x44],
self.assemble('LSR $4400,X'))
def dont_test_assembles_5f(self):
pass
def test_assembles_60(self):
self.assertEqual([0x60],
self.assemble('RTS'))
@ -357,27 +369,27 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_61(self):
self.assertEqual([0x61, 0x44],
self.assemble('ADC ($44,X)'))
def dont_test_assembles_62(self):
pass
def dont_test_assembles_63(self):
pass
def dont_test_assembles_64(self):
pass
def test_assembles_65(self):
self.assertEqual([0x65, 0x44],
self.assemble('ADC $44'))
def test_assembles_66(self):
self.assertEqual([0x66, 0x44],
self.assemble('ROR $44'))
def dont_test_assembles_67(self):
pass
def test_assembles_68(self):
self.assertEqual([0x68],
self.assemble('PLA'))
@ -389,33 +401,33 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_6a(self):
self.assertEqual([0x6a],
self.assemble('ROR A'))
def dont_test_assembles_6b(self):
pass
def test_assembles_6c(self):
self.assertEqual([0x6c, 0x97, 0x55],
self.assemble('JMP ($5597)'))
def test_assembles_6d(self):
self.assertEqual([0x6d, 0x00, 0x44],
self.assemble('ADC $4400'))
def test_assembles_6e(self):
self.assertEqual([0x6e, 0x00, 0x44],
self.assemble('ROR $4400'))
def dont_test_assembles_6f(self):
pass
def test_assembles_70(self):
self.assertEqual([0x70, 0x44],
self.assemble('BVS $0046'))
def test_assembles_71(self):
self.assertEqual([0x71, 0x44],
self.assemble('ADC ($44),Y'))
def dont_test_assembles_72(self):
pass
@ -435,11 +447,11 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_77(self):
pass
def test_assembles_78(self):
self.assertEqual([0x78],
self.assemble('SEI'))
def test_assembles_79(self):
self.assertEqual([0x79, 0x00, 0x44],
self.assemble('ADC $4400,Y'))
@ -452,11 +464,11 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_7c(self):
pass
def test_assembles_7d(self):
self.assertEqual([0x7d, 0x00, 0x44],
self.assemble('ADC $4400,X'))
def test_assembles_7e(self):
self.assertEqual([0x7e, 0x00, 0x44],
self.assemble('ROR $4400,X'))
@ -466,7 +478,7 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_80(self):
pass
def test_assembles_81(self):
self.assertEqual([0x81, 0x44],
self.assemble('STA ($44,X)'))
@ -476,11 +488,11 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_83(self):
pass
def test_assembles_84(self):
self.assertEqual([0x84, 0x44],
self.assemble('STY $44'))
def test_assembles_85(self):
self.assertEqual([0x85, 0x44],
self.assemble('STA $44'))
@ -498,14 +510,14 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_89(self):
pass
def test_assembles_8a(self):
self.assertEqual([0x8a],
self.assemble('TXA'))
def dont_test_assembles_8b(self):
pass
def test_assembles_8c(self):
self.assertEqual([0x8c, 0x00, 0x44],
self.assemble('STY $4400'))
@ -513,18 +525,18 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_8d(self):
self.assertEqual([0x8d, 0x00, 0x44],
self.assemble('STA $4400'))
def test_assembles_8e(self):
self.assertEqual([0x8e, 0x00, 0x44],
self.assemble('STX $4400'))
def dont_test_assembles_8f(self):
pass
def test_assembles_90(self):
self.assertEqual([0x90, 0x44],
self.assemble('BCC $0046'))
def test_assembles_91(self):
self.assertEqual([0x91, 0x44],
self.assemble('STA ($44),Y'))
@ -534,34 +546,34 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_93(self):
pass
def test_assembles_94(self):
self.assertEqual([0x94, 0x44],
self.assemble('STY $44,X'))
def test_assembles_95(self):
self.assertEqual([0x95, 0x44],
self.assemble('STA $44,X'))
def test_assembles_96(self):
self.assertEqual([0x96, 0x44],
self.assemble('STX $44,Y'))
def dont_test_assembles_97(self):
pass
def test_assembles_98(self):
self.assertEqual([0x98],
self.assemble('TYA'))
def test_assembles_99(self):
self.assertEqual([0x99, 0x00, 0x44],
self.assemble('STA $4400,Y'))
def test_assembles_9a(self):
self.assertEqual([0x9a],
self.assemble('TXS'))
def dont_test_assembles_9b(self):
pass
@ -581,52 +593,52 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_a0(self):
self.assertEqual([0xa0, 0x44],
self.assemble('LDY #$44'))
def test_assembles_a1(self):
self.assertEqual([0xa1, 0x44],
self.assemble('LDA ($44,X)'))
def test_assembles_a2(self):
self.assertEqual([0xa2, 0x44],
self.assemble('LDX #$44'))
def dont_test_assembles_a3(self):
pass
def test_assembles_a4(self):
self.assertEqual([0xa4, 0x44],
self.assemble('LDY $44'))
def test_assembles_a5(self):
self.assertEqual([0xa5, 0x44],
self.assemble('LDA $44'))
def test_assembles_a6(self):
self.assertEqual([0xa6, 0x44],
self.assemble('LDX $44'))
def dont_test_assembles_a7(self):
pass
def test_assembles_a9(self):
self.assertEqual([0xa8],
self.assemble('TAY'))
def test_assembles_a9(self):
self.assertEqual([0xa9, 0x44],
self.assemble('LDA #$44'))
def test_assembles_aa(self):
self.assertEqual([0xaa],
self.assemble('TAX'))
def dont_test_assembles_ab(self):
pass
def test_assembles_ac(self):
self.assertEqual([0xac, 0x00, 0x44],
self.assemble('LDY $4400'))
def test_assembles_ad(self):
self.assertEqual([0xad, 0x00, 0x44],
self.assemble('LDA $4400'))
@ -637,15 +649,15 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_af(self):
pass
def test_assembles_b0(self):
self.assertEqual([0xb0, 0x44],
self.assemble('BCS $0046'))
def test_assembles_b1(self):
self.assertEqual([0xb1, 0x44],
self.assemble('LDA ($44),Y'))
def dont_test_assembles_b2(self):
pass
@ -655,7 +667,7 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_b4(self):
self.assertEqual([0xb4, 0x44],
self.assemble('LDY $44,X'))
def test_assembles_b5(self):
self.assertEqual([0xb5, 0x44],
self.assemble('LDA $44,X'))
@ -681,11 +693,11 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_bb(self):
pass
def test_assembles_bc(self):
self.assertEqual([0xbc, 0x00, 0x44],
self.assemble('LDY $4400,X'))
def test_assembles_bd(self):
self.assertEqual([0xbd, 0x00, 0x44],
self.assemble('LDA $4400,X'))
@ -693,10 +705,10 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_be(self):
self.assertEqual([0xbe, 0x00, 0x44],
self.assemble('LDX $4400,Y'))
def dont_test_assembles_bf(self):
pass
def test_assembles_c0(self):
self.assertEqual([0xc0, 0x44],
self.assemble('CPY #$44'))
@ -704,17 +716,17 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_c1(self):
self.assertEqual([0xc1, 0x44],
self.assemble('CMP ($44,X)'))
def dont_test_assembles_c2(self):
pass
def dont_test_assembles_c3(self):
pass
def test_assembles_c4(self):
self.assertEqual([0xc4, 0x44],
self.assemble('CPY $44'))
def test_assembles_c5(self):
self.assertEqual([0xc5, 0x44],
self.assemble('CMP $44'))
@ -725,15 +737,15 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_c7(self):
pass
def test_assembles_c8(self):
self.assertEqual([0xc8],
self.assemble('INY'))
def test_assembles_c9(self):
self.assertEqual([0xc9, 0x44],
self.assemble('CMP #$44'))
def test_assembles_ca(self):
self.assertEqual([0xca],
self.assemble('DEX'))
@ -744,18 +756,18 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_cc(self):
self.assertEqual([0xcc, 0x00, 0x44],
self.assemble('CPY $4400'))
def test_assembles_cd(self):
self.assertEqual([0xcd, 0x00, 0x44],
self.assemble('CMP $4400'))
def test_assembles_ce(self):
self.assertEqual([0xce, 0x00, 0x44],
self.assemble('DEC $4400'))
def dont_test_assembles_cf(self):
pass
def test_assembles_d0(self):
self.assertEqual([0xd0, 0x44],
self.assemble('BNE $0046'))
@ -787,13 +799,13 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_d8(self):
self.assertEqual([0xd8],
self.assemble('CLD'))
def dont_test_assembles_da(self):
pass
def dont_test_assembles_db(self):
pass
def dont_test_assembles_dc(self):
pass
@ -804,7 +816,7 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_de(self):
self.assertEqual([0xde, 0x00, 0x44],
self.assemble('DEC $4400,X'))
def dont_test_assembles_df(self):
pass
@ -859,7 +871,7 @@ class AssemblerTests(unittest.TestCase):
def test_assembles_ed(self):
self.assertEqual([0xed, 0x00, 0x44],
self.assemble('SBC $4400'))
def test_assembles_ee(self):
self.assertEqual([0xee, 0x00, 0x44],
self.assemble('INC $4400'))
@ -872,7 +884,7 @@ class AssemblerTests(unittest.TestCase):
self.assemble('BEQ $0046'))
def test_assembles_f0_backward(self):
self.assertEqual([0xf0, 0xfc],
self.assertEqual([0xf0, 0xfc],
self.assemble('BEQ $BFFE', pc=0xc000))
def test_assembles_f1(self):
@ -915,26 +927,26 @@ class AssemblerTests(unittest.TestCase):
def dont_test_assembles_fc(self):
pass
def test_assembles_fd(self):
self.assertEqual([0xfd, 0x00, 0x44],
self.assemble('SBC $4400,X'))
def test_assembles_fe(self):
self.assertEqual([0xfe, 0x00, 0x44],
self.assemble('INC $4400,X'))
def dont_test_assembles_ff(self):
pass
# Test Helpers
def assemble(self, statement, pc=0000):
mpu = MPU()
address_parser = AddressParser()
assembler = Assembler(mpu, address_parser)
return assembler.assemble(statement, pc)
def test_suite():
return unittest.findTestCases(sys.modules[__name__])