vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sparc: pass page aligned addresses to tlb_set_page 

Mask incoming page address early so that resolved addresses
are page aligned. Remove further address masking.

Tested-by: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
master
Blue Swirl 2012-03-18 11:31:23 +00:00
parent 8a22565b7c
commit 1658dd3240
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target-sparc/mmu_helper.c
View File

@ -150,18 +150,17 @@ static int get_physical_address(CPUSPARCState *env, target_phys_addr_t *physical
case 3: /* Reserved */ case 3: /* Reserved */
return (3 << 8) | (4 << 2); return (3 << 8) | (4 << 2);
case 2: /* L3 PTE */ case 2: /* L3 PTE */
page_offset = (address & TARGET_PAGE_MASK) & page_offset = 0;
(TARGET_PAGE_SIZE - 1);
} }
*page_size = TARGET_PAGE_SIZE; *page_size = TARGET_PAGE_SIZE;
break; break;
case 2: /* L2 PTE */ case 2: /* L2 PTE */
page_offset = address & 0x3ffff; page_offset = address & 0x3f000;
*page_size = 0x40000; *page_size = 0x40000;
} }
break; break;
case 2: /* L1 PTE */ case 2: /* L1 PTE */
page_offset = address & 0xffffff; page_offset = address & 0xfff000;
*page_size = 0x1000000; *page_size = 0x1000000;
} }
} }
@ -206,11 +205,11 @@ int cpu_sparc_handle_mmu_fault(CPUSPARCState *env, target_ulong address, int rw,
target_ulong page_size; target_ulong page_size;
int error_code = 0, prot, access_index; int error_code = 0, prot, access_index;
address &= TARGET_PAGE_MASK;
error_code = get_physical_address(env, &paddr, &prot, &access_index, error_code = get_physical_address(env, &paddr, &prot, &access_index,
address, rw, mmu_idx, &page_size); address, rw, mmu_idx, &page_size);
vaddr = address;
if (error_code == 0) { if (error_code == 0) {
vaddr = address & TARGET_PAGE_MASK;
paddr &= TARGET_PAGE_MASK;
#ifdef DEBUG_MMU #ifdef DEBUG_MMU
printf("Translate at " TARGET_FMT_lx " -> " TARGET_FMT_plx ", vaddr " printf("Translate at " TARGET_FMT_lx " -> " TARGET_FMT_plx ", vaddr "
TARGET_FMT_lx "\n", address, paddr, vaddr); TARGET_FMT_lx "\n", address, paddr, vaddr);
@ -230,7 +229,6 @@ int cpu_sparc_handle_mmu_fault(CPUSPARCState *env, target_ulong address, int rw,
permissions. If no mapping is available, redirect accesses to permissions. If no mapping is available, redirect accesses to
neverland. Fake/overridden mappings will be flushed when neverland. Fake/overridden mappings will be flushed when
switching to normal mode. */ switching to normal mode. */
vaddr = address & TARGET_PAGE_MASK;
prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
tlb_set_page(env, vaddr, paddr, prot, mmu_idx, TARGET_PAGE_SIZE); tlb_set_page(env, vaddr, paddr, prot, mmu_idx, TARGET_PAGE_SIZE);
return 0; return 0;
@ -704,17 +702,16 @@ static int get_physical_address(CPUSPARCState *env, target_phys_addr_t *physical
int cpu_sparc_handle_mmu_fault(CPUSPARCState *env, target_ulong address, int rw, int cpu_sparc_handle_mmu_fault(CPUSPARCState *env, target_ulong address, int rw,
int mmu_idx) int mmu_idx)
{ {
target_ulong virt_addr, vaddr; target_ulong vaddr;
target_phys_addr_t paddr; target_phys_addr_t paddr;
target_ulong page_size; target_ulong page_size;
int error_code = 0, prot, access_index; int error_code = 0, prot, access_index;
address &= TARGET_PAGE_MASK;
error_code = get_physical_address(env, &paddr, &prot, &access_index, error_code = get_physical_address(env, &paddr, &prot, &access_index,
address, rw, mmu_idx, &page_size); address, rw, mmu_idx, &page_size);
if (error_code == 0) { if (error_code == 0) {
virt_addr = address & TARGET_PAGE_MASK; vaddr = address;
vaddr = virt_addr + ((address & TARGET_PAGE_MASK) &
(TARGET_PAGE_SIZE - 1));
trace_mmu_helper_mmu_fault(address, paddr, mmu_idx, env->tl, trace_mmu_helper_mmu_fault(address, paddr, mmu_idx, env->tl,
env->dmmu.mmu_primary_context, env->dmmu.mmu_primary_context,