diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp index e0f9fc97e9..ab9a936c9c 100644 --- a/Core/MIPS/ARM/ArmJit.cpp +++ b/Core/MIPS/ARM/ArmJit.cpp @@ -715,24 +715,4 @@ void ArmJit::WriteSyscallExit() void ArmJit::Comp_DoNothing(MIPSOpcode op) { } -#define _RS ((op>>21) & 0x1F) -#define _RT ((op>>16) & 0x1F) -#define _RD ((op>>11) & 0x1F) -#define _FS ((op>>11) & 0x1F) -#define _FT ((op>>16) & 0x1F) -#define _FD ((op>>6) & 0x1F) -#define _POS ((op>>6) & 0x1F) -#define _SIZE ((op>>11) & 0x1F) - -//memory regions: -// -// 08-0A -// 48-4A -// 04-05 -// 44-45 -// mov eax, addrreg - // shr eax, 28 -// mov eax, [table+eax] -// mov dreg, [eax+offreg] - } diff --git a/Core/MIPS/ARM64/Arm64Jit.cpp b/Core/MIPS/ARM64/Arm64Jit.cpp index 5c353f9eaa..d27f2ac90b 100644 --- a/Core/MIPS/ARM64/Arm64Jit.cpp +++ b/Core/MIPS/ARM64/Arm64Jit.cpp @@ -633,24 +633,4 @@ void Arm64Jit::WriteSyscallExit() { void Arm64Jit::Comp_DoNothing(MIPSOpcode op) { } -#define _RS ((op>>21) & 0x1F) -#define _RT ((op>>16) & 0x1F) -#define _RD ((op>>11) & 0x1F) -#define _FS ((op>>11) & 0x1F) -#define _FT ((op>>16) & 0x1F) -#define _FD ((op>>6) & 0x1F) -#define _POS ((op>>6) & 0x1F) -#define _SIZE ((op>>11) & 0x1F) - -//memory regions: -// -// 08-0A -// 48-4A -// 04-05 -// 44-45 -// mov eax, addrreg - // shr eax, 28 -// mov eax, [table+eax] -// mov dreg, [eax+offreg] - } diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp index 7f107b23f9..93d0d77b42 100644 --- a/GPU/Common/VertexDecoderCommon.cpp +++ b/GPU/Common/VertexDecoderCommon.cpp @@ -134,8 +134,7 @@ void PrintDecodedVertex(VertexReader &vtx) { printf("P: %f %f %f\n", pos[0], pos[1], pos[2]); } -VertexDecoder::VertexDecoder() : jitted_(0), decoded_(nullptr), ptr_(nullptr) -{ +VertexDecoder::VertexDecoder() : jitted_(0), decoded_(nullptr), ptr_(nullptr) { } void VertexDecoder::Step_WeightsU8() const diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 5ac270c5b4..8a93c3e349 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -439,12 +439,10 @@ void LogoScreen::render() { #ifdef _WIN32 dc.DrawText(screenManager()->getThin3DContext()->GetInfoString(T3DInfo::APINAME), bounds.centerX(), bounds.y2() - 100, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER); -#elif defined(ANDROID) -#ifdef ARM64 +#elif defined(ARM64) dc.SetFontScale(2.0f, 2.0f); dc.DrawText("EXPERIMENTAL ARM64 BUILD", bounds.centerX(), bounds.y2() - 100, colorAlpha(0xFF3030FF, alphaText), ALIGN_CENTER); dc.SetFontScale(1.0f, 1.0f); -#endif #endif dc.End();