d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further progress on assembler

This commit is contained in:
Andrew Alderwick 2021-04-14 22:00:10 +01:00
parent f7f4c78534
commit 59f362f441
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/assembler-test.usm
View File

@ -12,3 +12,6 @@
NOPa2r NOPa2r
swap16 swap16
@testme
,Hello.testing

23
projects/software/assembler.usm
View File

@ -1,5 +1,5 @@
;tree { search-key 2 max-key-len 1 } ;tree { search-key 2 max-key-len 1 }
;assembler { pass 1 state 1 token 2 scope-len 1 scope 80 heap 2 addr 2 subtree 2 vartmp 2 } ;assembler { pass 1 state 1 token 2 scope-len 1 scope 80 heap 2 addr 2 subtree 2 vartmp 2 field 2 }
%HCF { #0000 DIV } %HCF { #0000 DIV }
%SHORT_FLAG { #20 } %SHORT_FLAG { #20 }
@ -281,11 +281,25 @@
@lookup-label ( string-ptr* -- address* node-type if found @lookup-label ( string-ptr* -- address* node-type if found
OR false-address* 00 if not found ) OR false-address* 00 if not found )
( FIXME deal with dotted labels ) DUP2
$loop
DUP2 #0001 ADD2 SWP2 PEK2
DUP #2e EQU ^$dotted JNZ
^$loop JNZ
DUP2 EOR2 ( faster than POP2 #0000 )
=assembler.field
$main
DUP2 ,label-tree SWP2 #ff ,traverse-tree JSR2 DUP2 ,label-tree SWP2 #ff ,traverse-tree JSR2
^$not-found JNZ ^$not-found JNZ
SWP2 POP2 SWP2 POP2
~assembler.field #0000 EQU2 ^$end JNZ
DUP2 PEK2 #80 LTH ^$not-found JNZ
#0003 ADD2 ~assembler.field #ff ,traverse-tree JSR2
^$not-found JNZ
$end
DUP2 #0001 ADD2 LDR2 SWP2 PEK2 DUP2 #0001 ADD2 LDR2 SWP2 PEK2
JMP2r JMP2r
@ -298,6 +312,11 @@
#00 #00
JMP2r JMP2r
$dotted
DUP OVR2 =assembler.field
EOR ROT ROT #0001 SUB2 POK2
^$main JMP
@write-byte ( byte -- ) @write-byte ( byte -- )
( FIXME ) =Console.byte ( FIXME ) =Console.byte
~assembler.addr #0001 ADD2 =assembler.addr ~assembler.addr #0001 ADD2 =assembler.addr