Commit a8f13961 authored by James Hogan's avatar James Hogan Committed by Peter Maydell
Browse files

tcg/mips: Fix build error from merged memop+mmu_idx parameter 



Commit 3972ef6f ("tcg: Push merged memop+mmu_idx parameter to
softmmu routines") caused the following build errors when building TCG
for MIPS:

In file included from tcg/tcg.c:258:0:
tcg/mips/tcg-target.c In function ‘tcg_out_qemu_ld_slow_path’:
tcg/mips/tcg-target.c:1015:22: error: ‘lb’ undeclared (first use in this function)
tcg/mips/tcg-target.c In function ‘tcg_out_qemu_st_slow_path’:
tcg/mips/tcg-target.c:1058:22: error: ‘lb’ undeclared (first use in this function)

It looks like lb was meant to refer to the TCGLabelQemuLdst *l
parameter, so fix both references to lb to refer to just l.

Fixes: 3972ef6f ("tcg: Push merged memop+mmu_idx parameter to softmmu routines")
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
Message-id: 1436433435-24898-2-git-send-email-james.hogan@imgtec.com
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent acf7b7fd

tcg/mips/tcg-target.c

+2 −2
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static void add_qemu_ldst_label(TCGContext *s, int is_ld, TCGMemOpIdx oi, 


static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l)

{

    TCGMemOpIdx oi = lb->oi;

    TCGMemOpIdx oi = l->oi;

    TCGMemOp opc = get_memop(oi);

    TCGReg v0;

    int i;
@@ -1055,7 +1055,7 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) 


static void tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l)

{

    TCGMemOpIdx oi = lb->oi;

    TCGMemOpIdx oi = l->oi;

    TCGMemOp opc = get_memop(oi);

    TCGMemOp s_bits = opc & MO_SIZE;

    int i;