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

Implement -X/--max-errors for RGBASM (#1262)

Browse Source 
Co-authored-by: Eldred Habert <me@eldred.fr>
This commit is contained in:
Rangi
2023-12-07 05:42:47 -05:00
committed by GitHub
parent 1fa289f2ee
commit 34b2543c8b
9 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/asm/main.cpp
View File

@@ -4,6 +4,7 @@
#include <errno.h>
#include <float.h>
#include <inttypes.h>
#include <limits.h>
#include <math.h>
#include <stdarg.h>
#include <stdio.h>
@@ -83,7 +84,7 @@ static char *make_escape(char const *str)
}
// Short options
static const char *optstring = "b:D:Eg:Hhi:I:LlM:o:P:p:Q:r:VvW:w";
static const char *optstring = "b:D:Eg:Hhi:I:LlM:o:P:p:Q:r:VvW:wX:";
// Variables for the long-only options
static int depType; // Variants of `-M`
@@ -110,6 +111,7 @@ static struct option const longopts[] = {
{ "MG", no_argument, &depType, 'G' },
{ "MP", no_argument, &depType, 'P' },
{ "MT", required_argument, &depType, 'T' },
{ "warning", required_argument, NULL, 'W' },
{ "MQ", required_argument, &depType, 'Q' },
{ "output", required_argument, NULL, 'o' },
{ "preinclude", required_argument, NULL, 'P' },
@@ -119,6 +121,7 @@ static struct option const longopts[] = {
{ "version", no_argument, NULL, 'V' },
{ "verbose", no_argument, NULL, 'v' },
{ "warning", required_argument, NULL, 'W' },
{ "max-errors", required_argument, NULL, 'X' },
{ NULL, no_argument, NULL, 0 }
};
@@ -128,7 +131,7 @@ static void printUsage(void)
"Usage: rgbasm [-EHhLlVvw] [-b chars] [-D name[=value]] [-g chars] [-I path]\n"
" [-M depend_file] [-MG] [-MP] [-MT target_file] [-MQ target_file]\n"
" [-o out_file] [-P include_file] [-p pad_value] [-Q precision]\n"
" [-r depth] [-W warning] <file>\n"
" [-r depth] [-W warning] [-X max_errors] <file>\n"
"Useful options:\n"
" -E, --export-all export all labels\n"
" -M, --dependfile <path> set the output dependency file\n"
@@ -171,6 +174,10 @@ int main(int argc, char *argv[])
char const *dependFileName = NULL;
size_t targetFileNameLen = 0;
// Maximum of 100 errors only applies if rgbasm is printing errors to a terminal.
if (isatty(STDERR_FILENO))
maxErrors = 100;
for (int ch; (ch = musl_getopt_long_only(argc, argv, optstring, longopts, NULL)) != -1;) {
switch (ch) {
char *endptr;
@@ -316,6 +323,19 @@ int main(int argc, char *argv[])
warnings = false;
break;
unsigned int maxValue;
case 'X':
maxValue = strtoul(musl_optarg, &endptr, 0);
if (musl_optarg[0] == '\0' || *endptr != '\0')
errx("Invalid argument for option 'X'");
if (maxValue > UINT_MAX)
errx("Argument for option 'X' must be between 0 and %u", UINT_MAX);
maxErrors = maxValue;
break;
// Long-only options
case 0:
switch (depType) {
@@ -399,8 +419,7 @@ int main(int argc, char *argv[])
sect_CheckUnionClosed();
if (nbErrors != 0)
errx("Assembly aborted (%u error%s)!", nbErrors,
nbErrors == 1 ? "" : "s");
errx("Assembly aborted (%u error%s)!", nbErrors, nbErrors == 1 ? "" : "s");
// If parse aborted due to missing an include, and `-MG` was given, exit normally
if (failedOnMissingInclude)

6
src/asm/warning.cpp
View File

@@ -16,6 +16,7 @@
#include "itertools.hpp"
unsigned int nbErrors = 0;
unsigned int maxErrors = 0;
static const enum WarningState defaultWarnings[ARRAY_SIZE(warningStates)] = {
AT(WARNING_ASSERT) WARNING_ENABLED,
@@ -343,7 +344,12 @@ void error(char const *fmt, ...)
va_start(args, fmt);
printDiag(fmt, args, "error: ", ":\n ", NULL);
va_end(args);
// This intentionally makes 0 act as "unlimited" (or at least "limited to sizeof(unsigned)")
nbErrors++;
if (nbErrors == maxErrors)
errx("The maximum of %u error%s was reached (configure with \"-X/--max-errors\"); assembly aborted!",
maxErrors, maxErrors == 1 ? "" : "s");
}
[[noreturn]] void fatalerror(char const *fmt, ...)