[Qemu-devel] [PATCH 07/42] target-ppc: add vavg{s, u}{b, h, w} instructions.

[Nathan Froyd <froydnj@codesourcery.com>]

Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
---
 target-ppc/helper.h    |    6 ++++++
 target-ppc/op_helper.c |   18 ++++++++++++++++++
 target-ppc/translate.c |    6 ++++++
 3 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/target-ppc/helper.h b/target-ppc/helper.h
index f43556e..214bbf1 100644
--- a/target-ppc/helper.h
+++ b/target-ppc/helper.h
@@ -105,6 +105,12 @@ DEF_HELPER_3(vadduwm, void, avr, avr, avr)
 DEF_HELPER_3(vsububm, void, avr, avr, avr)
 DEF_HELPER_3(vsubuhm, void, avr, avr, avr)
 DEF_HELPER_3(vsubuwm, void, avr, avr, avr)
+DEF_HELPER_3(vavgub, void, avr, avr, avr)
+DEF_HELPER_3(vavguh, void, avr, avr, avr)
+DEF_HELPER_3(vavguw, void, avr, avr, avr)
+DEF_HELPER_3(vavgsb, void, avr, avr, avr)
+DEF_HELPER_3(vavgsh, void, avr, avr, avr)
+DEF_HELPER_3(vavgsw, void, avr, 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 d59e930..49c7256 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -2048,6 +2048,24 @@ VARITH(uwm, u32)
 #undef VARITH_DO
 #undef VARITH
 
+#define VAVG_DO(name, element, etype)                                   \
+    void helper_v##name (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)      \
+    {                                                                   \
+        VECTOR_FOR (element) {                                          \
+            etype x = (etype)a->element[i] + (etype)b->element[i] + 1;  \
+            r->element[i] = x >> 1;                                     \
+        }                                                               \
+    }
+
+#define VAVG(type, signed_element, signed_type, unsigned_element, unsigned_type) \
+    VAVG_DO(avgs##type, signed_element, signed_type)                    \
+    VAVG_DO(avgu##type, unsigned_element, unsigned_type)
+VAVG(b, s8, int16_t, u8, uint16_t)
+VAVG(h, s16, int32_t, u16, uint32_t)
+VAVG(w, s32, int64_t, u32, uint64_t)
+#undef VAVG_DO
+#undef VAVG
+
 #undef VECTOR_FOR
 #undef VECTOR_FOR_I
 #undef VECTOR_FOR_INORDER_I
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 9866c43..fbc9f9a 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -6157,6 +6157,12 @@ GEN_VXFORM(vadduwm, 128);
 GEN_VXFORM(vsububm, 1024);
 GEN_VXFORM(vsubuhm, 1088);
 GEN_VXFORM(vsubuwm, 1152);
+GEN_VXFORM(vavgub, 1026);
+GEN_VXFORM(vavguh, 1090);
+GEN_VXFORM(vavguw, 1154);
+GEN_VXFORM(vavgsb, 1282);
+GEN_VXFORM(vavgsh, 1346);
+GEN_VXFORM(vavgsw, 1410);
 
 /***                           SPE extension                               ***/
 /* Register moves */
-- 
1.6.0.5