[Qemu-devel] [PULL for-1.6] TCG mips --enable-debug fix

[Qemu-devel] [PULL for-1.6] TCG mips --enable-debug fix

[Richard Henderson]

Please pull for -rc2, thanks.


r~


The following changes since commit 6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f:

  fw_cfg: the I/O port variant expects little-endian (2013-08-07 12:48:15 -0500)

are available in the git repository at:

  git://github.com/rth7680/qemu.git for-1.6

for you to fetch changes up to 31e846e8f3885f82df7cc96f0a14a6665b42388e:

  tcg/mips: fix invalid op definition errors (2013-08-08 06:11:19 -1000)

----------------------------------------------------------------
James Hogan (1):
      tcg/mips: fix invalid op definition errors

 tcg/mips/tcg-target.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

[Qemu-devel] [PULL for-1.6] tcg/mips: fix invalid op definition errors

[Richard Henderson]

From: James Hogan <james.hogan@imgtec.com>

tcg/mips/tcg-target.h defines various operations conditionally depending
upon the isa revision, however these operations are included in
mips_op_defs[] unconditionally resulting in the following runtime errors
if CONFIG_DEBUG_TCG is defined:

Invalid op definition for movcond_i32
Invalid op definition for rotl_i32
Invalid op definition for rotr_i32
Invalid op definition for deposit_i32
Invalid op definition for bswap16_i32
Invalid op definition for bswap32_i32
tcg/tcg.c:1196: tcg fatal error

Fix with ifdefs like the i386 backend does for movcond_i32.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/mips/tcg-target.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c
index 373c364..793532e 100644
--- a/tcg/mips/tcg-target.c
+++ b/tcg/mips/tcg-target.c
@@ -1617,19 +1617,29 @@ static const TCGTargetOpDef mips_op_defs[] = {
     { INDEX_op_shl_i32, { "r", "rZ", "ri" } },
     { INDEX_op_shr_i32, { "r", "rZ", "ri" } },
     { INDEX_op_sar_i32, { "r", "rZ", "ri" } },
+#if TCG_TARGET_HAS_rot_i32
     { INDEX_op_rotr_i32, { "r", "rZ", "ri" } },
     { INDEX_op_rotl_i32, { "r", "rZ", "ri" } },
+#endif
 
+#if TCG_TARGET_HAS_bswap16_i32
     { INDEX_op_bswap16_i32, { "r", "r" } },
+#endif
+#if TCG_TARGET_HAS_bswap32_i32
     { INDEX_op_bswap32_i32, { "r", "r" } },
+#endif
 
     { INDEX_op_ext8s_i32, { "r", "rZ" } },
     { INDEX_op_ext16s_i32, { "r", "rZ" } },
 
+#if TCG_TARGET_HAS_deposit_i32
     { INDEX_op_deposit_i32, { "r", "0", "rZ" } },
+#endif
 
     { INDEX_op_brcond_i32, { "rZ", "rZ" } },
+#if TCG_TARGET_HAS_movcond_i32
     { INDEX_op_movcond_i32, { "r", "rZ", "rZ", "rZ", "0" } },
+#endif
     { INDEX_op_setcond_i32, { "r", "rZ", "rZ" } },
     { INDEX_op_setcond2_i32, { "r", "rZ", "rZ", "rZ", "rZ" } },
 
-- 
1.8.3.1

Re: [Qemu-devel] [PULL for-1.6] TCG mips --enable-debug fix

[Anthony Liguori]

Richard Henderson <rth@twiddle.net> writes:

> Please pull for -rc2, thanks.
>
>
> r~
>
>
> The following changes since commit 6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f:
>
>   fw_cfg: the I/O port variant expects little-endian (2013-08-07 12:48:15 -0500)
>
> are available in the git repository at:
>
>   git://github.com/rth7680/qemu.git for-1.6

I don't see a published branch of this name in the tree.

Regards,

Anthony Liguori

>
> for you to fetch changes up to 31e846e8f3885f82df7cc96f0a14a6665b42388e:
>
>   tcg/mips: fix invalid op definition errors (2013-08-08 06:11:19 -1000)
>
> ----------------------------------------------------------------
> James Hogan (1):
>       tcg/mips: fix invalid op definition errors
>
>  tcg/mips/tcg-target.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)

Re: [Qemu-devel] [PULL for-1.6] TCG mips --enable-debug fix

[Andreas Färber]

Am 12.08.2013 15:31, schrieb Anthony Liguori:
> Richard Henderson <rth@twiddle.net> writes:
> 
>> Please pull for -rc2, thanks.
>>
>>
>> r~
>>
>>
>> The following changes since commit 6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f:
>>
>>   fw_cfg: the I/O port variant expects little-endian (2013-08-07 12:48:15 -0500)
>>
>> are available in the git repository at:
>>
>>   git://github.com/rth7680/qemu.git for-1.6
> 
> I don't see a published branch of this name in the tree.

Aurélien seems to have already applied the original patch FWIW.

Andreas

> 
> Regards,
> 
> Anthony Liguori
> 
>>
>> for you to fetch changes up to 31e846e8f3885f82df7cc96f0a14a6665b42388e:
>>
>>   tcg/mips: fix invalid op definition errors (2013-08-08 06:11:19 -1000)
>>
>> ----------------------------------------------------------------
>> James Hogan (1):
>>       tcg/mips: fix invalid op definition errors
>>
>>  tcg/mips/tcg-target.c | 10 ++++++++++
>>  1 file changed, 10 insertions(+)
> 
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg