mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu_get_phys_page_debug should return target_phys_addr_t

Browse Source 
instead of target_ulong to be consistent.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2633 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-04-07 11:21:28 +00:00
parent 80a34d67a5
commit 9b3c35e0e6
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu-all.h
View File

@ -799,7 +799,7 @@ void cpu_reset(CPUState *s);
/* Return the physical page corresponding to a virtual one. Use it /* Return the physical page corresponding to a virtual one. Use it
only for debugging because no protection checks are done. Return -1 only for debugging because no protection checks are done. Return -1
if no page found. */ if no page found. */
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr); target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr);
#define CPU_LOG_TB_OUT_ASM (1 << 0) #define CPU_LOG_TB_OUT_ASM (1 << 0)
#define CPU_LOG_TB_IN_ASM (1 << 1) #define CPU_LOG_TB_IN_ASM (1 << 1)

6
exec.c
View File

@ -1030,7 +1030,8 @@ static void tb_reset_jump_recursive(TranslationBlock *tb)
#if defined(TARGET_HAS_ICE) #if defined(TARGET_HAS_ICE)
static void breakpoint_invalidate(CPUState *env, target_ulong pc) static void breakpoint_invalidate(CPUState *env, target_ulong pc)
{ {
target_ulong addr, pd; target_phys_addr_t addr;
target_ulong pd;
ram_addr_t ram_addr; ram_addr_t ram_addr;
PhysPageDesc *p; PhysPageDesc *p;
@ -2574,7 +2575,8 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
uint8_t *buf, int len, int is_write) uint8_t *buf, int len, int is_write)
{ {
int l; int l;
target_ulong page, phys_addr; target_phys_addr_t phys_addr;
target_ulong page;
while (len > 0) { while (len > 0) {
page = addr & TARGET_PAGE_MASK; page = addr & TARGET_PAGE_MASK;

4
target-alpha/helper.c
View File

@ -39,7 +39,7 @@ int cpu_alpha_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }
@ -51,7 +51,7 @@ void do_interrupt (CPUState *env)
#else #else
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
{ {
return -1; return -1;
} }

4
target-arm/helper.c
View File

@ -126,7 +126,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }
@ -441,7 +441,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
uint32_t phys_addr; uint32_t phys_addr;
int prot; int prot;

4
target-i386/helper2.c
View File

@ -578,7 +578,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }
@ -876,7 +876,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
uint32_t pde_addr, pte_addr; uint32_t pde_addr, pte_addr;
uint32_t pde, pte, paddr, page_offset, page_size; uint32_t pde, pte, paddr, page_offset, page_size;

2
target-m68k/translate.c
View File

@ -2738,7 +2738,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
} }
/* ??? */ /* ??? */
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }

4
target-mips/helper.c
View File

@ -141,12 +141,12 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
} }
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }
#else #else
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
target_ulong phys_addr; target_ulong phys_addr;
int prot; int prot;

4
target-ppc/helper.c
View File

@ -60,7 +60,7 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }
@ -821,7 +821,7 @@ int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong eaddr,
return ret; return ret;
} }
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
{ {
mmu_ctx_t ctx; mmu_ctx_t ctx;

4
target-sh4/helper.c
View File

@ -53,7 +53,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
return 1; return 1;
} }
target_ulong cpu_get_phys_page_debug(CPUState * env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
{ {
return addr; return addr;
} }
@ -429,7 +429,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
return tlb_set_page(env, address, physical, prot, is_user, is_softmmu); return tlb_set_page(env, address, physical, prot, is_user, is_softmmu);
} }
target_ulong cpu_get_phys_page_debug(CPUState * env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
{ {
target_ulong physical; target_ulong physical;
int prot; int prot;

4
target-sparc/translate.c
View File

@ -3012,7 +3012,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
} }
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
{ {
return addr; return addr;
} }
@ -3022,7 +3022,7 @@ extern int get_physical_address (CPUState *env, target_phys_addr_t *physical, in
int *access_index, target_ulong address, int rw, int *access_index, target_ulong address, int rw,
int is_user); int is_user);
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 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;