External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-10-04 09:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

psp-prxgen: Allow relocations before relocated section

Browse Source 
This commit scans through all sections first, before scanning for
relocation sections. Scanning relocations in a separate step allows
relocations to appear before the section they are relocating (valid with
ELF).
This commit is contained in:
Marko Mijalkovic
2020-05-08 16:32:48 -04:00
parent 9e63c70dad
commit 700632a9ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/psp-prxgen.c
View File

@@ -281,7 +281,11 @@ int load_sections(unsigned char *data)
load_addr = g_elfsections[i].iAddr; load_addr = g_elfsections[i].iAddr;
} }
} }
}
/* Okay so we have loaded all the sections, lets find relocations and fix up the names */
for(i = 0; i < g_elfhead.iShnum; i++)
{
if(((g_elfsections[i].iType == SHT_REL) || (g_elfsections[i].iType == SHT_PRXRELOC)) if(((g_elfsections[i].iType == SHT_REL) || (g_elfsections[i].iType == SHT_PRXRELOC))
&& (g_elfsections[g_elfsections[i].iInfo].iFlags & SHF_ALLOC)) && (g_elfsections[g_elfsections[i].iInfo].iFlags & SHF_ALLOC))
{ {
@@ -289,11 +293,7 @@ int load_sections(unsigned char *data)
found_rel = 1; found_rel = 1;
g_elfsections[i].blOutput = 1; g_elfsections[i].blOutput = 1;
} }
}
/* Okay so we have loaded all the sections, lets fix up the names */
for(i = 0; i < g_elfhead.iShnum; i++)
{
strcpy(g_elfsections[i].szName, (char *) (g_elfsections[g_elfhead.iShstrndx].pData + g_elfsections[i].iName)); strcpy(g_elfsections[i].szName, (char *) (g_elfsections[g_elfhead.iShstrndx].pData + g_elfsections[i].iName));
if(strcmp(g_elfsections[i].szName, PSP_MODULE_INFO_NAME) == 0) if(strcmp(g_elfsections[i].szName, PSP_MODULE_INFO_NAME) == 0)
{ {