aboutsummaryrefslogtreecommitdiffstats
path: root/atk16_asm
diff options
context:
space:
mode:
authorJan Tuomi <jans.tuomi@gmail.com>2024-02-25 20:08:32 +0200
committerJan Tuomi <jans.tuomi@gmail.com>2024-02-25 20:08:32 +0200
commit5776a07e6a3def343996c5ec83cd69242f7ea23a (patch)
treedfe91cff071a60be9fd9fc674625b8b462e06f27 /atk16_asm
parent3ac72608e8fc708277137fde62193c8763268ff5 (diff)
Add tests, fix bugs
Diffstat (limited to 'atk16_asm')
-rw-r--r--atk16_asm/asm_ops.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/atk16_asm/asm_ops.py b/atk16_asm/asm_ops.py
index 293b1cc..6a08495 100644
--- a/atk16_asm/asm_ops.py
+++ b/atk16_asm/asm_ops.py
@@ -54,11 +54,11 @@ def make_ldr(meta: Meta, symbols: Symbols, addr_reg: str, to_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(symbols, from_reg, bits=3)
- addr_reg_e = eval_expr(symbols, addr_reg, bits=3)
+ addr_reg_e = eval_expr(symbols, from_reg, bits=3)
+ from_reg_e = eval_expr(symbols, addr_reg, bits=3)
word = (0b0011 << 12) + \
- (addr_reg_e << 6) + \
- (from_reg_e << 3)
+ (from_reg_e << 6) + \
+ (addr_reg_e << 3)
return word
def make_ldi(meta: Meta, symbols: Symbols, imm: str, to_reg: str) -> int: