diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-17 02:04:13 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-17 02:04:13 +0200 |
| commit | a2804bf7010c2759668cfc36285a2b2a39bc695f (patch) | |
| tree | 9d0823f4cd6afca9255080530a16e50aa0673dcd /src/core/arm/interpreter/mmu | |
| parent | added maverick.cpp to ARM core from skyeye (diff) | |
| download | yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.tar yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.tar.gz yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.tar.bz2 yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.tar.lz yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.tar.xz yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.tar.zst yuzu-a2804bf7010c2759668cfc36285a2b2a39bc695f.zip | |
Diffstat (limited to 'src/core/arm/interpreter/mmu')
| -rw-r--r-- | src/core/arm/interpreter/mmu/xscale_copro.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/core/arm/interpreter/mmu/xscale_copro.cpp b/src/core/arm/interpreter/mmu/xscale_copro.cpp index a006cb102..433ce8e02 100644 --- a/src/core/arm/interpreter/mmu/xscale_copro.cpp +++ b/src/core/arm/interpreter/mmu/xscale_copro.cpp @@ -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-------------------------------------------------------------------------- +//}; |