Citra-emu/dynarmic-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a64/block_of_code: use GetWritableCodePtr() instead of const_cast<...>(GetCodePtr())

Browse Source
This commit is contained in:
SachinVin 2019-11-23 17:29:28 +05:30
parent 534ad728a8
commit a7ef959570
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/A64/block_of_code.cpp
View File

@ -149,7 +149,8 @@ void BlockOfCode::ForceReturnFromRunCode(bool fpscr_already_exited) {
void BlockOfCode::GenRunCode() { void BlockOfCode::GenRunCode() {
const u8* loop, *enter_fpscr_then_loop; const u8* loop, *enter_fpscr_then_loop;
run_code_from = (RunCodeFromFuncType) const_cast<u8*>(AlignCode16()); AlignCode16();
run_code_from = (RunCodeFromFuncType) GetWritableCodePtr();
ABI_PushCalleeSaveRegistersAndAdjustStack(*this); ABI_PushCalleeSaveRegistersAndAdjustStack(*this);
@ -164,7 +165,8 @@ void BlockOfCode::GenRunCode() {
SwitchFpscrOnEntry(); SwitchFpscrOnEntry();
BR(Arm64Gen::X27); BR(Arm64Gen::X27);
run_code = (RunCodeFuncType) const_cast<u8*>(AlignCode16()); AlignCode16();
run_code = (RunCodeFuncType) GetWritableCodePtr();
// This serves two purposes: // This serves two purposes:
// 1. It saves all the registers we as a callee need to save. // 1. It saves all the registers we as a callee need to save.
@ -292,7 +294,7 @@ CodePtr BlockOfCode::GetCodeBegin() const {
void* BlockOfCode::AllocateFromCodeSpace(size_t alloc_size) { void* BlockOfCode::AllocateFromCodeSpace(size_t alloc_size) {
ASSERT_MSG(GetSpaceLeft() >= alloc_size, "ERR_CODE_IS_TOO_BIG"); ASSERT_MSG(GetSpaceLeft() >= alloc_size, "ERR_CODE_IS_TOO_BIG");
void* ret = const_cast<u8*>(GetCodePtr()); void* ret = GetWritableCodePtr();
region_size += alloc_size; region_size += alloc_size;
SetCodePtr(GetCodePtr() + alloc_size); SetCodePtr(GetCodePtr() + alloc_size);
memset(ret, 0, alloc_size); memset(ret, 0, alloc_size);