From: Florian Krohm <florian@eich-krohm.de>
Date: Fri, 21 Dec 2012 21:43:00 +0000 (+0000)
Subject: s390: Rename s390_conv_t to s390_bfp_conv_t. Purely mechanical.
X-Git-Tag: svn/VALGRIND_3_9_0^2~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=666d716f61e0ccb759d773bd2bf9806eb2699aca;p=thirdparty%2Fvalgrind.git

s390: Rename s390_conv_t to s390_bfp_conv_t. Purely mechanical.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2609
---

diff --git a/VEX/priv/host_s390_defs.c b/VEX/priv/host_s390_defs.c
index 8057ba4ffc..77ce402be1 100644
--- a/VEX/priv/host_s390_defs.c
+++ b/VEX/priv/host_s390_defs.c
@@ -5094,7 +5094,7 @@ s390_insn_bfp_compare(UChar size, HReg dst, HReg op1, HReg op2)
 
 
 s390_insn *
-s390_insn_bfp_convert(UChar size, s390_conv_t tag, HReg dst, HReg op,
+s390_insn_bfp_convert(UChar size, s390_bfp_conv_t tag, HReg dst, HReg op,
                       s390_bfp_round_t rounding_mode)
 {
    s390_insn *insn = LibVEX_Alloc(sizeof(s390_insn));
@@ -5196,7 +5196,7 @@ s390_insn_bfp128_compare(UChar size, HReg dst, HReg op1_hi, HReg op1_lo,
 
 
 static s390_insn *
-s390_insn_bfp128_convert(UChar size, s390_conv_t tag, HReg dst_hi,
+s390_insn_bfp128_convert(UChar size, s390_bfp_conv_t tag, HReg dst_hi,
                          HReg dst_lo, HReg op_hi, HReg op_lo,
                          s390_bfp_round_t rounding_mode)
 {
@@ -5226,7 +5226,7 @@ s390_insn_bfp128_convert(UChar size, s390_conv_t tag, HReg dst_hi,
 
 
 s390_insn *
-s390_insn_bfp128_convert_to(UChar size, s390_conv_t tag, HReg dst_hi,
+s390_insn_bfp128_convert_to(UChar size, s390_bfp_conv_t tag, HReg dst_hi,
                             HReg dst_lo, HReg op)
 {
    /* Conversion to bfp128 never requires a rounding mode. Provide default
@@ -5239,7 +5239,7 @@ s390_insn_bfp128_convert_to(UChar size, s390_conv_t tag, HReg dst_hi,
 
 
 s390_insn *
-s390_insn_bfp128_convert_from(UChar size, s390_conv_t tag, HReg dst,
+s390_insn_bfp128_convert_from(UChar size, s390_bfp_conv_t tag, HReg dst,
                               HReg op_hi, HReg op_lo,
                               s390_bfp_round_t rounding_mode)
 {
diff --git a/VEX/priv/host_s390_defs.h b/VEX/priv/host_s390_defs.h
index 75e91c77dd..5789baa23e 100644
--- a/VEX/priv/host_s390_defs.h
+++ b/VEX/priv/host_s390_defs.h
@@ -233,7 +233,7 @@ typedef enum {
    S390_BFP_F128_TO_U64,
    S390_BFP_F128_TO_F32,
    S390_BFP_F128_TO_F64
-} s390_conv_t;
+} s390_bfp_conv_t;
 
 /* Type conversion operations: to and/or from decimal floating point */
 typedef enum {
@@ -492,7 +492,7 @@ typedef struct {
          HReg         op_lo;  /* 128-bit operand low part */
       } bfp_unop;
       struct {
-         s390_conv_t  tag;
+         s390_bfp_conv_t  tag;
          s390_bfp_round_t rounding_mode;
          HReg         dst_hi; /* 128-bit result high part; 32/64-bit result */
          HReg         dst_lo; /* 128-bit result low part */
@@ -623,7 +623,7 @@ s390_insn *s390_insn_bfp_binop(UChar size, s390_bfp_binop_t, HReg dst,
 s390_insn *s390_insn_bfp_unop(UChar size, s390_bfp_unop_t tag, HReg dst,
                               HReg op);
 s390_insn *s390_insn_bfp_compare(UChar size, HReg dst, HReg op1, HReg op2);
-s390_insn *s390_insn_bfp_convert(UChar size, s390_conv_t tag, HReg dst,
+s390_insn *s390_insn_bfp_convert(UChar size, s390_bfp_conv_t tag, HReg dst,
                                  HReg op, s390_bfp_round_t);
 s390_insn *s390_insn_bfp128_binop(UChar size, s390_bfp_binop_t, HReg dst_hi,
                                   HReg dst_lo, HReg op2_hi, HReg op2_lo);
@@ -631,9 +631,9 @@ s390_insn *s390_insn_bfp128_unop(UChar size, s390_bfp_unop_t, HReg dst_hi,
                                  HReg dst_lo, HReg op_hi, HReg op_lo);
 s390_insn *s390_insn_bfp128_compare(UChar size, HReg dst, HReg op1_hi,
                                     HReg op1_lo, HReg op2_hi, HReg op2_lo);
-s390_insn *s390_insn_bfp128_convert_to(UChar size, s390_conv_t,
+s390_insn *s390_insn_bfp128_convert_to(UChar size, s390_bfp_conv_t,
                                        HReg dst_hi, HReg dst_lo, HReg op);
-s390_insn *s390_insn_bfp128_convert_from(UChar size, s390_conv_t,
+s390_insn *s390_insn_bfp128_convert_from(UChar size, s390_bfp_conv_t,
                                          HReg dst, HReg op_hi, HReg op_lo,
                                          s390_bfp_round_t);
 s390_insn *s390_insn_dfp_binop(UChar size, s390_dfp_binop_t, HReg dst,
diff --git a/VEX/priv/host_s390_isel.c b/VEX/priv/host_s390_isel.c
index d22de3e4a7..9aca09f6c4 100644
--- a/VEX/priv/host_s390_isel.c
+++ b/VEX/priv/host_s390_isel.c
@@ -975,7 +975,7 @@ s390_isel_int_expr_wrk(ISelEnv *env, IRExpr *expr)
 {
    IRType ty = typeOfIRExpr(env->type_env, expr);
    UChar size;
-   s390_conv_t conv;
+   s390_bfp_conv_t conv;
 
    vassert(ty == Ity_I8 || ty == Ity_I16 || ty == Ity_I32 || ty == Ity_I64);
 
@@ -1891,7 +1891,7 @@ s390_isel_float128_expr_wrk(HReg *dst_hi, HReg *dst_lo, ISelEnv *env,
    case Iex_Unop: {
       IRExpr *left = expr->Iex.Unop.arg;
       s390_bfp_unop_t bfpop;
-      s390_conv_t conv;
+      s390_bfp_conv_t conv;
       HReg op_hi, op_lo, op, f12, f13, f14, f15;
 
       /* We use non-virtual registers as pairs (f13, f15) and (f12, f14)) */
@@ -2104,7 +2104,7 @@ s390_isel_float_expr_wrk(ISelEnv *env, IRExpr *expr)
       IRExpr *irrm = expr->Iex.Binop.arg1;
       IRExpr *left = expr->Iex.Binop.arg2;
       HReg h1, dst;
-      s390_conv_t  conv;
+      s390_bfp_conv_t  conv;
 
       switch (op) {
       case Iop_SqrtF32:
@@ -2189,7 +2189,7 @@ s390_isel_float_expr_wrk(ISelEnv *env, IRExpr *expr)
       IROp    op   = expr->Iex.Unop.op;
       IRExpr *left = expr->Iex.Unop.arg;
       s390_bfp_unop_t bfpop;
-      s390_conv_t conv;
+      s390_bfp_conv_t conv;
       HReg h1, dst;
 
       if (op == Iop_F128HItoF64 || op == Iop_F128LOtoF64) {