[Qemu-devel] [6669] target-ppc: improve mfcr/mtcrf

[Aurelien Jarno]

Revision: 6669
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6669
Author:   aurel32
Date:     2009-03-03 06:12:14 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
target-ppc: improve mfcr/mtcrf

- use ctz32 instead of ffs - 1
- small optimisation of mtcrf
- add the name of both opcodes

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

Modified Paths:
--------------
    trunk/target-ppc/translate.c
    trunk/target-ppc/translate_init.c

Modified: trunk/target-ppc/translate.c
===================================================================
--- trunk/target-ppc/translate.c        2009-03-03 06:12:03 UTC (rev 6668)
+++ trunk/target-ppc/translate.c        2009-03-03 06:12:14 UTC (rev 6669)
@@ -28,6 +28,7 @@
 #include "disas.h"
 #include "tcg-op.h"
 #include "qemu-common.h"
+#include "host-utils.h"
 
 #include "helper.h"
 #define GEN_HELPER 1
@@ -3836,7 +3837,7 @@
     tcg_gen_andi_tl(cpu_xer, cpu_xer, ~(1 << XER_SO | 1 << XER_OV | 1 << 
XER_CA));
 }
 
-/* mfcr */
+/* mfcr mfocrf */
 GEN_HANDLER(mfcr, 0x1F, 0x13, 0x00, 0x00000801, PPC_MISC)
 {
     uint32_t crm, crn;
@@ -3844,7 +3845,7 @@
     if (likely(ctx->opcode & 0x00100000)) {
         crm = CRM(ctx->opcode);
         if (likely(crm && ((crm & (crm - 1)) == 0))) {
-            crn = ffs (crm) - 1;
+            crn = ctz32 (crm);
             tcg_gen_extu_i32_tl(cpu_gpr[rD(ctx->opcode)], cpu_crf[7 - crn]);
             tcg_gen_shli_i32(cpu_gpr[rD(ctx->opcode)],
                              cpu_gpr[rD(ctx->opcode)], crn * 4);
@@ -3931,7 +3932,7 @@
     gen_op_mfspr(ctx);
 }
 
-/* mtcrf */
+/* mtcrf mtocrf*/
 GEN_HANDLER(mtcrf, 0x1F, 0x10, 0x04, 0x00000801, PPC_MISC)
 {
     uint32_t crm, crn;
@@ -3940,10 +3941,10 @@
     if (likely((ctx->opcode & 0x00100000))) {
         if (crm && ((crm & (crm - 1)) == 0)) {
             TCGv_i32 temp = tcg_temp_new_i32();
-            crn = ffs (crm) - 1;
+            crn = ctz32 (crm);
             tcg_gen_trunc_tl_i32(temp, cpu_gpr[rS(ctx->opcode)]);
-            tcg_gen_shri_i32(cpu_crf[7 - crn], temp, crn * 4);
-            tcg_gen_andi_i32(cpu_crf[7 - crn], cpu_crf[7 - crn], 0xf);
+            tcg_gen_shri_i32(temp, temp, crn * 4);
+            tcg_gen_andi_i32(cpu_crf[7 - crn], temp, 0xf);
             tcg_temp_free_i32(temp);
         }
     } else {

Modified: trunk/target-ppc/translate_init.c
===================================================================
--- trunk/target-ppc/translate_init.c   2009-03-03 06:12:03 UTC (rev 6668)
+++ trunk/target-ppc/translate_init.c   2009-03-03 06:12:14 UTC (rev 6669)
@@ -24,7 +24,6 @@
  */
 
 #include "dis-asm.h"
-#include "host-utils.h"
 #include "gdbstub.h"
 
 //#define PPC_DUMP_CPU