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

Print location information in linker errors where viable

Browse Source
This commit is contained in:
Jakub Kądziołka
2019-03-03 22:55:17 +01:00
parent c59cb6a828
commit 7af2d5dfe1
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/link/patch.c
View File

@@ -35,13 +35,13 @@ static int32_t rpnpop(void)
return rpnstack[rpnp];
}
static int32_t getsymvalue(int32_t symid)
static int32_t getsymvalue(struct sPatch *pPatch, int32_t symid)
{
const struct sSymbol *tSymbol = pCurrentSection->tSymbols[symid];
switch (tSymbol->Type) {
case SYM_IMPORT:
return sym_GetValue(tSymbol->pzName);
return sym_GetValue(pPatch, tSymbol->pzName);
case SYM_EXPORT:
case SYM_LOCAL:
@@ -75,14 +75,14 @@ static int32_t getrealbankfrominternalbank(int32_t n)
return n;
}
static int32_t getsymbank(int32_t symid)
static int32_t getsymbank(struct sPatch *pPatch, int32_t symid)
{
int32_t nBank;
const struct sSymbol *tSymbol = pCurrentSection->tSymbols[symid];
switch (tSymbol->Type) {
case SYM_IMPORT:
nBank = sym_GetBank(tSymbol->pzName);
nBank = sym_GetBank(pPatch, tSymbol->pzName);
break;
case SYM_EXPORT:
case SYM_LOCAL:
@@ -209,8 +209,8 @@ int32_t calcrpn(struct sPatch *pPatch)
t |= (*rpn++) << 8;
t |= (*rpn++) << 16;
t |= (*rpn++) << 24;
rpnpush(getsymvalue(t));
pPatch->oRelocPatch |= (getsymbank(t) != -1);
rpnpush(getsymvalue(pPatch, t));
pPatch->oRelocPatch |= (getsymbank(pPatch, t) != -1);
size -= 4;
break;
case RPN_BANK_SYM:
@@ -219,7 +219,7 @@ int32_t calcrpn(struct sPatch *pPatch)
t |= (*rpn++) << 8;
t |= (*rpn++) << 16;
t |= (*rpn++) << 24;
rpnpush(getsymbank(t));
rpnpush(getsymbank(pPatch, t));
size -= 4;
break;
case RPN_BANK_SECT:
@@ -229,7 +229,9 @@ int32_t calcrpn(struct sPatch *pPatch)
struct sSection *pSection = GetSectionByName(name);
if (pSection == NULL) {
errx(1, "Requested BANK() of section \"%s\", which was not found.\n",
errx(1,
"%s(%ld) : Requested BANK() of section \"%s\", which was not found.\n",
pPatch->pzFilename, pPatch->nLineNo,
name);
}