From 836ff6d5060416445c77ca67d421daad5e1c5432 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 21 Sep 2014 20:13:22 -0400 Subject: [PATCH] Fix some warnings on Linux --- Source/Core/Core/PowerPC/Gekko.h | 1 + Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp | 6 +----- Source/Core/VideoBackends/OGL/RasterFont.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h index 5d333add40..cde09114ee 100644 --- a/Source/Core/Core/PowerPC/Gekko.h +++ b/Source/Core/Core/PowerPC/Gekko.h @@ -407,6 +407,7 @@ const u32 FPSCR_VXVC = 1U << (31 - 12); const u32 FPSCR_VXSOFT = 1U << (31 - 21); const u32 FPSCR_VXSQRT = 1U << (31 - 22); const u32 FPSCR_VXCVI = 1U << (31 - 23); +const u32 FPSCR_VE = 1U << (31 - 24); const u32 FPSCR_VX_ANY = FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI | FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC | FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI; diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp index ccd9ce1821..0491854b42 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp @@ -29,6 +29,7 @@ The register allocation is linear scan allocation. #include "Common/CPUDetect.h" #include "Common/MathUtil.h" #include "Core/HW/ProcessorInterface.h" +#include "Core/PowerPC/Gekko.h" #include "Core/PowerPC/Jit64IL/JitIL.h" using namespace IREmitter; @@ -1890,11 +1891,6 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress) Jit->SetJumpTarget(pNan); Jit->MOV(32, R(destreg), Imm32(0x1)); - static const u32 FPSCR_VE = (u32)1 << (31 - 24); - static const u32 FPSCR_VXVC = (u32)1 << (31 - 12); - static const u32 FPSCR_VXSNAN = (u32)1 << (31 - 7); - static const u32 FPSCR_FX = (u32)1 << (31 - 0); - if (ordered) { // fcmpo diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index 34caa49ed8..2fb5d0e50a 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -215,7 +215,7 @@ void RasterFont::printMultilineText(const std::string& text, double start_x, dou continue; } - if ((u32) c < CHAR_OFFSET || (u32) c >= CHAR_COUNT + CHAR_OFFSET) + if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET) continue; vertices[usage++] = x;