gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use only one pass

Browse Source
This commit is contained in:
dbrotz
2019-05-04 16:18:26 -07:00
parent 6ff9435e0a
commit 23f5e9dacc
12 changed files with 185 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm/asm.h
View File

@@ -28,7 +28,6 @@
extern int32_t nLineNo; extern int32_t nLineNo;
extern uint32_t nTotalLines; extern uint32_t nTotalLines;
extern uint32_t nPC; extern uint32_t nPC;
extern uint32_t nPass;
extern uint32_t nIFDepth; extern uint32_t nIFDepth;
extern bool skipElif; extern bool skipElif;
extern uint32_t nUnionDepth; extern uint32_t nUnionDepth;

2
include/asm/rpn.h
View File

@@ -18,11 +18,9 @@ struct Expression {
uint32_t nRPNLength; uint32_t nRPNLength;
uint32_t nRPNOut; uint32_t nRPNOut;
uint32_t isReloc; uint32_t isReloc;
uint32_t isPCRel;
}; };
uint32_t rpn_isReloc(const struct Expression *expr); uint32_t rpn_isReloc(const struct Expression *expr);
uint32_t rpn_isPCRelative(const struct Expression *expr);
void rpn_Symbol(struct Expression *expr, char *tzSym); void rpn_Symbol(struct Expression *expr, char *tzSym);
void rpn_Number(struct Expression *expr, uint32_t i); void rpn_Number(struct Expression *expr, uint32_t i);
void rpn_LOGNOT(struct Expression *expr, const struct Expression *src); void rpn_LOGNOT(struct Expression *expr, const struct Expression *src);

7
include/asm/symbol.h
View File

