Commit 44f8625d23f9807c0853556ffe1c44540bd453f9
1 parent
c6ee607c
fixed invalid type
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3582 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
5 changed files
with
10 additions
and
10 deletions
target-alpha/op_helper.c
... | ... | @@ -1152,7 +1152,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
1152 | 1152 | { |
1153 | 1153 | TranslationBlock *tb; |
1154 | 1154 | CPUState *saved_env; |
1155 | - target_phys_addr_t pc; | |
1155 | + unsigned long pc; | |
1156 | 1156 | int ret; |
1157 | 1157 | |
1158 | 1158 | /* XXX: hack to restore env in all cases, even if not called from |
... | ... | @@ -1163,7 +1163,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
1163 | 1163 | if (!likely(ret == 0)) { |
1164 | 1164 | if (likely(retaddr)) { |
1165 | 1165 | /* now we have a real cpu fault */ |
1166 | - pc = (target_phys_addr_t)retaddr; | |
1166 | + pc = (unsigned long)retaddr; | |
1167 | 1167 | tb = tb_find_pc(pc); |
1168 | 1168 | if (likely(tb)) { |
1169 | 1169 | /* the PC is inside the translated code. It means that we have | ... | ... |
target-arm/op_helper.c
... | ... | @@ -279,7 +279,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
279 | 279 | { |
280 | 280 | TranslationBlock *tb; |
281 | 281 | CPUState *saved_env; |
282 | - target_phys_addr_t pc; | |
282 | + unsigned long pc; | |
283 | 283 | int ret; |
284 | 284 | |
285 | 285 | /* XXX: hack to restore env in all cases, even if not called from |
... | ... | @@ -290,7 +290,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
290 | 290 | if (__builtin_expect(ret, 0)) { |
291 | 291 | if (retaddr) { |
292 | 292 | /* now we have a real cpu fault */ |
293 | - pc = (target_phys_addr_t)retaddr; | |
293 | + pc = (unsigned long)retaddr; | |
294 | 294 | tb = tb_find_pc(pc); |
295 | 295 | if (tb) { |
296 | 296 | /* the PC is inside the translated code. It means that we have | ... | ... |
target-cris/op_helper.c
... | ... | @@ -49,7 +49,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
49 | 49 | { |
50 | 50 | TranslationBlock *tb; |
51 | 51 | CPUState *saved_env; |
52 | - target_phys_addr_t pc; | |
52 | + unsigned long pc; | |
53 | 53 | int ret; |
54 | 54 | |
55 | 55 | /* XXX: hack to restore env in all cases, even if not called from |
... | ... | @@ -60,7 +60,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
60 | 60 | if (__builtin_expect(ret, 0)) { |
61 | 61 | if (retaddr) { |
62 | 62 | /* now we have a real cpu fault */ |
63 | - pc = (target_phys_addr_t)retaddr; | |
63 | + pc = (unsigned long)retaddr; | |
64 | 64 | tb = tb_find_pc(pc); |
65 | 65 | if (tb) { |
66 | 66 | /* the PC is inside the translated code. It means that we have | ... | ... |
target-m68k/op_helper.c
... | ... | @@ -57,7 +57,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
57 | 57 | { |
58 | 58 | TranslationBlock *tb; |
59 | 59 | CPUState *saved_env; |
60 | - target_phys_addr_t pc; | |
60 | + unsigned long pc; | |
61 | 61 | int ret; |
62 | 62 | |
63 | 63 | /* XXX: hack to restore env in all cases, even if not called from |
... | ... | @@ -68,7 +68,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
68 | 68 | if (__builtin_expect(ret, 0)) { |
69 | 69 | if (retaddr) { |
70 | 70 | /* now we have a real cpu fault */ |
71 | - pc = (target_phys_addr_t)retaddr; | |
71 | + pc = (unsigned long)retaddr; | |
72 | 72 | tb = tb_find_pc(pc); |
73 | 73 | if (tb) { |
74 | 74 | /* the PC is inside the translated code. It means that we have | ... | ... |
target-ppc/op_helper.c
... | ... | @@ -2743,7 +2743,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
2743 | 2743 | { |
2744 | 2744 | TranslationBlock *tb; |
2745 | 2745 | CPUState *saved_env; |
2746 | - target_phys_addr_t pc; | |
2746 | + unsigned long pc; | |
2747 | 2747 | int ret; |
2748 | 2748 | |
2749 | 2749 | /* XXX: hack to restore env in all cases, even if not called from |
... | ... | @@ -2754,7 +2754,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) |
2754 | 2754 | if (unlikely(ret != 0)) { |
2755 | 2755 | if (likely(retaddr)) { |
2756 | 2756 | /* now we have a real cpu fault */ |
2757 | - pc = (target_phys_addr_t)(unsigned long)retaddr; | |
2757 | + pc = (unsigned long)retaddr; | |
2758 | 2758 | tb = tb_find_pc(pc); |
2759 | 2759 | if (likely(tb)) { |
2760 | 2760 | /* the PC is inside the translated code. It means that we have | ... | ... |