yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #897 from lioncash/return 

vfp: Change return type of VFPInit from unsigned int to void.
This commit is contained in:
Yuri Kunde Schlesner 2015-06-29 12:17:16 -07:00
parent 3085438216 e3e8ad48c1
commit fb66b0677b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
#include "core/arm/skyeye_common/vfp/asm_vfp.h" #include "core/arm/skyeye_common/vfp/asm_vfp.h"
#include "core/arm/skyeye_common/vfp/vfp.h" #include "core/arm/skyeye_common/vfp/vfp.h"
unsigned VFPInit(ARMul_State* state) void VFPInit(ARMul_State* state)
{ {
state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 | state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN<<24 | VFP_FPSID_SW<<23 | VFP_FPSID_SUBARCH<<16 |
VFP_FPSID_PARTNUM<<8 | VFP_FPSID_VARIANT<<4 | VFP_FPSID_REVISION; VFP_FPSID_PARTNUM<<8 | VFP_FPSID_VARIANT<<4 | VFP_FPSID_REVISION;
@ -40,8 +40,6 @@ unsigned VFPInit(ARMul_State* state)
// ARM11 MPCore feature register values. // ARM11 MPCore feature register values.
state->VFP[VFP_MVFR0] = 0x11111111; state->VFP[VFP_MVFR0] = 0x11111111;
state->VFP[VFP_MVFR1] = 0; state->VFP[VFP_MVFR1] = 0;
return 0;
} }
void VMOVBRS(ARMul_State* state, ARMword to_arm, ARMword t, ARMword n, ARMword* value) void VMOVBRS(ARMul_State* state, ARMword to_arm, ARMword t, ARMword n, ARMword* value)

2
src/core/arm/skyeye_common/vfp/vfp.h
View File

@ -26,7 +26,7 @@
#define CHECK_VFP_ENABLED #define CHECK_VFP_ENABLED
#define CHECK_VFP_CDP_RET vfp_raise_exceptions(cpu, ret, inst_cream->instr, cpu->VFP[VFP_FPSCR]); #define CHECK_VFP_CDP_RET vfp_raise_exceptions(cpu, ret, inst_cream->instr, cpu->VFP[VFP_FPSCR]);
unsigned VFPInit(ARMul_State* state); void VFPInit(ARMul_State* state);
s32 vfp_get_float(ARMul_State* state, u32 reg); s32 vfp_get_float(ARMul_State* state, u32 reg);
void vfp_put_float(ARMul_State* state, s32 val, u32 reg); void vfp_put_float(ARMul_State* state, s32 val, u32 reg);