@@ -38,8 +38,6 @@ struct sSymbol {
#define SYMF_SET 0x004 #define SYMF_SET 0x004
/* Symbol should be exported */ /* Symbol should be exported */
#define SYMF_EXPORT 0x008 #define SYMF_EXPORT 0x008
/* Symbol is imported, it's value is unknown */
#define SYMF_IMPORT 0x010
/* Symbol is a local symbol */ /* Symbol is a local symbol */
#define SYMF_LOCAL 0x020 #define SYMF_LOCAL 0x020
/* Symbol has been defined, not only referenced */ /* Symbol has been defined, not only referenced */
@@ -53,8 +51,6 @@ struct sSymbol {
uint32_t calchash(char *s); uint32_t calchash(char *s);
void sym_SetExportAll(uint8_t set); void sym_SetExportAll(uint8_t set);
void sym_PrepPass1(void);
void sym_PrepPass2(void);
void sym_AddLocalReloc(char *tzSym); void sym_AddLocalReloc(char *tzSym);
void sym_AddReloc(char *tzSym); void sym_AddReloc(char *tzSym);
void sym_Export(char *tzSym); void sym_Export(char *tzSym);
@@ -72,16 +68,15 @@ void sym_Init(void);
uint32_t sym_GetConstantValue(char *s); uint32_t sym_GetConstantValue(char *s);
uint32_t sym_isConstant(char *s); uint32_t sym_isConstant(char *s);
struct sSymbol *sym_FindSymbol(char *tzName); struct sSymbol *sym_FindSymbol(char *tzName);
void sym_Global(char *tzSym);
char *sym_FindMacroArg(int32_t i); char *sym_FindMacroArg(int32_t i);
char *sym_GetStringValue(char *tzSym); char *sym_GetStringValue(char *tzSym);
void sym_UseCurrentMacroArgs(void); void sym_UseCurrentMacroArgs(void);
void sym_SetMacroArgID(uint32_t nMacroCount); void sym_SetMacroArgID(uint32_t nMacroCount);
uint32_t sym_isString(char *tzSym); uint32_t sym_isString(char *tzSym);
void sym_AddMacro(char *tzSym); void sym_AddMacro(char *tzSym);
void sym_AddForwardRef(char *tzSym);
void sym_ShiftCurrentMacroArgs(void); void sym_ShiftCurrentMacroArgs(void);
void sym_AddString(char *tzSym, char *tzValue); void sym_AddString(char *tzSym, char *tzValue);
uint32_t sym_GetValue(char *s);
uint32_t sym_GetDefinedValue(char *s); uint32_t sym_GetDefinedValue(char *s);
uint32_t sym_isDefined(char *tzName); uint32_t sym_isDefined(char *tzName);
void sym_Purge(char *tzName); void sym_Purge(char *tzName);

22
src/asm/asmy.y
View File

@@ -799,7 +799,7 @@ ds : T_POP_DS uconst
; ;
db : T_POP_DB constlist_8bit_entry comma constlist_8bit { db : T_POP_DB constlist_8bit_entry comma constlist_8bit {
if ((nPass == 1) && (nListCountEmpty > 0)) { if (nListCountEmpty > 0) {
warning("Empty entry in list of 8-bit elements (treated as 0)."); warning("Empty entry in list of 8-bit elements (treated as 0).");
} }
} }
@@ -807,7 +807,7 @@ db : T_POP_DB constlist_8bit_entry comma constlist_8bit {
; ;
dw : T_POP_DW constlist_16bit_entry comma constlist_16bit { dw : T_POP_DW constlist_16bit_entry comma constlist_16bit {
if ((nPass == 1) && (nListCountEmpty > 0)) { if (nListCountEmpty > 0) {
warning("Empty entry in list of 16-bit elements (treated as 0)."); warning("Empty entry in list of 16-bit elements (treated as 0).");
} }
} }
@@ -815,7 +815,7 @@ dw : T_POP_DW constlist_16bit_entry comma constlist_16bit {
; ;
dl : T_POP_DL constlist_32bit_entry comma constlist_32bit { dl : T_POP_DL constlist_32bit_entry comma constlist_32bit {
if ((nPass == 1) && (nListCountEmpty > 0)) { if (nListCountEmpty > 0) {
warning("Empty entry in list of 32-bit elements (treated as 0)."); warning("Empty entry in list of 32-bit elements (treated as 0).");
} }
} }
@@ -852,7 +852,6 @@ import_list_entry : T_ID
* This is done automatically if the label isn't found * This is done automatically if the label isn't found
* in the list of defined symbols. * in the list of defined symbols.
*/ */
if (nPass == 1)
warning("IMPORT is a deprecated keyword with no effect: %s", $1); warning("IMPORT is a deprecated keyword with no effect: %s", $1);
} }
; ;
@@ -879,7 +878,7 @@ global_list : global_list_entry
global_list_entry : T_ID global_list_entry : T_ID
{ {
sym_Global($1); sym_Export($1);
} }
; ;
@@ -929,28 +928,24 @@ charmap : T_POP_CHARMAP string comma string
printt : T_POP_PRINTT string printt : T_POP_PRINTT string
{ {
if (nPass == 1)
printf("%s", $2); printf("%s", $2);
} }
; ;
printv : T_POP_PRINTV const printv : T_POP_PRINTV const
{ {
if (nPass == 1)
printf("$%X", constexpr_GetConstantValue(&$2)); printf("$%X", constexpr_GetConstantValue(&$2));
} }
; ;
printi : T_POP_PRINTI const printi : T_POP_PRINTI const
{ {
if (nPass == 1)
printf("%d", constexpr_GetConstantValue(&$2)); printf("%d", constexpr_GetConstantValue(&$2));
} }
; ;
printf : T_POP_PRINTF const printf : T_POP_PRINTF const
{ {
if (nPass == 1)
math_Print(constexpr_GetConstantValue(&$2)); math_Print(constexpr_GetConstantValue(&$2));
} }
; ;
@@ -1126,20 +1121,17 @@ relocconst : T_ID
struct Expression sTemp, sOffset; struct Expression sTemp, sOffset;
rpn_Symbol(&sTemp, $1); rpn_Symbol(&sTemp, $1);
sTemp.nVal = sym_GetValue($1);
rpn_Number(&sOffset, nPCOffset); rpn_Number(&sOffset, nPCOffset);
rpn_SUB(&$$, &sTemp, &sOffset); rpn_SUB(&$$, &sTemp, &sOffset);
} else { } else {
rpn_Symbol(&$$, $1); rpn_Symbol(&$$, $1);
$$.nVal = sym_GetValue($1);
} }
} }
| T_NUMBER | T_NUMBER
{ {
rpn_Number(&$$, $1); rpn_Number(&$$, $1);
$$.nVal = $1;
} }
| string | string
{ {
@@ -1149,7 +1141,6 @@ relocconst : T_ID
free(s); free(s);
rpn_Number(&$$, r); rpn_Number(&$$, r);
$$.nVal = r;
} }
| T_OP_LOGICNOT relocconst %prec NEG { rpn_LOGNOT(&$$, &$2); } | T_OP_LOGICNOT relocconst %prec NEG { rpn_LOGNOT(&$$, &$2); }
| relocconst T_OP_LOGICOR relocconst { rpn_LOGOR(&$$, &$1, &$3); } | relocconst T_OP_LOGICOR relocconst { rpn_LOGOR(&$$, &$1, &$3); }
@@ -1179,12 +1170,10 @@ relocconst : T_ID
{ {
/* '@' is also a T_ID, it is handled here. */ /* '@' is also a T_ID, it is handled here. */
rpn_BankSymbol(&$$, $3); rpn_BankSymbol(&$$, $3);
$$.nVal = 0;
} }
| T_OP_BANK '(' string ')' | T_OP_BANK '(' string ')'
{ {
rpn_BankSection(&$$, $3); rpn_BankSection(&$$, $3);
$$.nVal = 0;
} }
| T_OP_DEF { | T_OP_DEF {
oDontExpandStrings = true; oDontExpandStrings = true;
@@ -1637,7 +1626,6 @@ z80_jp : T_Z80_JP const_16bit
| T_Z80_JP T_MODE_HL_IND | T_Z80_JP T_MODE_HL_IND
{ {
out_AbsByte(0xE9); out_AbsByte(0xE9);
if (nPass == 1)
warning("'JP [HL]' is obsolete, use 'JP HL' instead."); warning("'JP [HL]' is obsolete, use 'JP HL' instead.");
} }
| T_Z80_JP T_MODE_HL | T_Z80_JP T_MODE_HL
@@ -1665,7 +1653,6 @@ z80_ldi : T_Z80_LDI T_MODE_HL_IND comma T_MODE_A
| T_Z80_LDI T_MODE_A comma T_MODE_HL | T_Z80_LDI T_MODE_A comma T_MODE_HL
{ {
out_AbsByte(0x0A | (2 << 4)); out_AbsByte(0x0A | (2 << 4));
if (nPass == 1)
warning("'LDI A,HL' is obsolete, use 'LDI A,[HL]' or 'LD A,[HL+] instead."); warning("'LDI A,HL' is obsolete, use 'LDI A,[HL]' or 'LD A,[HL+] instead.");
} }
| T_Z80_LDI T_MODE_A comma T_MODE_HL_IND | T_Z80_LDI T_MODE_A comma T_MODE_HL_IND
@@ -1681,7 +1668,6 @@ z80_ldd : T_Z80_LDD T_MODE_HL_IND comma T_MODE_A
| T_Z80_LDD T_MODE_A comma T_MODE_HL | T_Z80_LDD T_MODE_A comma T_MODE_HL
{ {
out_AbsByte(0x0A | (3 << 4)); out_AbsByte(0x0A | (3 << 4));
if (nPass == 1)
warning("'LDD A,HL' is obsolete, use 'LDD A,[HL]' or 'LD A,[HL-] instead."); warning("'LDD A,HL' is obsolete, use 'LDD A,[HL]' or 'LD A,[HL-] instead.");
} }
| T_Z80_LDD T_MODE_A comma T_MODE_HL_IND | T_Z80_LDD T_MODE_A comma T_MODE_HL_IND

3
src/asm/charmap.c
View File

@@ -62,9 +62,6 @@ int32_t charmap_Add(char *input, uint8_t output)
charmap = &globalCharmap; charmap = &globalCharmap;
} }
if (nPass == 2)
return charmap->count;
if (charmap->count > MAXCHARMAPS || strlen(input) > CHARMAPLENGTH) if (charmap->count > MAXCHARMAPS || strlen(input) > CHARMAPLENGTH)
return -1; return -1;

