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

Merge pull request #319 from mid-kid/patch-317

Browse Source 
Allow linker script to consider section attributes
This commit is contained in:
Antonio Niño Díaz
2019-01-19 16:15:37 +00:00
parent 861192c332 c63af05427
commit 65d7909466
12 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/link/assign.h
View File

@@ -36,8 +36,9 @@ void CreateSymbolTable(void);
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);

19
src/link/assign.c
View File

@@ -321,8 +321,9 @@ struct sSection *GetSectionByName(const char *name)
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 @@ int32_t IsSectionSameTypeBankAndFloating(const char *name,
* 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 */
@@ -374,15 +376,6 @@ uint32_t AssignSectionAddressAndBankByName(const char *name, uint32_t address,
/* 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) {
errx(1, "Section \"%s\" from linkerscript has different bank number than in the source.\n",

18
src/link/script.c
View File

@@ -23,6 +23,10 @@ static struct {
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 @@ void script_SetAddress(uint32_t addr)
bank[current_bank].address,
bank[current_bank].top_address);
}
fix_org = addr;
}
void script_SetAlignment(uint32_t alignment)
@@ -200,6 +206,8 @@ void script_SetAlignment(uint32_t alignment)
bank[current_bank].address,
bank[current_bank].top_address);
}
fix_align = size;
}
void script_OutputSection(const char *section_name)
@@ -209,9 +217,11 @@ void script_OutputSection(const char *section_name)
section_name);
}
if (!IsSectionSameTypeBankAndFloating(section_name,
if (!IsSectionSameTypeBankAndAttrs(section_name,
bank[current_bank].type,
current_real_bank)) {
current_real_bank,
fix_org,
fix_align)) {
errx(1, "Different attributes for \"%s\" in source and linkerscript\n",
section_name);
}
@@ -221,5 +231,7 @@ void script_OutputSection(const char *section_name)
AssignSectionAddressAndBankByName(section_name,
bank[current_bank].address,
current_real_bank);
}
fix_org = -1;
fix_align = 1;
}

1
test/asm/test.sh
View File

@@ -20,4 +20,5 @@ for i in *.asm; do
fi
done
rm -f $o $gb $before $after
exit $rc

1
test/asm/update-refs.sh
View File

@@ -6,4 +6,5 @@ for i in *.asm; do
mv -f $fname ${i%.asm}.out
done
rm -f $fname
exit 0

5
test/link/section-attributes-mismatch.link Normal file
View File

@@ -0,0 +1,5 @@
ROM0
org $10
"sec"
org $20
"secfix"

2
test/link/section-attributes-mismatch.out Normal file
View File

@@ -0,0 +1,2 @@
error: Different attributes for "sec" in source and linkerscript

2
test/link/section-attributes.asm Normal file
View File

@@ -0,0 +1,2 @@
SECTION "sec",ROM0,ALIGN[4]
SECTION "secfix",ROM0[$20]

5
test/link/section-attributes.link Normal file
View File

@@ -0,0 +1,5 @@
ROM0
align 4
"sec"
org $20
"secfix"

0
test/link/section-attributes.out Normal file
View File

9
test/link/test.sh
View File

@@ -16,6 +16,14 @@ head -c 20 $gbtemp > $otemp 2>&1
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 @@ $RGBLINK -o $gbtemp $otemp
diff all-instructions.out.bin $gbtemp
rc=$(($? || $rc))
rm -f $otemp $gbtemp $gbtemp2 $outtemp
exit $rc

7
test/link/update-refs.sh
View File

@@ -9,6 +9,12 @@ $RGBASM -o $otemp bank-numbers.asm
$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 @@ $RGBLINK -t -o $gbtemp $otemp > romx-tiny-t.out 2>&1
$RGBASM -o $otemp all-instructions.asm
$RGBLINK -o all-instructions.out.bin $otemp 2>&1
rm -f $otemp $gbtemp
exit 0