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

(uxnasm) Store refs as labels

This commit is contained in:
Devine Lu Linvega 2024-03-27 09:42:15 -07:00
parent 0414a98b0e
commit 4c7ec082f5
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/uxnasm.c
View File

@ -24,23 +24,17 @@ typedef struct {
} Macro; } Macro;
typedef struct { typedef struct {
char *name; char *name, rune;
Uint16 addr, refs; Uint16 addr, refs;
} Label; } Label;
typedef struct {
char *name, rune;
Uint16 addr;
} Reference;
typedef struct { typedef struct {
int ptr, length; int ptr, length;
Uint8 data[LENGTH]; Uint8 data[LENGTH];
Uint8 lambda_stack[0x100], lambda_ptr, lambda_len; Uint8 lambda_stack[0x100], lambda_ptr, lambda_len;
Uint16 line, label_len, macro_len, refs_len; Uint16 line, label_len, macro_len, refs_len;
Label labels[0x400]; Label labels[0x400], refs[0x1000];
Macro macros[0x100]; Macro macros[0x100];
Reference refs[0x1000];
} Program; } Program;
static char source[0x40], token[0x40], scope[0x40], sublabel[0x80], lambda[0x05]; static char source[0x40], token[0x40], scope[0x40], sublabel[0x80], lambda[0x05];
@ -70,13 +64,13 @@ static char *push(char *s) { char *ptr = storenext; while((*storenext++ = *s++))
#define isopcode(x) (findopcode(x) || scmp(x, "BRK", 4)) #define isopcode(x) (findopcode(x) || scmp(x, "BRK", 4))
#define writeshort(x) (writebyte(x >> 8) && writebyte(x & 0xff)) #define writeshort(x) (writebyte(x >> 8) && writebyte(x & 0xff))
#define makesublabel(x) (push(scat(scat(scpy(scope, sublabel, 0x40), "/"), x)))
#define error_top(name, msg) !!fprintf(stderr, "%s: %s\n", name, msg) #define error_top(name, msg) !!fprintf(stderr, "%s: %s\n", name, msg)
#define error_asm(name) !!fprintf(stderr, "%s: %s in @%s, %s:%d.\n", name, token, scope, source, p.line) #define error_asm(name) !!fprintf(stderr, "%s: %s in @%s, %s:%d.\n", name, token, scope, source, p.line)
/* clang-format on */ /* clang-format on */
static int parse(char *w, FILE *f); static int parse(char *w, FILE *f);
static char *makesublabel(char *name);
static Macro * static Macro *
findmacro(char *name) findmacro(char *name)
@ -201,12 +195,6 @@ makelambda(int id)
return lambda; return lambda;
} }
static char *
makesublabel(char *name)
{
return push(scat(scat(scpy(scope, sublabel, 0x40), "/"), name));
}
static int static int
makepad(char *w) makepad(char *w)
{ {
@ -224,7 +212,7 @@ makepad(char *w)
static int static int
addref(char *label, char rune, Uint16 addr) addref(char *label, char rune, Uint16 addr)
{ {
Reference *r; Label *r;
if(p.refs_len >= 0x1000) if(p.refs_len >= 0x1000)
return error_asm("References limit exceeded"); return error_asm("References limit exceeded");
r = &p.refs[p.refs_len++]; r = &p.refs[p.refs_len++];
@ -358,7 +346,7 @@ resolve(void)
int i; int i;
Uint16 a; Uint16 a;
for(i = 0; i < p.refs_len; i++) { for(i = 0; i < p.refs_len; i++) {
Reference *r = &p.refs[i]; Label *r = &p.refs[i];
Uint8 *rom = p.data + r->addr; Uint8 *rom = p.data + r->addr;
switch(r->rune) { switch(r->rune) {
case '_': case '_':