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>
qemu · May 27, 2014 · 93f94f9 · 93f94f9
2 parents 00d0f7c + a3abb29
commit 93f94f9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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,