Remove RGBLINK's unimplemented '-s' "smart linking" placeholder flag

This commit is contained in:
Rangi42
2024-03-25 11:36:23 -04:00
parent cb59119881
commit 3568418c5d
4 changed files with 2 additions and 14 deletions

View File

@@ -20,7 +20,6 @@ _rgblink_completions() {
[O]="overlay:glob-*.gb *.gbc *.sgb" [O]="overlay:glob-*.gb *.gbc *.sgb"
[o]="output:glob-*.gb *.gbc *.sgb" [o]="output:glob-*.gb *.gbc *.sgb"
[p]="pad:unk" [p]="pad:unk"
[s]="smart:unk"
) )
# Parse command-line up to current word # Parse command-line up to current word
local opt_ena=true local opt_ena=true

View File

@@ -18,7 +18,6 @@ local args=(
'(-o --output)'{-o,--output}"+[Write ROM image to this file]:rom file:_files -g '*.{gb,sgb,gbc}'" '(-o --output)'{-o,--output}"+[Write ROM image to this file]:rom file:_files -g '*.{gb,sgb,gbc}'"
'(-p --pad-value)'{-p,--pad-value}'+[Set padding byte]:padding byte:' '(-p --pad-value)'{-p,--pad-value}'+[Set padding byte]:padding byte:'
'(-S --scramble)'{-s,--scramble}'+[Activate scrambling]:scramble spec' '(-S --scramble)'{-s,--scramble}'+[Activate scrambling]:scramble spec'
'(-s --smart)'{-s,--smart}'+[!BROKEN! Perform smart linking from this symbol]:symbol name:'
'*'":object files:_files -g '*.o'" '*'":object files:_files -g '*.o'"
) )

View File

@@ -16,7 +16,6 @@
.Op Fl o Ar out_file .Op Fl o Ar out_file
.Op Fl p Ar pad_value .Op Fl p Ar pad_value
.Op Fl S Ar spec .Op Fl S Ar spec
.Op Fl s Ar symbol
.Ar .Ar
.Sh DESCRIPTION .Sh DESCRIPTION
The The
@@ -106,10 +105,6 @@ See
.Sx Scrambling algorithm .Sx Scrambling algorithm
below for an explanation and a description of below for an explanation and a description of
.Ar spec . .Ar spec .
.It Fl s Ar symbol , Fl \-smart Ar symbol
This option is ignored.
It was supposed to perform smart linking but fell into disrepair, and so has been removed.
It will be reimplemented at some point.
.It Fl t , Fl \-tiny .It Fl t , Fl \-tiny
Expand the ROM0 section size from 16 KiB to the full 32 KiB assigned to ROM. Expand the ROM0 section size from 16 KiB to the full 32 KiB assigned to ROM.
ROMX sections that are fixed to a bank other than 1 become errors, other ROMX sections are treated as ROM0. ROMX sections that are fixed to a bank other than 1 become errors, other ROMX sections are treated as ROM0.

View File

@@ -149,7 +149,7 @@ void argErr(char flag, char const *fmt, ...) {
} }
// Short options // Short options
static char const *optstring = "dl:m:Mn:O:o:p:S:s:tVvWwx"; static char const *optstring = "dl:m:Mn:O:o:p:S:tVvWwx";
/* /*
* Equivalent long options * Equivalent long options
@@ -171,7 +171,6 @@ static option const longopts[] = {
{"output", required_argument, nullptr, 'o'}, {"output", required_argument, nullptr, 'o'},
{"pad", required_argument, nullptr, 'p'}, {"pad", required_argument, nullptr, 'p'},
{"scramble", required_argument, nullptr, 'S'}, {"scramble", required_argument, nullptr, 'S'},
{"smart", required_argument, nullptr, 's'},
{"tiny", no_argument, nullptr, 't'}, {"tiny", no_argument, nullptr, 't'},
{"version", no_argument, nullptr, 'V'}, {"version", no_argument, nullptr, 'V'},
{"verbose", no_argument, nullptr, 'v'}, {"verbose", no_argument, nullptr, 'v'},
@@ -184,7 +183,7 @@ static void printUsage() {
fputs( fputs(
"Usage: rgblink [-dMtVvwx] [-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" " [-O overlay_file] [-o out_file] [-p pad_value]\n"
" [-S spec] [-s symbol] <file> ...\n" " [-S spec] <file> ...\n"
"Useful options:\n" "Useful options:\n"
" -l, --linkerscript <path> set the input linker script\n" " -l, --linkerscript <path> set the input linker script\n"
" -m, --map <path> set the output map file\n" " -m, --map <path> set the output map file\n"
@@ -393,10 +392,6 @@ int main(int argc, char *argv[]) {
case 'S': case 'S':
parseScrambleSpec(musl_optarg); parseScrambleSpec(musl_optarg);
break; break;
case 's':
// TODO: implement "smart linking" with `-s`
warning(nullptr, 0, "Nobody has any idea what `-s` does");
break;
case 't': case 't':
is32kMode = true; is32kMode = true;
break; break;