summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2015-06-29 14:51:38 -0400
committerGravatar Lioncash2015-06-29 14:51:38 -0400
commite3e8ad48c1f40148695125faa4e92767a18fd487 (patch)
tree7bc3a15762468fe0170071272596ddacfc2e6d62
parentMerge pull request #895 from lioncash/vfp (diff)
downloadyuzu-e3e8ad48c1f40148695125faa4e92767a18fd487.tar.gz
yuzu-e3e8ad48c1f40148695125faa4e92767a18fd487.tar.xz
yuzu-e3e8ad48c1f40148695125faa4e92767a18fd487.zip
vfp: Change return type of VFPInit from unsigned int to void.
Diffstat (limited to '')
-rw-r--r--src/core/arm/skyeye_common/vfp/vfp.cpp4
-rw-r--r--src/core/arm/skyeye_common/vfp/vfp.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp
index f40cf5955..592d32a74 100644
--- a/src/core/arm/skyeye_common/vfp/vfp.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfp.cpp
@@ -26,7 +26,7 @@
26#include "core/arm/skyeye_common/vfp/asm_vfp.h" 26#include "core/arm/skyeye_common/vfp/asm_vfp.h"
27#include "core/arm/skyeye_common/vfp/vfp.h" 27#include "core/arm/skyeye_common/vfp/vfp.h"
28 28
29unsigned VFPInit(ARMul_State* state) 29void VFPInit(ARMul_State* state)
30{ 30{
31 state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 | 31 state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 |
32 VFP_FPSID_PARTNUM<<8 | VFP_FPSID_VARIANT<<4 | VFP_FPSID_REVISION; 32 VFP_FPSID_PARTNUM<<8 | VFP_FPSID_VARIANT<<4 | VFP_FPSID_REVISION;
@@ -40,8 +40,6 @@ unsigned VFPInit(ARMul_State* state)
40 // ARM11 MPCore feature register values. 40 // ARM11 MPCore feature register values.
41 state->VFP[VFP_MVFR0] = 0x11111111; 41 state->VFP[VFP_MVFR0] = 0x11111111;
42 state->VFP[VFP_MVFR1] = 0; 42 state->VFP[VFP_MVFR1] = 0;
43
44 return 0;
45} 43}
46 44
47void VMOVBRS(ARMul_State* state, ARMword to_arm, ARMword t, ARMword n, ARMword* value) 45void VMOVBRS(ARMul_State* state, ARMword to_arm, ARMword t, ARMword n, ARMword* value)
diff --git a/src/core/arm/skyeye_common/vfp/vfp.h b/src/core/arm/skyeye_common/vfp/vfp.h
index eb376561a..80ca93ccd 100644
--- a/src/core/arm/skyeye_common/vfp/vfp.h
+++ b/src/core/arm/skyeye_common/vfp/vfp.h
@@ -26,7 +26,7 @@
26#define CHECK_VFP_ENABLED 26#define CHECK_VFP_ENABLED
27#define CHECK_VFP_CDP_RET vfp_raise_exceptions(cpu, ret, inst_cream->instr, cpu->VFP[VFP_FPSCR]); 27#define CHECK_VFP_CDP_RET vfp_raise_exceptions(cpu, ret, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
28 28
29unsigned VFPInit(ARMul_State* state); 29void VFPInit(ARMul_State* state);
30 30
31s32 vfp_get_float(ARMul_State* state, u32 reg); 31s32 vfp_get_float(ARMul_State* state, u32 reg);
32void vfp_put_float(ARMul_State* state, s32 val, u32 reg); 32void vfp_put_float(ARMul_State* state, s32 val, u32 reg);