diff options
Diffstat (limited to 'softmmu_header.h')
| -rw-r--r-- | softmmu_header.h | 70 |
1 files changed, 51 insertions, 19 deletions
diff --git a/softmmu_header.h b/softmmu_header.h index 36cf9f0a11..26b4f2cddb 100644 --- a/softmmu_header.h +++ b/softmmu_header.h @@ -19,26 +19,48 @@ */ #if DATA_SIZE == 8 #define SUFFIX q +#define USUFFIX q #define DATA_TYPE uint64_t #elif DATA_SIZE == 4 #define SUFFIX l +#define USUFFIX l #define DATA_TYPE uint32_t #elif DATA_SIZE == 2 #define SUFFIX w +#define USUFFIX uw #define DATA_TYPE uint16_t #define DATA_STYPE int16_t #elif DATA_SIZE == 1 #define SUFFIX b +#define USUFFIX ub #define DATA_TYPE uint8_t #define DATA_STYPE int8_t #else #error unsupported data size #endif -#if MEMUSER == 0 -#define MEMSUFFIX _kernel +#if ACCESS_TYPE == 0 + +#define CPU_MEM_INDEX 0 +#define MMUSUFFIX _mmu + +#elif ACCESS_TYPE == 1 + +#define CPU_MEM_INDEX 1 +#define MMUSUFFIX _mmu + +#elif ACCESS_TYPE == 2 + +#define CPU_MEM_INDEX ((env->hflags & HF_CPL_MASK) == 3) +#define MMUSUFFIX _mmu + +#elif ACCESS_TYPE == 3 + +#define CPU_MEM_INDEX ((env->hflags & HF_CPL_MASK) == 3) +#define MMUSUFFIX _cmmu + #else -#define MEMSUFFIX _user +#error invalid ACCESS_TYPE #endif #if DATA_SIZE == 8 @@ -48,24 +70,26 @@ #endif -#if MEMUSER == 0 -DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), _mmu)(unsigned long addr); -void REGPARM(2) glue(glue(__st, SUFFIX), _mmu)(unsigned long addr, DATA_TYPE v); -#endif +DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), MMUSUFFIX)(unsigned long addr, + int is_user); +void REGPARM(2) glue(glue(__st, SUFFIX), MMUSUFFIX)(unsigned long addr, DATA_TYPE v, int is_user); -static inline int glue(glue(ldu, SUFFIX), MEMSUFFIX)(void *ptr) +static inline int glue(glue(ld, USUFFIX), MEMSUFFIX)(void *ptr) { int index; RES_TYPE res; unsigned long addr, physaddr; + int is_user; + addr = (unsigned long)ptr; index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); - if (__builtin_expect(env->tlb_read[MEMUSER][index].address != + is_user = CPU_MEM_INDEX; + if (__builtin_expect(env->tlb_read[is_user][index].address != (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))), 0)) { - res = glue(glue(__ld, SUFFIX), _mmu)(addr); + res = glue(glue(__ld, SUFFIX), MMUSUFFIX)(addr, is_user); } else { - physaddr = addr + env->tlb_read[MEMUSER][index].addend; - res = glue(glue(ldu, SUFFIX), _raw)((uint8_t *)physaddr); + physaddr = addr + env->tlb_read[is_user][index].addend; + res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)physaddr); } return res; } @@ -75,13 +99,16 @@ static inline int glue(glue(lds, SUFFIX), MEMSUFFIX)(void *ptr) { int res, index; unsigned long addr, physaddr; + int is_user; + addr = (unsigned long)ptr; index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); - if (__builtin_expect(env->tlb_read[MEMUSER][index].address != + is_user = CPU_MEM_INDEX; + if (__builtin_expect(env->tlb_read[is_user][index].address != (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))), 0)) { - res = (DATA_STYPE)glue(glue(__ld, SUFFIX), _mmu)(addr); + res = (DATA_STYPE)glue(glue(__ld, SUFFIX), MMUSUFFIX)(addr, is_user); } else { - physaddr = addr + env->tlb_read[MEMUSER][index].addend; + physaddr = addr + env->tlb_read[is_user][index].addend; res = glue(glue(lds, SUFFIX), _raw)((uint8_t *)physaddr); } return res; @@ -92,13 +119,16 @@ static inline void glue(glue(st, SUFFIX), MEMSUFFIX)(void *ptr, RES_TYPE v) { int index; unsigned long addr, physaddr; + int is_user; + addr = (unsigned long)ptr; index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); - if (__builtin_expect(env->tlb_write[MEMUSER][index].address != + is_user = CPU_MEM_INDEX; + if (__builtin_expect(env->tlb_write[is_user][index].address != (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))), 0)) { - glue(glue(__st, SUFFIX), _mmu)(addr, v); + glue(glue(__st, SUFFIX), MMUSUFFIX)(addr, v, is_user); } else { - physaddr = addr + env->tlb_write[MEMUSER][index].addend; + physaddr = addr + env->tlb_write[is_user][index].addend; glue(glue(st, SUFFIX), _raw)((uint8_t *)physaddr, v); } } @@ -107,5 +137,7 @@ static inline void glue(glue(st, SUFFIX), MEMSUFFIX)(void *ptr, RES_TYPE v) #undef DATA_TYPE #undef DATA_STYPE #undef SUFFIX +#undef USUFFIX #undef DATA_SIZE -#undef MEMSUFFIX +#undef CPU_MEM_INDEX +#undef MMUSUFFIX |