diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-16 22:24:34 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-16 22:24:34 -0400 |
| commit | 0b1ba2f37a71831e6c60ddce7adfb170c53b193f (patch) | |
| tree | 53c185cffb4288f8d3e73b8f2b75df0789b86deb /src/core/arm/interpreter/armmmu.h | |
| parent | 4fba4f36bf20c2721e2602c450eafcc1117ac643 (diff) | |
| parent | a4fd257469bc06d1474a2e6e8df9dbd233ac79a5 (diff) | |
Merge master into threading to add support for VFP
Diffstat (limited to 'src/core/arm/interpreter/armmmu.h')
| -rw-r--r-- | src/core/arm/interpreter/armmmu.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/core/arm/interpreter/armmmu.h b/src/core/arm/interpreter/armmmu.h index 8b24e6151..818108c9c 100644 --- a/src/core/arm/interpreter/armmmu.h +++ b/src/core/arm/interpreter/armmmu.h @@ -172,18 +172,18 @@ typedef struct mmu_ops_s } mmu_ops_t; -#include "core/arm/mmu/tlb.h" -#include "core/arm/mmu/rb.h" -#include "core/arm/mmu/wb.h" -#include "core/arm/mmu/cache.h" +#include "core/arm/interpreter/mmu/tlb.h" +#include "core/arm/interpreter/mmu/rb.h" +#include "core/arm/interpreter/mmu/wb.h" +#include "core/arm/interpreter/mmu/cache.h" /*special process mmu.h*/ -//#include "core/arm/mmu/sa_mmu.h" -//#include "core/arm/mmu/arm7100_mmu.h" -//#include "core/arm/mmu/arm920t_mmu.h" -//#include "core/arm/mmu/arm926ejs_mmu.h" -#include "core/arm/mmu/arm1176jzf_s_mmu.h" -//#include "core/arm/mmu/cortex_a9_mmu.h" +#include "core/arm/interpreter/mmu/sa_mmu.h" +//#include "core/arm/interpreter/mmu/arm7100_mmu.h" +//#include "core/arm/interpreter/mmu/arm920t_mmu.h" +//#include "core/arm/interpreter/mmu/arm926ejs_mmu.h" +#include "core/arm/interpreter/mmu/arm1176jzf_s_mmu.h" +//#include "core/arm/interpreter/mmu/cortex_a9_mmu.h" typedef struct mmu_state_t { @@ -213,13 +213,13 @@ typedef struct mmu_state_t ARMword copro_access; // 15 mmu_ops_t ops; - //union - //{ - //sa_mmu_t sa_mmu; + union + { + sa_mmu_t sa_mmu; //arm7100_mmu_t arm7100_mmu; //arm920t_mmu_t arm920t_mmu; //arm926ejs_mmu_t arm926ejs_mmu; - //} u; + } u; } mmu_state_t; int mmu_init (ARMul_State * state); |