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 explicit SegmentTag

Browse Source
This commit is contained in:
wwylele 2016-08-16 11:04:01 +08:00
parent 1fb62d3a90
commit a0f6573708
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ class CROHelper final {
BitField<4, 28, u32_le> offset_into_segment; BitField<4, 28, u32_le> offset_into_segment;
SegmentTag() = default; SegmentTag() = default;
SegmentTag(u32 raw_) : raw(raw_) {} explicit SegmentTag(u32 raw_) : raw(raw_) {}
}; };
/// Information of a segment in this module. /// Information of a segment in this module.
@ -853,12 +853,21 @@ class CROHelper final {
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
/**
* Gets the address of OnUnresolved function in this module.
* Used as the applied symbol for reset patch.
* @returns the virtual address of OnUnresolved. 0 if not provided.
*/
VAddr GetOnUnresolvedAddress() {
return SegmentTagToAddress(SegmentTag(GetField(OnUnresolvedSegmentTag)));
}
/** /**
* Resets all external patches to unresolved state. * Resets all external patches to unresolved state.
* @returns ResultCode RESULT_SUCCESS on success, otherwise error code. * @returns ResultCode RESULT_SUCCESS on success, otherwise error code.
*/ */
ResultCode ResetExternalPatches() { ResultCode ResetExternalPatches() {
u32 unresolved_symbol = SegmentTagToAddress(GetField(OnUnresolvedSegmentTag)); u32 unresolved_symbol = GetOnUnresolvedAddress();
u32 external_patch_num = GetField(ExternalPatchNum); u32 external_patch_num = GetField(ExternalPatchNum);
ExternalPatchEntry patch; ExternalPatchEntry patch;
@ -1198,7 +1207,7 @@ class CROHelper final {
* @returns ResultCode RESULT_SUCCESS on success, otherwise error code. * @returns ResultCode RESULT_SUCCESS on success, otherwise error code.
*/ */
ResultCode ResetImportNamedSymbol() { ResultCode ResetImportNamedSymbol() {
u32 unresolved_symbol = SegmentTagToAddress(GetField(OnUnresolvedSegmentTag)); u32 unresolved_symbol = GetOnUnresolvedAddress();
u32 symbol_import_num = GetField(ImportNamedSymbolNum); u32 symbol_import_num = GetField(ImportNamedSymbolNum);
for (u32 i = 0; i < symbol_import_num; ++i) { for (u32 i = 0; i < symbol_import_num; ++i) {
@ -1223,7 +1232,7 @@ class CROHelper final {
* @returns ResultCode RESULT_SUCCESS on success, otherwise error code. * @returns ResultCode RESULT_SUCCESS on success, otherwise error code.
*/ */
ResultCode ResetImportIndexedSymbol() { ResultCode ResetImportIndexedSymbol() {
u32 unresolved_symbol = SegmentTagToAddress(GetField(OnUnresolvedSegmentTag)); u32 unresolved_symbol = GetOnUnresolvedAddress();
u32 import_num = GetField(ImportIndexedSymbolNum); u32 import_num = GetField(ImportIndexedSymbolNum);
for (u32 i = 0; i < import_num; ++i) { for (u32 i = 0; i < import_num; ++i) {
@ -1247,7 +1256,7 @@ class CROHelper final {
* @returns ResultCode RESULT_SUCCESS on success, otherwise error code. * @returns ResultCode RESULT_SUCCESS on success, otherwise error code.
*/ */
ResultCode ResetImportAnonymousSymbol() { ResultCode ResetImportAnonymousSymbol() {
u32 unresolved_symbol = SegmentTagToAddress(GetField(OnUnresolvedSegmentTag)); u32 unresolved_symbol = GetOnUnresolvedAddress();
u32 import_num = GetField(ImportAnonymousSymbolNum); u32 import_num = GetField(ImportAnonymousSymbolNum);
for (u32 i = 0; i < import_num; ++i) { for (u32 i = 0; i < import_num; ++i) {
@ -1362,7 +1371,7 @@ class CROHelper final {
ResultCode ResetExportNamedSymbol(CROHelper target) { ResultCode ResetExportNamedSymbol(CROHelper target) {
LOG_DEBUG(Service_LDR, "CRO \"%s\" unexports named symbols to \"%s\"", LOG_DEBUG(Service_LDR, "CRO \"%s\" unexports named symbols to \"%s\"",
ModuleName().data(), target.ModuleName().data()); ModuleName().data(), target.ModuleName().data());
u32 unresolved_symbol = target.SegmentTagToAddress(target.GetField(OnUnresolvedSegmentTag)); u32 unresolved_symbol = target.GetOnUnresolvedAddress();
u32 target_import_strings_size = target.GetField(ImportStringsSize); u32 target_import_strings_size = target.GetField(ImportStringsSize);
u32 target_symbol_import_num = target.GetField(ImportNamedSymbolNum); u32 target_symbol_import_num = target.GetField(ImportNamedSymbolNum);
for (u32 i = 0; i < target_symbol_import_num; ++i) { for (u32 i = 0; i < target_symbol_import_num; ++i) {
@ -1444,7 +1453,7 @@ class CROHelper final {
* @returns ResultCode RESULT_SUCCESS on success, otherwise error code. * @returns ResultCode RESULT_SUCCESS on success, otherwise error code.
*/ */
ResultCode ResetModuleExport(CROHelper target) { ResultCode ResetModuleExport(CROHelper target) {
u32 unresolved_symbol = target.SegmentTagToAddress(target.GetField(OnUnresolvedSegmentTag)); u32 unresolved_symbol = target.GetOnUnresolvedAddress();
std::string module_name = ModuleName(); std::string module_name = ModuleName();
u32 target_import_string_size = target.GetField(ImportStringsSize); u32 target_import_string_size = target.GetField(ImportStringsSize);