Disallow SECTION UNION for ROM sections

Fixes #1855
2025-11-20 02:02:06 +00:00 · 2025-11-07 11:30:38 -05:00
parent fb9fa6038c
commit 395b03e88e
16 changed files with 31 additions and 104 deletions
--- a/src/asm/section.cpp
+++ b/src/asm/section.cpp
@@ -120,9 +120,8 @@ Section *sect_FindSectionByName(std::string const &name) {
 		++nbSectErrors; \
 	} while (0)

-static unsigned int mergeSectUnion(
-    Section &sect, SectionType type, uint32_t org, uint8_t alignment, uint16_t alignOffset
-) {
+static unsigned int
+    mergeSectUnion(Section &sect, uint32_t org, uint8_t alignment, uint16_t alignOffset) {
 	unsigned int nbSectErrors = 0;

 	assume(alignment < 16); // Should be ensured by the caller
@@ -133,12 +132,6 @@ static unsigned int mergeSectUnion(
 	uint32_t sectAlignSize = 1u << sect.align;
 	uint32_t sectAlignMask = sectAlignSize - 1;

-	// Unionized sections only need "compatible" constraints, and they end up with the strictest
-	// combination of both.
-	if (sectTypeHasData(type)) {
-		sectError("Cannot declare ROM sections as `UNION`");
-	}
-
 	if (org != UINT32_MAX) {
 		// If both are fixed, they must be the same
 		if (sect.org != UINT32_MAX && sect.org != org) {
@@ -266,12 +259,10 @@ static void mergeSections(
 	} else {
 		switch (mod) {
 		case SECTION_UNION:
-		case SECTION_FRAGMENT:
-			nbSectErrors += mod == SECTION_UNION
-			                    ? mergeSectUnion(sect, type, org, alignment, alignOffset)
-			                    : mergeFragments(sect, org, alignment, alignOffset);
-
-			// Common checks
+		case SECTION_FRAGMENT: {
+			unsigned int (*merge)(Section &, uint32_t, uint8_t, uint16_t) =
+			    mod == SECTION_UNION ? mergeSectUnion : mergeFragments;
+			nbSectErrors += merge(sect, org, alignment, alignOffset);

 			// If the section's bank is unspecified, override it
 			if (sect.bank == UINT32_MAX) {
@@ -282,6 +273,7 @@ static void mergeSections(
 				sectError("Section already declared with different bank %" PRIu32, sect.bank);
 			}
 			break;
+		}

 		case SECTION_NORMAL:
 			errorNoTrace([&]() {
@@ -513,6 +505,11 @@ void sect_NewSection(
 		}
 	}

+	if (mod == SECTION_UNION && sectTypeHasData(type)) {
+		error("Cannot declare ROM sections as `UNION`");
+		return;
+	}
+
 	if (currentLoadSection) {
 		sect_EndLoadSection("SECTION");
 	}
@@ -1121,12 +1118,12 @@ std::string sect_PushSectionFragmentLiteral() {
 		);
 	}

+	// This section has data (ROM0 or ROMX), so it cannot be a UNION
+	assume(currentSection->modifier != SECTION_UNION);
+
 	if (currentLoadSection) {
 		fatal("`LOAD` blocks cannot contain fragment literals");
 	}
-	if (currentSection->modifier == SECTION_UNION) {
-		fatal("`SECTION UNION` cannot contain fragment literals");
-	}

 	// A section containing a fragment literal has to become a fragment too
 	currentSection->modifier = SECTION_FRAGMENT;
--- a/test/asm/fragment-literal-in-union.err
+++ b/test/asm/fragment-literal-in-union.err
@@ -1,2 +1,6 @@
-FATAL: `SECTION UNION` cannot contain fragment literals
+error: Cannot declare ROM sections as `UNION`
+    at fragment-literal-in-union.asm(1)
+error: Cannot output data outside of a `SECTION`
+    at fragment-literal-in-union.asm(2)
+FATAL: Cannot output fragment literals outside of a `SECTION`
    at fragment-literal-in-union.asm(3)
--- a/test/asm/section-union-data.asm
+++ b/test/asm/section-union-data.asm
@@ -0,0 +1,2 @@
+SECTION UNION "wat", ROM0
+db 42
--- a/test/asm/section-union-data.err
+++ b/test/asm/section-union-data.err
@@ -0,0 +1,5 @@
+error: Cannot declare ROM sections as `UNION`
+    at section-union-data.asm(1)
+error: Cannot output data outside of a `SECTION`
+    at section-union-data.asm(2)
+Assembly aborted with 2 errors!
--- a/test/link/section-conflict/different-mod/a.asm
+++ b/test/link/section-conflict/different-mod/a.asm
@@ -1,2 +1,2 @@
-section fragment "test", rom0
-db 1
+section fragment "test", wram0
+w1:: db
--- a/test/link/section-conflict/different-mod/b.asm
+++ b/test/link/section-conflict/different-mod/b.asm
@@ -1,2 +1,2 @@
-section union "test", rom0
-db 2
+section union "test", wram0
+w2:: db
--- a/test/link/section-union/data-overlay.asm
+++ b/test/link/section-union/data-overlay.asm
@@ -1,10 +0,0 @@
-IF !DEF(SECOND)
-	def DATA equs "ds 4"
-ELSE
-	def DATA equs "db $aa, $bb, $cc, $dd"
-ENDC
-
-SECTION UNION "overlaid data", ROM0
-	{DATA}
-
-	PURGE DATA
--- a/test/link/section-union/data-overlay.out
+++ b/test/link/section-union/data-overlay.out
@@ -1,7 +0,0 @@
-FATAL: Section "overlaid data" is of type `ROM0`, which cannot be `UNION`ized
-Linking aborted with 1 error
---
-error: Cannot declare ROM sections as `UNION`
-    at <stdin>(18)
-FATAL: Cannot create section "overlaid data" (1 error)
-    at <stdin>(18)
--- a/test/link/section-union/different-data.asm
+++ b/test/link/section-union/different-data.asm
@@ -1,8 +0,0 @@
-IF !DEF(SECOND)
-	def DATA = 1
-ELSE
-	def DATA = 2
-ENDC
-
-SECTION UNION "different data", ROM0
-	db DATA
--- a/test/link/section-union/different-data.out
+++ b/test/link/section-union/different-data.out
@@ -1,7 +0,0 @@
-FATAL: Section "different data" is of type `ROM0`, which cannot be `UNION`ized
-Linking aborted with 1 error
---
-error: Cannot declare ROM sections as `UNION`
-    at <stdin>(16)
-FATAL: Cannot create section "different data" (1 error)
-    at <stdin>(16)
--- a/test/link/section-union/different-size.asm
+++ b/test/link/section-union/different-size.asm
@@ -1,8 +0,0 @@
-IF !DEF(SECOND)
-	def SIZE = 69
-ELSE
-	def SIZE = 420
-ENDC
-
-SECTION UNION "different section sizes", ROM0
-	ds SIZE
--- a/test/link/section-union/different-size.out
+++ b/test/link/section-union/different-size.out
@@ -1,7 +0,0 @@
-FATAL: Section "different section sizes" is of type `ROM0`, which cannot be `UNION`ized
-Linking aborted with 1 error
---
-error: Cannot declare ROM sections as `UNION`
-    at <stdin>(16)
-FATAL: Cannot create section "different section sizes" (1 error)
-    at <stdin>(16)
--- a/test/link/section-union/different-syntaxes.asm
+++ b/test/link/section-union/different-syntaxes.asm
@@ -1,10 +0,0 @@
-IF !DEF(SECOND)
-	def INSTR equs "sbc a"
-ELSE
-	def INSTR equs "db $9f"
-ENDC
-
-SECTION UNION "different syntaxes", ROM0
-	{INSTR}
-
-	PURGE INSTR
--- a/test/link/section-union/different-syntaxes.out
+++ b/test/link/section-union/different-syntaxes.out
@@ -1,7 +0,0 @@
-FATAL: Section "different syntaxes" is of type `ROM0`, which cannot be `UNION`ized
-Linking aborted with 1 error
---
-error: Cannot declare ROM sections as `UNION`
-    at <stdin>(18)
-FATAL: Cannot create section "different syntaxes" (1 error)
-    at <stdin>(18)
--- a/test/link/section-union/split-data.asm
+++ b/test/link/section-union/split-data.asm
@@ -1,10 +0,0 @@
-IF !DEF(SECOND)
-	def DATA equs "ds 1\ndb $aa"
-ELSE
-	def DATA equs "db $bb\nds 1"
-ENDC
-
-SECTION UNION "mutually-overlaid data", ROM0
-	{DATA}
-
-	PURGE DATA
--- a/test/link/section-union/split-data.out
+++ b/test/link/section-union/split-data.out
@@ -1,7 +0,0 @@
-FATAL: Section "mutually-overlaid data" is of type `ROM0`, which cannot be `UNION`ized
-Linking aborted with 1 error
---
-error: Cannot declare ROM sections as `UNION`
-    at <stdin>(18)
-FATAL: Cannot create section "mutually-overlaid data" (1 error)
-    at <stdin>(18)