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

rgblink -M omits symbol names from .map file

Browse Source
This commit is contained in:
Rangi
2022-08-27 14:02:03 -04:00
committed by Eldred Habert
parent 0105779789
commit c7a92d3104
6 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/link/main.c
View File

@@ -36,6 +36,7 @@
bool isDmgMode; /* -d */
char *linkerScriptName; /* -l */
char const *mapFileName; /* -m */
bool noSymInMap; /* -M */
char const *symFileName; /* -n */
char const *overlayFileName; /* -O */
char const *outputFileName; /* -o */
@@ -165,7 +166,7 @@ FILE *openFile(char const *fileName, char const *mode)
}
/* Short options */
static const char *optstring = "dl:m:n:O:o:p:S:s:tVvWwx";
static const char *optstring = "dl:m:Mn:O:o:p:S:s:tVvWwx";
/*
* Equivalent long options
@@ -181,6 +182,7 @@ static struct option const longopts[] = {
{ "dmg", no_argument, NULL, 'd' },
{ "linkerscript", required_argument, NULL, 'l' },
{ "map", required_argument, NULL, 'm' },
{ "no-sym-in-map", no_argument, NULL, 'M' },
{ "sym", required_argument, NULL, 'n' },
{ "overlay", required_argument, NULL, 'O' },
{ "output", required_argument, NULL, 'o' },
@@ -201,7 +203,7 @@ static struct option const longopts[] = {
static void printUsage(void)
{
fputs(
"Usage: rgblink [-dtVvwx] [-l script] [-m map_file] [-n sym_file]\n"
"Usage: rgblink [-dMtVvwx] [-l script] [-m map_file] [-n sym_file]\n"
" [-O overlay_file] [-o out_file] [-p pad_value]\n"
" [-S spec] [-s symbol] <file> ...\n"
"Useful options:\n"
@@ -374,6 +376,9 @@ int main(int argc, char *argv[])
case 'l':
linkerScriptName = musl_optarg;
break;
case 'M':
noSymInMap = true;
break;
case 'm':
mapFileName = musl_optarg;
break;

21
src/link/output.c
View File

@@ -394,16 +394,21 @@ static uint16_t writeMapBank(struct SortedSections const *sectList,
fprintf(mapFile, " SECTION: $%04" PRIx16 " (0 bytes) [\"%s\"]\n",
sect->org, sect->name);
uint16_t org = sect->org;
if (!noSymInMap) {
uint16_t org = sect->org;
while (sect) {
fprintf(mapFile, " ; New %s\n", sect->modifier == SECTION_FRAGMENT ? "fragment": "union");
for (size_t i = 0; i < sect->nbSymbols; i++)
fprintf(mapFile, " $%04" PRIx32 " = %s\n",
sect->symbols[i]->offset + org,
sect->symbols[i]->name);
while (sect) {
if (sect->modifier == SECTION_UNION)
fprintf(mapFile, " ; New union\n");
else if (sect->modifier == SECTION_FRAGMENT)
fprintf(mapFile, " ; New fragment\n");
for (size_t i = 0; i < sect->nbSymbols; i++)
fprintf(mapFile, " $%04" PRIx32 " = %s\n",
sect->symbols[i]->offset + org,
sect->symbols[i]->name);
sect = sect->nextu; // Also print symbols in the following "pieces"
sect = sect->nextu; // Also print symbols in the following "pieces"
}
}
*pickedSection = (*pickedSection)->next;