Extend RGBASM and RGBLINK verbosity flags to have multiple levels like RGBGFX (#1772)

include/asm/fstack.hpp

@@ -49,6 +49,8 @@ struct FileStackNode {
 
 struct MacroArgs;
 
+void fstk_VerboseOutputConfig();
+
 bool fstk_DumpCurrent();
 std::shared_ptr<FileStackNode> fstk_GetFileStack();
 std::shared_ptr<std::string> fstk_GetUniqueIDStr();

include/asm/main.hpp

@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <string>
 
+#include "verbosity.hpp"
+
 enum MissingInclude {
 	INC_ERROR,    // A missing included file is an error that halts assembly
 	GEN_EXIT,     // A missing included file is assumed to be generated; exit normally
@@ -14,11 +16,11 @@ enum MissingInclude {
 };
 
 struct Options {
+	bool exportAll = false;                         // -E
 	uint8_t fixPrecision = 16;                      // -Q
 	size_t maxRecursionDepth = 64;                  // -r
 	char binDigits[2] = {'0', '1'};                 // -b
 	char gfxDigits[4] = {'0', '1', '2', '3'};       // -g
-	bool verbose = false;                           // -v
 	FILE *dependFile = nullptr;                     // -M
 	std::string targetFileName;                     // -MQ, -MT
 	MissingInclude missingIncludeState = INC_ERROR; // -MC, -MG
@@ -42,11 +44,4 @@ struct Options {
 
 extern Options options;
 
-#define verbosePrint(...) \
-	do { \
-		if (options.verbose) { \
-			fprintf(stderr, __VA_ARGS__); \
-		} \
-	} while (0)
-
 #endif // RGBDS_ASM_MAIN_HPP

include/asm/symbol.hpp

@@ -71,7 +71,6 @@ struct Symbol {
 
 void sym_ForEach(void (*callback)(Symbol &));
 
-void sym_SetExportAll(bool set);
 Symbol *sym_AddLocalLabel(std::string const &symName);
 Symbol *sym_AddLabel(std::string const &symName);
 Symbol *sym_AddAnonLabel();

include/gfx/main.hpp

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "helpers.hpp"
+#include "verbosity.hpp"
 
 #include "gfx/rgba.hpp"
 
@@ -20,7 +21,6 @@ struct Options {
 	bool allowMirroringX = false; // -X, -m
 	bool allowMirroringY = false; // -Y, -m
 	bool columnMajor = false;     // -Z
-	uint8_t verbosity = 0;        // -v
 
 	std::string attrmap{};                    // -a, -A
 	std::optional<Rgba> bgColor{};            // -B
@@ -42,6 +42,7 @@ struct Options {
 		uint16_t height;
 		uint32_t right() const { return left + width * 8; }
 		uint32_t bottom() const { return top + height * 8; }
+		bool specified() const { return left || top || width || height; }
 	} inputSlice{0, 0, 0, 0};                          // -L (margins in clockwise order, like CSS)
 	uint8_t basePalID = 0;                             // -l
 	std::array<uint16_t, 2> maxNbTiles{UINT16_MAX, 0}; // -N
@@ -56,18 +57,6 @@ struct Options {
 
 	std::string input{}; // positional arg
 
-	// clang-format off: vertically align values
-	static constexpr uint8_t VERB_NONE    = 0; // Normal, no extra output
-	static constexpr uint8_t VERB_CFG     = 1; // Print configuration after parsing options
-	static constexpr uint8_t VERB_LOG_ACT = 2; // Log actions before doing them
-	static constexpr uint8_t VERB_INTERM  = 3; // Print some intermediate results
-	static constexpr uint8_t VERB_DEBUG   = 4; // Internals are logged
-	static constexpr uint8_t VERB_TRACE   = 5; // Step-by-step algorithm details
-	static constexpr uint8_t VERB_VVVVVV  = 6; // What, can't I have a little fun?
-	// clang-format on
-	[[gnu::format(printf, 3, 4)]]
-	void verbosePrint(uint8_t level, char const *fmt, ...) const;
-
 	mutable bool hasTransparentPixels = false;
 	uint8_t maxOpaqueColors() const { return nbColorsPerPal - hasTransparentPixels; }
 

include/link/main.hpp

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "linkdefs.hpp"
+#include "verbosity.hpp"
 
 struct Options {
 	bool isDmgMode;              // -d
@@ -25,20 +26,12 @@ struct Options {
 	uint16_t scrambleWRAMX;
 	uint16_t scrambleSRAM;
 	bool is32kMode;      // -t
-	bool beVerbose;      // -v
 	bool isWRAM0Mode;    // -w
 	bool disablePadding; // -x
 };
 
 extern Options options;
 
-#define verbosePrint(...) \
-	do { \
-		if (options.beVerbose) { \
-			fprintf(stderr, __VA_ARGS__); \
-		} \
-	} while (0)
-
 struct FileStackNode {
 	FileStackNodeType type;
 	std::variant<

include/verbosity.hpp

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+
+#ifndef RGBDS_VERBOSITY_HPP
+#define RGBDS_VERBOSITY_HPP
+
+// This macro does not evaluate its arguments unless the condition is true.
+#define verbosePrint(level, ...) \
+	do { \
+		if (checkVerbosity(level)) { \
+			fprintf(stderr, __VA_ARGS__); \
+		} \
+	} while (0)
+
+enum Verbosity {
+	VERB_NONE,   // 0. Default, no extra output
+	VERB_CONFIG, // 1. Basic configuration, after parsing CLI options
+	VERB_NOTICE, // 2. Before significant actions
+	VERB_INFO,   // 3. Some intermediate action results
+	VERB_DEBUG,  // 4. Internals useful for debugging
+	VERB_TRACE,  // 5. Step-by-step algorithm details
+	VERB_VVVVVV, // 6. What, can't I have a little fun?
+};
+
+void incrementVerbosity();
+bool checkVerbosity(Verbosity level);
+
+void printVVVVVVerbosity();
+
+#endif // RGBDS_VERBOSITY_HPP