Allow LOAD FRAGMENT

This was implemented in #736 but removed after discussion in #869. Fixes #1537
gbdev · Oct 23, 2024 · 941ff16 · 941ff16
1 parent 0d3980d
commit 941ff16
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 12 deletions.
diff --git a/man/rgbasm.5 b/man/rgbasm.5
@@ -968,11 +968,11 @@ block before performing its own function.
 .Ic LOAD
 blocks can use the
 .Ic UNION
-modifier as described in
-.Sx Unionized sections
-below, but not the
+or
 .Ic FRAGMENT
-modifier.
+modifiers as described in
+.Sx Unionized sections
+below.
 .Ss Unionized sections
 When you're tight on RAM, you may want to define overlapping static memory allocations, as explained in the
 .Sx Allocating overlapping spaces in RAM

diff --git a/src/asm/section.cpp b/src/asm/section.cpp
@@ -462,11 +462,6 @@ void sect_SetLoadSection(
 		return;
 	}
 
-	if (mod == SECTION_FRAGMENT) {
-		error("`LOAD FRAGMENT` is not allowed\n");
-		return;
-	}
-
 	if (currentLoadSection)
 		sect_EndLoadSection("LOAD");
 

diff --git a/test/asm/load-fragment.asm b/test/asm/load-fragment.asm
@@ -1,2 +1,29 @@
 SECTION "A", ROM0
+AData::
 LOAD FRAGMENT "RAM", WRAM0
+AMem::
+	db 0, 1, 2
+AMemEnd::
+ENDL
+ADataEnd::
+	dw AMem
+
+SECTION "B", ROM0
+BData::
+LOAD FRAGMENT "RAM", WRAM0
+BMem::
+	db 3, 4, 5, 6, 7
+BMemEnd::
+ENDL
+BDataEnd::
+	dw BMem
+
+SECTION "C", ROM0
+CData::
+LOAD FRAGMENT "RAM", WRAM0
+CMem::
+	db 8, 9
+CMemEnd::
+ENDL
+CDataEnd::
+	dw CMem
diff --git a/test/asm/load-fragment.err b/test/asm/load-fragment.err
diff --git a/test/asm/load-fragment.out.bin b/test/asm/load-fragment.out.bin
diff --git a/test/link/load-fragment-jr.asm b/test/link/load-fragment-jr.asm
@@ -0,0 +1,12 @@
+SECTION "main", ROM0
+LOAD FRAGMENT "test", SRAM
+ENDL
+
+; The RPN patch for 'jr Label' in section "alt" refers to section "test",
+; but the object file puts section "test" after section "alt".
+; This case needs to be handled when identifying patches' PC sections.
+SECTION "alt", ROM0
+LOAD FRAGMENT "test", SRAM
+	jr Label
+Label:
+ENDL
diff --git a/test/link/load-fragment-jr.out.bin b/test/link/load-fragment-jr.out.bin
diff --git a/test/link/load-fragment/a.asm b/test/link/load-fragment/a.asm
@@ -0,0 +1,4 @@
+SECTION "main", ROM0
+LOAD FRAGMENT "test", SRAM
+	db 0
+ENDL
diff --git a/test/link/load-fragment/b.asm b/test/link/load-fragment/b.asm
@@ -0,0 +1,6 @@
+SECTION "SECTION2", ROM0
+LOAD FRAGMENT "test", SRAM
+	jr Label
+Label:
+	dw Label
+ENDL
diff --git a/test/link/load-fragment/ref.out.bin b/test/link/load-fragment/ref.out.bin
diff --git a/test/link/section-fragment/jr-offset-load/a.asm b/test/link/section-fragment/jr-offset-load/a.asm
@@ -0,0 +1,4 @@
+SECTION FRAGMENT "output", ROM0
+LOAD FRAGMENT "loaded", SRAM
+    ds 128
+ENDL
diff --git a/test/link/section-fragment/jr-offset-load/b.asm b/test/link/section-fragment/jr-offset-load/b.asm
@@ -0,0 +1,6 @@
+SECTION FRAGMENT "output", ROM0
+LOAD FRAGMENT "loaded", SRAM
+label:
+	jr nz, label2
+label2:
+ENDL
diff --git a/test/link/section-fragment/jr-offset-load/ref.out.bin b/test/link/section-fragment/jr-offset-load/ref.out.bin
diff --git a/test/link/test.sh b/test/link/test.sh
@@ -257,6 +257,15 @@ rgblinkQuiet -o "$gbtemp" "$otemp" "$gbtemp2"
 tryCmpRom "$test"/ref.out.bin
 evaluateTest
 
+test="section-fragment/jr-offset-load"
+startTest
+"$RGBASM" -o "$otemp" "$test"/a.asm
+"$RGBASM" -o "$gbtemp2" "$test"/b.asm
+continueTest
+rgblinkQuiet -o "$gbtemp" "$otemp" "$gbtemp2"
+tryCmpRom "$test"/ref.out.bin
+evaluateTest
+
 test="section-normal/same-name"
 startTest
 "$RGBASM" -o "$otemp" "$test"/a.asm