SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

exec.c: remove unnecessary #if NB_MMU_MODES

Browse Source 
remove unnecessary #if NB_MMU_MODES by using loop.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Isaku Yamahata 2009-05-20 11:31:43 +09:00 committed by Anthony Liguori
parent 77d4db015c
commit cfde4bd931
1 changed files with 23 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
exec.c
View File

@ -1762,28 +1762,12 @@ void tlb_flush(CPUState *env, int flush_global)
env->current_tb = NULL; env->current_tb = NULL;
for(i = 0; i < CPU_TLB_SIZE; i++) { for(i = 0; i < CPU_TLB_SIZE; i++) {
env->tlb_table[0][i].addr_read = -1; int mmu_idx;
env->tlb_table[0][i].addr_write = -1; for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
env->tlb_table[0][i].addr_code = -1; env->tlb_table[mmu_idx][i].addr_read = -1;
env->tlb_table[1][i].addr_read = -1; env->tlb_table[mmu_idx][i].addr_write = -1;
env->tlb_table[1][i].addr_write = -1; env->tlb_table[mmu_idx][i].addr_code = -1;
env->tlb_table[1][i].addr_code = -1; }
#if (NB_MMU_MODES >= 3)
env->tlb_table[2][i].addr_read = -1;
env->tlb_table[2][i].addr_write = -1;
env->tlb_table[2][i].addr_code = -1;
#endif
#if (NB_MMU_MODES >= 4)
env->tlb_table[3][i].addr_read = -1;
env->tlb_table[3][i].addr_write = -1;
env->tlb_table[3][i].addr_code = -1;
#endif
#if (NB_MMU_MODES >= 5)
env->tlb_table[4][i].addr_read = -1;
env->tlb_table[4][i].addr_write = -1;
env->tlb_table[4][i].addr_code = -1;
#endif
} }
memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *)); memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
@ -1813,6 +1797,7 @@ static inline void tlb_flush_entry(CPUTLBEntry *tlb_entry, target_ulong addr)
void tlb_flush_page(CPUState *env, target_ulong addr) void tlb_flush_page(CPUState *env, target_ulong addr)
{ {
int i; int i;
int mmu_idx;
#if defined(DEBUG_TLB) #if defined(DEBUG_TLB)
printf("tlb_flush_page: " TARGET_FMT_lx "\n", addr); printf("tlb_flush_page: " TARGET_FMT_lx "\n", addr);
@ -1823,17 +1808,8 @@ void tlb_flush_page(CPUState *env, target_ulong addr)
addr &= TARGET_PAGE_MASK; addr &= TARGET_PAGE_MASK;
i = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); i = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
tlb_flush_entry(&env->tlb_table[0][i], addr); for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++)
tlb_flush_entry(&env->tlb_table[1][i], addr); tlb_flush_entry(&env->tlb_table[mmu_idx][i], addr);
#if (NB_MMU_MODES >= 3)
tlb_flush_entry(&env->tlb_table[2][i], addr);
#endif
#if (NB_MMU_MODES >= 4)
tlb_flush_entry(&env->tlb_table[3][i], addr);
#endif
#if (NB_MMU_MODES >= 5)
tlb_flush_entry(&env->tlb_table[4][i], addr);
#endif
tlb_flush_jmp_cache(env, addr); tlb_flush_jmp_cache(env, addr);
@ -1917,22 +1893,12 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
} }
for(env = first_cpu; env != NULL; env = env->next_cpu) { for(env = first_cpu; env != NULL; env = env->next_cpu) {
for(i = 0; i < CPU_TLB_SIZE; i++) int mmu_idx;
tlb_reset_dirty_range(&env->tlb_table[0][i], start1, length); for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
for(i = 0; i < CPU_TLB_SIZE; i++) for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_reset_dirty_range(&env->tlb_table[1][i], start1, length); tlb_reset_dirty_range(&env->tlb_table[mmu_idx][i],
#if (NB_MMU_MODES >= 3) start1, length);
for(i = 0; i < CPU_TLB_SIZE; i++) }
tlb_reset_dirty_range(&env->tlb_table[2][i], start1, length);
#endif
#if (NB_MMU_MODES >= 4)
for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_reset_dirty_range(&env->tlb_table[3][i], start1, length);
#endif
#if (NB_MMU_MODES >= 5)
for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_reset_dirty_range(&env->tlb_table[4][i], start1, length);
#endif
} }
} }
@ -1979,22 +1945,11 @@ static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry)
void cpu_tlb_update_dirty(CPUState *env) void cpu_tlb_update_dirty(CPUState *env)
{ {
int i; int i;
for(i = 0; i < CPU_TLB_SIZE; i++) int mmu_idx;
tlb_update_dirty(&env->tlb_table[0][i]); for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
for(i = 0; i < CPU_TLB_SIZE; i++) for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_update_dirty(&env->tlb_table[1][i]); tlb_update_dirty(&env->tlb_table[mmu_idx][i]);
#if (NB_MMU_MODES >= 3) }
for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_update_dirty(&env->tlb_table[2][i]);
#endif
#if (NB_MMU_MODES >= 4)
for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_update_dirty(&env->tlb_table[3][i]);
#endif
#if (NB_MMU_MODES >= 5)
for(i = 0; i < CPU_TLB_SIZE; i++)
tlb_update_dirty(&env->tlb_table[4][i]);
#endif
} }
static inline void tlb_set_dirty1(CPUTLBEntry *tlb_entry, target_ulong vaddr) static inline void tlb_set_dirty1(CPUTLBEntry *tlb_entry, target_ulong vaddr)
@ -2008,20 +1963,12 @@ static inline void tlb_set_dirty1(CPUTLBEntry *tlb_entry, target_ulong vaddr)
static inline void tlb_set_dirty(CPUState *env, target_ulong vaddr) static inline void tlb_set_dirty(CPUState *env, target_ulong vaddr)
{ {
int i; int i;
int mmu_idx;
vaddr &= TARGET_PAGE_MASK; vaddr &= TARGET_PAGE_MASK;
i = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); i = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);
tlb_set_dirty1(&env->tlb_table[0][i], vaddr); for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++)
tlb_set_dirty1(&env->tlb_table[1][i], vaddr); tlb_set_dirty1(&env->tlb_table[mmu_idx][i], vaddr);
#if (NB_MMU_MODES >= 3)
tlb_set_dirty1(&env->tlb_table[2][i], vaddr);
#endif
#if (NB_MMU_MODES >= 4)
tlb_set_dirty1(&env->tlb_table[3][i], vaddr);
#endif
#if (NB_MMU_MODES >= 5)
tlb_set_dirty1(&env->tlb_table[4][i], vaddr);
#endif
} }
/* add a new TLB entry. At most one entry for a given virtual address /* add a new TLB entry. At most one entry for a given virtual address