ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e bitfields in mips TLB structures (Thiemo Seufer). 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1774 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2006-03-11 16:20:36 +00:00
parent 6d6f7c288d
commit 98c1b82b6c
3 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target-mips/cpu.h
View File

@ -21,11 +21,14 @@ struct tlb_t {
target_ulong VPN; target_ulong VPN;
target_ulong end; target_ulong end;
target_ulong end2; target_ulong end2;
uint8_t ASID; uint_fast8_t ASID;
uint8_t G; uint_fast16_t G:1;
uint8_t C[2]; uint_fast16_t C0:3;
uint8_t V[2]; uint_fast16_t C1:3;
uint8_t D[2]; uint_fast16_t V0:1;
uint_fast16_t V1:1;
uint_fast16_t D0:1;
uint_fast16_t D1:1;
target_ulong PFN[2]; target_ulong PFN[2];
}; };
#endif #endif

11
target-mips/helper.c
View File

@ -50,17 +50,16 @@ static int map_address (CPUState *env, target_ulong *physical, int *prot,
/* TLB match */ /* TLB match */
n = (address >> 12) & 1; n = (address >> 12) & 1;
/* Check access rights */ /* Check access rights */
if ((tlb->V[n] & 2) && (rw == 0 || (tlb->D[n] & 4))) { if (!(n ? tlb->V1 : tlb->V0))
return -3;
if (rw == 0 || (n ? tlb->D1 : tlb->D0)) {
*physical = tlb->PFN[n] | (address & 0xFFF); *physical = tlb->PFN[n] | (address & 0xFFF);
*prot = PAGE_READ; *prot = PAGE_READ;
if (tlb->D[n]) if (n ? tlb->D1 : tlb->D0)
*prot |= PAGE_WRITE; *prot |= PAGE_WRITE;
return 0; return 0;
} else if (!(tlb->V[n] & 2)) {
return -3;
} else {
return -4;
} }
return -4;
} }
} }

52
target-mips/op_helper.c
View File

