[PATCH] arm64: insn: fix compare-and-branch encodings

[Z Lim]

On Wed, Feb 18, 2015 at 8:08 AM, Robin Murphy <robin.murphy at arm.com> wrote:
> Oops, missed some CCs...
>
> On 18/02/15 15:40, Robin Murphy wrote:
>>
>> Fix cbz/cbnz having the mask offset by a bit, and add encodings for
>> tbz/tbnz so that all branch forms are represented.
>>
>> Signed-off-by: Robin Murphy <robin.murphy at arm.com>
>> Acked-by: Will Deacon <will.deacon at arm.com>
>> ---
>>   arch/arm64/include/asm/insn.h | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h
>> index e2ff32a..d2f4942 100644
>> --- a/arch/arm64/include/asm/insn.h
>> +++ b/arch/arm64/include/asm/insn.h
>> @@ -264,8 +264,10 @@ __AARCH64_INSN_FUNCS(ands, 0x7F200000, 0x6A000000)
>>   __AARCH64_INSN_FUNCS(bics,    0x7F200000, 0x6A200000)
>>   __AARCH64_INSN_FUNCS(b,               0xFC000000, 0x14000000)
>>   __AARCH64_INSN_FUNCS(bl,      0xFC000000, 0x94000000)
>> -__AARCH64_INSN_FUNCS(cbz,      0xFE000000, 0x34000000)
>> -__AARCH64_INSN_FUNCS(cbnz,     0xFE000000, 0x35000000)
>> +__AARCH64_INSN_FUNCS(cbz,      0x7F000000, 0x34000000)
>> +__AARCH64_INSN_FUNCS(cbnz,     0x7F000000, 0x35000000)
>> +__AARCH64_INSN_FUNCS(tbz,      0x7F000000, 0x36000000)
>> +__AARCH64_INSN_FUNCS(tbnz,     0x7F000000, 0x37000000)
>>   __AARCH64_INSN_FUNCS(bcond,   0xFF000010, 0x54000000)
>>   __AARCH64_INSN_FUNCS(svc,     0xFFE0001F, 0xD4000001)
>>   __AARCH64_INSN_FUNCS(hvc,     0xFFE0001F, 0xD4000002)
>>

Looks good to me, as described in ARMv8 ARM.

Acked-by: Zi Shen Lim <zlim.lnx at gmail.com>