From 44f8625d23f9807c0853556ffe1c44540bd453f9 Mon Sep 17 00:00:00 2001 From: bellard Date: Sun, 11 Nov 2007 12:35:55 +0000 Subject: [PATCH] fixed invalid type git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3582 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-alpha/op_helper.c | 4 ++-- target-arm/op_helper.c | 4 ++-- target-cris/op_helper.c | 4 ++-- target-m68k/op_helper.c | 4 ++-- target-ppc/op_helper.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index fa1e6acc5a..9a3009c4d4 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -1152,7 +1152,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - target_phys_addr_t pc; + unsigned long pc; int ret; /* 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) if (!likely(ret == 0)) { if (likely(retaddr)) { /* now we have a real cpu fault */ - pc = (target_phys_addr_t)retaddr; + pc = (unsigned long)retaddr; tb = tb_find_pc(pc); if (likely(tb)) { /* the PC is inside the translated code. It means that we have diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index a9bd95b057..2b9ec0fa75 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -279,7 +279,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - target_phys_addr_t pc; + unsigned long pc; int ret; /* 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) if (__builtin_expect(ret, 0)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (target_phys_addr_t)retaddr; + pc = (unsigned long)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index d0ec519b19..458b0585de 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -49,7 +49,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - target_phys_addr_t pc; + unsigned long pc; int ret; /* 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) if (__builtin_expect(ret, 0)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (target_phys_addr_t)retaddr; + pc = (unsigned long)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index 80ec89040f..547f13da5b 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -57,7 +57,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - target_phys_addr_t pc; + unsigned long pc; int ret; /* 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) if (__builtin_expect(ret, 0)) { if (retaddr) { /* now we have a real cpu fault */ - pc = (target_phys_addr_t)retaddr; + pc = (unsigned long)retaddr; tb = tb_find_pc(pc); if (tb) { /* the PC is inside the translated code. It means that we have diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 7d1411a1fd..2c6cef1271 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -2743,7 +2743,7 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr) { TranslationBlock *tb; CPUState *saved_env; - target_phys_addr_t pc; + unsigned long pc; int ret; /* 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) if (unlikely(ret != 0)) { if (likely(retaddr)) { /* now we have a real cpu fault */ - pc = (target_phys_addr_t)(unsigned long)retaddr; + pc = (unsigned long)retaddr; tb = tb_find_pc(pc); if (likely(tb)) { /* the PC is inside the translated code. It means that we have