@ -535,30 +535,22 @@ void do_mtc0 (int reg, int sel)
/* TLB management */ /* TLB management */
#if defined(MIPS_USES_R4K_TLB) #if defined(MIPS_USES_R4K_TLB)
static void invalidate_tb (int idx) static void invalidate_tlb (int idx)
{ {
tlb_t *tlb; tlb_t *tlb;
target_ulong addr, end; target_ulong addr;
tlb = &env->tlb[idx]; tlb = &env->tlb[idx];
if (tlb->V[0]) { if (tlb->V0) {
addr = tlb->PFN[0]; tb_invalidate_page_range(tlb->PFN[0], tlb->end - tlb->VPN);
end = addr + (tlb->end - tlb->VPN);
tb_invalidate_page_range(addr, end);
/* FIXME: Might be faster to just invalidate the whole "tlb" here
and refill it on demand from our simulated TLB. */
addr = tlb->VPN; addr = tlb->VPN;
while (addr < tlb->end) { while (addr < tlb->end) {
tlb_flush_page (env, addr); tlb_flush_page (env, addr);
addr += TARGET_PAGE_SIZE; addr += TARGET_PAGE_SIZE;
} }
} }
if (tlb->V[1]) { if (tlb->V1) {
addr = tlb->PFN[1]; tb_invalidate_page_range(tlb->PFN[1], tlb->end2 - tlb->end);
end = addr + (tlb->end - tlb->VPN);
tb_invalidate_page_range(addr, end);
/* FIXME: Might be faster to just invalidate the whole "tlb" here
and refill it on demand from our simulated TLB. */
addr = tlb->end; addr = tlb->end;
while (addr < tlb->end2) { while (addr < tlb->end2) {
tlb_flush_page (env, addr); tlb_flush_page (env, addr);
@ -567,7 +559,7 @@ static void invalidate_tb (int idx)
} }
} }
static void fill_tb (int idx) static void fill_tlb (int idx)
{ {
tlb_t *tlb; tlb_t *tlb;
int size; int size;
@ -575,19 +567,19 @@ static void fill_tb (int idx)
/* XXX: detect conflicting TLBs and raise a MCHECK exception when needed */ /* XXX: detect conflicting TLBs and raise a MCHECK exception when needed */
tlb = &env->tlb[idx]; tlb = &env->tlb[idx];
tlb->VPN = env->CP0_EntryHi & 0xFFFFE000; tlb->VPN = env->CP0_EntryHi & 0xFFFFE000;
tlb->ASID = env->CP0_EntryHi & 0x000000FF; tlb->ASID = env->CP0_EntryHi & 0xFF;
size = env->CP0_PageMask >> 13; size = env->CP0_PageMask >> 13;
size = 4 * (size + 1); size = 4 * (size + 1);
tlb->end = tlb->VPN + (1 << (8 + size)); tlb->end = tlb->VPN + (1 << (8 + size));
tlb->end2 = tlb->end + (1 << (8 + size)); tlb->end2 = tlb->end + (1 << (8 + size));
tlb->G = env->CP0_EntryLo0 & env->CP0_EntryLo1 & 1; tlb->G = env->CP0_EntryLo0 & env->CP0_EntryLo1 & 1;
tlb->V[0] = env->CP0_EntryLo0 & 2; tlb->V0 = (env->CP0_EntryLo0 & 2) != 0;
tlb->D[0] = env->CP0_EntryLo0 & 4; tlb->D0 = (env->CP0_EntryLo0 & 4) != 0;
tlb->C[0] = (env->CP0_EntryLo0 >> 3) & 0x7; tlb->C0 = (env->CP0_EntryLo0 >> 3) & 0x7;
tlb->PFN[0] = (env->CP0_EntryLo0 >> 6) << 12; tlb->PFN[0] = (env->CP0_EntryLo0 >> 6) << 12;
tlb->V[1] = env->CP0_EntryLo1 & 2; tlb->V1 = (env->CP0_EntryLo1 & 2) != 0;
tlb->D[1] = env->CP0_EntryLo1 & 4; tlb->D1 = (env->CP0_EntryLo1 & 4) != 0;
tlb->C[1] = (env->CP0_EntryLo1 >> 3) & 0x7; tlb->C1 = (env->CP0_EntryLo1 >> 3) & 0x7;
tlb->PFN[1] = (env->CP0_EntryLo1 >> 6) << 12; tlb->PFN[1] = (env->CP0_EntryLo1 >> 6) << 12;
} }
@ -595,16 +587,16 @@ void do_tlbwi (void)
{ {
/* Wildly undefined effects for CP0_index containing a too high value and /* Wildly undefined effects for CP0_index containing a too high value and
MIPS_TLB_NB not being a power of two. But so does real silicon. */ MIPS_TLB_NB not being a power of two. But so does real silicon. */
invalidate_tb(env->CP0_index & (MIPS_TLB_NB - 1)); invalidate_tlb(env->CP0_index & (MIPS_TLB_NB - 1));
fill_tb(env->CP0_index & (MIPS_TLB_NB - 1)); fill_tlb(env->CP0_index & (MIPS_TLB_NB - 1));
} }
void do_tlbwr (void) void do_tlbwr (void)
{ {
int r = cpu_mips_get_random(env); int r = cpu_mips_get_random(env);
invalidate_tb(r); invalidate_tlb(r);
fill_tb(r); fill_tlb(r);
} }
void do_tlbp (void) void do_tlbp (void)
@ -645,10 +637,10 @@ void do_tlbr (void)
env->CP0_EntryHi = tlb->VPN | tlb->ASID; env->CP0_EntryHi = tlb->VPN | tlb->ASID;
size = (tlb->end - tlb->VPN) >> 12; size = (tlb->end - tlb->VPN) >> 12;
env->CP0_PageMask = (size - 1) << 13; env->CP0_PageMask = (size - 1) << 13;
env->CP0_EntryLo0 = tlb->V[0] | tlb->D[0] | (tlb->C[0] << 3) | env->CP0_EntryLo0 = tlb->G | (tlb->V0 << 1) | (tlb->D0 << 2)
(tlb->PFN[0] >> 6); | (tlb->C0 << 3) | (tlb->PFN[0] >> 6);
env->CP0_EntryLo1 = tlb->V[1] | tlb->D[1] | (tlb->C[1] << 3) | env->CP0_EntryLo1 = tlb->G | (tlb->V1 << 1) | (tlb->D1 << 2)
(tlb->PFN[1] >> 6); | (tlb->C1 << 3) | (tlb->PFN[1] >> 6);
} }
#endif #endif