izaya
/
collapseos
mirror of https://github.com/hsoft/collapseos.git
1
0
Fork 0
Code Issues Releases Wiki Activity

zasm: can now assemble zasm/directive.asm!

This commit is contained in:
Virgil Dupras 2019-05-18 20:37:34 -04:00
parent 9f6ebf538d
commit 723497af69
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/zasm/directive.asm
View File

@ -33,7 +33,8 @@ handleDB:
call enterDoubleQuotes call enterDoubleQuotes
jr z, .stringLiteral jr z, .stringLiteral
call parseExpr call parseExpr
ld a, ixl push ix \ pop hl
ld a, l
call ioPutC call ioPutC
.stopStrLit: .stopStrLit:
call readComma call readComma
@ -91,8 +92,7 @@ handleEQU:
call parseExpr call parseExpr
jr nz, .error jr nz, .error
ld hl, DIREC_SCRATCHPAD ld hl, DIREC_SCRATCHPAD
ld d, ixh push ix \ pop de
ld e, ixl
call symRegister call symRegister
jr .end jr .end
.error: .error:
@ -137,7 +137,6 @@ parseDirective:
ld de, directiveHandlers ld de, directiveHandlers
call addDE call addDE
call intoDE call intoDE
ld ixh, d push de \ pop ix
ld ixl, e
pop de pop de
jp (ix) jp (ix)

4
tools/tests/zasm/test7.asm
View File

@ -22,6 +22,8 @@
#include "zasm/parse.asm" #include "zasm/parse.asm"
.equ TOK_RAMSTART SYM_RAMEND .equ TOK_RAMSTART SYM_RAMEND
#include "zasm/tok.asm" #include "zasm/tok.asm"
.equ DIREC_RAMSTART TOK_RAMEND
#include "zasm/directive.asm"
zasmIsFirstPass: zasmIsFirstPass:
nop nop
@ -32,5 +34,5 @@ zasmIsLocalPass:
getInstID: getInstID:
nop nop
getDirectiveID: parseExpr:
nop nop