[Qemu-devel] [PATCH for-2.4] tci: Fix regression with INDEX_op_qemu_st_i32, INDEX_op_qemu_st_i64

[Qemu-devel] [PATCH for-2.4] tci: Fix regression with INDEX_op_qemu_st_i32, INDEX_op_qemu_st_i64

[Stefan Weil]

Commit 59227d5d45bb3c31dc2118011691c35b3c00879c did not update the
code in tcg/tci/tcg-target.c for those two cases.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

Peter, could you please apply this patch directly (after Richard's review)?
Maybe this is simpler than waiting for a pull request.

Regards
Stefan

 tcg/tci/tcg-target.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c
index fb2339d..c6133d2 100644
--- a/tcg/tci/tcg-target.c
+++ b/tcg/tci/tcg-target.c
@@ -788,9 +788,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_i64:
         tcg_out_r(s, *args++);
@@ -802,9 +799,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_mov_i32:  /* Always emitted via tcg_out_mov.  */
     case INDEX_op_mov_i64:
-- 
2.1.4

Re: [Qemu-devel] [PATCH for-2.4] tci: Fix regression with INDEX_op_qemu_st_i32, INDEX_op_qemu_st_i64

[Richard Henderson]

On 07/10/2015 08:22 PM, Stefan Weil wrote:
> Commit 59227d5d45bb3c31dc2118011691c35b3c00879c did not update the
> code in tcg/tci/tcg-target.c for those two cases.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> Peter, could you please apply this patch directly (after Richard's review)?
> Maybe this is simpler than waiting for a pull request.

Reviewed-by: Richard Henderson <rth@twiddle.net>


r~

Re: [Qemu-devel] [PATCH for-2.4] tci: Fix regression with INDEX_op_qemu_st_i32, INDEX_op_qemu_st_i64

[Peter Maydell]

On 11 July 2015 at 08:51, Richard Henderson <rth@twiddle.net> wrote:
> On 07/10/2015 08:22 PM, Stefan Weil wrote:
>>
>> Commit 59227d5d45bb3c31dc2118011691c35b3c00879c did not update the
>> code in tcg/tci/tcg-target.c for those two cases.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>
>> Peter, could you please apply this patch directly (after Richard's
>> review)?
>> Maybe this is simpler than waiting for a pull request.
>
>
> Reviewed-by: Richard Henderson <rth@twiddle.net>

Applied to master, thanks.

-- PMM