diff options
Diffstat (limited to 'src/asm_ops.py')
| -rw-r--r-- | src/asm_ops.py | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/src/asm_ops.py b/src/asm_ops.py index 74e7930..61e2caa 100644 --- a/src/asm_ops.py +++ b/src/asm_ops.py @@ -11,12 +11,12 @@ class Options: class Meta: address: int -def make_alr(meta: Meta, labels: Labels, alu_op: str, left: str, right: str, target: str) -> int: +def make_alr(meta: Meta, symbols: Symbols, alu_op: str, left: str, right: str, target: str) -> int: """ALR 0000 TTTL LLRR RSSS""" - target_e = eval_expr(labels, target, bits=3) - left_e = eval_expr(labels, left, bits=3) - right_e = eval_expr(labels, right, bits=3) - alu_op_e = eval_expr(labels, alu_op, bits=3) + target_e = eval_expr(symbols, target, bits=3) + left_e = eval_expr(symbols, left, bits=3) + right_e = eval_expr(symbols, right, bits=3) + alu_op_e = eval_expr(symbols, alu_op, bits=3) word = (0b0000 << 12) + \ (target_e << 9) + \ (left_e << 6) + \ @@ -24,12 +24,12 @@ def make_alr(meta: Meta, labels: Labels, alu_op: str, left: str, right: str, tar alu_op_e return word -def make_ali(meta: Meta, labels: Labels, alu_op: str, left: str, imm: str, target: str) -> int: +def make_ali(meta: Meta, symbols: Symbols, alu_op: str, left: str, imm: str, target: str) -> int: """ALI 0001 TTTL LLII ISSS""" - target_e = eval_expr(labels, target, bits=3) - left_e = eval_expr(labels, left, bits=3) - imm_e = eval_expr(labels, imm, bits=3) - alu_op_e = eval_expr(labels, alu_op, bits=3) + target_e = eval_expr(symbols, target, bits=3) + left_e = eval_expr(symbols, left, bits=3) + imm_e = eval_expr(symbols, imm, bits=3) + alu_op_e = eval_expr(symbols, alu_op, bits=3) word = (0b0001 << 12) + \ (target_e << 9) + \ (left_e << 6) + \ @@ -37,62 +37,64 @@ def make_ali(meta: Meta, labels: Labels, alu_op: str, left: str, imm: str, targe alu_op_e return word -def make_ldr(meta: Meta, labels: Labels, addr_reg: str, to_reg: str) -> int: +def make_ldr(meta: Meta, symbols: Symbols, addr_reg: str, to_reg: str) -> int: """LDR 0010 TTTR RRXX XXXX""" - to_reg_e = eval_expr(labels, to_reg, bits=3) - addr_reg_e = eval_expr(labels, addr_reg, bits=3) + to_reg_e = eval_expr(symbols, to_reg, bits=3) + addr_reg_e = eval_expr(symbols, addr_reg, bits=3) word = (0b0010 << 12) + \ (to_reg_e << 9) + \ (addr_reg_e << 6) return word -def make_str(meta: Meta, labels: Labels, from_reg: str, addr_reg: str) -> int: +def make_str(meta: Meta, symbols: Symbols, from_reg: str, addr_reg: str) -> int: """STR 0011 XXXL LLRR RXXX""" - from_reg_e = eval_expr(labels, from_reg, bits=3) - addr_reg_e = eval_expr(labels, addr_reg, bits=3) + from_reg_e = eval_expr(symbols, from_reg, bits=3) + addr_reg_e = eval_expr(symbols, addr_reg, bits=3) word = (0b0011 << 12) + \ (addr_reg_e << 6) + \ (from_reg_e << 3) return word -def make_ldi(meta: Meta, labels: Labels, imm: str, to_reg: str) -> int: +def make_ldi(meta: Meta, symbols: Symbols, imm: str, to_reg: str) -> int: """LDI 0100 TTTI IIII IIII""" - to_reg_e = eval_expr(labels, to_reg, bits=3) - imm_e = eval_expr(labels, imm, bits=9) + to_reg_e = eval_expr(symbols, to_reg, bits=3) + imm_e = eval_expr(symbols, imm, bits=9) word = (0b0100 << 12) + \ (to_reg_e << 9) + \ imm_e return word -def make_jpr(meta: Meta, labels: Labels, addr_reg: str) -> int: +def make_jpr(meta: Meta, symbols: Symbols, addr_reg: str) -> int: """JPR 0101 XXXR RRXX XXXX""" - addr_reg_e = eval_expr(labels, addr_reg, bits=3) + addr_reg_e = eval_expr(symbols, addr_reg, bits=3) word = (0b0101 << 12) + \ (addr_reg_e << 6) return word -def make_jpi(meta: Meta, labels: Labels, imm: str) -> int: +def make_jpi(meta: Meta, symbols: Symbols, imm: str) -> int: """JPI 0110 XXXI IIII IIII""" - imm_e = eval_expr(labels, imm, bits=9) + imm_e = eval_expr(symbols, imm, bits=9) imm_e = imm_e - meta.address - 1 imm_e = imm_e & (0b111111111) + print("symbols:", symbols) + print(meta, imm, f"0x{imm_e:>0x}") word = (0b0110 << 12) + \ imm_e return word -def make_brr(meta: Meta, labels: Labels, flag_s: str, addr_reg: str) -> int: +def make_brr(meta: Meta, symbols: Symbols, flag_s: str, addr_reg: str) -> int: """brr 0111 XFFR RRXX XXXX""" - flag_s_e = eval_expr(labels, flag_s, bits=2) - addr_reg_e = eval_expr(labels, addr_reg, bits=3) + flag_s_e = eval_expr(symbols, flag_s, bits=2) + addr_reg_e = eval_expr(symbols, addr_reg, bits=3) word = (0b0111 << 12) + \ (flag_s_e << 9) + \ (addr_reg_e << 6) return word -def make_bri(meta: Meta, labels: Labels, flag_s: str, imm: str) -> int: +def make_bri(meta: Meta, symbols: Symbols, flag_s: str, imm: str) -> int: """BRI 1000 XFFI IIII IIII""" - flag_s_e = eval_expr(labels, flag_s, bits=2) - imm_e = eval_expr(labels, imm, bits=9) + flag_s_e = eval_expr(symbols, flag_s, bits=2) + imm_e = eval_expr(symbols, imm, bits=9) imm_e = imm_e - meta.address - 1 imm_e = imm_e & (0b111111111) word = (0b1000 << 12) + \ @@ -100,14 +102,14 @@ def make_bri(meta: Meta, labels: Labels, flag_s: str, imm: str) -> int: imm_e return word -def make_lpc(meta: Meta, labels: Labels, target: str) -> int: +def make_lpc(meta: Meta, symbols: Symbols, target: str) -> int: """LPC 1001 TTTX XXXX XXXX""" - target_e = eval_expr(labels, target, bits=3) + target_e = eval_expr(symbols, target, bits=3) word = (0b1001 << 12) + \ (target_e << 9) return word -def make_hlt(meta: Meta, labels: Labels) -> int: +def make_hlt(meta: Meta, symbols: Symbols) -> int: """HLT 1111 XXXX XXXX XXXX""" word = (0b1111 << 12) return word |