gwj / at91sam9263 · Commits

Commit 0e69805af6fe2ad9380c566f46cbe5b2275cb015

Authored by aurel32
1 parent b4cec7b4

target-ppc: cleanup op_helper.c after TCG conversion 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5951 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 10 additions and 10 deletions
target-ppc/op_helper.c
  View file @0e69805
@@ -2738,9 +2738,9 @@ static void do_6xx_tlb (target_ulong new_EPN, int is_code) @@ -2738,9 +2738,9 @@ static void do_6xx_tlb (target_ulong new_EPN, int is_code)
2738 way = (env->spr[SPR_SRR1] >> 17) & 1; 2738 way = (env->spr[SPR_SRR1] >> 17) & 1;
2739 #if defined (DEBUG_SOFTWARE_TLB) 2739 #if defined (DEBUG_SOFTWARE_TLB)
2740 if (loglevel != 0) { 2740 if (loglevel != 0) {
2741 - fprintf(logfile, "%s: EPN " TDX " " ADDRX " PTE0 " ADDRX 2741 + fprintf(logfile, "%s: EPN " ADDRX " " ADDRX " PTE0 " ADDRX
2742 " PTE1 " ADDRX " way %d\n", 2742 " PTE1 " ADDRX " way %d\n",
2743 - __func__, T0, EPN, CMP, RPN, way); 2743 + __func__, new_EPN, EPN, CMP, RPN, way);
2744 } 2744 }
2745 #endif 2745 #endif
2746 /* Store this TLB */ 2746 /* Store this TLB */
@@ -2770,9 +2770,9 @@ static void do_74xx_tlb (target_ulong new_EPN, int is_code) @@ -2770,9 +2770,9 @@ static void do_74xx_tlb (target_ulong new_EPN, int is_code)
2770 way = env->spr[SPR_TLBMISS] & 0x3; 2770 way = env->spr[SPR_TLBMISS] & 0x3;
2771 #if defined (DEBUG_SOFTWARE_TLB) 2771 #if defined (DEBUG_SOFTWARE_TLB)
2772 if (loglevel != 0) { 2772 if (loglevel != 0) {
2773 - fprintf(logfile, "%s: EPN " TDX " " ADDRX " PTE0 " ADDRX 2773 + fprintf(logfile, "%s: EPN " ADDRX " " ADDRX " PTE0 " ADDRX
2774 " PTE1 " ADDRX " way %d\n", 2774 " PTE1 " ADDRX " way %d\n",
2775 - __func__, T0, EPN, CMP, RPN, way); 2775 + __func__, new_EPN, EPN, CMP, RPN, way);
2776 } 2776 }
2777 #endif 2777 #endif
2778 /* Store this TLB */ 2778 /* Store this TLB */
@@ -2900,7 +2900,7 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val) @@ -2900,7 +2900,7 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val)
2900 2900
2901 #if defined (DEBUG_SOFTWARE_TLB) 2901 #if defined (DEBUG_SOFTWARE_TLB)
2902 if (loglevel != 0) { 2902 if (loglevel != 0) {
2903 - fprintf(logfile, "%s entry " TDX " val " TDX "\n", __func__, entry, val); 2903 + fprintf(logfile, "%s entry %d val " ADDRX "\n", __func__, (int)entry, val);
2904 } 2904 }
2905 #endif 2905 #endif
2906 entry &= 0x3F; 2906 entry &= 0x3F;
@@ -2942,7 +2942,7 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val) @@ -2942,7 +2942,7 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val)
2942 if (loglevel != 0) { 2942 if (loglevel != 0) {
2943 fprintf(logfile, "%s: set up TLB %d RPN " PADDRX " EPN " ADDRX 2943 fprintf(logfile, "%s: set up TLB %d RPN " PADDRX " EPN " ADDRX
2944 " size " ADDRX " prot %c%c%c%c PID %d\n", __func__, 2944 " size " ADDRX " prot %c%c%c%c PID %d\n", __func__,
2945 - (int)T0, tlb->RPN, tlb->EPN, tlb->size, 2945 + (int)entry, tlb->RPN, tlb->EPN, tlb->size,
2946 tlb->prot & PAGE_READ ? 'r' : '-', 2946 tlb->prot & PAGE_READ ? 'r' : '-',
2947 tlb->prot & PAGE_WRITE ? 'w' : '-', 2947 tlb->prot & PAGE_WRITE ? 'w' : '-',
2948 tlb->prot & PAGE_EXEC ? 'x' : '-', 2948 tlb->prot & PAGE_EXEC ? 'x' : '-',
@@ -2955,7 +2955,7 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val) @@ -2955,7 +2955,7 @@ void helper_4xx_tlbwe_hi (target_ulong entry, target_ulong val)
2955 #if defined (DEBUG_SOFTWARE_TLB) 2955 #if defined (DEBUG_SOFTWARE_TLB)
2956 if (loglevel != 0) { 2956 if (loglevel != 0) {
2957 fprintf(logfile, "%s: invalidate TLB %d start " ADDRX 2957 fprintf(logfile, "%s: invalidate TLB %d start " ADDRX
2958 - " end " ADDRX "\n", __func__, (int)T0, tlb->EPN, end); 2958 + " end " ADDRX "\n", __func__, (int)entry, tlb->EPN, end);
2959 } 2959 }
2960 #endif 2960 #endif
2961 for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE) 2961 for (page = tlb->EPN; page < end; page += TARGET_PAGE_SIZE)
@@ -2969,7 +2969,7 @@ void helper_4xx_tlbwe_lo (target_ulong entry, target_ulong val) @@ -2969,7 +2969,7 @@ void helper_4xx_tlbwe_lo (target_ulong entry, target_ulong val)
2969 2969
2970 #if defined (DEBUG_SOFTWARE_TLB) 2970 #if defined (DEBUG_SOFTWARE_TLB)
2971 if (loglevel != 0) { 2971 if (loglevel != 0) {
2972 - fprintf(logfile, "%s entry " TDX " val " TDX "\n", __func__, entry, val); 2972 + fprintf(logfile, "%s entry %i val " ADDRX "\n", __func__, (int)entry, val);
2973 } 2973 }
2974 #endif 2974 #endif
2975 entry &= 0x3F; 2975 entry &= 0x3F;
@@ -3007,8 +3007,8 @@ void helper_440_tlbwe (uint32_t word, target_ulong entry, target_ulong value) @@ -3007,8 +3007,8 @@ void helper_440_tlbwe (uint32_t word, target_ulong entry, target_ulong value)
3007 3007
3008 #if defined (DEBUG_SOFTWARE_TLB) 3008 #if defined (DEBUG_SOFTWARE_TLB)
3009 if (loglevel != 0) { 3009 if (loglevel != 0) {
3010 - fprintf(logfile, "%s word %d entry " TDX " value " TDX "\n",  
3011 - __func__, word, entry, value); 3010 + fprintf(logfile, "%s word %d entry %d value " ADDRX "\n",
  3011 + __func__, word, (int)entry, value);
3012 } 3012 }
3013 #endif 3013 #endif
3014 do_flush_tlbs = 0; 3014 do_flush_tlbs = 0;