sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

Revert foolish patch. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3724 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-11-23 22:16:59 +00:00
parent 9b605b9eae
commit 69facb7897
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ppc_oldworld.c
View File

@ -93,8 +93,7 @@ static int vga_osi_call (CPUState *env)
/* R6 = x, R7 = y, R8 = visible, R9 = data */ /* R6 = x, R7 = y, R8 = visible, R9 = data */
break; break;
default: default:
fprintf(stderr, "unsupported OSI call R5=" REGX "\n", fprintf(stderr, "unsupported OSI call R5=" REGX "\n", env->gpr[5]);
(target_ulong)env->gpr[5]);
break; break;
} }

7
target-ppc/cpu.h
View File

@ -30,6 +30,7 @@
typedef uint64_t ppc_gpr_t; typedef uint64_t ppc_gpr_t;
#define TARGET_GPR_BITS 64 #define TARGET_GPR_BITS 64
#define TARGET_LONG_BITS 64 #define TARGET_LONG_BITS 64
#define REGX "%016" PRIx64
#define TARGET_PAGE_BITS 12 #define TARGET_PAGE_BITS 12
#else /* defined (TARGET_PPC64) */ #else /* defined (TARGET_PPC64) */
@ -42,9 +43,11 @@ typedef uint64_t ppc_gpr_t;
*/ */
typedef uint64_t ppc_gpr_t; typedef uint64_t ppc_gpr_t;
#define TARGET_GPR_BITS 64 #define TARGET_GPR_BITS 64
#define REGX "%08" PRIx64
#else /* (HOST_LONG_BITS >= 64) */ #else /* (HOST_LONG_BITS >= 64) */
typedef uint32_t ppc_gpr_t; typedef uint32_t ppc_gpr_t;
#define TARGET_GPR_BITS 32 #define TARGET_GPR_BITS 32
#define REGX "%08" PRIx32
#endif /* (HOST_LONG_BITS >= 64) */ #endif /* (HOST_LONG_BITS >= 64) */
#define TARGET_LONG_BITS 32 #define TARGET_LONG_BITS 32
@ -69,10 +72,6 @@ typedef uint32_t ppc_gpr_t;
#endif /* defined (TARGET_PPC64) */ #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" #include "cpu-defs.h"
#define ADDRX TARGET_FMT_lx #define ADDRX TARGET_FMT_lx

5
target-ppc/helper.c
View File

@ -2169,9 +2169,8 @@ static always_inline void dump_syscall (CPUState *env)
{ {
fprintf(logfile, "syscall r0=0x" REGX " r3=0x" REGX " r4=0x" REGX fprintf(logfile, "syscall r0=0x" REGX " r3=0x" REGX " r4=0x" REGX
" r5=0x" REGX " r6=0x" REGX " nip=0x" ADDRX "\n", " r5=0x" REGX " r6=0x" REGX " nip=0x" ADDRX "\n",
(target_ulong)env->gpr[0], (target_ulong)env->gpr[3], env->gpr[0], env->gpr[3], env->gpr[4],
(target_ulong)env->gpr[4], (target_ulong)env->gpr[5], env->gpr[5], env->gpr[6], env->nip);
(target_ulong)env->gpr[6], env->nip);
} }
/* Note that this function should be greatly optimized /* Note that this function should be greatly optimized

8
target-ppc/op_helper.c
View File

@ -2920,8 +2920,7 @@ void do_4xx_tlbwe_hi (void)
#if defined (DEBUG_SOFTWARE_TLB) #if defined (DEBUG_SOFTWARE_TLB)
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, T0, T1);
(target_ulong)T0, (target_ulong)T1);
} }
#endif #endif
T0 &= 0x3F; T0 &= 0x3F;
@ -2990,8 +2989,7 @@ void do_4xx_tlbwe_lo (void)
#if defined (DEBUG_SOFTWARE_TLB) #if defined (DEBUG_SOFTWARE_TLB)
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, fprintf(logfile, "%s T0 " REGX " T1 " REGX "\n", __func__, T0, T1);
(targt_ulong)T0, (target_ulong)T1);
} }
#endif #endif
T0 &= 0x3F; T0 &= 0x3F;
@ -3025,7 +3023,7 @@ void do_440_tlbwe (int word)
#if defined (DEBUG_SOFTWARE_TLB) #if defined (DEBUG_SOFTWARE_TLB)
if (loglevel != 0) { if (loglevel != 0) {
fprintf(logfile, "%s word %d T0 " REGX " T1 " REGX "\n", fprintf(logfile, "%s word %d T0 " REGX " T1 " REGX "\n",
__func__, word, (target_ulong)T0, (target_ulong)T1); __func__, word, T0, T1);
} }
#endif #endif
do_flush_tlbs = 0; do_flush_tlbs = 0;