Merge pull request #497 from PSI-Rockin/poketto_monsutaa
[CRO] Fix faulty data relocations
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -65,3 +65,4 @@ fb.bat
|
|||||||
*.smdh
|
*.smdh
|
||||||
|
|
||||||
config.toml
|
config.toml
|
||||||
|
CMakeSettings.json
|
||||||
|
|||||||
@@ -437,7 +437,7 @@ public:
|
|||||||
const u32 segmentID = mem.read32(segmentTable.offset + 12 * segment + SegmentTable::ID);
|
const u32 segmentID = mem.read32(segmentTable.offset + 12 * segment + SegmentTable::ID);
|
||||||
switch (segmentID) {
|
switch (segmentID) {
|
||||||
case SegmentTable::SegmentID::DATA:
|
case SegmentTable::SegmentID::DATA:
|
||||||
*oldDataVaddr = segmentOffset + dataVaddr; oldDataSegmentOffset = segmentOffset; segmentOffset = dataVaddr; break;
|
*oldDataVaddr = segmentOffset + croPointer; oldDataSegmentOffset = segmentOffset; segmentOffset = dataVaddr; break;
|
||||||
case SegmentTable::SegmentID::BSS: segmentOffset = bssVaddr; break;
|
case SegmentTable::SegmentID::BSS: segmentOffset = bssVaddr; break;
|
||||||
case SegmentTable::SegmentID::TEXT:
|
case SegmentTable::SegmentID::TEXT:
|
||||||
case SegmentTable::SegmentID::RODATA:
|
case SegmentTable::SegmentID::RODATA:
|
||||||
|
|||||||
Reference in New Issue
Block a user