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

zasm: consolidate code

Browse Source
This commit is contained in:
Virgil Dupras 2019-05-09 15:55:29 -04:00
parent d34aff67bb
commit 1c17dcb7a2
3 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/zasm/main.asm
View File

@ -27,7 +27,6 @@ main:
#include "parse.asm" #include "parse.asm"
#include "literal.asm" #include "literal.asm"
#include "instr.asm" #include "instr.asm"
#include "tok.asm"
#include "directive.asm" #include "directive.asm"
; Parse line in (HL), write the resulting opcode(s) in (DE) and returns the ; Parse line in (HL), write the resulting opcode(s) in (DE) and returns the

37
apps/zasm/parse.asm
View File

@ -1,4 +1,9 @@
; *** Consts *** ; *** Consts ***
TOK_INSTR .equ 0x01
TOK_DIRECTIVE .equ 0x02
TOK_EMPTY .equ 0xfe ; not a bad token, just an empty line
TOK_BAD .equ 0xff
.equ SCRATCHPAD_SIZE 0x20 .equ SCRATCHPAD_SIZE 0x20
; *** Variables *** ; *** Variables ***
scratchpad: scratchpad:
@ -73,3 +78,35 @@ toWord:
.success: .success:
xor a ; ensure Z xor a ; ensure Z
ret ret
; Parse line in (HL) and read the next token in BC. The token is written on
; two bytes (B and C). B is a token type (TOK_* constants) and C is an ID
; specific to that token type.
; Advance HL to after the read word.
; If no token matches, TOK_BAD is written to B
tokenize:
call toWord
jr nz, .emptyline
call readWord
push hl ; Save advanced HL for later
ld hl, scratchpad
call getInstID
jr z, .instr
call getDirectiveID
jr z, .direc
; no match
ld b, TOK_BAD
jr .end
.instr:
ld b, TOK_INSTR
jr .end
.direc:
ld b, TOK_DIRECTIVE
.end:
ld c, a
pop hl
ret
.emptyline:
ld b, TOK_EMPTY
; no HL to pop, we jumped before the push
ret

41
apps/zasm/tok.asm
View File

@ -1,41 +0,0 @@
; *** Requirements ***
; JUMP_UPCASE
; *** Consts ***
TOK_INSTR .equ 0x01
TOK_DIRECTIVE .equ 0x02
TOK_EMPTY .equ 0xfe ; not a bad token, just an empty line
TOK_BAD .equ 0xff
; *** Code ***
; Parse line in (HL) and read the next token in BC. The token is written on
; two bytes (B and C). B is a token type (TOK_* constants) and C is an ID
; specific to that token type.
; Advance HL to after the read word.
; If no token matches, TOK_BAD is written to B
tokenize:
call toWord
jr nz, .emptyline
call readWord
push hl ; Save advanced HL for later
ld hl, scratchpad
call getInstID
jr z, .instr
call getDirectiveID
jr z, .direc
; no match
ld b, TOK_BAD
jr .end
.instr:
ld b, TOK_INSTR
jr .end
.direc:
ld b, TOK_DIRECTIVE
.end:
ld c, a
pop hl
ret
.emptyline:
ld b, TOK_EMPTY
; no HL to pop, we jumped before the push
ret