On 12/16/20 10:27 AM, Philippe Mathieu-Daudé wrote: > MIPS 64-bit ISA is introduced with MIPS3. > No need for another bit/definition to check for 64-bit. > > Suggested-by: Jiaxun Yang <jiaxun.y...@flygoat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > target/mips/mips-defs.h | 2 +- > hw/mips/boston.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h > index f4d76e562d1..ab621a750d5 100644 > --- a/target/mips/mips-defs.h > +++ b/target/mips/mips-defs.h > @@ -19,7 +19,7 @@ > */ > #define ISA_MIPS1 0x0000000000000001ULL > #define ISA_MIPS2 0x0000000000000002ULL > -#define ISA_MIPS3 0x0000000000000004ULL > +#define ISA_MIPS3 0x0000000000000004ULL /* 64-bit */ > #define ISA_MIPS4 0x0000000000000008ULL > #define ISA_MIPS5 0x0000000000000010ULL > #define ISA_MIPS32 0x0000000000000020ULL > diff --git a/hw/mips/boston.c b/hw/mips/boston.c > index c3b94c68e1b..f44f681fab5 100644 > --- a/hw/mips/boston.c > +++ b/hw/mips/boston.c > @@ -463,7 +463,7 @@ static void boston_mach_init(MachineState *machine) > exit(1); > } > > - is_64b = cpu_type_supports_isa(machine->cpu_type, ISA_MIPS64); > + is_64b = cpu_type_supports_isa(machine->cpu_type, ISA_MIPS3);
Find this slightly confusing. After all of the renaming, I would expect ISA_MIPS64R6 -> ISA_MIPS_R6 | ISA_MIPS_64, not ISA_MIPS_R6 | ISA_MIPS3. r~
