Re: [PATCH v3 16/23] target/mips: Extract trap code into env->error_code

[Philippe Mathieu-Daudé]

On 11/3/21 16:46, Richard Henderson wrote:
> On 11/3/21 11:21 AM, Philippe Mathieu-Daudé wrote:
>>>       do_trap:
>>> -        gen_trap(ctx, mips32_op, rs, rt, -1);
>>> +        gen_trap(ctx, mips32_op, rs, rt, -1, extract32(ctx->opcode,
>>> 12, 4));
>>>           break;
>>>   #ifndef CONFIG_USER_ONLY
>>>       case MFC0:
>>> @@ -2439,7 +2439,7 @@ static void decode_micromips32_opc(CPUMIPSState
>>> *env, DisasContext *ctx)
>>>               check_insn_opc_removed(ctx, ISA_MIPS_R6);
>>>               mips32_op = OPC_TEQI;
>>>           do_trapi:
>>> -            gen_trap(ctx, mips32_op, rs, -1, imm);
>>> +            gen_trap(ctx, mips32_op, rs, -1, imm, 0);
>>
>> IIUC the microMIPS manual (MD00594):
>>
>>                 gen_trap(ctx, mips32_op, rs, -1, imm,
>>                          extract32(ctx->opcode, 12, 4));
> 
> No, there is no code for trap-immediate.
> You can see the 12:4 code above for trap-register.
> 
> See the 3.05 revision of the manual, which still contains TEQI.  Note
> that all trap-immediate opcodes were removed for R6.

Oops indeed (checked 3.05 and 5.04).

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>