From 8ded02bc782d98c61fb858e11966c354bfb8eab1 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 22 Dec 2019 18:27:34 -0500 Subject: [PATCH] avra: fix misordered MOV, MUL, NEG and NOP --- apps/zasm/avr.asm | 2 +- tools/tests/avra/blink_tn45.asm | 1 - tools/tests/avra/test1.asm | 1 + tools/tests/avra/test1.expected | Bin 44 -> 46 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/zasm/avr.asm b/apps/zasm/avr.asm index 9812673..36e87cd 100644 --- a/apps/zasm/avr.asm +++ b/apps/zasm/avr.asm @@ -181,10 +181,10 @@ instrTbl: .db 0x01, 0b10010010, 0b00000101 ; LAS Rd .db 0x01, 0b10010010, 0b00000111 ; LAT Rd .db 0x01, 0b10010100, 0b00000110 ; LSR Rd -.db 0x00, 0b00000000, 0b00000000 ; NOP .db 0x02, 0b00101100, 0x00 ; MOV Rd, Rr .db 0x02, 0b10011100, 0x00 ; MUL Rd, Rr .db 0x01, 0b10010100, 0b00000001 ; NEG Rd +.db 0x00, 0b00000000, 0b00000000 ; NOP .db 0x02, 0b00101000, 0x00 ; OR Rd, Rr .db 0x87, 0b10111000, 0x00 ; OUT A, Rr (Bit 7) .db 0x01, 0b10010000, 0b00001111 ; POP Rd diff --git a/tools/tests/avra/blink_tn45.asm b/tools/tests/avra/blink_tn45.asm index c612913..ef63bef 100644 --- a/tools/tests/avra/blink_tn45.asm +++ b/tools/tests/avra/blink_tn45.asm @@ -1,4 +1,3 @@ -; TODO: implement instructions that are commented out ; REGISTER USAGE ; ; R1: overflow counter diff --git a/tools/tests/avra/test1.asm b/tools/tests/avra/test1.asm index 839d0d9..595ca6e 100644 --- a/tools/tests/avra/test1.asm +++ b/tools/tests/avra/test1.asm @@ -21,3 +21,4 @@ bset 4 bclr 7 call foo jmp bar +mov r6, r30 diff --git a/tools/tests/avra/test1.expected b/tools/tests/avra/test1.expected index 0ee2648f91b194748397b93c6854a4a4005af8a1..19a7b1a619369e0f3549819a043b0f26d0e57545 100644 GIT binary patch delta 7 OcmdPVo1nv#rw0HA-vPA% delta 4 LcmdPXnV