diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-23 22:16:59 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-23 22:16:59 +0000 |
| commit | 69facb7897ef6404175b4739751f9255fc0c8a2e (patch) | |
| tree | 09e69e600d3e3d706b7f0ace8e59f122c2f30c96 /target-ppc | |
| parent | 9b605b9eaee7845353f32aed23e8b9085bfa44ee (diff) | |
Revert foolish patch.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3724 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/cpu.h | 7 | ||||
| -rw-r--r-- | target-ppc/helper.c | 5 | ||||
| -rw-r--r-- | target-ppc/op_helper.c | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 0630a6e8ef..365d83697c 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -30,6 +30,7 @@ typedef uint64_t ppc_gpr_t; #define TARGET_GPR_BITS 64 #define TARGET_LONG_BITS 64 +#define REGX "%016" PRIx64 #define TARGET_PAGE_BITS 12 #else /* defined (TARGET_PPC64) */ @@ -42,9 +43,11 @@ typedef uint64_t ppc_gpr_t; */ typedef uint64_t ppc_gpr_t; #define TARGET_GPR_BITS 64 +#define REGX "%08" PRIx64 #else /* (HOST_LONG_BITS >= 64) */ typedef uint32_t ppc_gpr_t; #define TARGET_GPR_BITS 32 +#define REGX "%08" PRIx32 #endif /* (HOST_LONG_BITS >= 64) */ #define TARGET_LONG_BITS 32 @@ -69,10 +72,6 @@ typedef uint32_t ppc_gpr_t; #endif /* defined (TARGET_PPC64) */ -/* A ppc_gpr_t should not be printed directly as the high bits may be - garbage. It should always be cast to a target_ulong first. */ -#define REGX TARGET_FMT_lx - #include "cpu-defs.h" #define ADDRX TARGET_FMT_lx diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 149f6cbfa5..cb9b778cc7 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2169,9 +2169,8 @@ static always_inline void dump_syscall (CPUState *env) { fprintf(logfile, "syscall r0=0x" REGX " r3=0x" REGX " r4=0x" REGX " r5=0x" REGX " r6=0x" REGX " nip=0x" ADDRX "\n", - (target_ulong)env->gpr[0], (target_ulong)env->gpr[3], - (target_ulong)env->gpr[4], (target_ulong)env->gpr[5], - (target_ulong)env->gpr[6], env->nip); + env->gpr[0], env->gpr[3], env->gpr[4], + env->gpr[5], env->gpr[6], env->nip); } /* Note that this function should be greatly optimized diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 1a36dfaef1..172dd48be4 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -2920,8 +2920,7 @@ void do_4xx_tlbwe_hi (void) #if defined (DEBUG_SOFTWARE_TLB) if (loglevel != 0) { - fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, - (target_ulong)T0, (target_ulong)T1); + fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, T0, T1); } #endif T0 &= 0x3F; @@ -2990,8 +2989,7 @@ void do_4xx_tlbwe_lo (void) #if defined (DEBUG_SOFTWARE_TLB) if (loglevel != 0) { - fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, - (targt_ulong)T0, (target_ulong)T1); + fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, T0, T1); } #endif T0 &= 0x3F; @@ -3025,7 +3023,7 @@ void do_440_tlbwe (int word) #if defined (DEBUG_SOFTWARE_TLB) if (loglevel != 0) { fprintf(logfile, "%s word %d T0 " REGX " T1 " REGX "\n", - __func__, word, (target_ulong)T0, (target_ulong)T1); + __func__, word, T0, T1); } #endif do_flush_tlbs = 0; |