From e891a43f00680d1d99063c3b8231fb862738e0e3 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavierleroy@users.noreply.github.com>
Date: Tue, 18 Sep 2018 13:11:32 +0200
Subject: Support __builtin_isel64 for non-EREF PPC64 platforms (#141)

If the isel instruction is missing, it can be emulated just like we do
in the 32-bit case (__builtin_isel).
Follow-up to commit 51d32b92.
Bug 24516
---
 powerpc/Asmexpand.ml | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/powerpc/Asmexpand.ml b/powerpc/Asmexpand.ml
index 106193d9..62e65951 100644
--- a/powerpc/Asmexpand.ml
+++ b/powerpc/Asmexpand.ml
@@ -410,6 +410,30 @@ let expand_builtin_va_start r =
 let expand_int64_arith conflict rl fn =
   if conflict then (fn GPR0; emit (Pmr(rl, GPR0))) else fn rl
 
+(* Expansion of integer conditional moves (__builtin_*sel) *)
+(* The generated code works equally well with 32-bit integer registers
+   and with 64-bit integer registers. *)
+
+let expand_integer_cond_move a1 a2 a3 res =
+  if eref then begin
+    emit (Pcmpwi (a1,Cint (Int.zero)));
+    emit (Pisel (res,a3,a2,CRbit_2))
+  end else if a2 = a3 then
+    emit (Pmr (res, a2))
+  else begin
+    (* a1 has type _Bool, hence it is 0 or 1 *)
+    emit (Psubfic (GPR0, a1, Cint _0));
+    (* r0 = -1 (all ones) if a1 is true, r0 = 0 if a1 is false *)
+    if res <> a3 then begin
+      emit (Pand_ (res, a2, GPR0));
+      emit (Pandc (GPR0, a3, GPR0))
+    end else begin
+      emit (Pandc (res, a3, GPR0));
+      emit (Pand_ (GPR0, a2, GPR0))
+    end;
+    emit (Por (res, res, GPR0))
+  end
+
 (* Convert integer constant into GPR with corresponding number *)
 let int_to_int_reg = function
    | 0 -> Some GPR0  | 1 -> Some GPR1  | 2 -> Some GPR2  | 3 -> Some GPR3
@@ -670,29 +694,11 @@ let expand_builtin_inline name args res =
       emit (Plwz (res, Cint! retaddr_offset,GPR1))
   (* Integer selection *)
   | ("__builtin_bsel" | "__builtin_isel" | "__builtin_uisel"), [BA (IR a1); BA (IR a2); BA (IR a3)],BR (IR res) ->
-      if eref then begin
-        emit (Pcmpwi (a1,Cint (Int.zero)));
-        emit (Pisel (res,a3,a2,CRbit_2))
-      end else if a2 = a3 then
-        emit (Pmr (res, a2))
-      else begin
-        (* a1 has type _Bool, hence it is 0 or 1 *)
-        emit (Psubfic (GPR0, a1, Cint _0));
-        (* r0 = 0xFFFF_FFFF if a1 is true, r0 = 0 if a1 is false *)
-        if res <> a3 then begin
-          emit (Pand_ (res, a2, GPR0));
-          emit (Pandc (GPR0, a3, GPR0))
-        end else begin
-          emit (Pandc (res, a3, GPR0));
-          emit (Pand_ (GPR0, a2, GPR0))
-        end;
-        emit (Por (res, res, GPR0))
-      end
+      expand_integer_cond_move a1 a2 a3 res
   | ("__builtin_isel64" | "__builtin_uisel64"), [BA (IR a1); BA (IR a2); BA (IR a3)],BR (IR res) ->
-    if eref && Archi.ppc64 then begin
-      emit (Pcmpwi (a1,Cint (Int.zero)));
-      emit (Pisel (res,a3,a2,CRbit_2))
-    end else
+    if Archi.ppc64 then
+      expand_integer_cond_move a1 a2 a3 res
+    else
       raise (Error (name ^" is only supported for PPC64 targets"))
   (* no operation *)
   | "__builtin_nop", [], _ ->
-- 
cgit