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

Fix remote debugger memory access problems reported by Matthias Stein 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3982 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-02-14 17:46:44 +00:00
parent d0dc7dc327
commit 9e31b9e28a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target-sparc/cpu.h
View File

@ -339,19 +339,22 @@ void cpu_check_irqs(CPUSPARCState *env);
#define MMU_MODE2_SUFFIX _hypv #define MMU_MODE2_SUFFIX _hypv
#endif #endif
#define MMU_USER_IDX 0 #define MMU_USER_IDX 0
#define MMU_KERNEL_IDX 1
#define MMU_HYPV_IDX 2
static inline int cpu_mmu_index (CPUState *env) static inline int cpu_mmu_index (CPUState *env)
{ {
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
return 0; return MMU_USER_IDX;
#elif !defined(TARGET_SPARC64) #elif !defined(TARGET_SPARC64)
return env->psrs; return env->psrs;
#else #else
if (!env->psrs) if (!env->psrs)
return 0; return MMU_USER_IDX;
else if ((env->hpstate & HS_PRIV) == 0) else if ((env->hpstate & HS_PRIV) == 0)
return 1; return MMU_KERNEL_IDX;
else else
return 2; return MMU_HYPV_IDX;
#endif #endif
} }

6
target-sparc/translate.c
View File

@ -4194,8 +4194,10 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
target_phys_addr_t phys_addr; target_phys_addr_t phys_addr;
int prot, access_index; int prot, access_index;
if (get_physical_address(env, &phys_addr, &prot, &access_index, addr, 2, 0) != 0) if (get_physical_address(env, &phys_addr, &prot, &access_index, addr, 2,
if (get_physical_address(env, &phys_addr, &prot, &access_index, addr, 0, 0) != 0) MMU_KERNEL_IDX) != 0)
if (get_physical_address(env, &phys_addr, &prot, &access_index, addr,
0, MMU_KERNEL_IDX) != 0)
return -1; return -1;
if (cpu_get_physical_page_desc(phys_addr) == IO_MEM_UNASSIGNED) if (cpu_get_physical_page_desc(phys_addr) == IO_MEM_UNASSIGNED)
return -1; return -1;