31
src/asm/main.c
View File

@@ -37,7 +37,7 @@ char **cldefines;
clock_t nStartClock, nEndClock; clock_t nStartClock, nEndClock;
int32_t nLineNo; int32_t nLineNo;
uint32_t nTotalLines, nPass, nPC, nIFDepth, nUnionDepth, nErrors; uint32_t nTotalLines, nPC, nIFDepth, nUnionDepth, nErrors;
bool skipElif; bool skipElif;
uint32_t unionStart[128], unionSize[128]; uint32_t unionStart[128], unionSize[128];
@@ -432,21 +432,17 @@ int main(int argc, char *argv[])
skipElif = true; skipElif = true;
nUnionDepth = 0; nUnionDepth = 0;
nPC = 0; nPC = 0;
nPass = 1;
nErrors = 0; nErrors = 0;
sym_PrepPass1(); sym_Init();
sym_SetExportAll(CurrentOptions.exportall); sym_SetExportAll(CurrentOptions.exportall);
fstk_Init(tzMainfile); fstk_Init(tzMainfile);
opt_ParseDefines(); opt_ParseDefines();
if (CurrentOptions.verbose)
printf("Pass 1...\n");
yy_set_state(LEX_STATE_NORMAL); yy_set_state(LEX_STATE_NORMAL);
opt_SetCurrentOptions(&DefaultOptions); opt_SetCurrentOptions(&DefaultOptions);
if (yyparse() != 0 || nErrors != 0) if (yyparse() != 0 || nErrors != 0)
errx(1, "Assembly aborted in pass 1 (%ld errors)!", nErrors); errx(1, "Assembly aborted (%ld errors)!", nErrors);
if (nIFDepth != 0) if (nIFDepth != 0)
errx(1, "Unterminated IF construct (%ld levels)!", nIFDepth); errx(1, "Unterminated IF construct (%ld levels)!", nIFDepth);
@@ -456,27 +452,6 @@ int main(int argc, char *argv[])
nUnionDepth); nUnionDepth);
} }
nTotalLines = 0;
nLineNo = 1;
nIFDepth = 0;
skipElif = true;
nUnionDepth = 0;
nPC = 0;
nPass = 2;
nErrors = 0;
sym_PrepPass2();
out_PrepPass2();
fstk_Init(tzMainfile);
yy_set_state(LEX_STATE_NORMAL);
opt_SetCurrentOptions(&DefaultOptions);
opt_ParseDefines();
if (CurrentOptions.verbose)
printf("Pass 2...\n");
if (yyparse() != 0 || nErrors != 0)
errx(1, "Assembly aborted in pass 2 (%ld errors)!", nErrors);
double timespent; double timespent;
nEndClock = clock(); nEndClock = clock();

