citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #525 from lioncash/armwarn 

vfp: Get rid of some compile warnings
This commit is contained in:
bunnei 2015-02-01 00:28:50 -05:00
parent a4b1e8ce52 8c944bd1f0
commit c8628f5d56
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/arm/skyeye_common/vfp/vfp.cpp
View File

@ -471,7 +471,7 @@ int VSTR(ARMul_State* state, int type, ARMword instr, ARMword* value)
int VPUSH(ARMul_State* state, int type, ARMword instr, ARMword* value) int VPUSH(ARMul_State* state, int type, ARMword instr, ARMword* value)
{ {
static int i = 0; static int i = 0;
static int single_regs, add, wback, d, n, imm32, regs; static int single_regs, d, imm32, regs;
if (type == ARMul_FIRST) if (type == ARMul_FIRST)
{ {
single_regs = BIT(instr, 8) == 0; // Single precision single_regs = BIT(instr, 8) == 0; // Single precision
@ -562,7 +562,7 @@ int VSTM(ARMul_State* state, int type, ARMword instr, ARMword* value)
int VPOP(ARMul_State* state, int type, ARMword instr, ARMword value) int VPOP(ARMul_State* state, int type, ARMword instr, ARMword value)
{ {
static int i = 0; static int i = 0;
static int single_regs, add, wback, d, n, imm32, regs; static int single_regs, d, imm32, regs;
if (type == ARMul_FIRST) if (type == ARMul_FIRST)
{ {
single_regs = BIT(instr, 8) == 0; // Single precision single_regs = BIT(instr, 8) == 0; // Single precision
@ -759,8 +759,6 @@ void vfp_put_double(arm_core_t* state, uint64_t val, unsigned int reg)
*/ */
void vfp_raise_exceptions(ARMul_State* state, u32 exceptions, u32 inst, u32 fpscr) void vfp_raise_exceptions(ARMul_State* state, u32 exceptions, u32 inst, u32 fpscr)
{ {
int si_code = 0;
LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x\n", exceptions); LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x\n", exceptions);
if (exceptions == VFP_EXCEPTION_ERROR) { if (exceptions == VFP_EXCEPTION_ERROR) {

3
src/core/arm/skyeye_common/vfp/vfp_helper.h
View File

@ -43,7 +43,6 @@
#define pr_info //printf #define pr_info //printf
#define pr_debug //printf #define pr_debug //printf
static u32 fls(ARMword x);
#define do_div(n, base) {n/=base;} #define do_div(n, base) {n/=base;}
/* From vfpinstr.h */ /* From vfpinstr.h */
@ -501,7 +500,7 @@ struct op {
u32 flags; u32 flags;
}; };
static u32 fls(ARMword x) static inline u32 fls(ARMword x)
{ {
int r = 32; int r = 32;