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

avra: code consolidation

Browse Source
This commit is contained in:
Virgil Dupras 2019-12-15 19:17:03 -05:00
parent 52359a4e42
commit b130cac635
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apps/zasm/avr.asm
View File

@ -160,8 +160,8 @@ instrTbl:
.db 0x04, 0b01100000, 0x00 ; SBR .db 0x04, 0b01100000, 0x00 ; SBR
.db 0x04, 0b01010000, 0x00 ; SUBI .db 0x04, 0b01010000, 0x00 ; SUBI
; k(12): XXXXkkkk kkkkkkkk ; k(12): XXXXkkkk kkkkkkkk
.db 0x00, 0b11010000, 0x00 ; RCALL .db 0x08, 0b11010000, 0x00 ; RCALL k
.db 0x00, 0b11000000, 0x00 ; RJMP .db 0x08, 0b11000000, 0x00 ; RJMP k
; IN and OUT ; IN and OUT
.db 0x07, 0b10110000, 0x00 ; IN .db 0x07, 0b10110000, 0x00 ; IN
.db 0x87, 0b10111000, 0x00 ; OUT (Bit 7) .db 0x87, 0b10111000, 0x00 ; OUT (Bit 7)
@ -298,7 +298,7 @@ parseInstruction:
cp I_RCALL cp I_RCALL
jr c, .spitRdK8 jr c, .spitRdK8
cp I_IN cp I_IN
jr c, .spitK12 jr c, .spitk12
cp I_BREAK cp I_BREAK
jp c, .spitINOUT jp c, .spitINOUT
cp I_ASR cp I_ASR
@ -319,13 +319,8 @@ parseInstruction:
rr b ; K(8) start at B's 1st bit, not 2nd rr b ; K(8) start at B's 1st bit, not 2nd
jr .spit jr .spit
.spitK12: .spitk12:
; Let's deal with the upcode constant before we destroy IX below ; k(12) in HL
ld b, (ix+1)
call readWord
call parseExpr
ret nz
push ix \ pop hl
; We're doing the same dance as in _readk7. See comments there. ; We're doing the same dance as in _readk7. See comments there.
ld de, 0xfff ld de, 0xfff
add hl, de add hl, de
@ -341,12 +336,12 @@ parseInstruction:
; We're within bounds! Now, divide by 2 ; We're within bounds! Now, divide by 2
ld a, l ld a, l
rr h \ rra rr h \ rra
; LSB in A, spit ; LSB in A
call ioPutB ld c, a
ld a, h ld a, h
and 0xf and 0xf
or b ld b, a
jp ioPutB jr .spit
.spitINOUT: .spitINOUT:
; Rd in H, A in L ; Rd in H, A in L
@ -473,6 +468,7 @@ parseInstruction:
; 'a' - A 5-bit I/O port value ; 'a' - A 5-bit I/O port value
; 'A' - A 6-bit I/O port value ; 'A' - A 6-bit I/O port value
; 'b' - a 0-7 bit value ; 'b' - a 0-7 bit value
; 'D' - A double-length number which will fill whole HL.
; 'R' - an r5 value: r0-r31 ; 'R' - an r5 value: r0-r31
; 'r' - an r4 value: r16-r31 ; 'r' - an r4 value: r16-r31
; ;
@ -488,6 +484,7 @@ argSpecs:
.db 'R', 'b' ; Rd(5) + bit .db 'R', 'b' ; Rd(5) + bit
.db 'b', 7 ; bit + k(7) .db 'b', 7 ; bit + k(7)
.db 'R', 'A' ; Rd(5) + A(6) .db 'R', 'A' ; Rd(5) + A(6)
.db 'D', 0 ; K(12)
; Parse arguments from I/O according to specs in HL ; Parse arguments from I/O according to specs in HL
; H for first spec, L for second spec ; H for first spec, L for second spec
@ -540,6 +537,8 @@ _parseArgs:
jr z, _readk7 jr z, _readk7
cp 8 cp 8
jr z, _readK8 jr z, _readK8
cp 'D'
jr z, _readDouble
ret ; something's wrong ret ; something's wrong
; Read expr and return success only if result in under number given in A ; Read expr and return success only if result in under number given in A
@ -572,6 +571,17 @@ _readK8:
ld a, 0xff ld a, 0xff
jr _readExpr jr _readExpr
_readDouble:
push ix
call parseExpr
jr nz, .end
push ix \ pop hl
; HL is already set. For good measure, let's set A to HL's MSB
ld a, h
.end:
pop ix
ret
_readk7: _readk7:
push hl push hl
push de push de