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

Improve incorrect object file revision error (#1189)

Browse Source 
Fixes #1118
This commit is contained in:
Rangi
2023-10-31 15:04:27 -04:00
committed by GitHub
parent ab42eb2c50
commit 79948be3a0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/link/object.c
View File

@@ -25,6 +25,7 @@
#include "error.h" #include "error.h"
#include "helpers.h" #include "helpers.h"
#include "linkdefs.h" #include "linkdefs.h"
#include "version.h"
static struct SymbolList { static struct SymbolList {
size_t nbSymbols; size_t nbSymbols;
@@ -509,7 +510,7 @@ void obj_ReadFile(char const *fileName, unsigned int fileID)
if (fscanf(file, RGBDS_OBJECT_VERSION_STRING "%n", &matchedElems) == 1 if (fscanf(file, RGBDS_OBJECT_VERSION_STRING "%n", &matchedElems) == 1
&& matchedElems != strlen(RGBDS_OBJECT_VERSION_STRING)) && matchedElems != strlen(RGBDS_OBJECT_VERSION_STRING))
errx("\"%s\" is not a RGBDS object file", fileName); errx("%s: Not a RGBDS object file", fileName);
verbosePrint("Reading object file %s\n", verbosePrint("Reading object file %s\n",
fileName); fileName);
@@ -519,8 +520,10 @@ void obj_ReadFile(char const *fileName, unsigned int fileID)
tryReadlong(revNum, file, "%s: Cannot read revision number: %s", tryReadlong(revNum, file, "%s: Cannot read revision number: %s",
fileName); fileName);
if (revNum != RGBDS_OBJECT_REV) if (revNum != RGBDS_OBJECT_REV)
errx("%s is a revision 0x%04" PRIx32 " object file; only 0x%04x is supported", errx("%s: Unsupported object file for rgblink %s; try rebuilding it%s"
fileName, revNum, RGBDS_OBJECT_REV); " (expected revision %d, got %d)", fileName, get_package_version_string(),
revNum > RGBDS_OBJECT_REV ? " or updating rgblink" : "", RGBDS_OBJECT_REV,
revNum);
uint32_t nbSymbols; uint32_t nbSymbols;
uint32_t nbSections; uint32_t nbSections;