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

Fixed issue with invalid hexadecimal values

This commit is contained in:
Devine Lu Linvega 2024-05-30 18:37:49 -07:00
parent bb57b85f57
commit 987a3348a6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/uxnasm.c
View File

@ -266,12 +266,13 @@ writehex(char *w, Context *ctx)
{ {
if(*w == '#') if(*w == '#')
writebyte(findopcode("LIT") | !!(++w)[2] << 5, ctx); writebyte(findopcode("LIT") | !!(++w)[2] << 5, ctx);
if(w[1] && !w[2]) if(ishex(w)) {
return writebyte(shex(w), ctx); if(w[1] && !w[2])
else if(w[3] && !w[4]) return writebyte(shex(w), ctx);
return writeshort(shex(w)); else if(w[3] && !w[4])
else return writeshort(shex(w));
return error_asm("Hexadecimal invalid"); }
return error_asm("Hexadecimal invalid");
} }
static int static int
@ -409,7 +410,7 @@ main(int argc, char *argv[])
{ {
ptr = PAGE; ptr = PAGE;
copy("on-reset", scope, 0); copy("on-reset", scope, 0);
if(argc == 2 && scmp(argv[1], "-v", 2)) return !printf("Uxnasm - Uxntal Assembler, 10 May 2024.\n"); if(argc == 2 && scmp(argv[1], "-v", 2)) return !printf("Uxnasm - Uxntal Assembler, 30 May 2024.\n");
if(argc != 3) return error_top("usage", "uxnasm [-v] input.tal output.rom"); if(argc != 3) return error_top("usage", "uxnasm [-v] input.tal output.rom");
if(!assemble(argv[1])) return 1; if(!assemble(argv[1])) return 1;
if(!resolve(argv[2])) return 1; if(!resolve(argv[2])) return 1;