static int map_address (CPUState *env, target_ulong *physical, int *prot,
target_ulong address, int rw, int access_type)
{
- target_ulong tag = address & (TARGET_PAGE_MASK << 1);
- uint8_t ASID = env->CP0_EntryHi & 0xFF;
- tlb_t *tlb;
- int i, n;
+ int i;
for (i = 0; i < env->tlb_in_use; i++) {
- tlb = &env->tlb[i];
+ tlb_t *tlb = &env->tlb[i];
+ /* 1k pages are not supported. */
+ uint8_t ASID = env->CP0_EntryHi & 0xFF;
+ target_ulong mask = tlb->PageMask | 0x1FFF;
+ target_ulong tag = address & ~mask;
+ int n;
+
/* Check ASID, virtual page number & size */
if ((tlb->G == 1 || tlb->ASID == ASID) &&
tlb->VPN == tag) {
/* TLB match */
- n = (address >> TARGET_PAGE_BITS) & 1;
+ n = !!(address & mask & ~(mask >> 1));
/* Check access rights */
if (!(n ? tlb->V1 : tlb->V0))
return TLBRET_INVALID;
if (rw == 0 || (n ? tlb->D1 : tlb->D0)) {
- *physical = tlb->PFN[n] | (address & ~TARGET_PAGE_MASK);
+ *physical = tlb->PFN[n] | (address & (mask >> 1));
*prot = PAGE_READ;
if (n ? tlb->D1 : tlb->D0)
*prot |= PAGE_WRITE;
void invalidate_tlb (CPUState *env, int idx, int use_extra)
{
tlb_t *tlb;
- uint8_t ASID;
-
- ASID = env->CP0_EntryHi & 0xFF;
+ target_ulong addr;
+ target_ulong end;
+ uint8_t ASID = env->CP0_EntryHi & 0xFF;
+ target_ulong mask;
tlb = &env->tlb[idx];
/* The qemu TLB is flushed then the ASID changes, so no need to
return;
}
- if (tlb->V0)
- tlb_flush_page (env, tlb->VPN);
- if (tlb->V1)
- tlb_flush_page (env, tlb->VPN + TARGET_PAGE_SIZE);
+ /* 1k pages are not supported. */
+ mask = tlb->PageMask | 0x1FFF;
+ if (tlb->V0) {
+ addr = tlb->VPN;
+ end = addr | (mask >> 1);
+ while (addr < end) {
+ tlb_flush_page (env, addr);
+ addr += TARGET_PAGE_SIZE;
+ }
+ }
+ if (tlb->V1) {
+ addr = tlb->VPN | ((mask >> 1) + 1);
+ addr = tlb->VPN + TARGET_PAGE_SIZE;
+ end = addr | mask;
+ while (addr < end) {
+ tlb_flush_page (env, addr);
+ addr += TARGET_PAGE_SIZE;
+ }
+ }
}
tlb = &env->tlb[idx];
tlb->VPN = env->CP0_EntryHi & (int32_t)0xFFFFE000;
tlb->ASID = env->CP0_EntryHi & 0xFF;
+ tlb->PageMask = env->CP0_PageMask;
tlb->G = env->CP0_EntryLo0 & env->CP0_EntryLo1 & 1;
tlb->V0 = (env->CP0_EntryLo0 & 2) != 0;
tlb->D0 = (env->CP0_EntryLo0 & 4) != 0;
mips_tlb_flush_extra(env, MIPS_TLB_NB);
env->CP0_EntryHi = tlb->VPN | tlb->ASID;
+ env->CP0_PageMask = tlb->PageMask;
env->CP0_EntryLo0 = tlb->G | (tlb->V0 << 1) | (tlb->D0 << 2) |
(tlb->C0 << 3) | (tlb->PFN[0] >> 6);
env->CP0_EntryLo1 = tlb->G | (tlb->V1 << 1) | (tlb->D1 << 2) |