mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-04 19:24:28 +00:00
Code Issues Projects Releases Wiki Activity

git subrepo pull tools/fado (#2437)

Browse source 
subrepo:
  subdir:   "tools/fado"
  merged:   "a45f99b46"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "a45f99b46"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"
This commit is contained in:
cadmic 2025-01-22 10:42:19 -08:00 • committed by GitHub
parent 06904e1ee7
commit b97a21c253
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/fado/.gitrepo
View file

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = git@github.com:EllipticEllipsis/fado.git remote = git@github.com:EllipticEllipsis/fado.git
branch = master branch = master
commit = 7fad57f834a86b6a752292996f99f08771f29df4 commit = a45f99b46d2f70fb14f4648907f493b28a96a78a
parent = 17d683780d3878159959a87a9c4a2683d8781ef2 parent = 06904e1ee76828591b42f419a5e4f80106de4615
method = merge method = merge
cmdver = 0.4.6 cmdver = 0.4.6

22
tools/fado/lib/fairy/fairy.c
View file

@ -364,10 +364,10 @@ void Fairy_InitFile(FairyFileInfo* fileInfo, FILE* file) {
off += 1; off += 1;
case SHT_REL: case SHT_REL:
off += 5; off += 5;
/* This assumes only one reloc section of each name */
// TODO: is this a problem?
{ {
FairySection relocSection = FAIRY_SECTION_OTHER; FairySection relocSection = FAIRY_SECTION_OTHER;
FairyRela* relocs;
size_t relocCount;
/* Ignore the first 5/6 chars, which will always be ".rel."/".rela." */ /* Ignore the first 5/6 chars, which will always be ".rel."/".rela." */
if (strcmp(&shstrtab[currentSection.sh_name + off], "text") == 0) { if (strcmp(&shstrtab[currentSection.sh_name + off], "text") == 0) {
@ -381,11 +381,23 @@ void Fairy_InitFile(FairyFileInfo* fileInfo, FILE* file) {
} }
FAIRY_DEBUG_PRINTF("Found %s section\n", &shstrtab[currentSection.sh_name]); FAIRY_DEBUG_PRINTF("Found %s section\n", &shstrtab[currentSection.sh_name]);
relocCount = Fairy_ReadRelocs(&relocs, file, currentSection.sh_type, currentSection.sh_offset,
currentSection.sh_size);
/* Ignore empty reloc sections */
if (relocCount == 0) {
free(relocs);
break;
}
/* This assumes only one non-empty reloc section of each name */
/* TODO: is this a problem? */
assert(fileInfo->relocTablesInfo[relocSection].sectionData == NULL);
fileInfo->relocTablesInfo[relocSection].sectionData = relocs;
fileInfo->relocTablesInfo[relocSection].sectionType = SHT_RELA; fileInfo->relocTablesInfo[relocSection].sectionType = SHT_RELA;
fileInfo->relocTablesInfo[relocSection].sectionEntrySize = sizeof(FairyRela); fileInfo->relocTablesInfo[relocSection].sectionEntrySize = sizeof(FairyRela);
fileInfo->relocTablesInfo[relocSection].sectionEntryCount = fileInfo->relocTablesInfo[relocSection].sectionEntryCount = relocCount;
Fairy_ReadRelocs((FairyRela**)&fileInfo->relocTablesInfo[relocSection].sectionData, file,
currentSection.sh_type, currentSection.sh_offset, currentSection.sh_size);
} }
break; break;