* [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug @ 2010-02-20 10:08 Jay Foad 2010-02-20 10:32 ` Blue Swirl 0 siblings, 1 reply; 9+ messages in thread From: Jay Foad @ 2010-02-20 10:08 UTC (permalink / raw) To: qemu-devel On 32-bit hosts op_qemu_ld32s is unused. Remove it to fix the following assertion failure: qemu-alpha: tcg/tcg.c:1055: tcg_add_target_add_op_defs: Assertion `tcg_op_defs[op].used' failed. Signed-off-by: Jay Foad <jay.foad@gmail.com> --- tcg/tcg-opc.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) 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 DEF2(qemu_ld64, 2, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS) ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug 2010-02-20 10:08 [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug Jay Foad @ 2010-02-20 10:32 ` Blue Swirl 2010-02-22 14:34 ` Alexander Graf 0 siblings, 1 reply; 9+ messages in thread From: Blue Swirl @ 2010-02-20 10:32 UTC (permalink / raw) To: Jay Foad; +Cc: qemu-devel Thanks, applied. On 2/20/10, Jay Foad <jay.foad@gmail.com> wrote: > On 32-bit hosts op_qemu_ld32s is unused. Remove it to fix the > following assertion failure: > > qemu-alpha: tcg/tcg.c:1055: > tcg_add_target_add_op_defs: Assertion `tcg_op_defs[op].used' failed. > > Signed-off-by: Jay Foad <jay.foad@gmail.com> > --- > tcg/tcg-opc.h | 5 ----- > 1 files changed, 0 insertions(+), 5 deletions(-) > > 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 > DEF2(qemu_ld64, 2, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS) > > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug 2010-02-20 10:32 ` Blue Swirl @ 2010-02-22 14:34 ` Alexander Graf 2010-02-22 14:42 ` Jay Foad 0 siblings, 1 reply; 9+ messages in thread From: Alexander Graf @ 2010-02-22 14:34 UTC (permalink / raw) To: Blue Swirl; +Cc: Jay Foad, qemu-devel Blue Swirl wrote: > Thanks, applied. > This patch breaks building on ppc32. Reverting it makes it compile again: In file included from /suse/agraf/git/qemu/tcg/tcg.c:158: /suse/agraf/git/qemu/tcg/ppc/tcg-target.c:1696: error: ‘INDEX_op_qemu_ld32s’ undeclared here (not in a function) Alex > On 2/20/10, Jay Foad <jay.foad@gmail.com> wrote: > >> On 32-bit hosts op_qemu_ld32s is unused. Remove it to fix the >> following assertion failure: >> >> qemu-alpha: tcg/tcg.c:1055: >> tcg_add_target_add_op_defs: Assertion `tcg_op_defs[op].used' failed. >> >> Signed-off-by: Jay Foad <jay.foad@gmail.com> >> --- >> tcg/tcg-opc.h | 5 ----- >> 1 files changed, 0 insertions(+), 5 deletions(-) >> >> 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 >> DEF2(qemu_ld64, 2, 2, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS) >> >> >> >> > > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug 2010-02-22 14:34 ` Alexander Graf @ 2010-02-22 14:42 ` Jay Foad 2010-02-22 15:22 ` Stefan Weil 2010-02-22 15:23 ` [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug Alexander Graf 0 siblings, 2 replies; 9+ messages in thread From: Jay Foad @ 2010-02-22 14:42 UTC (permalink / raw) To: Alexander Graf; +Cc: Blue Swirl, qemu-devel > This patch breaks building on ppc32. Reverting it makes it compile again: > /suse/agraf/git/qemu/tcg/ppc/tcg-target.c:1696: error: > ‘INDEX_op_qemu_ld32s’ undeclared here (not in a function) Does it build if you remove line 1696? If so, I'd suggest doing that. Thanks, Jay. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug 2010-02-22 14:42 ` Jay Foad @ 2010-02-22 15:22 ` Stefan Weil 2010-02-22 16:43 ` [Qemu-devel] [PATCH] tcg/ppc: Add missing conditional compilation Stefan Weil 2010-02-22 15:23 ` [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug Alexander Graf 1 sibling, 1 reply; 9+ messages in thread From: Stefan Weil @ 2010-02-22 15:22 UTC (permalink / raw) To: Jay Foad; +Cc: Blue Swirl, Alexander Graf, qemu-devel Jay Foad schrieb: >> This patch breaks building on ppc32. Reverting it makes it compile again: >> > > >> /suse/agraf/git/qemu/tcg/ppc/tcg-target.c:1696: error: >> ‘INDEX_op_qemu_ld32s’ undeclared here (not in a function) >> > > Does it build if you remove line 1696? If so, I'd suggest doing that. > > Thanks, > Jay. Removing the line helps only in that special case. #if TCG_TARGET_REG_BITS == 64 ... #endif is better. I can provide a patch. Regards, Stefan ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH] tcg/ppc: Add missing conditional compilation 2010-02-22 15:22 ` Stefan Weil @ 2010-02-22 16:43 ` Stefan Weil 2010-02-22 17:09 ` malc 0 siblings, 1 reply; 9+ messages in thread From: Stefan Weil @ 2010-02-22 16:43 UTC (permalink / raw) To: QEMU Developers; +Cc: blauwirbel, jay.foad, agraf INDEX_op_qemu_ld32s is only used when TCG_TARGET_REG_BITS == 64. This fixes a compile error (reported by Alexander Graf). Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- tcg/ppc/tcg-target.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 903b69f..9f801c2 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -1693,7 +1693,9 @@ static const TCGTargetOpDef ppc_op_defs[] = { { INDEX_op_qemu_ld16u, { "r", "L" } }, { INDEX_op_qemu_ld16s, { "r", "L" } }, { INDEX_op_qemu_ld32u, { "r", "L" } }, +#if TCG_TARGET_REG_BITS == 64 { INDEX_op_qemu_ld32s, { "r", "L" } }, +#endif { INDEX_op_qemu_ld64, { "r", "r", "L" } }, { INDEX_op_qemu_st8, { "K", "K" } }, @@ -1706,7 +1708,9 @@ static const TCGTargetOpDef ppc_op_defs[] = { { INDEX_op_qemu_ld16u, { "r", "L", "L" } }, { INDEX_op_qemu_ld16s, { "r", "L", "L" } }, { INDEX_op_qemu_ld32u, { "r", "L", "L" } }, +#if TCG_TARGET_REG_BITS == 64 { INDEX_op_qemu_ld32s, { "r", "L", "L" } }, +#endif { INDEX_op_qemu_ld64, { "r", "L", "L", "L" } }, { INDEX_op_qemu_st8, { "K", "K", "K" } }, -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] tcg/ppc: Add missing conditional compilation 2010-02-22 16:43 ` [Qemu-devel] [PATCH] tcg/ppc: Add missing conditional compilation Stefan Weil @ 2010-02-22 17:09 ` malc 0 siblings, 0 replies; 9+ messages in thread From: malc @ 2010-02-22 17:09 UTC (permalink / raw) To: Stefan Weil; +Cc: blauwirbel, agraf, QEMU Developers, jay.foad On Mon, 22 Feb 2010, Stefan Weil wrote: > INDEX_op_qemu_ld32s is only used when > TCG_TARGET_REG_BITS == 64. TCG_TARGET_REG_BITS is always 32 for PPC32. [..snip..] -- mailto:av1474@comtv.ru ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug 2010-02-22 14:42 ` Jay Foad 2010-02-22 15:22 ` Stefan Weil @ 2010-02-22 15:23 ` Alexander Graf 2010-02-22 15:55 ` Jay Foad 1 sibling, 1 reply; 9+ messages in thread From: Alexander Graf @ 2010-02-22 15:23 UTC (permalink / raw) To: Jay Foad; +Cc: Blue Swirl, qemu-devel Jay Foad wrote: >> This patch breaks building on ppc32. Reverting it makes it compile again: >> > > >> /suse/agraf/git/qemu/tcg/ppc/tcg-target.c:1696: error: >> ‘INDEX_op_qemu_ld32s’ undeclared here (not in a function) >> > > Does it build if you remove line 1696? If so, I'd suggest doing that. > Yes, that fixes it. Please grep through all tcg targets and send a patch removing all references to ld32s if you think it's not necessary. Alex ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug 2010-02-22 15:23 ` [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug Alexander Graf @ 2010-02-22 15:55 ` Jay Foad 0 siblings, 0 replies; 9+ messages in thread From: Jay Foad @ 2010-02-22 15:55 UTC (permalink / raw) To: Alexander Graf; +Cc: Blue Swirl, qemu-devel >> Does it build if you remove line 1696? If so, I'd suggest doing that. >> > > Yes, that fixes it. Please grep through all tcg targets and send a patch > removing all references to ld32s if you think it's not necessary. Done. Unfortunately I'm not in a position to try building any of the affected tcg targets. Or is there a way I can test it without an hppa/ppc/sparc cross-compiler? Thanks, Jay. ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-02-22 17:11 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-02-20 10:08 [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug Jay Foad 2010-02-20 10:32 ` Blue Swirl 2010-02-22 14:34 ` Alexander Graf 2010-02-22 14:42 ` Jay Foad 2010-02-22 15:22 ` Stefan Weil 2010-02-22 16:43 ` [Qemu-devel] [PATCH] tcg/ppc: Add missing conditional compilation Stefan Weil 2010-02-22 17:09 ` malc 2010-02-22 15:23 ` [Qemu-devel] [PATCH v2] tcg: fix assertion with --enable-debug Alexander Graf 2010-02-22 15:55 ` Jay Foad
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).