optabs.c (prepare_libcall_arg): New function.

2015-11-09  Steve Ellcey  <sellcey@imgtec.com>

	* optabs.c (prepare_libcall_arg): New function.
	(expand_fixed_convert): Add call to prepare_libcall_arg.

From-SVN: r230065

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf1f13aff789cec15c3cb8ee94560e69582cb06f..c6a25611f376c35bb68035f6ea6d4b235d99d27c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-09  Steve Ellcey  <sellcey@imgtec.com>
+
+       * optabs.c (prepare_libcall_arg): New function.
+       (expand_fixed_convert): Add call to prepare_libcall_arg.
+
 2015-11-09  Nikolai Bozhenov  <n.bozhenov@samsung.com>
 
        * sched-int.h (dump_rgn_dependencies_dot): Declare

diff --git a/gcc/optabs.c b/gcc/optabs.c
index 44971ad827fe5851f63469fb6b4638139f0a65f0..79c5873ce368be64f72791ee510190ce98862f48 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -4838,6 +4838,33 @@ expand_fix (rtx to, rtx from, int unsignedp)
     }
 }
 
+
+/* Promote integer arguments for a libcall if necessary.
+   emit_library_call_value cannot do the promotion because it does not
+   know if it should do a signed or unsigned promotion.  This is because
+   there are no tree types defined for libcalls.  */
+
+static rtx
+prepare_libcall_arg (rtx arg, int uintp)
+{
+  machine_mode mode = GET_MODE (arg);
+  machine_mode arg_mode;
+  if (SCALAR_INT_MODE_P (mode))
+    {
+      /*  If we need to promote the integer function argument we need to do
+         it here instead of inside emit_library_call_value because in
+         emit_library_call_value we don't know if we should do a signed or
+         unsigned promotion.  */
+
+      int unsigned_p = 0;
+      arg_mode = promote_function_mode (NULL_TREE, mode,
+                                       &unsigned_p, NULL_TREE, 0);
+      if (arg_mode != mode)
+       return convert_to_mode (arg_mode, arg, uintp);
+    }
+    return arg;
+}
+
 /* Generate code to convert FROM or TO a fixed-point.
    If UINTP is true, either TO or FROM is an unsigned integer.
    If SATP is true, we need to saturate the result.  */
@@ -4880,6 +4907,9 @@ expand_fixed_convert (rtx to, rtx from, int uintp, int satp)
   libfunc = convert_optab_libfunc (tab, to_mode, from_mode);
   gcc_assert (libfunc);
 
+  from = prepare_libcall_arg (from, uintp);
+  from_mode = GET_MODE (from);
+
   start_sequence ();
   value = emit_library_call_value (libfunc, NULL_RTX, LCT_CONST, to_mode,
                                   1, from, from_mode);