# HG changeset patch # User james # Date 1386448347 0 # Node ID 81dd03d17c229683e36f33f72854ed4f8c60c84f # Parent 4549109a0d1ec5a1b50bf65abdf9e28d81f64f7e first_pass() didn't need a pc diff -r 4549109a0d1e -r 81dd03d17c22 assembler/assembler.py --- a/assembler/assembler.py Sat Dec 07 16:42:30 2013 +0000 +++ b/assembler/assembler.py Sat Dec 07 20:32:27 2013 +0000 @@ -19,8 +19,6 @@ source_code = filter(lambda l: l != '\n', f.readlines()) asm = [] - pc = 0 - # ::= [] [";"] for line in source_code: # remove EOL @@ -58,8 +56,6 @@ symbols, constants = tokenize(arguments) asm.append([mnemonic, symbols, constants, label]) - pc = pc + 1 - return asm # take preprocessed asm and write machine code to binary file diff -r 4549109a0d1e -r 81dd03d17c22 assembler/language.py --- a/assembler/language.py Sat Dec 07 16:42:30 2013 +0000 +++ b/assembler/language.py Sat Dec 07 20:32:27 2013 +0000 @@ -243,7 +243,7 @@ ('a', 'r3'): 147}} # take a list of arguments -# identify dataant data: +# identify constant data: # pack that data into a bit string # return data type symbols and data def tokenize(args): diff -r 4549109a0d1e -r 81dd03d17c22 tests/label_test.asm --- a/tests/label_test.asm Sat Dec 07 16:42:30 2013 +0000 +++ b/tests/label_test.asm Sat Dec 07 20:32:27 2013 +0000 @@ -1,4 +1,4 @@ -; pc ofset set +; label test label_1: MOV A, #0xFF ; 0: 0x15 0xFF label_2: JNZ label_2 ; 2: 0xE1 0x02 label_4: ; 4: