Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

- removed unused stubbed out code

Browse source 
- fixed some compiler issues with xscale_copro when porting code to Windows
- fixed some #include's
This commit is contained in:
bunnei 2014-05-16 20:04:13 -04:00
parent f872807de2
commit a2804bf701
5 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/arm/interpreter/armemu.cpp
View file

@ -23,17 +23,6 @@
#include "armemu.h"
#include "armos.h"
void
XScale_set_fsr_far(ARMul_State * state, ARMword fsr, ARMword _far)
{
_dbg_assert_msg_(ARM11, false, "ImplementMe: XScale_set_fsr_far!");
//if (!state->is_XScale || (read_cp14_reg(10) & (1UL << 31)) == 0)
// return;
//
//write_cp15_reg(state, 5, 0, 0, fsr);
//write_cp15_reg(state, 6, 0, 0, _far);
}
#define ARMul_Debug(x,y,z) 0 // Disabling this /bunnei
//#include "skyeye_callback.h"

35
src/core/arm/interpreter/mmu/xscale_copro.cpp
View file

@ -412,7 +412,8 @@ unsigned xscale_cp15_write_reg (ARMul_State * state, unsigned reg,
return 0;
}
int xscale_cp15_init (ARMul_State * state)
unsigned
xscale_cp15_init (ARMul_State * state)
{
xscale_mmu_desc_t *desc;
cache_desc_t *c_desc;
@ -489,7 +490,8 @@ int xscale_cp15_init (ARMul_State * state)
return -1;
}
void xscale_cp15_exit (ARMul_State * state)
unsigned
xscale_cp15_exit (ARMul_State * state)
{
//mmu_rb_exit(RB());
mmu_wb_exit (WB ());
@ -498,6 +500,7 @@ void xscale_cp15_exit (ARMul_State * state)
mmu_tlb_exit (D_TLB ());
mmu_cache_exit (I_CACHE ());
mmu_tlb_exit (I_TLB ());
return 0;
};
@ -1372,17 +1375,17 @@ static int xscale_mmu_v2p_dbct (ARMul_State * state, ARMword virt_addr,
//AJ2D--------------------------------------------------------------------------
/*xscale mmu_ops_t*/
mmu_ops_t xscale_mmu_ops = {
xscale_cp15_init,
xscale_cp15_exit,
xscale_mmu_read_byte,
xscale_mmu_write_byte,
xscale_mmu_read_halfword,
xscale_mmu_write_halfword,
xscale_mmu_read_word,
xscale_mmu_write_word,
xscale_mmu_load_instr, xscale_mmu_mcr, xscale_mmu_mrc,
//teawater add for arm2x86 2005.06.24-------------------------------------------
xscale_mmu_v2p_dbct,
//AJ2D--------------------------------------------------------------------------
};
//mmu_ops_t xscale_mmu_ops = {
// xscale_cp15_init,
// xscale_cp15_exit,
// xscale_mmu_read_byte,
// xscale_mmu_write_byte,
// xscale_mmu_read_halfword,
// xscale_mmu_write_halfword,
// xscale_mmu_read_word,
// xscale_mmu_write_word,
// xscale_mmu_load_instr, xscale_mmu_mcr, xscale_mmu_mrc,
////teawater add for arm2x86 2005.06.24-------------------------------------------
// xscale_mmu_v2p_dbct,
////AJ2D--------------------------------------------------------------------------
//};

4
src/core/arm/interpreter/vfp/vfp.h
View file

@ -84,8 +84,8 @@ void vfp_put_float(ARMul_State * state, int32_t val, unsigned int reg);
uint64_t vfp_get_double(ARMul_State * state, unsigned int reg);
void vfp_put_double(ARMul_State * state, uint64_t val, unsigned int reg);
void vfp_raise_exceptions(ARMul_State * state, uint32_t exceptions, uint32_t inst, uint32_t fpscr);
extern uint32_t vfp_single_cpdo(ARMul_State * state, uint32_t inst, uint32_t fpscr);
extern uint32_t vfp_double_cpdo(ARMul_State * state, uint32_t inst, uint32_t fpscr);
u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr);
u32 vfp_double_cpdo(ARMul_State* state, u32 inst, u32 fpscr);
/* MRC */
inline void VMRS(ARMul_State * state, ARMword reg, ARMword Rt, ARMword *value);

5
src/core/arm/interpreter/vfp/vfpdouble.cpp
View file

@ -51,8 +51,9 @@
* ===========================================================================
*/
#include "vfp_helper.h"
#include "asm_vfp.h"
#include "core/arm/interpreter/vfp/vfp.h"
#include "core/arm/interpreter/vfp/vfp_helper.h"
#include "core/arm/interpreter/vfp/asm_vfp.h"
static struct vfp_double vfp_double_default_qnan = {
//.exponent = 2047,

5
src/core/arm/interpreter/vfp/vfpsingle.cpp
View file

@ -51,8 +51,9 @@
* ===========================================================================
*/
#include "vfp_helper.h"
#include "asm_vfp.h"
#include "core/arm/interpreter/vfp/vfp_helper.h"
#include "core/arm/interpreter/vfp/asm_vfp.h"
#include "core/arm/interpreter/vfp/vfp.h"
static struct vfp_single vfp_single_default_qnan = {
//.exponent = 255,