commit 01ed6e7e73b3f13e8c2bbb037036385f88e4d12e
author florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sun May 27 16:52:43 2012 +0000
committer florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sun May 27 16:52:43 2012 +0000
tree e60b6d48529e989e12169865cd1e75493a5624cb
parent 3616a2ec4af166a3917810e4fdbe910ed80bd278

Change S390_INSN_HELPER_CALL such that returning a value is part
of the call. Previously, this was a separate insn. 


git-svn-id: svn://svn.valgrind.org/vex/trunk@2356 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/host_s390_isel.c

diff --git a/priv/host_s390_isel.c b/priv/host_s390_isel.c
index a84413e..76173d2 100644
--- a/priv/host_s390_isel.c
+++ b/priv/host_s390_isel.c
@@ -450,7 +450,7 @@
 */
 static void
 doHelperCall(ISelEnv *env, Bool passBBP, IRExpr *guard,
-             IRCallee *callee, IRExpr **args)
+             IRCallee *callee, IRExpr **args, HReg dst)
 {
    UInt n_args, i, argreg, size;
    ULong target;
@@ -507,7 +507,7 @@
 
    /* Finally, the call itself. */
    addInstr(env, s390_insn_helper_call(cc, (Addr64)target, n_args,
-                                       callee->name));
+                                       callee->name, dst));
 }
 
 
@@ -1325,11 +1325,7 @@
       HReg dst = newVRegI(env);
 
       doHelperCall(env, False, NULL, expr->Iex.CCall.cee,
-                   expr->Iex.CCall.args);
-
-      /* Move the returned value into the return register */
-      addInstr(env, s390_insn_move(sizeofIRType(expr->Iex.CCall.retty), dst,
-                                   make_gpr(S390_REGNO_RETURN_VALUE)));
+                   expr->Iex.CCall.args, dst);
       return dst;
    }
 
@@ -2417,6 +2413,7 @@
       IRType   retty;
       IRDirty* d = stmt->Ist.Dirty.details;
       Bool     passBBP;
+      HReg dst;
       Int i;
 
       /* Invalidate tracked values of those guest state registers that are
@@ -2434,20 +2431,19 @@
 
       passBBP = toBool(d->nFxState > 0 && d->needsBBP);
 
-      doHelperCall(env, passBBP, d->guard, d->cee, d->args);
-
-      /* Now figure out what to do with the returned value, if any. */
-      if (d->tmp == IRTemp_INVALID)
-         /* No return value.  Nothing to do. */
+      if (d->tmp == IRTemp_INVALID) {
+         /* No return value. */
+         dst = INVALID_HREG;
+         doHelperCall(env, passBBP, d->guard, d->cee, d->args, dst);
          return;
+      }
 
       retty = typeOfIRTemp(env->type_env, d->tmp);
       if (retty == Ity_I64 || retty == Ity_I32
           || retty == Ity_I16 || retty == Ity_I8) {
          /* Move the returned value to the destination register */
-         HReg dst = lookupIRTemp(env, d->tmp);
-         addInstr(env, s390_insn_move(sizeofIRType(retty), dst,
-                                      make_gpr(S390_REGNO_RETURN_VALUE)));
+         dst = lookupIRTemp(env, d->tmp);
+         doHelperCall(env, passBBP, d->guard, d->cee, d->args, dst);
          return;
       }
       break;