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

(uxnasm) addref use global scope

This commit is contained in:
Devine Lu Linvega 2024-03-26 11:46:15 -07:00
parent 5d6d9ef4b1
commit 7819add659
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/uxnasm.c
View File

@ -218,7 +218,7 @@ makepad(char *w)
} }
static int static int
addref(char *scope, char *label, char rune, Uint16 addr) addref(char *label, char rune, Uint16 addr)
{ {
char parent[0x40]; char parent[0x40];
Reference *r; Reference *r;
@ -355,22 +355,22 @@ parse(char *w, FILE *f)
return error_asm("Invalid hex literal"); return error_asm("Invalid hex literal");
break; break;
case '_': /* raw byte relative */ case '_': /* raw byte relative */
return addref(scope, w + 1, w[0], p.ptr) && writebyte(0xff); return addref(w + 1, w[0], p.ptr) && writebyte(0xff);
case ',': /* literal byte relative */ case ',': /* literal byte relative */
return addref(scope, w + 1, w[0], p.ptr + 1) && writebyte(findopcode("LIT")) && writebyte(0xff); return addref(w + 1, w[0], p.ptr + 1) && writebyte(findopcode("LIT")) && writebyte(0xff);
case '-': /* raw byte absolute */ case '-': /* raw byte absolute */
return addref(scope, w + 1, w[0], p.ptr) && writebyte(0xff); return addref(w + 1, w[0], p.ptr) && writebyte(0xff);
case '.': /* literal byte zero-page */ case '.': /* literal byte zero-page */
return addref(scope, w + 1, w[0], p.ptr + 1) && writebyte(findopcode("LIT")) && writebyte(0xff); return addref(w + 1, w[0], p.ptr + 1) && writebyte(findopcode("LIT")) && writebyte(0xff);
case ':': fprintf(stderr, "Deprecated rune %s, use =%s\n", w, w + 1); case ':': fprintf(stderr, "Deprecated rune %s, use =%s\n", w, w + 1);
case '=': /* raw short absolute */ case '=': /* raw short absolute */
return addref(scope, w + 1, w[0], p.ptr) && writeshort(0xffff, 0); return addref(w + 1, w[0], p.ptr) && writeshort(0xffff, 0);
case ';': /* literal short absolute */ case ';': /* literal short absolute */
return addref(scope, w + 1, w[0], p.ptr + 1) && writeshort(0xffff, 1); return addref(w + 1, w[0], p.ptr + 1) && writeshort(0xffff, 1);
case '?': /* JCI */ case '?': /* JCI */
return addref(scope, w + 1, w[0], p.ptr + 1) && writebyte(0x20) && writeshort(0xffff, 0); return addref(w + 1, w[0], p.ptr + 1) && writebyte(0x20) && writeshort(0xffff, 0);
case '!': /* JMI */ case '!': /* JMI */
return addref(scope, w + 1, w[0], p.ptr + 1) && writebyte(0x40) && writeshort(0xffff, 0); return addref(w + 1, w[0], p.ptr + 1) && writebyte(0x40) && writeshort(0xffff, 0);
case '"': /* raw string */ case '"': /* raw string */
i = 0; i = 0;
while((c = w[++i])) while((c = w[++i]))
@ -400,7 +400,7 @@ parse(char *w, FILE *f)
return 0; return 0;
return 1; return 1;
} else } else
return addref(scope, w, ' ', p.ptr + 1) && writebyte(0x60) && writeshort(0xffff, 0); return addref(w, ' ', p.ptr + 1) && writebyte(0x60) && writeshort(0xffff, 0);
} }
return 1; return 1;
} }