[Qemu-devel] [5951] target-ppc: cleanup op_helper.c after TCG conversion

[Aurelien Jarno]

Revision: 5951
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5951
Author:   aurel32
Date:     2008-12-08 18:11:42 +0000 (Mon, 08 Dec 2008)

Log Message:
-----------
target-ppc: cleanup op_helper.c after TCG conversion

Signed-off-by: Aurelien Jarno <address@hidden>

Modified Paths:
--------------
    trunk/target-ppc/op_helper.c

Modified: trunk/target-ppc/op_helper.c
===================================================================
--- trunk/target-ppc/op_helper.c        2008-12-08 18:11:33 UTC (rev 5950)
+++ trunk/target-ppc/op_helper.c        2008-12-08 18:11:42 UTC (rev 5951)
@@ -2738,9 +2738,9 @@
     way = (env->spr[SPR_SRR1] >> 17) & 1;
 #if defined (DEBUG_SOFTWARE_TLB)
     if (loglevel != 0) {
-        fprintf(logfile, "%s: EPN " TDX " " ADDRX " PTE0 " ADDRX
+        fprintf(logfile, "%s: EPN " ADDRX " " ADDRX " PTE0 " ADDRX
                 " PTE1 " ADDRX " way %d\n",
-                __func__, T0, EPN, CMP, RPN, way);
+                __func__, new_EPN, EPN, CMP, RPN, way);
     }
 #endif
     /* Store this TLB */
@@ -2770,9 +2770,9 @@
     way = env->spr[SPR_TLBMISS] & 0x3;
 #if defined (DEBUG_SOFTWARE_TLB)
     if (loglevel != 0) {
-        fprintf(logfile, "%s: EPN " TDX " " ADDRX " PTE0 " ADDRX
+        fprintf(logfile, "%s: EPN " ADDRX " " ADDRX " PTE0 " ADDRX
                 " PTE1 " ADDRX " way %d\n",
-                __func__, T0, EPN, CMP, RPN, way);
+                __func__, new_EPN, EPN, CMP, RPN, way);
     }
 #endif
     /* Store this TLB */
@@ -2900,7 +2900,7 @@
 
 #if defined (DEBUG_SOFTWARE_TLB)
     if (loglevel != 0) {
-        fprintf(logfile, "%s entry " TDX " val " TDX "\n", __func__, entry, 
val);
+        fprintf(logfile, "%s entry %d val " ADDRX "\n", __func__, (int)entry, 
val);
     }
 #endif
     entry &= 0x3F;
@@ -2942,7 +2942,7 @@
     if (loglevel != 0) {
         fprintf(logfile, "%s: set up TLB %d RPN " PADDRX " EPN " ADDRX
                 " size " ADDRX " prot %c%c%c%c PID %d\n", __func__,
-                (int)T0, tlb->RPN, tlb->EPN, tlb->size,
+                (int)entry, tlb->RPN, tlb->EPN, tlb->size,
                 tlb->prot & PAGE_READ ? 'r' : '-',
                 tlb->prot & PAGE_WRITE ? 'w' : '-',
                 tlb->prot & PAGE_EXEC ? 'x' : '-',
@@ -2955,7 +2955,7 @@
 #if defined (DEBUG_SOFTWARE_TLB)
         if (loglevel != 0) {
             fprintf(logfile, "%s: invalidate TLB %d start " ADDRX
-                    " end " ADDRX "\n", __func__, (int)T0, tlb->EPN, end);
+                    " end " ADDRX "\n", __func__, (int)entry, tlb->EPN, end);
         }
 #endif
         for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE)
@@ -2969,7 +2969,7 @@
 
 #if defined (DEBUG_SOFTWARE_TLB)
     if (loglevel != 0) {
-        fprintf(logfile, "%s entry " TDX " val " TDX "\n", __func__, entry, 
val);
+        fprintf(logfile, "%s entry %i val " ADDRX "\n", __func__, (int)entry, 
val);
     }
 #endif
     entry &= 0x3F;
@@ -3007,8 +3007,8 @@
 
 #if defined (DEBUG_SOFTWARE_TLB)
     if (loglevel != 0) {
-        fprintf(logfile, "%s word %d entry " TDX " value " TDX "\n",
-                __func__, word, entry, value);
+        fprintf(logfile, "%s word %d entry %d value " ADDRX "\n",
+                __func__, word, (int)entry, value);
     }
 #endif
     do_flush_tlbs = 0;