aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-27 14:44:03 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-05-27 14:44:04 +0100
commit93f94f9018229f146ed6bbe9e5ff72d67e4bd7ab (patch)
tree57c08ec592cba8e5170c79b531c470b3bcb05a64
parent00d0f7cb6617f50be90e7dbb90a83d87b33f7695 (diff)
parenta3abb29292dccd5681beb16f610b2b838eec2174 (diff)
Merge remote-tracking branch 'remotes/rth/fix-tci' into staging
* remotes/rth/fix-tci: tci: Fix tcg_out_call Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tcg/tci/tcg-target.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c
index 9b39231c15..375e590d2b 100644
--- a/tcg/tci/tcg-target.c
+++ b/tcg/tci/tcg-target.c
@@ -544,7 +544,10 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
static inline void tcg_out_call(TCGContext *s, tcg_insn_unit *arg)
{
+ uint8_t *old_code_ptr = s->code_ptr;
+ tcg_out_op_t(s, INDEX_op_call);
tcg_out_ri(s, 1, (uintptr_t)arg);
+ old_code_ptr[1] = s->code_ptr - old_code_ptr;
}
static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,