ref: 65d790946610e907039f75b416971a9b080a4e11
parent: 861192c332560d8f9b668f42b1bdb9dfbb5f11a3
parent: c63af0542733e6c78a23f5814bce4a26ddb6b969
author: Antonio Niño Díaz <antonio_nd@outlook.com>
date: Sat Jan 19 11:15:37 EST 2019
Merge pull request #319 from mid-kid/patch-317 Allow linker script to consider section attributes
--- a/include/link/assign.h
+++ b/include/link/assign.h
@@ -36,8 +36,9 @@
struct sSection *GetSectionByName(const char *name);
int32_t IsSectionNameInUse(const char *name);
void SetLinkerscriptName(char *tzLinkerscriptFile);
-int32_t IsSectionSameTypeBankAndFloating(const char *name,
- enum eSectionType type, int32_t bank);
+int32_t IsSectionSameTypeBankAndAttrs(const char *name,
+ enum eSectionType type, int32_t bank,
+ int32_t org, int32_t align);
uint32_t AssignSectionAddressAndBankByName(const char *name, uint32_t address,
int32_t bank);
--- a/src/link/assign.c
+++ b/src/link/assign.c
@@ -321,8 +321,9 @@
return NULL;
}
-int32_t IsSectionSameTypeBankAndFloating(const char *name,
- enum eSectionType type, int32_t bank)
+int32_t IsSectionSameTypeBankAndAttrs(const char *name,
+ enum eSectionType type, int32_t bank,
+ int32_t org, int32_t align)
{const struct sSection *pSection;
@@ -340,8 +341,9 @@
* mismatch or not.
*/
- /* Section must be floating in source */
- if (pSection->nOrg != -1 || pSection->nAlign != 1)
+ /* Section must have the same attributes or float */
+ if ((pSection->nOrg != -1 && pSection->nOrg != org) ||
+ (pSection->nAlign != 1 && pSection->nAlign != align))
return 0;
/* It must have the same type in source and linkerscript */
@@ -373,15 +375,6 @@
continue;
/* Section has been found. */
-
- /*
- * A section can be left as floating in the code if the location
- * is assigned in the linkerscript.
- */
- if (pSection->nOrg != -1 || pSection->nAlign != 1) {- errx(1, "Section \"%s\" from linkerscript isn't floating.\n",
- name);
- }
/* The bank can be left as unassigned or be the same */
if (pSection->nBank != -1 && pSection->nBank != bank) {--- a/src/link/script.c
+++ b/src/link/script.c
@@ -23,6 +23,10 @@
static int32_t current_bank = -1; /* Bank as seen by the bank array */
static int32_t current_real_bank = -1; /* bank as seen by the GB */
+/* Current section attributes */
+static int32_t fix_org = -1;
+static int32_t fix_align = 1;
+
void script_InitSections(void)
{int32_t i;
@@ -176,6 +180,8 @@
bank[current_bank].address,
bank[current_bank].top_address);
}
+
+ fix_org = addr;
}
void script_SetAlignment(uint32_t alignment)
@@ -200,6 +206,8 @@
bank[current_bank].address,
bank[current_bank].top_address);
}
+
+ fix_align = size;
}
void script_OutputSection(const char *section_name)
@@ -209,9 +217,11 @@
section_name);
}
- if (!IsSectionSameTypeBankAndFloating(section_name,
- bank[current_bank].type,
- current_real_bank)) {+ if (!IsSectionSameTypeBankAndAttrs(section_name,
+ bank[current_bank].type,
+ current_real_bank,
+ fix_org,
+ fix_align)) {errx(1, "Different attributes for \"%s\" in source and linkerscript\n",
section_name);
}
@@ -221,5 +231,7 @@
AssignSectionAddressAndBankByName(section_name,
bank[current_bank].address,
current_real_bank);
-}
+ fix_org = -1;
+ fix_align = 1;
+}
--- a/test/asm/test.sh
+++ b/test/asm/test.sh
@@ -20,4 +20,5 @@
fi
done
+rm -f $o $gb $before $after
exit $rc
--- a/test/asm/update-refs.sh
+++ b/test/asm/update-refs.sh
@@ -6,4 +6,5 @@
mv -f $fname ${i%.asm}.outdone
+rm -f $fname
exit 0
--- /dev/null
+++ b/test/link/section-attributes-mismatch.link
@@ -1,0 +1,5 @@
+ROM0
+ org $10
+ "sec"
+ org $20
+ "secfix"
--- /dev/null
+++ b/test/link/section-attributes-mismatch.out
@@ -1,0 +1,2 @@
+error: Different attributes for "sec" in source and linkerscript
+
--- /dev/null
+++ b/test/link/section-attributes.asm
@@ -1,0 +1,2 @@
+SECTION "sec",ROM0,ALIGN[4]
+SECTION "secfix",ROM0[$20]
--- /dev/null
+++ b/test/link/section-attributes.link
@@ -1,0 +1,5 @@
+ROM0
+ align 4
+ "sec"
+ org $20
+ "secfix"
--- a/test/link/test.sh
+++ b/test/link/test.sh
@@ -16,6 +16,14 @@
diff bank-numbers.out.bin $otemp
rc=$(($? || $rc))
+$RGBASM -o $otemp section-attributes.asm
+$RGBLINK -l section-attributes.link -o $gbtemp $otemp > $outtemp 2>&1
+diff section-attributes.out $outtemp
+rc=$(($? || $rc))
+$RGBLINK -l section-attributes-mismatch.link -o $gbtemp $otemp > $outtemp 2>&1
+diff section-attributes-mismatch.out $outtemp
+rc=$(($? || $rc))
+
$RGBASM -o $otemp wramx-dmg-mode.asm
$RGBLINK -o $gbtemp $otemp > $outtemp 2>&1
diff wramx-dmg-mode-no-d.out $outtemp
@@ -60,4 +68,5 @@
diff all-instructions.out.bin $gbtemp
rc=$(($? || $rc))
+rm -f $otemp $gbtemp $gbtemp2 $outtemp
exit $rc
--- a/test/link/update-refs.sh
+++ b/test/link/update-refs.sh
@@ -9,6 +9,12 @@
$RGBLINK -o $gbtemp $otemp > bank-numbers.out 2>&1
head -c 20 $gbtemp > bank-numbers.out.bin 2>&1
+$RGBASM -o $otemp section-attributes.asm
+$RGBLINK -l section-attributes.link \
+ -o $gbtemp $otemp > section-attributes.out 2>&1
+$RGBLINK -l section-attributes-mismatch.link \
+ -o $gbtemp $otemp > section-attributes-mismatch.out 2>&1
+
$RGBASM -o $otemp wramx-dmg-mode.asm
$RGBLINK -o $gbtemp $otemp > wramx-dmg-mode-no-d.out 2>&1
$RGBLINK -d -o $gbtemp $otemp > wramx-dmg-mode-d.out 2>&1
@@ -28,4 +34,5 @@
$RGBASM -o $otemp all-instructions.asm
$RGBLINK -o all-instructions.out.bin $otemp 2>&1
+rm -f $otemp $gbtemp
exit 0