[Qemu-devel] [PATCH 30/42] target-ppc: add vupk{h, l}s{b, h} instructions.

[Nathan Froyd]

Signed-off-by: Nathan Froyd <address@hidden>
---
 target-ppc/helper.h    |    4 ++++
 target-ppc/op_helper.c |   22 ++++++++++++++++++++++
 target-ppc/translate.c |    4 ++++
 3 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/target-ppc/helper.h b/target-ppc/helper.h
index 9352a67..26ff038 100644
--- a/target-ppc/helper.h
+++ b/target-ppc/helper.h
@@ -187,6 +187,10 @@ DEF_HELPER_3(vsplth, void, avr, avr, i32)
 DEF_HELPER_3(vspltw, void, avr, avr, i32)
 DEF_HELPER_2(vupkhpx, void, avr, avr)
 DEF_HELPER_2(vupklpx, void, avr, avr)
+DEF_HELPER_2(vupkhsb, void, avr, avr)
+DEF_HELPER_2(vupkhsh, void, avr, avr)
+DEF_HELPER_2(vupklsb, void, avr, avr)
+DEF_HELPER_2(vupklsh, void, avr, avr)
 
 DEF_HELPER_1(efscfsi, i32, i32)
 DEF_HELPER_1(efscfui, i32, i32)
diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
index 22d88db..346ddde 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -2453,6 +2453,28 @@ void helper_vsubcuw (ppc_avr_t *r, ppc_avr_t *a, 
ppc_avr_t *b)
     }
 VUPKPX(lpx, UPKLO)
 VUPKPX(hpx, UPKHI)
+
+#define VUPK(suffix, unpacked, packee, hi)                              \
+    void helper_vupk##suffix (ppc_avr_t *r, ppc_avr_t *b)               \
+    {                                                                   \
+        int i;                                                          \
+        ppc_avr_t result;                                               \
+        if (hi) {                                                       \
+            for (i = 0; i < N_ELEMS(unpacked); i++) {                   \
+                result.unpacked[i] = b->packee[i];                      \
+            }                                                           \
+        } else {                                                        \
+            for (i = N_ELEMS(unpacked); i < N_ELEMS(packee); i++) {     \
+                result.unpacked[i-N_ELEMS(unpacked)] = b->packee[i];    \
+            }                                                           \
+        }                                                               \
+        *r = result;                                                    \
+    }
+VUPK(hsb, s16, s8, UPKHI)
+VUPK(hsh, s32, s16, UPKHI)
+VUPK(lsb, s16, s8, UPKLO)
+VUPK(lsh, s32, s16, UPKLO)
+#undef VUPK
 #undef UPKHI
 #undef UPKLO
 
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index ca4f10a..0ed504b 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -6314,6 +6314,10 @@ GEN_VXFORM(vsr, 708);
         tcg_temp_free (rd);                                             \
     }
 
+GEN_VXFORM_NOA(vupkhsb, 526);
+GEN_VXFORM_NOA(vupkhsh, 590);
+GEN_VXFORM_NOA(vupklsb, 654);
+GEN_VXFORM_NOA(vupklsh, 718);
 GEN_VXFORM_NOA(vupkhpx, 846);
 GEN_VXFORM_NOA(vupklpx, 974);
 
-- 
1.6.0.5