izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-27 18:58:05 +11:00
Code Issues Releases Wiki Activity

avra: add LSL

Browse Source
This commit is contained in:
Virgil Dupras 2019-12-22 18:36:15 -05:00
parent 8ded02bc78
commit 6e1e8e0e59
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/zasm/avr.asm
View File

@ -66,6 +66,7 @@ instrNames:
.db "LAC", 0 .db "LAC", 0
.db "LAS", 0 .db "LAS", 0
.db "LAT", 0 .db "LAT", 0
.db "LSL", 0
.db "LSR", 0 .db "LSR", 0
.db "MOV", 0 .db "MOV", 0
.db "MUL", 0 .db "MUL", 0
@ -95,7 +96,7 @@ instrNames:
.db "SWAP", 0 .db "SWAP", 0
.db "WDR", 0 .db "WDR", 0
.db "XCH", 0 .db "XCH", 0
.equ I_ANDI 80 .equ I_ANDI 81
.db "ANDI", 0 .db "ANDI", 0
.db "CBR", 0 .db "CBR", 0
.db "CPI", 0 .db "CPI", 0
@ -104,10 +105,10 @@ instrNames:
.db "SBCI", 0 .db "SBCI", 0
.db "SBR", 0 .db "SBR", 0
.db "SUBI", 0 .db "SUBI", 0
.equ I_RCALL 88 .equ I_RCALL 89
.db "RCALL", 0 .db "RCALL", 0
.db "RJMP", 0 .db "RJMP", 0
.equ I_CBI 90 .equ I_CBI 91
.db "CBI", 0 .db "CBI", 0
.db "SBI", 0 .db "SBI", 0
.db "SBIC", 0 .db "SBIC", 0
@ -116,7 +117,7 @@ instrNames:
; ZASM limitation: CALL and JMP constants are 22-bit. In ZASM, we limit ; ZASM limitation: CALL and JMP constants are 22-bit. In ZASM, we limit
; ourselves to 16-bit. Supporting 22-bit would incur a prohibitive complexity ; ourselves to 16-bit. Supporting 22-bit would incur a prohibitive complexity
; cost. As they say, 64K words ought to be enough for anybody. ; cost. As they say, 64K words ought to be enough for anybody.
.equ I_CALL 94 .equ I_CALL 95
.db "CALL", 0 .db "CALL", 0
.db "JMP", 0 .db "JMP", 0
.db 0xff .db 0xff
@ -180,6 +181,7 @@ instrTbl:
.db 0x01, 0b10010010, 0b00000110 ; LAC Rd .db 0x01, 0b10010010, 0b00000110 ; LAC Rd
.db 0x01, 0b10010010, 0b00000101 ; LAS Rd .db 0x01, 0b10010010, 0b00000101 ; LAS Rd
.db 0x01, 0b10010010, 0b00000111 ; LAT Rd .db 0x01, 0b10010010, 0b00000111 ; LAT Rd
.db 0x41, 0b00001100, 0x00 ; LSL Rd
.db 0x01, 0b10010100, 0b00000110 ; LSR Rd .db 0x01, 0b10010100, 0b00000110 ; LSR Rd
.db 0x02, 0b00101100, 0x00 ; MOV Rd, Rr .db 0x02, 0b00101100, 0x00 ; MOV Rd, Rr
.db 0x02, 0b10011100, 0x00 ; MUL Rd, Rr .db 0x02, 0b10011100, 0x00 ; MUL Rd, Rr

4
avr/ops.txt
View File

@ -21,8 +21,8 @@ IJMP, NOP, RET, RETI, SEC, SEH, SEI, SEN, SES, SET, SEV, SEZ, SLEEP, SPM*, WDR
XXXX XXXd dddd XXXX XXXX XXXd dddd XXXX
ASR, COM, DEC, ELPM*, INC, LAC, LAS, LAT, LD*, LPM*, LSR, NEG, POP, PUSH, ROR, ASR, COM, DEC, ELPM*, INC, LAC, LAS, LAT, LD*, LPM*, LSL*, LSR, NEG, POP, PUSH,
ST*, SWAP, XCH ROR, ST*, SWAP, XCH
## Rd(5) + Rr(5) ## Rd(5) + Rr(5)

1
tools/tests/avra/test1.asm
View File

@ -22,3 +22,4 @@ bclr 7
call foo call foo
jmp bar jmp bar
mov r6, r30 mov r6, r30
lsl r3

BIN
tools/tests/avra/test1.expected
View File

Binary file not shown.