From 45ea1fa9905d20d7c3a839e28f571aff0b3e76f5 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Sat, 31 Oct 2020 17:40:05 +0100 Subject: Fix compilation issues on pedantic cpp compilers. (#783) * Fix compilation issues on pedantic cpp compilers. * Avoid using fullblown static function. --- src/ARMJIT_x64/ARMJIT_Compiler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/ARMJIT_x64') diff --git a/src/ARMJIT_x64/ARMJIT_Compiler.cpp b/src/ARMJIT_x64/ARMJIT_Compiler.cpp index c6419c9..9785ffc 100644 --- a/src/ARMJIT_x64/ARMJIT_Compiler.cpp +++ b/src/ARMJIT_x64/ARMJIT_Compiler.cpp @@ -101,6 +101,11 @@ void Compiler::A_Comp_MRS() MOV(32, rd, R(RCPSR)); } +void UpdateModeTrampoline(ARM* arm, u32 oldmode, u32 newmode) +{ + arm->UpdateMode(oldmode, newmode); +} + void Compiler::A_Comp_MSR() { Comp_AddCycles_C(); @@ -185,7 +190,7 @@ void Compiler::A_Comp_MSR() MOV(32, R(ABI_PARAM3), R(RCPSR)); MOV(32, R(ABI_PARAM2), R(RSCRATCH3)); MOV(64, R(ABI_PARAM1), R(RCPU)); - CALL((void*)&ARM::UpdateMode); + CALL((void*)&UpdateModeTrampoline); PopRegs(true); } @@ -896,5 +901,4 @@ void Compiler::Comp_AddCycles_CD() else ConstantCycles += cycles; } - -} \ No newline at end of file +} -- cgit v1.2.3