Re: [PATCH v2 11/22] tcg/sparc: Split out target constraints to tcg-target-con-str.h

[Richard Henderson]

On 1/19/21 4:58 AM, Peter Maydell wrote:
> On Fri, 15 Jan 2021 at 21:14, Richard Henderson
> <richard.henderson@linaro.org> wrote:
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>  tcg/sparc/tcg-target-con-str.h | 22 +++++++++++++++++
>>  tcg/sparc/tcg-target.h         |  5 +---
>>  tcg/sparc/tcg-target.c.inc     | 45 +++++-----------------------------
>>  3 files changed, 29 insertions(+), 43 deletions(-)
>>  create mode 100644 tcg/sparc/tcg-target-con-str.h
>>
>> diff --git a/tcg/sparc/tcg-target-con-str.h b/tcg/sparc/tcg-target-con-str.h
>> new file mode 100644
>> index 0000000000..6dc5b95f33
>> --- /dev/null
>> +++ b/tcg/sparc/tcg-target-con-str.h
>> @@ -0,0 +1,22 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Define Sparc target-specific operand constraints.
>> + * Copyright (c) 2021 Linaro
>> + */
>> +
>> +/*
>> + * Define constraint letters for register sets:
>> + * REGS(letter, register_mask)
>> + */
>> +REGS('r', 0xffffffff)
>> +REGS('R', ALL_64)
>> +REGS('s', 0xffffffff & ~RESERVE_QLDST)
>> +REGS('S', ALL_64 & ~RESERVE_QLDST)
> 
> As with s390, I think an ALL_GENERAL_REGS constant would help here.
> 
> 
>> +
>> +/*
>> + * Define constraint letters for constants:
>> + * CONST(letter, TCG_CT_CONST_* bit set)
>> + */
>> +CONST('I', TCG_CT_CONST_S11)
>> +CONST('J', TCG_CT_CONST_S13)
>> +CONST('Z', TCG_CT_CONST_ZERO)
> 
> 
>> -static const char *target_parse_constraint(TCGArgConstraint *ct,
>> -                                           const char *ct_str, TCGType type)
>> -{
>> -    switch (*ct_str++) {
>> -    case 'r':
>> -        ct->regs = 0xffffffff;
>> -        break;
>> -    case 'R':
>> -        ct->regs = ALL_64;
>> -        break;
>> -    case 'A': /* qemu_ld/st address constraint */
>> -        ct->regs = TARGET_LONG_BITS == 64 ? ALL_64 : 0xffffffff;
>> -    reserve_helpers:
>> -        tcg_regset_reset_reg(ct->regs, TCG_REG_O0);
>> -        tcg_regset_reset_reg(ct->regs, TCG_REG_O1);
>> -        tcg_regset_reset_reg(ct->regs, TCG_REG_O2);
>> -        break;
> 
> The "A" constraint seems to have vanished in the conversion...

Argh.  Something that would have been found eventually, but I really want to
turn into a build-time error.


r~