etc
/
uxn
mirror of https://git.sr.ht/~rabbits/uxn
0
1
Fork 0
Code Issues Projects Releases Wiki Activity

(uxnasm) Fixed issue with makeref()

This commit is contained in:
Devine Lu Linvega 2023-02-28 21:47:45 -08:00
parent bd01e71c35
commit 85df5f2d36
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/uxnasm.c
View File

@ -39,7 +39,7 @@ typedef struct {
Uint16 llen, mlen, rlen; Uint16 llen, mlen, rlen;
Label labels[0x400]; Label labels[0x400];
Macro macros[0x100]; Macro macros[0x100];
Reference refs[0x1000]; Reference refs[0x400];
char scope[0x40]; char scope[0x40];
} Program; } Program;
@ -175,27 +175,27 @@ makelabel(char *name)
} }
static int static int
makereference(char *scope, char *label, Uint16 addr) makereference(char *scope, char *label, char rune, Uint16 addr)
{ {
char subw[0x40], parent[0x40]; char subw[0x40], parent[0x40];
Reference *r; Reference *r;
if(p.rlen == 0x1000) if(p.rlen == 0x1000)
return error("References limit exceeded", label); return error("References limit exceeded", label);
r = &p.refs[p.rlen++]; r = &p.refs[p.rlen++];
if(label[1] == '&') { if(label[0] == '&') {
if(!sublabel(subw, scope, label + 2)) if(!sublabel(subw, scope, label + 1))
return error("Invalid sublabel", label); return error("Invalid sublabel", label);
scpy(subw, r->name, 0x40); scpy(subw, r->name, 0x40);
} else { } else {
int pos = spos(label + 1, '/'); int pos = spos(label, '/');
if(pos > 0) { if(pos > 0) {
Label *l; Label *l;
if((l = findlabel(scpy(label + 1, parent, pos)))) if((l = findlabel(scpy(label, parent, pos))))
l->refs++; l->refs++;
} }
scpy(label + 1, r->name, 0x40); scpy(label, r->name, 0x40);
} }
r->rune = label[0]; r->rune = rune;
r->addr = addr; r->addr = addr;
return 1; return 1;
} }
@ -305,29 +305,29 @@ parse(char *w, FILE *f)
return error("Invalid hex literal", w); return error("Invalid hex literal", w);
break; break;
case '_': /* raw byte relative */ case '_': /* raw byte relative */
makereference(p.scope, w, p.ptr); makereference(p.scope, w + 1, w[0], p.ptr);
return writebyte(0xff); return writebyte(0xff);
case ',': /* literal byte relative */ case ',': /* literal byte relative */
makereference(p.scope, w, p.ptr + 1); makereference(p.scope, w + 1, w[0], p.ptr + 1);
return writelitbyte(0xff); return writelitbyte(0xff);
case '-': /* raw byte absolute */ case '-': /* raw byte absolute */
makereference(p.scope, w, p.ptr); makereference(p.scope, w + 1, w[0], p.ptr);
return writebyte(0xff); return writebyte(0xff);
case '.': /* literal byte zero-page */ case '.': /* literal byte zero-page */
makereference(p.scope, w, p.ptr + 1); makereference(p.scope, w + 1, w[0], p.ptr + 1);
return writelitbyte(0xff); return writelitbyte(0xff);
case ':': /* raw short absolute */ case ':':
case '=': case '=': /* raw short absolute */
makereference(p.scope, w, p.ptr); makereference(p.scope, w + 1, w[0], p.ptr);
return writeshort(0xffff, 0); return writeshort(0xffff, 0);
case ';': /* literal short absolute */ case ';': /* literal short absolute */
makereference(p.scope, w, p.ptr + 1); makereference(p.scope, w + 1, w[0], p.ptr + 1);
return writeshort(0xffff, 1); return writeshort(0xffff, 1);
case '?': /* JCI */ case '?': /* JCI */
makereference(p.scope, w, p.ptr + 1); makereference(p.scope, w + 1, w[0], p.ptr + 1);
return writebyte(0x20) && writeshort(0xffff, 0); return writebyte(0x20) && writeshort(0xffff, 0);
case '!': /* JMI */ case '!': /* JMI */
makereference(p.scope, w, p.ptr + 1); makereference(p.scope, w + 1, w[0], p.ptr + 1);
return writebyte(0x40) && writeshort(0xffff, 0); return writebyte(0x40) && writeshort(0xffff, 0);
case '"': /* raw string */ case '"': /* raw string */
i = 0; i = 0;
@ -354,7 +354,7 @@ parse(char *w, FILE *f)
return 0; return 0;
return 1; return 1;
} else { } else {
makereference(p.scope, w - 1, p.ptr + 1); makereference(p.scope, w, ' ', p.ptr + 1);
return writebyte(0x60) && writeshort(0xffff, 0); return writebyte(0x60) && writeshort(0xffff, 0);
} }
} }