| Message ID | 1436433435-24898-2-git-send-email-james.hogan@imgtec.com |
|---|---|
| State | New |
| Headers | show |
On 2015-07-09 10:17, James Hogan wrote: > Commit 3972ef6f830d ("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: 3972ef6f830d ("tcg: Push merged memop+mmu_idx parameter to softmmu routines") > Signed-off-by: James Hogan <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> > --- > tcg/mips/tcg-target.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Aurelien Jarno <aurelien@aurel32.net> I was planning to test various hosts after the rc0 release, but it seems you have been faster. Unfortunately we have more regressions, I am going to send some more mails. I am fine if it can be merged directly.
diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index f643eca3df45..668029977c1a 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -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;
Commit 3972ef6f830d ("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: 3972ef6f830d ("tcg: Push merged memop+mmu_idx parameter to softmmu routines") Signed-off-by: James Hogan <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> --- tcg/mips/tcg-target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)