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

(uxnasm) Added support for label sized pads

This commit is contained in:
Devine Lu Linvega 2023-04-04 20:02:33 -07:00
parent edfa734817
commit 00ed056e51
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/uxnasm.c
View File

@ -253,6 +253,7 @@ parse(char *w, FILE *f)
{ {
int i; int i;
char word[0x40], subw[0x40], c; char word[0x40], subw[0x40], c;
Label *l;
Macro *m; Macro *m;
if(slen(w) >= 63) if(slen(w) >= 63)
return error("Invalid token", w); return error("Invalid token", w);
@ -278,14 +279,30 @@ parse(char *w, FILE *f)
return error("Invalid macro", w); return error("Invalid macro", w);
break; break;
case '|': /* pad-absolute */ case '|': /* pad-absolute */
if(!sihx(w + 1)) if(sihx(w + 1))
return error("Invalid padding", w); p.ptr = shex(w + 1);
p.ptr = shex(w + 1); else if(w[1] == '&') {
if(!sublabel(subw, p.scope, w + 2) || !(l = findlabel(subw)))
return error("Invalid sublabel", w);
p.ptr = l->addr;
} else {
if(!(l = findlabel(w + 1)))
return error("Invalid label", w);
p.ptr = l->addr;
}
break; break;
case '$': /* pad-relative */ case '$': /* pad-relative */
if(!sihx(w + 1)) if(sihx(w + 1))
return error("Invalid padding", w); p.ptr += shex(w + 1);
p.ptr += shex(w + 1); else if(w[1] == '&') {
if(!sublabel(subw, p.scope, w + 2) || !(l = findlabel(subw)))
return error("Invalid sublabel", w);
p.ptr += l->addr;
} else {
if(!(l = findlabel(w + 1)))
return error("Invalid label", w);
p.ptr += l->addr;
}
break; break;
case '@': /* label */ case '@': /* label */
if(!makelabel(w + 1)) if(!makelabel(w + 1))