Patchwork tcg: fix assertion with --enable-debug

login
register
mail settings
Submitter Jay Foad
Date Feb. 19, 2010, 6:57 p.m.
Message ID <ee2e06e91002191057n2201e13fk19dc28758577a87d@mail.gmail.com>
Download mbox | patch
Permalink /patch/45909/
State New
Headers show

Comments

Jay Foad - Feb. 19, 2010, 6:57 p.m.
After configuring with --enable-debug on Linux/x86, I get:

foad@foad-ubuntu:~/qemu/objdir-git$ qemu-alpha /dev/null
qemu-alpha: /home/foad/git/qemu/tcg/tcg.c:1055:
tcg_add_target_add_op_defs: Assertion `tcg_op_defs[op].used' failed.
Aborted

(and the same for all other targets). The qemu_ld32s op appears to be
unused on 32-bit hosts. Is it OK to just remove it?

Signed-off-by: Jay Foad <address@hidden>
---
 tcg/tcg-opc.h |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

 DEF2(qemu_ld64, 2, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS)
Blue Swirl - Feb. 20, 2010, 8:59 a.m.
On 2/19/10, Jay Foad <jay.foad@gmail.com> wrote:
> After configuring with --enable-debug on Linux/x86, I get:
>
>  foad@foad-ubuntu:~/qemu/objdir-git$ qemu-alpha /dev/null
>  qemu-alpha: /home/foad/git/qemu/tcg/tcg.c:1055:
>  tcg_add_target_add_op_defs: Assertion `tcg_op_defs[op].used' failed.
>  Aborted
>
>  (and the same for all other targets). The qemu_ld32s op appears to be
>  unused on 32-bit hosts. Is it OK to just remove it?

Should be OK.

Patch

diff --git a/tcg/tcg-opc.h b/tcg/tcg-opc.h
index 89db3b4..838f1f4 100644
--- a/tcg/tcg-opc.h
+++ b/tcg/tcg-opc.h
@@ -224,11 +224,6 @@  DEF2(qemu_ld32u, 1, 1, 1, TCG_OPF_CALL_CLOBBER |
TCG_OPF_SIDE_EFFECTS)
 DEF2(qemu_ld32u, 1, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS)
 #endif
 #if TARGET_LONG_BITS == 32
-DEF2(qemu_ld32s, 1, 1, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS)
-#else
-DEF2(qemu_ld32s, 1, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS)
-#endif
-#if TARGET_LONG_BITS == 32
 DEF2(qemu_ld64, 2, 1, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS)
 #else