fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Memory] TranslateVirtual in shim and strings

Browse Source
This commit is contained in:
Triang3l
2019-08-14 10:31:11 +03:00
parent 0067f5561d
commit 2507f1a819
7 changed files with 67 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/xenia/xbox.h
View File

@@ -260,47 +260,11 @@ struct X_ANSI_STRING {
xe::be<uint16_t> maximum_length;
xe::be<uint32_t> pointer;
static X_ANSI_STRING* Translate(uint8_t* membase, uint32_t guest_address) {
if (!guest_address) {
return nullptr;
}
return reinterpret_cast<X_ANSI_STRING*>(membase + guest_address);
}
static X_ANSI_STRING* TranslateIndirect(uint8_t* membase,
uint32_t guest_address_ptr) {
if (!guest_address_ptr) {
return nullptr;
}
uint32_t guest_address =
xe::load_and_swap<uint32_t>(membase + guest_address_ptr);
return Translate(membase, guest_address);
}
static std::string to_string(uint8_t* membase, uint32_t guest_address) {
auto str = Translate(membase, guest_address);
return str ? str->to_string(membase) : "";
}
static std::string to_string_indirect(uint8_t* membase,
uint32_t guest_address_ptr) {
auto str = TranslateIndirect(membase, guest_address_ptr);
return str ? str->to_string(membase) : "";
}
void reset() {
length = 0;
maximum_length = 0;
pointer = 0;
}
std::string to_string(uint8_t* membase) const {
if (!length) {
return "";
}
return std::string(reinterpret_cast<const char*>(membase + pointer),
length);
}
};
static_assert_size(X_ANSI_STRING, 8);
@@ -314,15 +278,6 @@ struct X_UNICODE_STRING {
maximum_length = 0;
pointer = 0;
}
std::wstring to_string(uint8_t* membase) const {
if (!length) {
return L"";
}
return std::wstring(reinterpret_cast<const wchar_t*>(membase + pointer),
length);
}
};
static_assert_size(X_UNICODE_STRING, 8);