OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 18:50:14 +00:00
Code Issues Projects Releases Wiki Activity

LDR fixup VAddr data address

Browse Source
This commit is contained in:
wwylele 2016-08-16 11:50:03 +08:00
parent 09c6876ecb
commit c063b2467c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/service/ldr_ro.cpp
View File

@ -650,11 +650,12 @@ class CROHelper final {
* @param data_segment_size the buffer size for .data segment * @param data_segment_size the buffer size for .data segment
* @param bss_segment_address the buffer address for .bss segment * @param bss_segment_address the buffer address for .bss segment
* @param bss_segment_size the buffer size for .bss segment * @param bss_segment_size the buffer size for .bss segment
* @returns ResultVal<u32> with the previous data segment offset before rebasing. * @returns ResultVal<VAddr> with the virtual address of .data segment in CRO.
*/ */
ResultVal<u32> RebaseSegmentTable(u32 cro_size, ResultVal<VAddr> RebaseSegmentTable(u32 cro_size,
VAddr data_segment_address, u32 data_segment_size, VAddr data_segment_address, u32 data_segment_size,
VAddr bss_segment_address, u32 bss_segment_size) { VAddr bss_segment_address, u32 bss_segment_size) {
u32 prev_data_segment = 0; u32 prev_data_segment = 0;
u32 segment_num = GetField(SegmentNum); u32 segment_num = GetField(SegmentNum);
for (u32 i = 0; i < segment_num; ++i) { for (u32 i = 0; i < segment_num; ++i) {
@ -680,7 +681,7 @@ class CROHelper final {
} }
SetEntry(i, segment); SetEntry(i, segment);
} }
return MakeResult<u32>(prev_data_segment); return MakeResult<u32>(prev_data_segment + module_address);
} }
/** /**
@ -1592,7 +1593,6 @@ public:
} }
prev_data_segment_address = *result_val; prev_data_segment_address = *result_val;
} }
prev_data_segment_address += module_address;
result = RebaseExportNamedSymbolTable(); result = RebaseExportNamedSymbolTable();
if (result.IsError()) { if (result.IsError()) {