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

findlabel can find sublabels

This commit is contained in:
Devine Lu Linvega 2024-03-25 20:41:02 -07:00
parent d96902b2d7
commit 6ac22a1e1a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/uxnasm.c
View File

@ -43,6 +43,7 @@ typedef struct {
Reference refs[0x1000]; Reference refs[0x1000];
} Program; } Program;
char sublabel[0x40];
char token[0x40]; char token[0x40];
Program p; Program p;
@ -70,6 +71,7 @@ static char *scat(char *dst, const char *src) { char *ptr = dst + slen(dst); whi
/* clang-format on */ /* clang-format on */
static int parse(char *w, FILE *f); static int parse(char *w, FILE *f);
static char *makesublabel(char *src, char *scope, char *name);
static int static int
error_top(const char *name, const char *msg) error_top(const char *name, const char *msg)
@ -107,6 +109,8 @@ static Label *
findlabel(char *name) findlabel(char *name)
{ {
int i; int i;
if(name[0] == '&')
name = makesublabel(sublabel, p.scope, name + 1);
for(i = 0; i < p.label_len; i++) for(i = 0; i < p.label_len; i++)
if(scmp(p.labels[i].name, name, 0x40)) if(scmp(p.labels[i].name, name, 0x40))
return &p.labels[i]; return &p.labels[i];
@ -218,16 +222,11 @@ makesublabel(char *src, char *scope, char *name)
static int static int
makepad(char *w) makepad(char *w)
{ {
char subw[0x40];
Label *l; Label *l;
int rel = w[0] == '$' ? p.ptr : 0; int rel = w[0] == '$' ? p.ptr : 0;
if(sihx(w + 1)) if(sihx(w + 1))
p.ptr = shex(w + 1) + rel; p.ptr = shex(w + 1) + rel;
else if(w[1] == '&') { else {
if(!makesublabel(subw, p.scope, w + 2) || !(l = findlabel(subw)))
return error_asm("Invalid sublabel");
p.ptr = l->addr + rel;
} else {
if(!(l = findlabel(w + 1))) if(!(l = findlabel(w + 1)))
return error_asm("Invalid label"); return error_asm("Invalid label");
p.ptr = l->addr + rel; p.ptr = l->addr + rel;