gwj / at91sam9263 · Commits

Commit 9b3c35e0e6cea178b7c757300f9045258bc5cd10

Authored by j_mayer
1 parent 80a34d67

cpu_get_phys_page_debug should return target_phys_addr_t 

instead of target_ulong to be consistent.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2633 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 10 changed files with 20 additions and 18 deletions
cpu-all.h
  View file @9b3c35e
@@ -799,7 +799,7 @@ void cpu_reset(CPUState *s); @@ -799,7 +799,7 @@ void cpu_reset(CPUState *s);
799 /* Return the physical page corresponding to a virtual one. Use it 799 /* Return the physical page corresponding to a virtual one. Use it
800 only for debugging because no protection checks are done. Return -1 800 only for debugging because no protection checks are done. Return -1
801 if no page found. */ 801 if no page found. */
802 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr); 802 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr);
803 803
804 #define CPU_LOG_TB_OUT_ASM (1 << 0) 804 #define CPU_LOG_TB_OUT_ASM (1 << 0)
805 #define CPU_LOG_TB_IN_ASM (1 << 1) 805 #define CPU_LOG_TB_IN_ASM (1 << 1)
@@ -1030,7 +1030,8 @@ static void tb_reset_jump_recursive(TranslationBlock *tb) @@ -1030,7 +1030,8 @@ static void tb_reset_jump_recursive(TranslationBlock *tb)
1030 #if defined(TARGET_HAS_ICE) 1030 #if defined(TARGET_HAS_ICE)
1031 static void breakpoint_invalidate(CPUState *env, target_ulong pc) 1031 static void breakpoint_invalidate(CPUState *env, target_ulong pc)
1032 { 1032 {
1033 - target_ulong addr, pd; 1033 + target_phys_addr_t addr;
  1034 + target_ulong pd;
1034 ram_addr_t ram_addr; 1035 ram_addr_t ram_addr;
1035 PhysPageDesc *p; 1036 PhysPageDesc *p;
1036 1037
@@ -2574,7 +2575,8 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr, @@ -2574,7 +2575,8 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
2574 uint8_t *buf, int len, int is_write) 2575 uint8_t *buf, int len, int is_write)
2575 { 2576 {
2576 int l; 2577 int l;
2577 - target_ulong page, phys_addr; 2578 + target_phys_addr_t phys_addr;
  2579 + target_ulong page;
2578 2580
2579 while (len > 0) { 2581 while (len > 0) {
2580 page = addr & TARGET_PAGE_MASK; 2582 page = addr & TARGET_PAGE_MASK;
target-alpha/helper.c
  View file @9b3c35e
@@ -39,7 +39,7 @@ int cpu_alpha_handle_mmu_fault (CPUState *env, target_ulong address, int rw, @@ -39,7 +39,7 @@ int cpu_alpha_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
39 return 1; 39 return 1;
40 } 40 }
41 41
42 -target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) 42 +target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
43 { 43 {
44 return addr; 44 return addr;
45 } 45 }
@@ -51,7 +51,7 @@ void do_interrupt (CPUState *env) @@ -51,7 +51,7 @@ void do_interrupt (CPUState *env)
51 51
52 #else 52 #else
53 53
54 -target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) 54 +target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
55 { 55 {
56 return -1; 56 return -1;
57 } 57 }
target-arm/helper.c
  View file @9b3c35e
@@ -126,7 +126,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw, @@ -126,7 +126,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
126 return 1; 126 return 1;
127 } 127 }
128 128
129 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 129 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
130 { 130 {
131 return addr; 131 return addr;
132 } 132 }
@@ -441,7 +441,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, @@ -441,7 +441,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address,
441 return 1; 441 return 1;
442 } 442 }
443 443
444 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 444 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
445 { 445 {
446 uint32_t phys_addr; 446 uint32_t phys_addr;
447 int prot; 447 int prot;
target-i386/helper2.c
  View file @9b3c35e
@@ -578,7 +578,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, @@ -578,7 +578,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,
578 return 1; 578 return 1;
579 } 579 }
580 580
581 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 581 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
582 { 582 {
583 return addr; 583 return addr;
584 } 584 }
@@ -876,7 +876,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, @@ -876,7 +876,7 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,
876 return 1; 876 return 1;
877 } 877 }
878 878
879 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 879 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
880 { 880 {
881 uint32_t pde_addr, pte_addr; 881 uint32_t pde_addr, pte_addr;
882 uint32_t pde, pte, paddr, page_offset, page_size; 882 uint32_t pde, pte, paddr, page_offset, page_size;
target-m68k/translate.c
  View file @9b3c35e
@@ -2738,7 +2738,7 @@ void cpu_dump_state(CPUState *env, FILE *f, @@ -2738,7 +2738,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
2738 } 2738 }
2739 2739
2740 /* ??? */ 2740 /* ??? */
2741 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 2741 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
2742 { 2742 {
2743 return addr; 2743 return addr;
2744 } 2744 }
target-mips/helper.c
  View file @9b3c35e
@@ -141,12 +141,12 @@ static int get_physical_address (CPUState *env, target_ulong *physical, @@ -141,12 +141,12 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
141 } 141 }
142 142
143 #if defined(CONFIG_USER_ONLY) 143 #if defined(CONFIG_USER_ONLY)
144 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 144 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
145 { 145 {
146 return addr; 146 return addr;
147 } 147 }
148 #else 148 #else
149 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 149 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
150 { 150 {
151 target_ulong phys_addr; 151 target_ulong phys_addr;
152 int prot; 152 int prot;
target-ppc/helper.c
  View file @9b3c35e
@@ -60,7 +60,7 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw, @@ -60,7 +60,7 @@ int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw,
60 return 1; 60 return 1;
61 } 61 }
62 62
63 -target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) 63 +target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
64 { 64 {
65 return addr; 65 return addr;
66 } 66 }
@@ -821,7 +821,7 @@ int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong eaddr, @@ -821,7 +821,7 @@ int get_physical_address (CPUState *env, mmu_ctx_t *ctx, target_ulong eaddr,
821 return ret; 821 return ret;
822 } 822 }
823 823
824 -target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr) 824 +target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
825 { 825 {
826 mmu_ctx_t ctx; 826 mmu_ctx_t ctx;
827 827
target-sh4/helper.c
  View file @9b3c35e
@@ -53,7 +53,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, @@ -53,7 +53,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
53 return 1; 53 return 1;
54 } 54 }
55 55
56 -target_ulong cpu_get_phys_page_debug(CPUState * env, target_ulong addr) 56 +target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
57 { 57 {
58 return addr; 58 return addr;
59 } 59 }
@@ -429,7 +429,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw, @@ -429,7 +429,7 @@ int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
429 return tlb_set_page(env, address, physical, prot, is_user, is_softmmu); 429 return tlb_set_page(env, address, physical, prot, is_user, is_softmmu);
430 } 430 }
431 431
432 -target_ulong cpu_get_phys_page_debug(CPUState * env, target_ulong addr) 432 +target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
433 { 433 {
434 target_ulong physical; 434 target_ulong physical;
435 int prot; 435 int prot;
target-sparc/translate.c
  View file @9b3c35e
@@ -3012,7 +3012,7 @@ void cpu_dump_state(CPUState *env, FILE *f, @@ -3012,7 +3012,7 @@ void cpu_dump_state(CPUState *env, FILE *f,
3012 } 3012 }
3013 3013
3014 #if defined(CONFIG_USER_ONLY) 3014 #if defined(CONFIG_USER_ONLY)
3015 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 3015 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
3016 { 3016 {
3017 return addr; 3017 return addr;
3018 } 3018 }
@@ -3022,7 +3022,7 @@ extern int get_physical_address (CPUState *env, target_phys_addr_t *physical, in @@ -3022,7 +3022,7 @@ extern int get_physical_address (CPUState *env, target_phys_addr_t *physical, in
3022 int *access_index, target_ulong address, int rw, 3022 int *access_index, target_ulong address, int rw,
3023 int is_user); 3023 int is_user);
3024 3024
3025 -target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr) 3025 +target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
3026 { 3026 {
3027 target_phys_addr_t phys_addr; 3027 target_phys_addr_t phys_addr;
3028 int prot, access_index; 3028 int prot, access_index;