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

Check for valid hex in padding

This commit is contained in:
neauoire 2021-06-08 07:37:12 -07:00
parent b6239ad549
commit 31f18e1bdf
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/uxnasm.c
View File

@ -296,18 +296,20 @@ pass1(FILE *f)
printf("Pass 1\n"); printf("Pass 1\n");
while(fscanf(f, "%s", w) == 1) { while(fscanf(f, "%s", w) == 1) {
if(skipblock(w, &ccmnt, '(', ')')) continue; if(skipblock(w, &ccmnt, '(', ')')) continue;
if(w[0] == '|') if(w[0] == '|') {
if(!sihx(w + 1))
return error("Invalid padding", w);
addr = shex(w + 1); addr = shex(w + 1);
else if(w[0] == '%') { } else if(w[0] == '%') {
if(!makemacro(w + 1, f)) if(!makemacro(w + 1, f))
return error("Pass1 failed", w); return error("Invalid macro", w);
} else if(w[0] == '@') { } else if(w[0] == '@') {
if(!makelabel(w + 1, addr)) if(!makelabel(w + 1, addr))
return error("Pass1 failed", w); return error("Invalid label", w);
scpy(w + 1, scope, 64); scpy(w + 1, scope, 64);
} else if(w[0] == '&') { } else if(w[0] == '&') {
if(!makelabel(sublabel(subw, scope, w + 1), addr)) if(!makelabel(sublabel(subw, scope, w + 1), addr))
return error("Pass1 failed", w); return error("Ivalid sublabel", w);
} else if(sihx(w)) } else if(sihx(w))
addr += slen(w) / 2; addr += slen(w) / 2;
else else