summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-02-01 06:28:50 +0100
committerbunnei <bunneidev@gmail.com>2015-02-01 06:28:50 +0100
commitc8628f5d5611658cf1c769367830bc16d4ecfd5c (patch)
tree7756176ba9462105d4f824bb3f14dc6ae1696405
parentMerge pull request #524 from lioncash/state (diff)
parentvfp: Get rid of some compile warnings (diff)
downloadyuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.tar
yuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.tar.gz
yuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.tar.bz2
yuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.tar.lz
yuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.tar.xz
yuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.tar.zst
yuzu-c8628f5d5611658cf1c769367830bc16d4ecfd5c.zip
-rw-r--r--src/core/arm/skyeye_common/vfp/vfp.cpp6
-rw-r--r--src/core/arm/skyeye_common/vfp/vfp_helper.h3
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp
index 5f3dd4b47..563247c78 100644
--- a/src/core/arm/skyeye_common/vfp/vfp.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfp.cpp
@@ -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)
{
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)
{
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)
{
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)
{
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)
{
- int si_code = 0;
-
LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x\n", exceptions);
if (exceptions == VFP_EXCEPTION_ERROR) {
diff --git a/src/core/arm/skyeye_common/vfp/vfp_helper.h b/src/core/arm/skyeye_common/vfp/vfp_helper.h
index 55e63f553..dec36c692 100644
--- a/src/core/arm/skyeye_common/vfp/vfp_helper.h
+++ b/src/core/arm/skyeye_common/vfp/vfp_helper.h
@@ -43,7 +43,6 @@
#define pr_info //printf
#define pr_debug //printf
-static u32 fls(ARMword x);
#define do_div(n, base) {n/=base;}
/* From vfpinstr.h */
@@ -501,7 +500,7 @@ struct op {
u32 flags;
};
-static u32 fls(ARMword x)
+static inline u32 fls(ARMword x)
{
int r = 32;