diff options
| author | Richard Henderson | 2015-05-13 18:10:33 +0200 |
|---|---|---|
| committer | Richard Henderson | 2015-05-14 21:15:14 +0200 |
| commit | 3972ef6f830d65e9bacbd31257abedc055fd6dc8 (patch) | |
| tree | d348fedebe4a637698a3a8e116d74a96924adcf7 /tcg/sparc | |
| parent | tcg: Merge memop and mmu_idx parameters to qemu_ld/st (diff) | |
| download | qemu-3972ef6f830d65e9bacbd31257abedc055fd6dc8.tar.gz qemu-3972ef6f830d65e9bacbd31257abedc055fd6dc8.tar.xz qemu-3972ef6f830d65e9bacbd31257abedc055fd6dc8.zip | |
tcg: Push merged memop+mmu_idx parameter to softmmu routines
The extra information is not yet used but it is now available.
This requires minor changes through all of the tcg backends.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'tcg/sparc')
| -rw-r--r-- | tcg/sparc/tcg-target.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index ccc3173e3c..c1794a33ed 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -915,7 +915,7 @@ static void build_trampolines(TCGContext *s) } else { ra += 1; } - /* Skip the mem_index argument. */ + /* Skip the oi argument. */ ra += 1; } @@ -1113,7 +1113,7 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data, TCGReg addr, assert(func != NULL); tcg_out_call_nodelay(s, func); /* delay slot */ - tcg_out_movi(s, TCG_TYPE_I32, param, memi); + tcg_out_movi(s, TCG_TYPE_I32, param, oi); /* Recall that all of the helpers return 64-bit results. Which complicates things for sparcv8plus. */ @@ -1192,7 +1192,7 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data, TCGReg addr, assert(func != NULL); tcg_out_call_nodelay(s, func); /* delay slot */ - tcg_out_movi(s, TCG_TYPE_REG, param, memi); + tcg_out_movi(s, TCG_TYPE_I32, param, oi); *label_ptr |= INSN_OFF19(tcg_ptr_byte_diff(s->code_ptr, label_ptr)); #else |