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

(uxnasm) Housekeeping

This commit is contained in:
Devine Lu Linvega 2024-03-27 17:00:08 -07:00
parent 652bff0a93
commit a252da617c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/uxnasm.c
View File

@ -332,17 +332,17 @@ parse(char *w, FILE *f, Context *ctx)
} }
static int static int
resolveref(Item *r) writeref(Item *r)
{ {
Uint16 a; int rel;
Uint8 *rom = data + r->addr; Uint8 *rom = data + r->addr;
Item *l = findlabel(r->name); Item *l = findlabel(r->name);
if(!l) return 0; if(!l) return 0;
switch(r->rune) { switch(r->rune) {
case '_': case '_':
case ',': case ',':
*rom = (Sint8)(l->addr - r->addr - 2); *rom = rel = l->addr - r->addr - 2;
if((Sint8)data[r->addr] != (l->addr - r->addr - 2)) if((Sint8)data[r->addr] != rel)
return error_top("Relative reference is too far", r->name); return error_top("Relative reference is too far", r->name);
break; break;
case '-': case '-':
@ -357,8 +357,8 @@ resolveref(Item *r)
case '?': case '?':
case '!': case '!':
default: default:
a = l->addr - r->addr - 2; rel = l->addr - r->addr - 2;
*rom++ = a >> 8, *rom = a; *rom++ = rel >> 8, *rom = rel;
break; break;
} }
l->refs++; l->refs++;
@ -371,7 +371,7 @@ resolve(void)
int i; int i;
for(i = 0; i < refs_len; i++) { for(i = 0; i < refs_len; i++) {
Item *r = &refs[i]; Item *r = &refs[i];
if(!resolveref(r)) return error_top("Unknown reference", r->name); if(!writeref(r)) return error_top("Unknown reference", r->name);
} }
return 1; return 1;
} }