ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings on Linux

This commit is contained in:
Lioncash 2014-09-21 20:13:22 -04:00
parent 9e2b9e2471
commit 836ff6d506
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/PowerPC/Gekko.h
View File

@ -407,6 +407,7 @@ const u32 FPSCR_VXVC = 1U << (31 - 12);
const u32 FPSCR_VXSOFT = 1U << (31 - 21); const u32 FPSCR_VXSOFT = 1U << (31 - 21);
const u32 FPSCR_VXSQRT = 1U << (31 - 22); const u32 FPSCR_VXSQRT = 1U << (31 - 22);
const u32 FPSCR_VXCVI = 1U << (31 - 23); 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 | const u32 FPSCR_VX_ANY = FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI | FPSCR_VXZDZ | FPSCR_VXIMZ |
FPSCR_VXVC | FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI; FPSCR_VXVC | FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI;

6
Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
View File

@ -29,6 +29,7 @@ The register allocation is linear scan allocation.
#include "Common/CPUDetect.h" #include "Common/CPUDetect.h"
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/PowerPC/Gekko.h"
#include "Core/PowerPC/Jit64IL/JitIL.h" #include "Core/PowerPC/Jit64IL/JitIL.h"
using namespace IREmitter; using namespace IREmitter;
@ -1890,11 +1891,6 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress)
Jit->SetJumpTarget(pNan); Jit->SetJumpTarget(pNan);
Jit->MOV(32, R(destreg), Imm32(0x1)); 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) if (ordered)
{ {
// fcmpo // fcmpo

2
Source/Core/VideoBackends/OGL/RasterFont.cpp
View File

@ -215,7 +215,7 @@ void RasterFont::printMultilineText(const std::string& text, double start_x, dou
continue; continue;
} }
if ((u32) c < CHAR_OFFSET || (u32) c >= CHAR_COUNT + CHAR_OFFSET) if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET)
continue; continue;
vertices[usage++] = x; vertices[usage++] = x;