commit cfe046e178666280b87da998b1b52ecda03ecd89
author sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Thu Jan 17 14:23:53 2013 +0000
committer sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Thu Jan 17 14:23:53 2013 +0000
tree 386cf2af46ff9ee3ff468b9adc9f871025c0a147
parent f88839912747399c9441f1072bdfb87e1de96ed9

Merge, from branches/COMEM, revisions 2568 to 2641.


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

priv/host_amd64_defs.h

diff --git a/priv/host_amd64_defs.h b/priv/host_amd64_defs.h
index 3886a6d..3584e05 100644
--- a/priv/host_amd64_defs.h
+++ b/priv/host_amd64_defs.h
@@ -473,6 +473,7 @@
             AMD64CondCode cond;
             Addr64        target;
             Int           regparms; /* 0 .. 6 */
+            RetLoc        rloc;     /* where the return value will be */
          } Call;
          /* Update the guest RIP value, then exit requesting to chain
             to it.  May be conditional. */
@@ -701,7 +702,7 @@
 extern AMD64Instr* AMD64Instr_MulL       ( Bool syned, AMD64RM* );
 extern AMD64Instr* AMD64Instr_Div        ( Bool syned, Int sz, AMD64RM* );
 extern AMD64Instr* AMD64Instr_Push       ( AMD64RMI* );
-extern AMD64Instr* AMD64Instr_Call       ( AMD64CondCode, Addr64, Int );
+extern AMD64Instr* AMD64Instr_Call       ( AMD64CondCode, Addr64, Int, RetLoc );
 extern AMD64Instr* AMD64Instr_XDirect    ( Addr64 dstGA, AMD64AMode* amRIP,
                                            AMD64CondCode cond, Bool toFastEP );
 extern AMD64Instr* AMD64Instr_XIndir     ( HReg dstGA, AMD64AMode* amRIP,