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

(uxnasm)Passing uxntal scope requirements

This commit is contained in:
Devine Lu Linvega 2024-02-24 08:46:18 -08:00
parent cb73e63eb4
commit b9a79eca19
2 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
etc/coverage.tal Normal file
View File

@ -0,0 +1,77 @@
( test file )
|0100 @program
#01 ?{ ( skip ) #ffff }
!{ ( skip ) #ffff }
{ ( skip ) #ffff } POP2r
( nested lambda )
{ { "hello 0a $1 } STH2r !print-str } STH2r JSR2
( function application )
{ 01 02 03 04 05 } STH2r { LIT "0 ADD #18 DEO #0a18 DEO JMP2r } STH2r foreach
( get lambda length )
{ "Dindeldums $1 } STH2r get-lambda-length <print-dec> #0a18 DEO
( allocated string )
;hello-word print-str
#800f DEO
BRK
(
@| test label inheritance )
@object
&x $1 &y $1
&get-x ( -- x )
,&x LDR
JMP2r
@object/get-y ( -- y )
,&y LDR
JMP2r
( raw lambda length )
_{ 01 02 03 }
@get-lambda-length ( lambda* -- length* )
#0002 SUB2 LDA2
JMP2r
@print-str ( str* -- )
&while ( -- )
( send ) LDAk #18 DEO
( loop ) INC2 LDAk ?&while
POP2
JMP2r
@foreach ( arr* fn* -- )
STH2
DUP2
DUP2 #0002 SUB2 LDA2 ADD2
SWP2
&l
LDAk STH2kr JSR2
INC2 NEQ2k ?&l
POP2 POP2 POP2r
JMP2r
@<print-dec> ( short* -- )
#2710 [ LIT2r 00fb ]
&w ( -- )
DIV2k #000a DIV2k MUL2 SUB2 SWPr EQUk OVR STHkr EQU AND ?&>skip
DUP [ LIT "0 ] ADD #19 DEO
INCr &>skip
POP2 #000a DIV2 SWPr INCr STHkr ?&w
POP2r POP2 POP2 JMP2r
$20 @label2
@hello-word "Hello 20 "World! 0a $1

9
src/uxnasm.c
View File

@ -320,7 +320,10 @@ parse(char *w, FILE *f)
case '@': /* label */ case '@': /* label */
if(!makelabel(w + 1)) if(!makelabel(w + 1))
return error("Invalid label", w); return error("Invalid label", w);
scpy(w + 1, p.scope, 0x40); i = 0;
while(w[i + 1] != '/' && i < 0x3e && (p.scope[i] = w[i + 1]))
i++;
p.scope[i] = '\0';
break; break;
case '&': /* sublabel */ case '&': /* sublabel */
if(!sublabel(subw, p.scope, w + 1) || !makelabel(subw)) if(!sublabel(subw, p.scope, w + 1) || !makelabel(subw))
@ -346,7 +349,6 @@ parse(char *w, FILE *f)
case '.': /* literal byte zero-page */ case '.': /* literal byte zero-page */
makereference(p.scope, w + 1, w[0], p.ptr + 1); makereference(p.scope, w + 1, w[0], p.ptr + 1);
return writelitbyte(0xff); return writelitbyte(0xff);
case ':':
case '=': /* raw short absolute */ case '=': /* raw short absolute */
makereference(p.scope, w + 1, w[0], p.ptr); makereference(p.scope, w + 1, w[0], p.ptr);
return writeshort(0xffff, 0); return writeshort(0xffff, 0);
@ -420,7 +422,6 @@ resolve(void)
p.data[r->addr] = l->addr & 0xff; p.data[r->addr] = l->addr & 0xff;
l->refs++; l->refs++;
break; break;
case ':':
case '=': case '=':
case ';': case ';':
if(!(l = findlabel(r->name))) if(!(l = findlabel(r->name)))
@ -501,7 +502,7 @@ main(int argc, char *argv[])
if(argc == 1) if(argc == 1)
return error("usage", "uxnasm [-v] input.tal output.rom"); return error("usage", "uxnasm [-v] input.tal output.rom");
if(argv[1][0] == '-' && argv[1][1] == 'v') if(argv[1][0] == '-' && argv[1][1] == 'v')
return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 27 Oct 2023.\n"); return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 24 Feb 2024.\n");
if(!(src = fopen(argv[1], "r"))) if(!(src = fopen(argv[1], "r")))
return !error("Invalid input", argv[1]); return !error("Invalid input", argv[1]);
if(!assemble(src)) if(!assemble(src))