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

Always use braces with InsertBraces: true in .clang-format

Browse Source
This commit is contained in:
Rangi42
2025-01-27 19:31:35 -05:00
committed by Rangi
parent 25c9f8f383
commit cae31005f8
29 changed files with 1350 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/asm/main.cpp
View File

@@ -37,8 +37,9 @@ static std::string make_escape(std::string &str) {
for (;;) {
// All dollars needs to be doubled
size_t nextPos = str.find("$", pos);
if (nextPos == std::string::npos)
if (nextPos == std::string::npos) {
break;
}
escaped.append(str, pos, nextPos - pos);
escaped.append("$$");
pos = nextPos + literal_strlen("$");
@@ -111,12 +112,14 @@ int main(int argc, char *argv[]) {
time_t now = time(nullptr);
// Support SOURCE_DATE_EPOCH for reproducible builds
// https://reproducible-builds.org/docs/source-date-epoch/
if (char const *sourceDateEpoch = getenv("SOURCE_DATE_EPOCH"); sourceDateEpoch)
if (char const *sourceDateEpoch = getenv("SOURCE_DATE_EPOCH"); sourceDateEpoch) {
now = static_cast<time_t>(strtoul(sourceDateEpoch, nullptr, 0));
}
Defer closeDependFile{[&] {
if (dependFile)
if (dependFile) {
fclose(dependFile);
}
}};
// Perform some init for below
@@ -133,18 +136,20 @@ int main(int argc, char *argv[]) {
std::unordered_map<std::string, std::vector<StateFeature>> stateFileSpecs;
std::string newTarget;
// Maximum of 100 errors only applies if rgbasm is printing errors to a terminal.
if (isatty(STDERR_FILENO))
if (isatty(STDERR_FILENO)) {
maxErrors = 100;
}
for (int ch; (ch = musl_getopt_long_only(argc, argv, optstring, longopts, nullptr)) != -1;) {
switch (ch) {
char *endptr;
case 'b':
if (strlen(musl_optarg) == 2)
if (strlen(musl_optarg) == 2) {
opt_B(musl_optarg);
else
} else {
errx("Must specify exactly 2 characters for option 'b'");
}
break;
char *equals;
@@ -163,10 +168,11 @@ int main(int argc, char *argv[]) {
break;
case 'g':
if (strlen(musl_optarg) == 4)
if (strlen(musl_optarg) == 4) {
opt_G(musl_optarg);
else
} else {
errx("Must specify exactly 4 characters for option 'g'");
}
break;
case 'h':
@@ -178,8 +184,9 @@ int main(int argc, char *argv[]) {
break;
case 'M':
if (dependFile)
if (dependFile) {
warnx("Overriding dependfile %s", dependFileName);
}
if (strcmp("-", musl_optarg)) {
dependFile = fopen(musl_optarg, "w");
dependFileName = musl_optarg;
@@ -187,8 +194,9 @@ int main(int argc, char *argv[]) {
dependFile = stdout;
dependFileName = "<stdout>";
}
if (dependFile == nullptr)
if (dependFile == nullptr) {
err("Failed to open dependfile \"%s\"", dependFileName);
}
break;
case 'o':
@@ -203,11 +211,13 @@ int main(int argc, char *argv[]) {
case 'p':
padByte = strtoul(musl_optarg, &endptr, 0);
if (musl_optarg[0] == '\0' || *endptr != '\0')
if (musl_optarg[0] == '\0' || *endptr != '\0') {
errx("Invalid argument for option 'p'");
}
if (padByte > 0xFF)
if (padByte > 0xFF) {
errx("Argument for option 'p' must be between 0 and 0xFF");
}
opt_P(padByte);
break;
@@ -216,15 +226,18 @@ int main(int argc, char *argv[]) {
char const *precisionArg;
case 'Q':
precisionArg = musl_optarg;
if (precisionArg[0] == '.')
if (precisionArg[0] == '.') {
precisionArg++;
}
precision = strtoul(precisionArg, &endptr, 0);
if (musl_optarg[0] == '\0' || *endptr != '\0')
if (musl_optarg[0] == '\0' || *endptr != '\0') {
errx("Invalid argument for option 'Q'");
}
if (precision < 1 || precision > 31)
if (precision < 1 || precision > 31) {
errx("Argument for option 'Q' must be between 1 and 31");
}
opt_Q(precision);
break;
@@ -232,35 +245,41 @@ int main(int argc, char *argv[]) {
case 'r':
maxDepth = strtoul(musl_optarg, &endptr, 0);
if (musl_optarg[0] == '\0' || *endptr != '\0')
if (musl_optarg[0] == '\0' || *endptr != '\0') {
errx("Invalid argument for option 'r'");
}
break;
case 's': {
// Split "<features>:<name>" so `musl_optarg` is "<features>" and `name` is "<name>"
char *name = strchr(musl_optarg, ':');
if (!name)
if (!name) {
errx("Invalid argument for option 's'");
}
*name++ = '\0';
std::vector<StateFeature> features;
for (char *feature = musl_optarg; feature;) {
// Split "<feature>,<rest>" so `feature` is "<feature>" and `next` is "<rest>"
char *next = strchr(feature, ',');
if (next)
if (next) {
*next++ = '\0';
}
// Trim whitespace from the beginning of `feature`...
feature += strspn(feature, " \t");
// ...and from the end
if (char *end = strpbrk(feature, " \t"); end)
if (char *end = strpbrk(feature, " \t"); end) {
*end = '\0';
}
// A feature must be specified
if (*feature == '\0')
if (*feature == '\0') {
errx("Empty feature for option 's'");
}
// Parse the `feature` and update the `features` list
if (!strcasecmp(feature, "all")) {
if (!features.empty())
if (!features.empty()) {
warnx("Redundant feature before \"%s\" for option 's'", feature);
}
features.assign({STATE_EQU, STATE_VAR, STATE_EQUS, STATE_CHAR, STATE_MACRO});
} else {
StateFeature value = !strcasecmp(feature, "equ") ? STATE_EQU
@@ -280,10 +299,12 @@ int main(int argc, char *argv[]) {
feature = next;
}
if (stateFileSpecs.find(name) != stateFileSpecs.end())
if (stateFileSpecs.find(name) != stateFileSpecs.end()) {
warnx("Overriding state filename %s", name);
if (verbose)
}
if (verbose) {
printf("State filename %s\n", name);
}
stateFileSpecs.emplace(name, std::move(features));
break;
}
@@ -308,11 +329,13 @@ int main(int argc, char *argv[]) {
case 'X':
maxValue = strtoul(musl_optarg, &endptr, 0);
if (musl_optarg[0] == '\0' || *endptr != '\0')
if (musl_optarg[0] == '\0' || *endptr != '\0') {
errx("Invalid argument for option 'X'");
}
if (maxValue > UINT_MAX)
if (maxValue > UINT_MAX) {
errx("Argument for option 'X' must be between 0 and %u", UINT_MAX);
}
maxErrors = maxValue;
break;
@@ -331,10 +354,12 @@ int main(int argc, char *argv[]) {
case 'Q':
case 'T':
newTarget = musl_optarg;
if (depType == 'Q')
if (depType == 'Q') {
newTarget = make_escape(newTarget);
if (!targetFileName.empty())
}
if (!targetFileName.empty()) {
targetFileName += ' ';
}
targetFileName += newTarget;
break;
}
@@ -347,8 +372,9 @@ int main(int argc, char *argv[]) {
}
}
if (targetFileName.empty() && !objectFileName.empty())
if (targetFileName.empty() && !objectFileName.empty()) {
targetFileName = objectFileName;
}
if (argc == musl_optind) {
fputs(
@@ -364,13 +390,15 @@ int main(int argc, char *argv[]) {
std::string mainFileName = argv[musl_optind];
if (verbose)
if (verbose) {
printf("Assembling %s\n", mainFileName.c_str());
}
if (dependFile) {
if (targetFileName.empty())
if (targetFileName.empty()) {
errx("Dependency files can only be created if a target file is specified with either "
"-o, -MQ or -MT");
}
fprintf(dependFile, "%s: %s\n", targetFileName.c_str(), mainFileName.c_str());
}
@@ -381,8 +409,9 @@ int main(int argc, char *argv[]) {
fstk_Init(mainFileName, maxDepth);
// Perform parse (`yy::parser` is auto-generated from `parser.y`)
if (yy::parser parser; parser.parse() != 0 && nbErrors == 0)
if (yy::parser parser; parser.parse() != 0 && nbErrors == 0) {
nbErrors = 1;
}
if (!failedOnMissingInclude) {
sect_CheckUnionClosed();
@@ -394,17 +423,20 @@ int main(int argc, char *argv[]) {
sect_CheckStack();
}
if (nbErrors != 0)
if (nbErrors != 0) {
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)
if (failedOnMissingInclude) {
return 0;
}
out_WriteObject();
for (auto [name, features] : stateFileSpecs)
for (auto [name, features] : stateFileSpecs) {
out_WriteState(name, features);
}
return 0;
}