tcg/tci: Restrict tci_write_reg16() to 64-bit hosts

[PATCH] tcg/tci: Restrict tci_write_reg16() to 64-bit hosts

Posted by Philippe Mathieu-Daudé 5 years ago

Restrict tci_write_reg16() to 64-bit hosts to fix on 32-bit ones:

  [520/1115] Compiling C object libqemu-arm-linux-user.fa.p/tcg_tci.c.o
  FAILED: libqemu-arm-linux-user.fa.p/tcg_tci.c.o
  tcg/tci.c:132:1: error: 'tci_write_reg16' defined but not used [-Werror=unused-function]
   tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value)
   ^~~~~~~~~~~~~~~

Fixes: 2f160e0f979 ("tci: Add implementation for INDEX_op_ld16u_i64")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tcg/tci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tcg/tci.c b/tcg/tci.c
index 2311aa7d3ab..3fc82d3c79d 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -128,11 +128,13 @@ static void tci_write_reg8(tcg_target_ulong *regs, TCGReg index, uint8_t value)
     tci_write_reg(regs, index, value);
 }
 
+#if TCG_TARGET_REG_BITS == 64
 static void
 tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value)
 {
     tci_write_reg(regs, index, value);
 }
+#endif
 
 static void
 tci_write_reg32(tcg_target_ulong *regs, TCGReg index, uint32_t value)
-- 
2.26.2

Re: [PATCH] tcg/tci: Restrict tci_write_reg16() to 64-bit hosts

Posted by Stefan Weil 5 years ago

Am 23.01.21 um 10:41 schrieb Philippe Mathieu-Daudé:

> Restrict tci_write_reg16() to 64-bit hosts to fix on 32-bit ones:
>
>    [520/1115] Compiling C object libqemu-arm-linux-user.fa.p/tcg_tci.c.o
>    FAILED: libqemu-arm-linux-user.fa.p/tcg_tci.c.o
>    tcg/tci.c:132:1: error: 'tci_write_reg16' defined but not used [-Werror=unused-function]
>     tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value)
>     ^~~~~~~~~~~~~~~
>
> Fixes: 2f160e0f979 ("tci: Add implementation for INDEX_op_ld16u_i64")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   tcg/tci.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/tcg/tci.c b/tcg/tci.c
> index 2311aa7d3ab..3fc82d3c79d 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -128,11 +128,13 @@ static void tci_write_reg8(tcg_target_ulong *regs, TCGReg index, uint8_t value)
>       tci_write_reg(regs, index, value);
>   }
>   
> +#if TCG_TARGET_REG_BITS == 64
>   static void
>   tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value)
>   {
>       tci_write_reg(regs, index, value);
>   }
> +#endif
>   
>   static void
>   tci_write_reg32(tcg_target_ulong *regs, TCGReg index, uint32_t value)


Thanks for fixing this. This could optionally be applied via qemu-trivial.

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Re: [PATCH] tcg/tci: Restrict tci_write_reg16() to 64-bit hosts

Posted by Laurent Vivier 5 years ago

Le 23/01/2021 à 11:30, Stefan Weil a écrit :
> Am 23.01.21 um 10:41 schrieb Philippe Mathieu-Daudé:
> 
>> Restrict tci_write_reg16() to 64-bit hosts to fix on 32-bit ones:
>>
>>    [520/1115] Compiling C object libqemu-arm-linux-user.fa.p/tcg_tci.c.o
>>    FAILED: libqemu-arm-linux-user.fa.p/tcg_tci.c.o
>>    tcg/tci.c:132:1: error: 'tci_write_reg16' defined but not used [-Werror=unused-function]
>>     tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value)
>>     ^~~~~~~~~~~~~~~
>>
>> Fixes: 2f160e0f979 ("tci: Add implementation for INDEX_op_ld16u_i64")
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>   tcg/tci.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/tcg/tci.c b/tcg/tci.c
>> index 2311aa7d3ab..3fc82d3c79d 100644
>> --- a/tcg/tci.c
>> +++ b/tcg/tci.c
>> @@ -128,11 +128,13 @@ static void tci_write_reg8(tcg_target_ulong *regs, TCGReg index, uint8_t value)
>>       tci_write_reg(regs, index, value);
>>   }
>>   +#if TCG_TARGET_REG_BITS == 64
>>   static void
>>   tci_write_reg16(tcg_target_ulong *regs, TCGReg index, uint16_t value)
>>   {
>>       tci_write_reg(regs, index, value);
>>   }
>> +#endif
>>     static void
>>   tci_write_reg32(tcg_target_ulong *regs, TCGReg index, uint32_t value)
> 
> 
> Thanks for fixing this. This could optionally be applied via qemu-trivial.
> 
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
> 
> 

Applied to my trivial-patches branch.

Thanks,
Laurent