104
src/asm/output.c
View File

@@ -259,37 +259,46 @@ static void writesection(struct Section *pSect, FILE *f)
*/ */
static void writesymbol(struct sSymbol *pSym, FILE *f) static void writesymbol(struct sSymbol *pSym, FILE *f)
{ {
char symname[MAXSYMLEN * 2 + 1];
uint32_t type; uint32_t type;
uint32_t offset; uint32_t offset;
int32_t sectid; int32_t sectid;
if (pSym->nType & SYMF_IMPORT) { if (!(pSym->nType & SYMF_DEFINED)) {
/* Symbol should be imported */ if (pSym->nType & SYMF_LOCAL) {
strcpy(symname, pSym->tzName); char *name = pSym->tzName;
char *localPtr = strchr(name, '.');
if (localPtr)
name = localPtr;
errx(1, "%s(%u) : '%s' not defined",
pSym->tzFileName, pSym->nFileLine, name);
}
type = SYM_IMPORT;
} else if (pSym->nType & SYMF_EXPORT) {
type = SYM_EXPORT;
} else {
type = SYM_LOCAL;
}
switch (type) {
case SYM_LOCAL:
offset = pSym->nValue;
sectid = getsectid(pSym->pSection);
break;
case SYM_IMPORT:
offset = 0; offset = 0;
sectid = -1; sectid = -1;
type = SYM_IMPORT; break;
} else { case SYM_EXPORT:
strcpy(symname, pSym->tzName);
if (pSym->nType & SYMF_EXPORT) {
/* Symbol should be exported */
type = SYM_EXPORT;
offset = pSym->nValue; offset = pSym->nValue;
if (pSym->nType & SYMF_CONST) if (pSym->nType & SYMF_CONST)
sectid = -1; sectid = -1;
else else
sectid = getsectid(pSym->pSection); sectid = getsectid(pSym->pSection);
} else { break;
/* Symbol is local to this file */
type = SYM_LOCAL;
offset = pSym->nValue;
sectid = getsectid(pSym->pSection);
}
} }
fputstring(symname, f); fputstring(pSym->tzName, f);
fputc(type, f); fputc(type, f);
if (type != SYM_IMPORT) { if (type != SYM_IMPORT) {
@@ -562,22 +571,6 @@ void out_WriteObject(void)
fclose(f); fclose(f);
} }
/*
* Prepare for pass #2
*/
void out_PrepPass2(void)
{
struct Section *pSect;
pSect = pSectionList;
while (pSect) {
pSect->nPC = 0;
pSect = pSect->pNext;
}
pCurrentSection = NULL;
pSectionStack = NULL;
}
/* /*
* Set the objectfilename * Set the objectfilename
*/ */
@@ -586,10 +579,6 @@ void out_SetFileName(char *s)
tzObjectname = s; tzObjectname = s;
if (CurrentOptions.verbose) if (CurrentOptions.verbose)
printf("Output filename %s\n", s); printf("Output filename %s\n", s);
pSectionList = NULL;
pCurrentSection = NULL;
pPatchSymbols = NULL;
} }
/* /*
@@ -636,7 +625,6 @@ struct Section *out_FindSection(char *pzName, uint32_t secttype, int32_t org,
pSect->pNext = NULL; pSect->pNext = NULL;
pSect->pPatches = NULL; pSect->pPatches = NULL;
pSect->charmap = NULL; pSect->charmap = NULL;
pPatchSymbols = NULL;
/* It is only needed to allocate memory for ROM sections. */ /* It is only needed to allocate memory for ROM sections. */
if (secttype == SECT_ROM0 || secttype == SECT_ROMX) { if (secttype == SECT_ROM0 || secttype == SECT_ROMX) {
@@ -705,9 +693,7 @@ void out_AbsByteBypassCheck(int32_t b)
{ {
checksectionoverflow(1); checksectionoverflow(1);
b &= 0xFF; b &= 0xFF;
if (nPass == 2)
pCurrentSection->tData[nPC] = b; pCurrentSection->tData[nPC] = b;
pCurrentSection->nPC += 1; pCurrentSection->nPC += 1;
nPC += 1; nPC += 1;
pPCSymbol->nValue += 1; pPCSymbol->nValue += 1;
@@ -772,10 +758,8 @@ void out_RelByte(struct Expression *expr)
checkcodesection(); checkcodesection();
checksectionoverflow(1); checksectionoverflow(1);
if (rpn_isReloc(expr)) { if (rpn_isReloc(expr)) {
if (nPass == 2) {
pCurrentSection->tData[nPC] = 0; pCurrentSection->tData[nPC] = 0;
createpatch(PATCH_BYTE, expr); createpatch(PATCH_BYTE, expr);
}
pCurrentSection->nPC += 1; pCurrentSection->nPC += 1;
nPC += 1; nPC += 1;
pPCSymbol->nValue += 1; pPCSymbol->nValue += 1;
@@ -793,10 +777,8 @@ void out_AbsWord(int32_t b)
checkcodesection(); checkcodesection();
checksectionoverflow(2); checksectionoverflow(2);
b &= 0xFFFF; b &= 0xFFFF;
if (nPass == 2) {
pCurrentSection->tData[nPC] = b & 0xFF; pCurrentSection->tData[nPC] = b & 0xFF;
pCurrentSection->tData[nPC + 1] = b >> 8; pCurrentSection->tData[nPC + 1] = b >> 8;
}
pCurrentSection->nPC += 2; pCurrentSection->nPC += 2;
nPC += 2; nPC += 2;
pPCSymbol->nValue += 2; pPCSymbol->nValue += 2;
@@ -808,17 +790,12 @@ void out_AbsWord(int32_t b)
*/ */
void out_RelWord(struct Expression *expr) void out_RelWord(struct Expression *expr)
{ {
uint32_t b;
checkcodesection(); checkcodesection();
checksectionoverflow(2); checksectionoverflow(2);
b = expr->nVal & 0xFFFF;
if (rpn_isReloc(expr)) { if (rpn_isReloc(expr)) {
if (nPass == 2) { pCurrentSection->tData[nPC] = 0;
pCurrentSection->tData[nPC] = b & 0xFF; pCurrentSection->tData[nPC + 1] = 0;
pCurrentSection->tData[nPC + 1] = b >> 8;
createpatch(PATCH_WORD_L, expr); createpatch(PATCH_WORD_L, expr);
}
pCurrentSection->nPC += 2; pCurrentSection->nPC += 2;
nPC += 2; nPC += 2;
pPCSymbol->nValue += 2; pPCSymbol->nValue += 2;
@@ -835,12 +812,10 @@ void out_AbsLong(int32_t b)
{ {
checkcodesection(); checkcodesection();
checksectionoverflow(sizeof(int32_t)); checksectionoverflow(sizeof(int32_t));
if (nPass == 2) {
pCurrentSection->tData[nPC] = b & 0xFF; pCurrentSection->tData[nPC] = b & 0xFF;
pCurrentSection->tData[nPC + 1] = b >> 8; pCurrentSection->tData[nPC + 1] = b >> 8;
pCurrentSection->tData[nPC + 2] = b >> 16; pCurrentSection->tData[nPC + 2] = b >> 16;
pCurrentSection->tData[nPC + 3] = b >> 24; pCurrentSection->tData[nPC + 3] = b >> 24;
}
pCurrentSection->nPC += 4; pCurrentSection->nPC += 4;
nPC += 4; nPC += 4;
pPCSymbol->nValue += 4; pPCSymbol->nValue += 4;
@@ -852,19 +827,14 @@ void out_AbsLong(int32_t b)
*/ */
void out_RelLong(struct Expression *expr) void out_RelLong(struct Expression *expr)
{ {
int32_t b;
checkcodesection(); checkcodesection();
checksectionoverflow(4); checksectionoverflow(4);
b = expr->nVal;
if (rpn_isReloc(expr)) { if (rpn_isReloc(expr)) {
if (nPass == 2) { pCurrentSection->tData[nPC] = 0;
pCurrentSection->tData[nPC] = b & 0xFF; pCurrentSection->tData[nPC + 1] = 0;
pCurrentSection->tData[nPC + 1] = b >> 8; pCurrentSection->tData[nPC + 2] = 0;
pCurrentSection->tData[nPC + 2] = b >> 16; pCurrentSection->tData[nPC + 3] = 0;
pCurrentSection->tData[nPC + 3] = b >> 24;
createpatch(PATCH_LONG_L, expr); createpatch(PATCH_LONG_L, expr);
}
pCurrentSection->nPC += 4; pCurrentSection->nPC += 4;
nPC += 4; nPC += 4;
pPCSymbol->nValue += 4; pPCSymbol->nValue += 4;
@@ -884,10 +854,8 @@ void out_PCRelByte(struct Expression *expr)
checksectionoverflow(1); checksectionoverflow(1);
/* Always let the linker calculate the offset. */ /* Always let the linker calculate the offset. */
if (nPass == 2) {
pCurrentSection->tData[nPC] = 0; pCurrentSection->tData[nPC] = 0;
createpatch(PATCH_BYTE_JR, expr); createpatch(PATCH_BYTE_JR, expr);
}
pCurrentSection->nPC += 1; pCurrentSection->nPC += 1;
nPC += 1; nPC += 1;
pPCSymbol->nValue += 1; pPCSymbol->nValue += 1;
@@ -915,13 +883,12 @@ void out_BinaryFile(char *s)
checkcodesection(); checkcodesection();
checksectionoverflow(fsize); checksectionoverflow(fsize);
if (nPass == 2) {
int32_t dest = nPC; int32_t dest = nPC;
int32_t todo = fsize; int32_t todo = fsize;
while (todo--) while (todo--)
pCurrentSection->tData[dest++] = fgetc(f); pCurrentSection->tData[dest++] = fgetc(f);
}
pCurrentSection->nPC += fsize; pCurrentSection->nPC += fsize;
nPC += fsize; nPC += fsize;
pPCSymbol->nValue += fsize; pPCSymbol->nValue += fsize;
@@ -958,13 +925,12 @@ void out_BinaryFileSlice(char *s, int32_t start_pos, int32_t length)
checkcodesection(); checkcodesection();
checksectionoverflow(length); checksectionoverflow(length);
if (nPass == 2) {
int32_t dest = nPC; int32_t dest = nPC;
int32_t todo = length; int32_t todo = length;
while (todo--) while (todo--)
pCurrentSection->tData[dest++] = fgetc(f); pCurrentSection->tData[dest++] = fgetc(f);
}
pCurrentSection->nPC += length; pCurrentSection->nPC += length;
nPC += length; nPC += length;
pPCSymbol->nValue += length; pPCSymbol->nValue += length;

27
src/asm/rpn.c
View File

@@ -55,7 +55,6 @@ void mergetwoexpressions(struct Expression *expr, const struct Expression *src1,
expr->nRPNLength = len; expr->nRPNLength = len;
expr->isReloc = src1->isReloc || src2->isReloc; expr->isReloc = src1->isReloc || src2->isReloc;
expr->isPCRel = src1->isPCRel || src2->isPCRel;
} }
#define joinexpr() mergetwoexpressions(expr, src1, src2) #define joinexpr() mergetwoexpressions(expr, src1, src2)
@@ -91,7 +90,6 @@ void rpn_Init(struct Expression *expr)
expr->nRPNLength = 0; expr->nRPNLength = 0;
expr->nRPNOut = 0; expr->nRPNOut = 0;
expr->isReloc = 0; expr->isReloc = 0;
expr->isPCRel = 0;
} }
/* /*
@@ -122,14 +120,6 @@ uint32_t rpn_isReloc(const struct Expression *expr)
return expr->isReloc; return expr->isReloc;
} }
/*
* Determine if the current expression can be pc-relative
*/
uint32_t rpn_isPCRelative(const struct Expression *expr)
{
return expr->isPCRel;
}
/* /*
* Add symbols, constants and operators to expression * Add symbols, constants and operators to expression
*/ */
@@ -147,15 +137,8 @@ void rpn_Number(struct Expression *expr, uint32_t i)
void rpn_Symbol(struct Expression *expr, char *tzSym) void rpn_Symbol(struct Expression *expr, char *tzSym)
{ {
if (!sym_isConstant(tzSym)) { if (!sym_isConstant(tzSym)) {
const struct sSymbol *psym;
rpn_Init(expr); rpn_Init(expr);
sym_AddForwardRef(tzSym);
psym = sym_FindSymbol(tzSym);
if (psym == NULL || psym->pSection == pCurrentSection
|| psym->pSection == NULL)
expr->isPCRel = 1;
expr->isReloc = 1; expr->isReloc = 1;
pushbyte(expr, RPN_SYM); pushbyte(expr, RPN_SYM);
while (*tzSym) while (*tzSym)
@@ -189,13 +172,7 @@ void rpn_BankSymbol(struct Expression *expr, char *tzSym)
if (!sym_isConstant(tzSym)) { if (!sym_isConstant(tzSym)) {
rpn_Init(expr); rpn_Init(expr);
sym_AddForwardRef(tzSym);
/*
* Check that the symbol exists by evaluating and discarding the
* value.
*/
sym_GetValue(tzSym);
expr->isReloc = 1; expr->isReloc = 1;
pushbyte(expr, RPN_BANK_SYM); pushbyte(expr, RPN_BANK_SYM);
while (*tzSym) while (*tzSym)

175
src/asm/symbol.c
View File

@@ -358,50 +358,6 @@ uint32_t sym_GetConstantValue(char *s)
return 0; return 0;
} }
/*
* Return a symbols value... "estimated" if not defined yet
*/
uint32_t sym_GetValue(char *s)
{
struct sSymbol *psym, *pscope;
if (*s == '.')
pscope = pScope;
else
pscope = NULL;
psym = findsymbol(s, pscope);
if (psym != NULL) {
if (psym->nType & SYMF_DEFINED) {
if (psym->nType & (SYMF_MACRO | SYMF_STRING))
yyerror("'%s' is a macro or string symbol", s);
return getvaluefield(psym);
}
if (nPass == 2) {
/*
* Assume undefined symbols are imported from
* somwehere else
*/
psym->nType |= SYMF_IMPORT;
}
/* 0x80 seems like a good default value... */
return 0x80;
}
if (nPass == 1) {
createsymbol(s);
return 0x80;
}
yyerror("'%s' not defined", s);
return 0;
}
/* /*
* Return a defined symbols value... aborts if not defined yet * Return a defined symbols value... aborts if not defined yet
*/ */
@@ -549,8 +505,6 @@ struct sSymbol *sym_FindMacro(char *s)
*/ */
void sym_AddEqu(char *tzSym, int32_t value) void sym_AddEqu(char *tzSym, int32_t value)
{ {
if ((nPass == 1) || ((nPass == 2) && (sym_isDefined(tzSym) == 0))) {
/* only add equated symbols in pass 1 */
struct sSymbol *nsym = findsymbol(tzSym, NULL); struct sSymbol *nsym = findsymbol(tzSym, NULL);
if (nsym != NULL) { if (nsym != NULL) {
@@ -568,7 +522,7 @@ void sym_AddEqu(char *tzSym, int32_t value)
nsym->pScope = NULL; nsym->pScope = NULL;
updateSymbolFilename(nsym); updateSymbolFilename(nsym);
} }
}
} }
/* /*
@@ -669,10 +623,6 @@ void sym_AddLocalReloc(char *tzSym)
void sym_AddReloc(char *tzSym) void sym_AddReloc(char *tzSym)
{ {
struct sSymbol *scope = NULL; struct sSymbol *scope = NULL;
if ((nPass == 1)
|| ((nPass == 2) && (sym_isDefined(tzSym) == 0))) {
/* only add reloc symbols in pass 1 */
struct sSymbol *nsym; struct sSymbol *nsym;
char *localPtr = strchr(tzSym, '.'); char *localPtr = strchr(tzSym, '.');
@@ -721,7 +671,7 @@ void sym_AddReloc(char *tzSym)
updateSymbolFilename(nsym); updateSymbolFilename(nsym);
} }
}
pScope = findsymbol(tzSym, scope); pScope = findsymbol(tzSym, scope);
} }
@@ -734,10 +684,6 @@ void sym_AddReloc(char *tzSym)
*/ */
int32_t sym_IsRelocDiffDefined(char *tzSym1, char *tzSym2) int32_t sym_IsRelocDiffDefined(char *tzSym1, char *tzSym2)
{ {
/* Do nothing the first pass. */
if (nPass != 2)
return 1;
const struct sSymbol *nsym1 = sym_FindSymbol(tzSym1); const struct sSymbol *nsym1 = sym_FindSymbol(tzSym1);
const struct sSymbol *nsym2 = sym_FindSymbol(tzSym2); const struct sSymbol *nsym2 = sym_FindSymbol(tzSym2);
@@ -781,8 +727,6 @@ int32_t sym_IsRelocDiffDefined(char *tzSym1, char *tzSym2)
*/ */
void sym_Export(char *tzSym) void sym_Export(char *tzSym)
{ {
if (nPass == 1) {
/* only export symbols in pass 1 */
struct sSymbol *nsym = sym_FindSymbol(tzSym); struct sSymbol *nsym = sym_FindSymbol(tzSym);
if (nsym == NULL) if (nsym == NULL)
@@ -790,37 +734,6 @@ void sym_Export(char *tzSym)
if (nsym) if (nsym)
nsym->nType |= SYMF_EXPORT; nsym->nType |= SYMF_EXPORT;
} else {
const struct sSymbol *nsym = sym_FindSymbol(tzSym);
if (nsym != NULL) {
if (nsym->nType & SYMF_DEFINED)
return;
}
yyerror("'%s' not defined", tzSym);
}
}
/*
* Globalize a symbol (export if defined, import if not)
*/
void sym_Global(char *tzSym)
{
if (nPass == 2) {
/* only globalize symbols in pass 2 */
struct sSymbol *nsym = sym_FindSymbol(tzSym);
if ((nsym == NULL) || ((nsym->nType & SYMF_DEFINED) == 0)) {
if (nsym == NULL)
nsym = createsymbol(tzSym);
if (nsym)
nsym->nType |= SYMF_IMPORT;
} else {
if (nsym)
nsym->nType |= SYMF_EXPORT;
}
}
} }
/* /*
@@ -828,8 +741,6 @@ void sym_Global(char *tzSym)
*/ */
void sym_AddMacro(char *tzSym) void sym_AddMacro(char *tzSym)
{ {
if ((nPass == 1) || ((nPass == 2) && (sym_isDefined(tzSym) == 0))) {
/* only add macros in pass 1 */
struct sSymbol *nsym; struct sSymbol *nsym;
nsym = findsymbol(tzSym, NULL); nsym = findsymbol(tzSym, NULL);
@@ -852,6 +763,28 @@ void sym_AddMacro(char *tzSym)
nsym->pMacro = tzNewMacro; nsym->pMacro = tzNewMacro;
updateSymbolFilename(nsym); updateSymbolFilename(nsym);
} }
}
/*
* Add a symbol that is being referenced ahead of its definition
*/
void sym_AddForwardRef(char *tzSym)
{
if (sym_FindSymbol(tzSym) == NULL) {
char fullname[MAXSYMLEN + 1];
int isLocal = 0;
if (*tzSym == '.') {
fullSymbolName(fullname, sizeof(fullname), tzSym,
pScope);
tzSym = fullname;
isLocal = 1;
}
struct sSymbol *nsym = createsymbol(tzSym);
if (nsym && isLocal)
nsym->nType |= SYMF_LOCAL;
} }
} }
@@ -863,66 +796,6 @@ void sym_SetExportAll(uint8_t set)
exportall = set; exportall = set;
} }
/*
* Prepare for pass #1
*/
void sym_PrepPass1(void)
{
sym_Init();
}
/*
* Prepare for pass #2
*/
void sym_PrepPass2(void)
{
int32_t i;
for (i = 0; i < HASHSIZE; i += 1) {
struct sSymbol **ppSym = &(tHashedSymbols[i]);
while (*ppSym) {
uint32_t mask = SYMF_SET | SYMF_STRING | SYMF_EQU;
if ((*ppSym)->nType & mask) {
struct sSymbol *pTemp;
pTemp = (*ppSym)->pNext;
free(*ppSym);
*ppSym = pTemp;
} else {
ppSym = &((*ppSym)->pNext);
}
}
}
pScope = NULL;
pPCSymbol->nValue = 0;
sym_AddString("__TIME__", SavedTIME);
sym_AddString("__DATE__", SavedDATE);
sym_AddString("__ISO_8601_LOCAL__", SavedTIMESTAMP_ISO8601_LOCAL);
sym_AddString("__ISO_8601_UTC__", SavedTIMESTAMP_ISO8601_UTC);
sym_AddString("__UTC_DAY__", SavedDAY);
sym_AddString("__UTC_MONTH__", SavedMONTH);
sym_AddString("__UTC_YEAR__", SavedYEAR);
sym_AddString("__UTC_HOUR__", SavedHOUR);
sym_AddString("__UTC_MINUTE__", SavedMINUTE);
sym_AddString("__UTC_SECOND__", SavedSECOND);
sym_AddEqu("__RGBDS_MAJOR__", PACKAGE_VERSION_MAJOR);
sym_AddEqu("__RGBDS_MINOR__", PACKAGE_VERSION_MINOR);
sym_AddEqu("__RGBDS_PATCH__", PACKAGE_VERSION_PATCH);
sym_AddSet("_RS", 0);
sym_AddEqu("_NARG", 0);
p_NARGSymbol = findsymbol("_NARG", NULL);
p_NARGSymbol->Callback = Callback_NARG;
sym_AddEqu("__LINE__", 0);
p__LINE__Symbol = findsymbol("__LINE__", NULL);
p__LINE__Symbol->Callback = Callback__LINE__;
math_DefinePI();
}
/* /*
* Initialize the symboltable * Initialize the symboltable
*/ */

2
test/asm/label-redefinition.out
View File

@@ -1,3 +1,3 @@
ERROR: label-redefinition.asm(7): ERROR: label-redefinition.asm(7):
'Sym' already defined in m(6) 'Sym' already defined in m(6)
error: Assembly aborted in pass 1 (1 errors)! error: Assembly aborted (1 errors)!

2
test/asm/local-wrong-parent.out
View File

@@ -1,3 +1,3 @@
ERROR: local-wrong-parent.asm(5): ERROR: local-wrong-parent.asm(5):
Not currently in the scope of 'WrongParent' Not currently in the scope of 'WrongParent'
error: Assembly aborted in pass 1 (1 errors)! error: Assembly aborted (1 errors)!

4
test/asm/undefined-dot.out
View File

@@ -1,3 +1 @@
ERROR: undefined-dot.asm(3): error: undefined-dot.asm(3) : '.' not defined
'.' not defined
error: Assembly aborted in pass 2 (1 errors)!