piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 14:19:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix aarch64 build with gcc 11

Browse Source
This commit is contained in:
RSDuck
2021-04-29 15:15:16 +02:00
parent eae42fb9f8
commit 0a3a2ad009
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ARMJIT_A64/ARMJIT_Compiler.cpp
View File

@ -483,12 +483,12 @@ void Compiler::LoadReg(int reg, ARM64Reg nativeReg)
if (reg == 15) if (reg == 15)
MOVI2R(nativeReg, R15); MOVI2R(nativeReg, R15);
else else
LDR(INDEX_UNSIGNED, nativeReg, RCPU, offsetof(ARM, R[reg])); LDR(INDEX_UNSIGNED, nativeReg, RCPU, offsetof(ARM, R) + reg*4);
} }
void Compiler::SaveReg(int reg, ARM64Reg nativeReg) void Compiler::SaveReg(int reg, ARM64Reg nativeReg)
{ {
STR(INDEX_UNSIGNED, nativeReg, RCPU, offsetof(ARM, R[reg])); STR(INDEX_UNSIGNED, nativeReg, RCPU, offsetof(ARM, R) + reg*4);
} }
void Compiler::LoadCPSR() void Compiler::LoadCPSR()

1
src/dolphin/Arm64Emitter.cpp
View File

@ -7,6 +7,7 @@
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>
#include <vector> #include <vector>
#include <limits>
#include "Compat.h" #include "Compat.h"
#include "Align.h" #include "Align.h"