diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-15 16:02:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-15 16:02:08 +0100 |
| commit | 99e7627a70d1a23e30a514e5a4798005cf4eb3aa (patch) | |
| tree | 5fb7817c8d37d5a0c22316ee398749ef244ce881 /tcg/tci/tcg-target.c | |
| parent | 1eeace9c237a729d11c7acd7c0338ab4562af637 (diff) | |
| parent | dfb36305626636e2e07e0c5acd3a002a5419399e (diff) | |
| download | focaccia-qemu-99e7627a70d1a23e30a514e5a4798005cf4eb3aa.tar.gz focaccia-qemu-99e7627a70d1a23e30a514e5a4798005cf4eb3aa.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150514' into staging
Per-memop alignment # gpg: Signature made Thu May 14 20:17:27 2015 BST using RSA key ID 4DD0279B # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>" # gpg: aka "Richard Henderson <rth@redhat.com>" # gpg: aka "Richard Henderson <rth@twiddle.net>" * remotes/rth/tags/pull-tcg-20150514: tcg: Add MO_ALIGN, MO_UNALN tcg: Push merged memop+mmu_idx parameter to softmmu routines tcg: Merge memop and mmu_idx parameters to qemu_ld/st Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tcg/tci/tcg-target.c')
| -rw-r--r-- | tcg/tci/tcg-target.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c index fb2339dcdf..10affabc39 100644 --- a/tcg/tci/tcg-target.c +++ b/tcg/tci/tcg-target.c @@ -763,9 +763,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, tcg_out_r(s, *args++); } tcg_out_i(s, *args++); -#ifdef CONFIG_SOFTMMU - tcg_out_i(s, *args); -#endif break; case INDEX_op_qemu_ld_i64: tcg_out_r(s, *args++); @@ -777,9 +774,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, tcg_out_r(s, *args++); } tcg_out_i(s, *args++); -#ifdef CONFIG_SOFTMMU - tcg_out_i(s, *args); -#endif break; case INDEX_op_qemu_st_i32: tcg_out_r(s, *args++); |