target/mips/mips-defs: Simplify ISA definitions
v3 cover target/mips/mips-defs: Simplify ISA definitions
v3: Replace ISA_MIPS3 by ISA_MIPS64 (Richard)
v2: Do not use MIPS3 for 64R1 (Jiaxun)
Missing review: 1, 3, 4, 5
As we don't need to duplicate 32/64-bit ISA defititions, this series remove the duplicated 64-bit variants, simplifying the overall.
Regards,
Phil.
$ git backport-diff -u v2 -r ..v3 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respective= ly
001/15:[down] 'target/mips/mips-defs: Remove USE_HOST_FLOAT_REGS comment' 002/15:[----] [--] 'target/mips/mips-defs: Reorder CPU_MIPS5 definition' 003/15:[down] 'target/mips/mips-defs: Rename CPU_MIPSxx Release 1 as CPU_MIPS= xxR1'
004/15:[down] 'target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64= bit()'
005/15:[down] 'hw/mips/boston: Check 64-bit support with cpu_type_is_64bit()' 006/15:[0004] [FC] 'target/mips/mips-defs: Use ISA_MIPS32 definition to check=
Release 1'
007/15:[0004] [FC] 'target/mips/mips-defs: Use ISA_MIPS32R2 definition to che= ck Release 2'
008/15:[----] [--] 'target/mips/mips-defs: Use ISA_MIPS32R3 definition to che= ck Release 3'
009/15:[----] [--] 'target/mips/mips-defs: Use ISA_MIPS32R5 definition to che= ck Release 5'
010/15:[0002] [FC] 'target/mips/mips-defs: Use ISA_MIPS32R6 definition to che= ck Release 6'
011/15:[0004] [FC] 'target/mips/mips-defs: Rename ISA_MIPS32 as ISA_MIPS_R1' 012/15:[0006] [FC] 'target/mips/mips-defs: Rename ISA_MIPS32R2 as ISA_MIPS_R2' 013/15:[----] [-C] 'target/mips/mips-defs: Rename ISA_MIPS32R3 as ISA_MIPS_R3' 014/15:[----] [--] 'target/mips/mips-defs: Rename ISA_MIPS32R5 as ISA_MIPS_R5' 015/15:[0018] [FC] 'target/mips/mips-defs: Rename ISA_MIPS32R6 as ISA_MIPS_R6'
Philippe Mathieu-Daud=C3=A9 (15):
target/mips/mips-defs: Remove USE_HOST_FLOAT_REGS comment target/mips/mips-defs: Reorder CPU_MIPS5 definition target/mips/mips-defs: Rename CPU_MIPSxx Release 1 as CPU_MIPSxxR1 target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit() hw/mips/boston: Check 64-bit support with cpu_type_is_64bit() target/mips/mips-defs: Use ISA_MIPS32 definition to check Release 1 target/mips/mips-defs: Use ISA_MIPS32R2 definition to check Release 2 target/mips/mips-defs: Use ISA_MIPS32R3 definition to check Release 3 target/mips/mips-defs: Use ISA_MIPS32R5 definition to check Release 5 target/mips/mips-defs: Use ISA_MIPS32R6 definition to check Release 6 target/mips/mips-defs: Rename ISA_MIPS32 as ISA_MIPS_R1 target/mips/mips-defs: Rename ISA_MIPS32R2 as ISA_MIPS_R2 target/mips/mips-defs: Rename ISA_MIPS32R3 as ISA_MIPS_R3 target/mips/mips-defs: Rename ISA_MIPS32R5 as ISA_MIPS_R5 target/mips/mips-defs: Rename ISA_MIPS32R6 as ISA_MIPS_R6
target/mips/cpu.h | 5 + target/mips/internal.h | 8 +- target/mips/mips-defs.h | 46 +-- hw/mips/boston.c | 6 +- linux-user/mips/cpu_loop.c | 6 +- target/mips/cp0_helper.c | 18 +- target/mips/cp0_timer.c | 4 +- target/mips/cpu.c | 6 +- target/mips/fpu_helper.c | 4 +- target/mips/helper.c | 12 +- target/mips/translate.c | 620 +++++++++++++++---------------- target/mips/translate_init.c.inc | 14 +- 12 files changed, 370 insertions(+), 379 deletions(-)
--=20
2.26.2
PATCH v3 1/15 target/mips/mips-defs: Remove USE_HOST_FLOAT_REGS comment
Remove a comment added 12 years ago but never used (commitb6d96beda3a: "Use temporary registers for the MIPS FPU emulation").
--- target/mips/mips-defs.h | 6 ------ 1 file changed, 6 deletions(-)
target/mips/mips-defs.h +0 -6
@@ -1,12 +1,6 @@#ifndef QEMU_MIPS_DEFS_H #define QEMU_MIPS_DEFS_H -/* -* If we want to use host float regs... -* -* #define USE_HOST_FLOAT_REGS -*/ -/* Real pages are variable size... */ #define MIPS_TLB_MAX 128
Signature · 1 line
2.26.2
Re: [PATCH v3 01/15] target/mips/mips-defs: Remove USE_HOST_FLOAT_REGS comment
Quoted 7 lines · Philippe Mathieu-Daudé
Remove a comment added 12 years ago but never used (commit
b6d96beda3a: "Use temporary registers for the MIPS FPU emulation").Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/mips/mips-defs.h | 6 ------ 1 file changed, 6 deletions(-)
r~
PATCH v3 2/15 target/mips/mips-defs: Reorder CPU_MIPS5 definition
In reply to Philippe Mathieu-DaudéMove CPU_MIPS5 after CPU_MIPS4 :)
--- target/mips/mips-defs.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
target/mips/mips-defs.h +1 -2
@@ -65,13 +65,12 @@#define CPU_MIPS2 (CPU_MIPS1 | ISA_MIPS2)#define CPU_MIPS3 (CPU_MIPS2 | ISA_MIPS3)#define CPU_MIPS4 (CPU_MIPS3 | ISA_MIPS4) +#define CPU_MIPS5 (CPU_MIPS4 | ISA_MIPS5)#define CPU_VR54XX (CPU_MIPS4 | INSN_VR54XX)#define CPU_R5900 (CPU_MIPS3 | INSN_R5900)#define CPU_LOONGSON2E (CPU_MIPS3 | INSN_LOONGSON2E)#define CPU_LOONGSON2F (CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI) -#define CPU_MIPS5 (CPU_MIPS4 | ISA_MIPS5) -/* MIPS Technologies "Release 1" */ #define CPU_MIPS32 (CPU_MIPS2 | ISA_MIPS32)#define CPU_MIPS64 (CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64)
Signature · 1 line
2.26.2
PATCH v3 3/15 target/mips/mips-defs: Rename CPU_MIPSxx Release 1 as CPU_MIPSxxR1
In reply to Philippe Mathieu-Daudé'CPU_MIPS32' and 'CPU_MIPS64' definitions concern CPUs implementing the "Release 1" ISA. Rename it with the 'R1' suffix, as the other CPU definitions do.
--- target/mips/mips-defs.h | 8 ++++---- target/mips/translate_init.c.inc | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-)
target/mips/mips-defs.h +4 -4
@@ -72,12 +72,12 @@#define CPU_LOONGSON2F (CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI)/* MIPS Technologies "Release 1" */ -#define CPU_MIPS32 (CPU_MIPS2 | ISA_MIPS32) -#define CPU_MIPS64 (CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64) +#define CPU_MIPS32R1 (CPU_MIPS2 | ISA_MIPS32) +#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1 | ISA_MIPS64)/* MIPS Technologies "Release 2" */ -#define CPU_MIPS32R2 (CPU_MIPS32 | ISA_MIPS32R2) -#define CPU_MIPS64R2 (CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2) +#define CPU_MIPS32R2 (CPU_MIPS32R1 | ISA_MIPS32R2) +#define CPU_MIPS64R2 (CPU_MIPS64R1 | CPU_MIPS32R2 | ISA_MIPS64R2)/* MIPS Technologies "Release 3" */ #define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3)
target/mips/translate_init.c.inc +7 -7
@@ -72,7 +72,7 @@ const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1278FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32, + .insn_flags = CPU_MIPS32R1, .mmu_type = MMU_TYPE_R4000, }, {
@@ -94,7 +94,7 @@ const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1258FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32 | ASE_MIPS16, + .insn_flags = CPU_MIPS32R1 | ASE_MIPS16, .mmu_type = MMU_TYPE_FMT, }, {
@@ -114,7 +114,7 @@ const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1278FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32, + .insn_flags = CPU_MIPS32R1, .mmu_type = MMU_TYPE_R4000, }, {
@@ -134,7 +134,7 @@ const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x1258FF17, .SEGBITS = 32, .PABITS = 32, - .insn_flags = CPU_MIPS32 | ASE_MIPS16, + .insn_flags = CPU_MIPS32R1 | ASE_MIPS16, .mmu_type = MMU_TYPE_FMT, }, {
@@ -550,7 +550,7 @@ const mips_def_t mips_defs[] = .CP0_Status_rw_bitmask = 0x12F8FFFF, .SEGBITS = 42, .PABITS = 36, - .insn_flags = CPU_MIPS64, + .insn_flags = CPU_MIPS64R1, .mmu_type = MMU_TYPE_R4000, }, {
@@ -576,7 +576,7 @@ const mips_def_t mips_defs[] = .CP1_fcr31_rw_bitmask = 0xFF83FFFF, .SEGBITS = 42, .PABITS = 36, - .insn_flags = CPU_MIPS64, + .insn_flags = CPU_MIPS64R1, .mmu_type = MMU_TYPE_R4000, }, {
@@ -605,7 +605,7 @@ const mips_def_t mips_defs[] = .CP1_fcr31_rw_bitmask = 0xFF83FFFF, .SEGBITS = 40, .PABITS = 36, - .insn_flags = CPU_MIPS64 | ASE_MIPS3D, + .insn_flags = CPU_MIPS64R1 | ASE_MIPS3D, .mmu_type = MMU_TYPE_R4000, }, {
Signature · 1 line
2.26.2
Re: [PATCH v3 03/15] target/mips/mips-defs: Rename CPU_MIPSxx Release 1 as CPU_MIPSxxR1
Quoted 9 lines · Philippe Mathieu-Daudé
'
CPU_MIPS32' and 'CPU_MIPS64' definitions concern CPUs implementing the "Release 1" ISA. Rename it with the 'R1' suffix, as the other CPU definitions do.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/mips/mips-defs.h | 8 ++++---- target/mips/translate_init.c.inc | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-)
r~
PATCH v3 4/15 target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
In reply to Philippe Mathieu-DaudéMIPS 64-bit ISA is introduced with MIPS3.
Introduce the CPU_MIPS64 definition aliased to the MIPS3 ISA, and the cpu_type_is_64bit() method to check if a CPU supports this ISA (thus is 64-bit).
--- target/mips/cpu.h | 5 +++++ target/mips/mips-defs.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)
target/mips/cpu.h +5 -0
@@ -1297,6 +1297,11 @@ static inline bool ase_mt_available(CPUMIPSState *env)return env->CP0_Config3 & (1 <<CP0C3_MT ); } +static inline bool cpu_type_is_64bit (const char *cpu_type) +{ +return cpu_type_supports_isa (cpu_type,CPU_MIPS64 ); +} +void cpu_set_exception_base (int vp_index,target_ulong address);/* addr.c */
target/mips/mips-defs.h +3 -1
@@ -13,7 +13,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
@@ -71,6 +71,8 @@#define CPU_LOONGSON2E (CPU_MIPS3 | INSN_LOONGSON2E)#define CPU_LOONGSON2F (CPU_MIPS3 | INSN_LOONGSON2F | ASE_LMMI) +#define CPU_MIPS64 (ISA_MIPS3) +/* MIPS Technologies "Release 1" */ #define CPU_MIPS32R1 (CPU_MIPS2 | ISA_MIPS32)#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1 | ISA_MIPS64)
Signature · 1 line
2.26.2
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
Quoted 6 lines · Philippe Mathieu-Daudé
MIPS 64-bit ISA is introduced with MIPS3.
Introduce the
CPU_MIPS64definition aliased to the MIPS3 ISA, and thecpu_type_is_64bit()method to check if a CPU supports this ISA (thus is 64-bit).
Quoted 6 lines
Suggested-by Jiaxun Yang <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/mips/cpu.h | 5 +++++ target/mips/mips-defs.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)
I still don't understand this as an alias, as opposed to a separate bit. (ISA_MIPS3 | CPU_MIPS64R6) does not make sense, because R6 removes instructions.
But if this is an intermediate step,
r~
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
Quoted 14 lines · Richard Henderson
Quoted 6 lines · Philippe Mathieu-Daudé
MIPS 64-bit ISA is introduced with MIPS3.
Introduce the
CPU_MIPS64definition aliased to the MIPS3 ISA, and thecpu_type_is_64bit()method to check if a CPU supports this ISA (thus is 64-bit).Quoted 6 lines
Suggested-by Jiaxun Yang <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/mips/cpu.h | 5 +++++ target/mips/mips-defs.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)
Quoted 2 lines
I still don't understand this as an alias, as opposed to a separate bit. (
ISA_MIPS3|CPU_MIPS64R6) does not make sense, because R6 removes instructions.
I now understand your concern.
I based the decodetree logic on the R6 ISA manual, decoding the bits from the more recent feature (a leaf) to the root, following this tree:
https://images.anandtech.com/doci/8457/MIPS%20ISA%20Evolution.JPG
(2.3 Evolution of the Architecture).
Also "2.1 Historical Perspective":
In the MIPS IIITM ISA, 64-bit integers and addresses were added to the instruction set. [...]
The MIPS32 Release 6 ISA maintains backward-compatibility, with the exception of a few rarely used instructions, though the use of trap-and-emulate or trap-and-patch; all pre-Release 6 binaries can execute under binary translation. [...]
The MIPS64 Architecture is based on the MIPS V ISA and is backward compatible with the MIPS32 Architecture.
Quoted 1 line
But if this is an intermediate step,
As this isn't planned as intermediate step, I'll try to keep CPU_MIPS64 as a separate bit and post the result.
Thanks for reviewing!
Phil.
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
Hi Richard,
Quoted 15 lines · Philippe Mathieu-Daudé
Quoted 14 lines · Richard Henderson
Quoted 12 lines · Philippe Mathieu-Daudé
MIPS 64-bit ISA is introduced with MIPS3.
Introduce the
CPU_MIPS64definition aliased to the MIPS3 ISA, and thecpu_type_is_64bit()method to check if a CPU supports this ISA (thus is 64-bit).Suggested-by Jiaxun Yang <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/mips/cpu.h | 5 +++++ target/mips/mips-defs.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)
Quoted 2 lines
Quoted 2 lines
I still don't understand this as an alias, as opposed to a separate bit. (
ISA_MIPS3|CPU_MIPS64R6) does not make sense, because R6 removes instructions.
Well, FWIW (ISA_MIPS3 | CPU_MIPS64R6) is what we currently have:
#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6)
#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5 | ISA_MIPS64R5)
#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3 | ISA_MIPS64R3)
#define CPU_MIPS64R2 (CPU_MIPS64 | CPU_MIPS32R2 | ISA_MIPS64R2)
#define CPU_MIPS64 (CPU_MIPS5 | CPU_MIPS32 | ISA_MIPS64)
#define CPU_MIPS5 (CPU_MIPS4 | ISA_MIPS5)
#define CPU_MIPS4 (CPU_MIPS3 | ISA_MIPS4)
#define CPU_MIPS3 (CPU_MIPS2 | ISA_MIPS3)
So CPU_MIPS64R6 -> CPU_MIPS64R5 -> CPU_MIPS64R3 -> CPU_MIPS64R2
-> CPU_MIPS64 -> CPU_MIPS5 -> CPU_MIPS4 -> CPU_MIPS3 -> ISA_MIPS3
This patch doesn't make it worst :)
Quoted 19 lines
I now understand your concern.
I based the decodetree logic on the R6 ISA manual, decoding the bits from the more recent feature (a leaf) to the root, following this tree:
https://images.anandtech.com/doci/8457/MIPS%20ISA%20Evolution.JPG
(2.3 Evolution of the Architecture).Also "2.1 Historical Perspective":
In the MIPS IIITM ISA, 64-bit integers and addresses were added to the instruction set. [...]
The MIPS32 Release 6 ISA maintains backward-compatibility, with the exception of a few rarely used instructions, though the use of trap-and-emulate or trap-and-patch; all pre-Release 6 binaries can execute under binary translation. [...]
The MIPS64 Architecture is based on the MIPS V ISA and is backward compatible with the MIPS32 Architecture.
Quoted 4 lines
Quoted 1 line
But if this is an intermediate step,
As this isn't planned as intermediate step, I'll try to keep
CPU_MIPS64as a separate bit and post the result.
I'm not sure it is worth the effort, as I plan to check each ISA / ASE bit from the CP0_ConfigX bits (similarly target/arm/ does), so these definitions should disappear eventually.
I.e. for the MSA ASE see:
https://www.mail-archive.com/[email protected]/msg767523.html
/* Check presence of MSA implementation */ static inline bool ase_msa_available(CPUMIPSState *env)
{
return env->CP0_Config3 & (1 << CP0C3_MSAP);}
Might I keep your R-b tag for this patch (eventually improving the commit description with some of the info added in this mail) and keep going?
Thanks,
Phil.
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
Quoted 3 lines · Philippe Mathieu-Daudé
I'm not sure it is worth the effort, as I plan to check each ISA / ASE bit from the
CP0_ConfigXbits (similarly target/arm/ does), so these definitions should disappear eventually.
Excellent.
Quoted 3 lines
Might I keep your R-b tag for this patch (eventually improving the commit description with some of the info added in this mail) and keep going?
Yes.
r~
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
Quoted 5 lines · Richard Henderson
Quoted 3 lines · Philippe Mathieu-Daudé
I'm not sure it is worth the effort, as I plan to check each ISA / ASE bit from the
CP0_ConfigXbits (similarly target/arm/ does), so these definitions should disappear eventually.
Quoted 7 lines
Excellent.
Quoted 3 lines
Might I keep your R-b tag for this patch (eventually improving the commit description with some of the info added in this mail) and keep going?
Yes.
Thanks :)
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
In reply to Philippe Mathieu-DaudéQuoted 33 lines · Philippe Mathieu-Daudé
Hi Richard,
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Richard Henderson
Quoted 6 lines · Philippe Mathieu-Daudé
MIPS 64-bit ISA is introduced with MIPS3.
Introduce the
CPU_MIPS64definition aliased to the MIPS3 ISA, and thecpu_type_is_64bit()method to check if a CPU supports this ISA (thus is 64-bit).Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
Suggested-by Jiaxun Yang <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/mips/cpu.h | 5 +++++ target/mips/mips-defs.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)I still don't understand this as an alias, as opposed to a separate bit. (
ISA_MIPS3|CPU_MIPS64R6) does not make sense, because R6 removes instructions.Well, FWIW (
ISA_MIPS3|CPU_MIPS64R6) is what we currently have:#define
CPU_MIPS64R6(CPU_MIPS64R5|CPU_MIPS32R6|ISA_MIPS64R6)#define
CPU_MIPS64R5(CPU_MIPS64R3|CPU_MIPS32R5|ISA_MIPS64R5)#define
CPU_MIPS64R3(CPU_MIPS64R2|CPU_MIPS32R3|ISA_MIPS64R3)#define
CPU_MIPS64R2(CPU_MIPS64|CPU_MIPS32R2|ISA_MIPS64R2)#define
CPU_MIPS64(CPU_MIPS5|CPU_MIPS32|ISA_MIPS64)#define
CPU_MIPS5(CPU_MIPS4|ISA_MIPS5)
Quoted 27 lines
#define
CPU_MIPS4(CPU_MIPS3|ISA_MIPS4)#define
CPU_MIPS3(CPU_MIPS2|ISA_MIPS3)So
CPU_MIPS64R6->CPU_MIPS64R5->CPU_MIPS64R3->CPU_MIPS64R2
->CPU_MIPS64->CPU_MIPS5->CPU_MIPS4->CPU_MIPS3->ISA_MIPS3This patch doesn't make it worst :)
Quoted 18 lines
I now understand your concern.
I based the decodetree logic on the R6 ISA manual, decoding the bits from the more recent feature (a leaf) to the root, following this tree:
https://images.anandtech.com/doci/8457/MIPS%20ISA%20Evolution.JPG
(2.3 Evolution of the Architecture).Also "2.1 Historical Perspective":
In the MIPS IIITM ISA, 64-bit integers and addresses were added to the instruction set. [...]
The MIPS32 Release 6 ISA maintains backward-compatibility, with the exception of a few rarely used instructions, though the use of trap-and-emulate or trap-and-patch; all pre-Release 6 binaries can execute under binary translation. [...]
The MIPS64 Architecture is based on the MIPS V ISA and is backward compatible with the MIPS32 Architecture.
Hi all,
Well I don't think it's worthy to keep R6 backward compatible with previous Release. Opcodes existed in pre-R6 but removed in R6 will be reused in future Releases (e.g. R6.1) for different functions.
And the statement here about trap-and-emul, trap-and-patch is false. It never happens in the real world. R2-to-R6 emul in kernel never goes into production quality, not to mention IEEE754-2008 (NAN2008) issue.
Based on documents we have, I'd prefer to treat MIPS ISA into three eras Classic (I, II, III, IV), Modern (R1, R2, R3, R5), R6+(R6 and afterwards). The difference inside each era is well-documented in manuals, it can prevent us from get into a long-term hide and seek game of finding difference between ISA levels.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
But if this is an intermediate step,
As this isn't planned as intermediate step, I'll try to keep
CPU_MIPS64as a separate bit and post the result.I'm not sure it is worth the effort, as I plan to check each ISA / ASE bit from the
CP0_ConfigXbits (similarly target/arm/ does), so these definitions should disappear eventually.
Quoted 8 lines
I.e. for the MSA ASE see:
https://www.mail-archive.com/[email protected]/msg767523.html/* Check presence of MSA implementation */ static inline bool ase_msa_available(CPUMIPSState *env) { return env->CP0_Config3 & (1 << CP0C3_MSAP); }
Unfortunately MIPS has a bad manner that allows vendors to have random extensions without unique identification.
ASEs flag can never go...... But identify ASEs from registers is surely a good idea though. At least removing MIPS defined ASEs from ASE flag can make life easier.
AFAIK Loongson has a CPUID instruction for 3A4000 and we may implement that to identify Loongson extensions, Ingenic is also marking MXU support in CP0. There could be some PRID based match to further reduce ASEs flag.
Thanks.
- Jiaxun
Quoted 8 lines
Might I keep your R-b tag for this patch (eventually improving the commit description with some of the info added in this mail) and keep going?
Thanks,
Phil.
Re: [PATCH v3 04/15] target/mips/mips-defs: Introduce CPU_MIPS64 and cpu_type_is_64bit()
Quoted 1 line · Jiaxun Yang
在 2021/1/5 下午6:05, Philippe Mathieu-Daudé 写道:
[...]
Quoted 23 lines
Quoted 8 lines
Quoted 8 lines
I based the decodetree logic on the R6 ISA manual, decoding the bits from the more recent feature (a leaf) to the root, following this tree:
https://images.anandtech.com/doci/8457/MIPS%20ISA%20Evolution.JPG
(2.3 Evolution of the Architecture).Also "2.1 Historical Perspective":
Quoted 8 lines
Quoted 8 lines
In the MIPS IIITM ISA, 64-bit integers and addresses were added to the instruction set. [...]
The MIPS32 Release 6 ISA maintains backward-compatibility, with the exception of a few rarely used instructions, though the use of trap-and-emulate or trap-and-patch; all pre-Release 6 binaries can execute under binary translation. [...]
The MIPS64 Architecture is based on the MIPS V ISA and is backward compatible with the MIPS32 Architecture.Hi all,
Well I don't think it's worthy to keep R6 backward compatible with previous Release. Opcodes existed in pre-R6 but removed in R6 will be reused in future Releases (e.g. R6.1) for different functions.
Quoted 8 lines
And the statement here about trap-and-emul, trap-and-patch is false. It never
happens in the real world. R2-to-R6 emul in kernel never goes into production
quality, not to mention IEEE754-2008 (NAN2008) issue.Based on documents we have, I'd prefer to treat MIPS ISA into three eras Classic (I, II, III, IV), Modern (R1, R2, R3, R5), R6+(R6 and afterwards).
Sounds good to me!
Quoted 5 lines
The difference inside each era is well-documented in manuals, it can prevent
us from get into a long-term hide and seek game of finding difference between
ISA levels.
Which is easier when you have access to the manuals ;)
Quoted 23 lines
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
But if this is an intermediate step,
As this isn't planned as intermediate step, I'll try to keep
CPU_MIPS64as a separate bit and post the result.I'm not sure it is worth the effort, as I plan to check each ISA / ASE bit from the
CP0_ConfigXbits (similarly target/arm/ does), so these definitions should disappear eventually.Quoted 8 lines
I.e. for the MSA ASE see:
https://www.mail-archive.com/[email protected]/msg767523.html/* Check presence of MSA implementation */ static inline bool
ase_msa_available(CPUMIPSState *env){
returnenv->CP0_Config3& (1 <<CP0C3_MSAP); }Unfortunately MIPS has a bad manner that allows vendors to have random extensions without unique identification.
ASEs flag can never go...... But identify ASEs from registers is surely a good
idea though. At least removing MIPS defined ASEs from ASE flag can make life easier.
Quoted 4 lines
AFAIK Loongson has a CPUID instruction for 3A4000 and we may implement that to identify Loongson extensions, Ingenic is also marking MXU support in CP0. There could be some PRID based match to further reduce ASEs flag.
Yes. I'd like to have check_$FEAT() opaque from the TCG helpers perspective. Then how the check is implemented is a different story and can involve CPU specific code (as your 3A4000 example).
Regards,
Phil.
PATCH v3 5/15 hw/mips/boston: Check 64-bit support with cpu_type_is_64bit()
In reply to Philippe Mathieu-DaudéDirectly check if the CPU supports 64-bit with the recently added cpu_type_is_64bit() helper (inlined).
--- hw/mips/boston.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
hw/mips/boston.c +2 -4
@@ -444,7 +444,6 @@ static void boston_mach_init(MachineState *machine)DriveInfo *hd[6 ];Chardev *chr;int fw_size, fit_err; -bool is_64b;if ((machine->ram_size % GiB) || (machine->ram_size > (2 * GiB))) {
@@ -463,8 +462,6 @@ static void boston_mach_init(MachineState *machine)exit (1 ); } - is_64b =cpu_type_supports_isa (machine->cpu_type,ISA_MIPS64 ); -object_initialize_child (OBJECT (machine),"cps" , &s->cps,TYPE_MIPS_CPS );object_property_set_str (OBJECT (&s->cps),"cpu-type" , machine->cpu_type, &error_fatal);
@@ -545,7 +542,8 @@ static void boston_mach_init(MachineState *machine) }gen_firmware (memory_region_get_ram_ptr (flash) +0x7c00000 , - s->kernel_entry, s->fdt_base, is_64b); + s->kernel_entry, s->fdt_base, +cpu_type_is_64bit (machine->cpu_type)); }else if (!qtest_enabled ()) {error_report ("Please provide either a -kernel or -bios argument" );exit (1 );
Signature · 1 line
2.26.2
Re: [PATCH v3 05/15] hw/mips/boston: Check 64-bit support with cpu_type_is_64bit()
Quoted 7 lines · Philippe Mathieu-Daudé
Directly check if the CPU supports 64-bit with the recently added
cpu_type_is_64bit()helper (inlined).Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/mips/boston.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
r~
PATCH v3 6/15 target/mips/mips-defs: Use ISA_MIPS32 definition to check Release 1
In reply to Philippe Mathieu-DaudéUse the single ISA_MIPS32 definition to check if the Release 1 ISA is supported, whether the CPU support 32/64-bit.
For now we keep '32' in the definition name, we will rename it as ISA_MIPS_R1 in few commits.
--- target/mips/mips-defs.h | 3 +-- target/mips/translate.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-)
target/mips/mips-defs.h +1 -2
@@ -18,7 +18,6 @@#define ISA_MIPS5 0x0000000000000010ULL#define ISA_MIPS32 0x0000000000000020ULL#define ISA_MIPS32R2 0x0000000000000040ULL -#define ISA_MIPS64 0x0000000000000080ULL#define ISA_MIPS64R2 0x0000000000000100ULL#define ISA_MIPS32R3 0x0000000000000200ULL#define ISA_MIPS64R3 0x0000000000000400ULL
@@ -75,7 +74,7 @@/* MIPS Technologies "Release 1" */ #define CPU_MIPS32R1 (CPU_MIPS2 | ISA_MIPS32) -#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1 | ISA_MIPS64) +#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1)/* MIPS Technologies "Release 2" */ #define CPU_MIPS32R2 (CPU_MIPS32R1 | ISA_MIPS32R2)
target/mips/translate.c +5 -5
@@ -8943,7 +8943,7 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel)const char *register_name ="invalid" ;if (sel !=0 ) { -check_insn (ctx,ISA_MIPS64 ); +check_insn (ctx,ISA_MIPS32 ); }switch (reg) {
@@ -9669,7 +9669,7 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)const char *register_name ="invalid" ;if (sel !=0 ) { -check_insn (ctx,ISA_MIPS64 ); +check_insn (ctx,ISA_MIPS32 ); }if (tb_cflags (ctx->base.tb) &CF_USE_ICOUNT ) {
@@ -14907,12 +14907,12 @@ static int decode_mips16_opc(CPUMIPSState *env, DisasContext *ctx)break ;#if defined(TARGET_MIPS64 )case RR_RY_CNVT_ZEW : -check_insn (ctx,ISA_MIPS64 ); +check_insn (ctx,ISA_MIPS32 );check_mips_64 (ctx);tcg_gen_ext32u_tl (cpu_gpr[rx], cpu_gpr[rx]);break ;case RR_RY_CNVT_SEW : -check_insn (ctx,ISA_MIPS64 ); +check_insn (ctx,ISA_MIPS32 );check_mips_64 (ctx);tcg_gen_ext32s_tl (cpu_gpr[rx], cpu_gpr[rx]);break ;
@@ -27612,7 +27612,7 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx)#if defined(TARGET_MIPS64 )case OPC_DCLO :case OPC_DCLZ : -check_insn (ctx,ISA_MIPS64 ); +check_insn (ctx,ISA_MIPS32 );check_mips_64 (ctx);gen_cl (ctx, op1, rd, rs);break ;
Signature · 1 line
2.26.2
PATCH v3 7/15 target/mips/mips-defs: Use ISA_MIPS32R2 definition to check Release 2
In reply to Philippe Mathieu-DaudéUse the single ISA_MIPS32R2 definition to check if the Release 2 ISA is supported, whether the CPU support 32/64-bit.
For now we keep '32' in the definition name, we will rename it as ISA_MIPS_R2 in few commits.
--- target/mips/mips-defs.h | 3 +-- linux-user/mips/cpu_loop.c | 1 - target/mips/translate.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-)
target/mips/mips-defs.h +1 -2
@@ -18,7 +18,6 @@#define ISA_MIPS5 0x0000000000000010ULL#define ISA_MIPS32 0x0000000000000020ULL#define ISA_MIPS32R2 0x0000000000000040ULL -#define ISA_MIPS64R2 0x0000000000000100ULL#define ISA_MIPS32R3 0x0000000000000200ULL#define ISA_MIPS64R3 0x0000000000000400ULL#define ISA_MIPS32R5 0x0000000000000800ULL
@@ -78,7 +77,7 @@/* MIPS Technologies "Release 2" */ #define CPU_MIPS32R2 (CPU_MIPS32R1 | ISA_MIPS32R2) -#define CPU_MIPS64R2 (CPU_MIPS64R1 | CPU_MIPS32R2 | ISA_MIPS64R2) +#define CPU_MIPS64R2 (CPU_MIPS64R1 | CPU_MIPS32R2)/* MIPS Technologies "Release 3" */ #define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3)
linux-user/mips/cpu_loop.c +0 -1
@@ -385,7 +385,6 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) prog_req.fre &= interp_req.fre;bool cpu_has_mips_r2_r6 = env->insn_flags &ISA_MIPS32R2 || - env->insn_flags &ISA_MIPS64R2 || env->insn_flags &ISA_MIPS32R6 || env->insn_flags &ISA_MIPS64R6 ;
target/mips/translate.c +2 -2
@@ -28621,7 +28621,7 @@ static void decode_opc_special3(CPUMIPSState *env, DisasContext *ctx)case OPC_DINSM :case OPC_DINSU :case OPC_DINS : -check_insn (ctx,ISA_MIPS64R2 ); +check_insn (ctx,ISA_MIPS32R2 );check_mips_64 (ctx);gen_bitops (ctx, op1, rt, rs, sa, rd);break ;
@@ -28641,7 +28641,7 @@ static void decode_opc_special3(CPUMIPSState *env, DisasContext *ctx)decode_opc_special3_r6 (env, ctx);break ;default : -check_insn (ctx,ISA_MIPS64R2 ); +check_insn (ctx,ISA_MIPS32R2 );check_mips_64 (ctx); op2 =MASK_DBSHFL (ctx->opcode);gen_bshfl (ctx, op2, rt, rd);
Signature · 1 line
2.26.2
PATCH v3 8/15 target/mips/mips-defs: Use ISA_MIPS32R3 definition to check Release 3
In reply to Philippe Mathieu-DaudéUse the single ISA_MIPS32R3 definition to check if the Release 3 ISA is supported, whether the CPU support 32/64-bit.
For now we keep '32' in the definition name, we will rename it as ISA_MIPS_R3 in few commits.
--- target/mips/mips-defs.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
target/mips/mips-defs.h +1 -2
@@ -19,7 +19,6 @@#define ISA_MIPS32 0x0000000000000020ULL#define ISA_MIPS32R2 0x0000000000000040ULL#define ISA_MIPS32R3 0x0000000000000200ULL -#define ISA_MIPS64R3 0x0000000000000400ULL#define ISA_MIPS32R5 0x0000000000000800ULL#define ISA_MIPS64R5 0x0000000000001000ULL#define ISA_MIPS32R6 0x0000000000002000ULL
@@ -81,7 +80,7 @@/* MIPS Technologies "Release 3" */ #define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3) -#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3 | ISA_MIPS64R3) +#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3)/* MIPS Technologies "Release 5" */ #define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS32R5)
Signature · 1 line
2.26.2
PATCH v3 9/15 target/mips/mips-defs: Use ISA_MIPS32R5 definition to check Release 5
In reply to Philippe Mathieu-DaudéUse the single ISA_MIPS32R5 definition to check if the Release 5 ISA is supported, whether the CPU support 32/64-bit.
For now we keep '32' in the definition name, we will rename it as ISA_MIPS_R5 in few commits.
--- target/mips/mips-defs.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
target/mips/mips-defs.h +1 -2
@@ -20,7 +20,6 @@#define ISA_MIPS32R2 0x0000000000000040ULL#define ISA_MIPS32R3 0x0000000000000200ULL#define ISA_MIPS32R5 0x0000000000000800ULL -#define ISA_MIPS64R5 0x0000000000001000ULL#define ISA_MIPS32R6 0x0000000000002000ULL#define ISA_MIPS64R6 0x0000000000004000ULL#define ISA_NANOMIPS32 0x0000000000008000ULL
@@ -84,7 +83,7 @@/* MIPS Technologies "Release 5" */ #define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS32R5) -#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5 | ISA_MIPS64R5) +#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5)/* MIPS Technologies "Release 6" */ #define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS32R6)
Signature · 1 line
2.26.2
PATCH v3 10/15 target/mips/mips-defs: Use ISA_MIPS32R6 definition to check Release 6
In reply to Philippe Mathieu-DaudéUse the single ISA_MIPS32R6 definition to check if the Release 6 ISA is supported, whether the CPU support 32/64-bit.
For now we keep '32' in the definition name, we will rename it as ISA_MIPS_R6 in few commits.
--- target/mips/internal.h | 2 +- target/mips/mips-defs.h | 3 +-- linux-user/mips/cpu_loop.c | 3 +-- target/mips/helper.c | 6 +++--- target/mips/translate.c | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-)
target/mips/internal.h +1 -1
@@ -354,7 +354,7 @@ static inline void compute_hflags(CPUMIPSState *env) }else if (((env->hflags &MIPS_HFLAG_KSU ) ==MIPS_HFLAG_UM ) && !(env->CP0_Status & (1 << CP0St_UX))) { env->hflags |=MIPS_HFLAG_AWRAP ; - }else if (env->insn_flags &ISA_MIPS64R6 ) { + }else if (env->insn_flags &ISA_MIPS32R6 ) {/* Address wrapping for Supervisor and Kernel is specified in R6 */ if ((((env->hflags & MIPS_HFLAG_KSU) == MIPS_HFLAG_SM) && !(env->CP0_Status & (1 << CP0St_SX))) ||
target/mips/mips-defs.h +1 -2
@@ -21,7 +21,6 @@#define ISA_MIPS32R3 0x0000000000000200ULL#define ISA_MIPS32R5 0x0000000000000800ULL#define ISA_MIPS32R6 0x0000000000002000ULL -#define ISA_MIPS64R6 0x0000000000004000ULL#define ISA_NANOMIPS32 0x0000000000008000ULL/* * bits 24-39: MIPS ASEs
@@ -87,7 +86,7 @@/* MIPS Technologies "Release 6" */ #define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS32R6) -#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6 | ISA_MIPS64R6) +#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6)/* Wave Computing: "nanoMIPS" */ #define CPU_NANOMIPS32 (CPU_MIPS32R6 | ISA_NANOMIPS32)
linux-user/mips/cpu_loop.c +1 -2
@@ -385,8 +385,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) prog_req.fre &= interp_req.fre;bool cpu_has_mips_r2_r6 = env->insn_flags &ISA_MIPS32R2 || - env->insn_flags &ISA_MIPS32R6 || - env->insn_flags &ISA_MIPS64R6 ; + env->insn_flags &ISA_MIPS32R6 ;if (prog_req.fre && !prog_req.frdefault && !prog_req.fr1) { env->CP0_Config5 |= (1 <<CP0C5_FRE );
target/mips/helper.c +3 -3
@@ -1145,7 +1145,7 @@ void mips_cpu_do_interrupt(CPUState *cs) enter_debug_mode:if (env->insn_flags &ISA_MIPS3 ) { env->hflags |=MIPS_HFLAG_64 ; -if (!(env->insn_flags &ISA_MIPS64R6 ) || +if (!(env->insn_flags &ISA_MIPS32R6 ) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &= ~MIPS_HFLAG_AWRAP ; }
@@ -1174,7 +1174,7 @@ void mips_cpu_do_interrupt(CPUState *cs) env->CP0_Status |= (1 << CP0St_ERL) | (1 << CP0St_BEV);if (env->insn_flags &ISA_MIPS3 ) { env->hflags |=MIPS_HFLAG_64 ; -if (!(env->insn_flags &ISA_MIPS64R6 ) || +if (!(env->insn_flags &ISA_MIPS32R6 ) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &= ~MIPS_HFLAG_AWRAP ; }
@@ -1360,7 +1360,7 @@ void mips_cpu_do_interrupt(CPUState *cs) env->CP0_Status |= (1 << CP0St_EXL);if (env->insn_flags &ISA_MIPS3 ) { env->hflags |=MIPS_HFLAG_64 ; -if (!(env->insn_flags &ISA_MIPS64R6 ) || +if (!(env->insn_flags &ISA_MIPS32R6 ) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &= ~MIPS_HFLAG_AWRAP ; }
target/mips/translate.c +1 -1
@@ -31438,7 +31438,7 @@ static void mips_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)#else ctx->mem_idx =hflags_mmu_index (ctx->hflags);#endif - ctx->default_tcg_memop_mask = (ctx->insn_flags & (ISA_MIPS32R6 |ISA_MIPS64R6 | + ctx->default_tcg_memop_mask = (ctx->insn_flags & (ISA_MIPS32R6 |INSN_LOONGSON3A )) ?MO_UNALN :MO_ALIGN ; LOG_DISAS("\ntb %p idx %d hflags %04x\n", ctx->base.tb, ctx->mem_idx,
Signature · 1 line
2.26.2
PATCH v3 11/15 target/mips/mips-defs: Rename ISA_MIPS32 as ISA_MIPS_R1
In reply to Philippe Mathieu-DaudéThe MIPS ISA release '1' is common to 32/64-bit CPUs.
--- target/mips/internal.h | 2 +- target/mips/mips-defs.h | 4 +-- target/mips/translate.c | 54 ++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 30 deletions(-)
target/mips/internal.h +1 -1
@@ -411,7 +411,7 @@ static inline void compute_hflags(CPUMIPSState *env)if (env->active_fpu.fcr0 & (1 <<FCR0_F64 )) { env->hflags |=MIPS_HFLAG_COP1X ; } - }else if (env->insn_flags &ISA_MIPS32 ) { + }else if (env->insn_flags &ISA_MIPS_R1 ) {if (env->hflags &MIPS_HFLAG_64 ) { env->hflags |=MIPS_HFLAG_COP1X ; }
target/mips/mips-defs.h +2 -2
@@ -16,7 +16,7 @@#define ISA_MIPS3 0x0000000000000004ULL/* 64-bit */ #define ISA_MIPS4 0x0000000000000008ULL#define ISA_MIPS5 0x0000000000000010ULL -#define ISA_MIPS32 0x0000000000000020ULL +#define ISA_MIPS_R1 0x0000000000000020ULL#define ISA_MIPS32R2 0x0000000000000040ULL#define ISA_MIPS32R3 0x0000000000000200ULL#define ISA_MIPS32R5 0x0000000000000800ULL
@@ -69,7 +69,7 @@#define CPU_MIPS64 (ISA_MIPS3)/* MIPS Technologies "Release 1" */ -#define CPU_MIPS32R1 (CPU_MIPS2 | ISA_MIPS32) +#define CPU_MIPS32R1 (CPU_MIPS2 | ISA_MIPS_R1)#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1)/* MIPS Technologies "Release 2" */
target/mips/translate.c +27 -27
214 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v3 12/15 target/mips/mips-defs: Rename ISA_MIPS32R2 as ISA_MIPS_R2
In reply to Philippe Mathieu-DaudéThe MIPS ISA release 2 is common to 32/64-bit CPUs.
--- target/mips/internal.h | 2 +- target/mips/mips-defs.h | 4 +- linux-user/mips/cpu_loop.c | 2 +- target/mips/cp0_timer.c | 4 +- target/mips/helper.c | 2 +- target/mips/translate.c | 138 ++++++++++++++++++------------------- 6 files changed, 76 insertions(+), 76 deletions(-)
target/mips/internal.h +1 -1
@@ -407,7 +407,7 @@ static inline void compute_hflags(CPUMIPSState *env) } } -if (env->insn_flags &ISA_MIPS32R2 ) { +if (env->insn_flags &ISA_MIPS_R2 ) {if (env->active_fpu.fcr0 & (1 <<FCR0_F64 )) { env->hflags |=MIPS_HFLAG_COP1X ; }
target/mips/mips-defs.h +2 -2
@@ -17,7 +17,7 @@#define ISA_MIPS4 0x0000000000000008ULL#define ISA_MIPS5 0x0000000000000010ULL#define ISA_MIPS_R1 0x0000000000000020ULL -#define ISA_MIPS32R2 0x0000000000000040ULL +#define ISA_MIPS_R2 0x0000000000000040ULL#define ISA_MIPS32R3 0x0000000000000200ULL#define ISA_MIPS32R5 0x0000000000000800ULL#define ISA_MIPS32R6 0x0000000000002000ULL
@@ -73,7 +73,7 @@#define CPU_MIPS64R1 (CPU_MIPS5 | CPU_MIPS32R1)/* MIPS Technologies "Release 2" */ -#define CPU_MIPS32R2 (CPU_MIPS32R1 | ISA_MIPS32R2) +#define CPU_MIPS32R2 (CPU_MIPS32R1 | ISA_MIPS_R2)#define CPU_MIPS64R2 (CPU_MIPS64R1 | CPU_MIPS32R2)/* MIPS Technologies "Release 3" */
linux-user/mips/cpu_loop.c +1 -1
@@ -384,7 +384,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) prog_req.frdefault &= interp_req.frdefault; prog_req.fre &= interp_req.fre; -bool cpu_has_mips_r2_r6 = env->insn_flags &ISA_MIPS32R2 || +bool cpu_has_mips_r2_r6 = env->insn_flags &ISA_MIPS_R2 || env->insn_flags &ISA_MIPS32R6 ;if (prog_req.fre && !prog_req.frdefault && !prog_req.fr1) {
target/mips/cp0_timer.c +2 -2
@@ -44,7 +44,7 @@ static void cpu_mips_timer_update(CPUMIPSState *env)static void cpu_mips_timer_expire (CPUMIPSState *env) {cpu_mips_timer_update (env); -if (env->insn_flags &ISA_MIPS32R2 ) { +if (env->insn_flags &ISA_MIPS_R2 ) { env->CP0_Cause |=1 << CP0Ca_TI; }qemu_irq_raise (env->irq[(env->CP0_IntCtl >> CP0IntCtl_IPTI) &0x7 ]);
@@ -93,7 +93,7 @@ void cpu_mips_store_compare(CPUMIPSState *env, uint32_t value)if (!(env->CP0_Cause & (1 << CP0Ca_DC))) {cpu_mips_timer_update (env); } -if (env->insn_flags &ISA_MIPS32R2 ) { +if (env->insn_flags &ISA_MIPS_R2 ) { env->CP0_Cause &= ~(1 << CP0Ca_TI); }qemu_irq_lower (env->irq[(env->CP0_IntCtl >> CP0IntCtl_IPTI) &0x7 ]);
target/mips/helper.c +1 -1
@@ -431,7 +431,7 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val)uint32_t old = env->CP0_Cause;int i; -if (env->insn_flags &ISA_MIPS32R2 ) { +if (env->insn_flags &ISA_MIPS_R2 ) { mask |=1 << CP0Ca_DC; }if (env->insn_flags &ISA_MIPS32R6 ) {
target/mips/translate.c +69 -69
497 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v3 13/15 target/mips/mips-defs: Rename ISA_MIPS32R3 as ISA_MIPS_R3
In reply to Philippe Mathieu-DaudéThe MIPS ISA release 3 is common to 32/64-bit CPUs.
To avoid holes in the insn_flags type, update the
definition with the next available bit.
--- target/mips/mips-defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/mips/mips-defs.h +2 -2
@@ -18,7 +18,7 @@#define ISA_MIPS5 0x0000000000000010ULL#define ISA_MIPS_R1 0x0000000000000020ULL#define ISA_MIPS_R2 0x0000000000000040ULL -#define ISA_MIPS32R3 0x0000000000000200ULL +#define ISA_MIPS_R3 0x0000000000000080ULL#define ISA_MIPS32R5 0x0000000000000800ULL#define ISA_MIPS32R6 0x0000000000002000ULL#define ISA_NANOMIPS32 0x0000000000008000ULL
@@ -77,7 +77,7 @@#define CPU_MIPS64R2 (CPU_MIPS64R1 | CPU_MIPS32R2)/* MIPS Technologies "Release 3" */ -#define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS32R3) +#define CPU_MIPS32R3 (CPU_MIPS32R2 | ISA_MIPS_R3)#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3)/* MIPS Technologies "Release 5" */
Signature · 1 line
2.26.2
PATCH v3 14/15 target/mips/mips-defs: Rename ISA_MIPS32R5 as ISA_MIPS_R5
In reply to Philippe Mathieu-DaudéThe MIPS ISA release 5 is common to 32/64-bit CPUs.
To avoid holes in the insn_flags type, update the
definition with the next available bit.
--- target/mips/mips-defs.h | 4 ++-- target/mips/translate.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
target/mips/mips-defs.h +2 -2
@@ -19,7 +19,7 @@#define ISA_MIPS_R1 0x0000000000000020ULL#define ISA_MIPS_R2 0x0000000000000040ULL#define ISA_MIPS_R3 0x0000000000000080ULL -#define ISA_MIPS32R5 0x0000000000000800ULL +#define ISA_MIPS_R5 0x0000000000000100ULL#define ISA_MIPS32R6 0x0000000000002000ULL#define ISA_NANOMIPS32 0x0000000000008000ULL/*
@@ -81,7 +81,7 @@#define CPU_MIPS64R3 (CPU_MIPS64R2 | CPU_MIPS32R3)/* MIPS Technologies "Release 5" */ -#define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS32R5) +#define CPU_MIPS32R5 (CPU_MIPS32R3 | ISA_MIPS_R5)#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5)/* MIPS Technologies "Release 6" */
target/mips/translate.c +1 -1
@@ -10993,7 +10993,7 @@ static void gen_cp0(CPUMIPSState *env, DisasContext *ctx, uint32_t opc,if (ctx->opcode & (1 << bit_shift)) {/* OPC_ERETNC */ opn ="eretnc" ; -check_insn (ctx,ISA_MIPS32R5 ); +check_insn (ctx,ISA_MIPS_R5 );gen_helper_eretnc (cpu_env); }else {/* OPC_ERET */
Signature · 1 line
2.26.2
PATCH v3 15/15 target/mips/mips-defs: Rename ISA_MIPS32R6 as ISA_MIPS_R6
In reply to Philippe Mathieu-DaudéThe MIPS ISA release 6 is common to 32/64-bit CPUs.
To avoid holes in the insn_flags type, update the
definition with the next available bit.
--- target/mips/internal.h | 4 +- target/mips/mips-defs.h | 4 +- linux-user/mips/cpu_loop.c | 2 +- target/mips/cp0_helper.c | 18 +- target/mips/cpu.c | 6 +- target/mips/fpu_helper.c | 4 +- target/mips/helper.c | 10 +- target/mips/translate.c | 426 ++++++++++++++++++------------------- 8 files changed, 237 insertions(+), 237 deletions(-)
target/mips/internal.h +2 -2
@@ -354,7 +354,7 @@ static inline void compute_hflags(CPUMIPSState *env) }else if (((env->hflags &MIPS_HFLAG_KSU ) ==MIPS_HFLAG_UM ) && !(env->CP0_Status & (1 << CP0St_UX))) { env->hflags |=MIPS_HFLAG_AWRAP ; - }else if (env->insn_flags &ISA_MIPS32R6 ) { + }else if (env->insn_flags &ISA_MIPS_R6 ) {/* Address wrapping for Supervisor and Kernel is specified in R6 */ if ((((env->hflags & MIPS_HFLAG_KSU) == MIPS_HFLAG_SM) && !(env->CP0_Status & (1 << CP0St_SX))) ||
@@ -365,7 +365,7 @@ static inline void compute_hflags(CPUMIPSState *env) }#endif if (((env->CP0_Status & (1 << CP0St_CU0)) && - !(env->insn_flags &ISA_MIPS32R6 )) || + !(env->insn_flags &ISA_MIPS_R6 )) || !(env->hflags &MIPS_HFLAG_KSU )) { env->hflags |=MIPS_HFLAG_CP0 ; }
target/mips/mips-defs.h +2 -2
@@ -20,7 +20,7 @@#define ISA_MIPS_R2 0x0000000000000040ULL#define ISA_MIPS_R3 0x0000000000000080ULL#define ISA_MIPS_R5 0x0000000000000100ULL -#define ISA_MIPS32R6 0x0000000000002000ULL +#define ISA_MIPS_R6 0x0000000000000200ULL#define ISA_NANOMIPS32 0x0000000000008000ULL/* * bits 24-39: MIPS ASEs
@@ -85,7 +85,7 @@#define CPU_MIPS64R5 (CPU_MIPS64R3 | CPU_MIPS32R5)/* MIPS Technologies "Release 6" */ -#define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS32R6) +#define CPU_MIPS32R6 (CPU_MIPS32R5 | ISA_MIPS_R6)#define CPU_MIPS64R6 (CPU_MIPS64R5 | CPU_MIPS32R6)/* Wave Computing: "nanoMIPS" */
linux-user/mips/cpu_loop.c +1 -1
@@ -385,7 +385,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) prog_req.fre &= interp_req.fre;bool cpu_has_mips_r2_r6 = env->insn_flags &ISA_MIPS_R2 || - env->insn_flags &ISA_MIPS32R6 ; + env->insn_flags &ISA_MIPS_R6 ;if (prog_req.fre && !prog_req.frdefault && !prog_req.fr1) { env->CP0_Config5 |= (1 <<CP0C5_FRE );
target/mips/cp0_helper.c +9 -9
@@ -527,7 +527,7 @@ void helper_mtc0_index(CPUMIPSState *env, target_ulong arg1)uint32_t index_p = env->CP0_Index &0x80000000 ;uint32_t tlb_index = arg1 &0x7fffffff ;if (tlb_index < env->tlb->nb_tlb) { -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) { index_p |= arg1 &0x80000000 ; } env->CP0_Index = index_p | tlb_index;
@@ -960,7 +960,7 @@ void helper_mtc0_pwfield(CPUMIPSState *env, target_ulong arg1)uint32_t old_ptei = (env->CP0_PWField >>CP0PF_PTEI ) &0x3FULL ;uint32_t new_ptei = (arg1 >>CP0PF_PTEI ) &0x3FULL ; -if ((env->insn_flags &ISA_MIPS32R6 )) { +if ((env->insn_flags &ISA_MIPS_R6 )) {if (((arg1 >>CP0PF_BDI ) &0x3FULL ) <12 ) { mask &= ~(0x3FULL <<CP0PF_BDI ); }
@@ -980,7 +980,7 @@ void helper_mtc0_pwfield(CPUMIPSState *env, target_ulong arg1) env->CP0_PWField = arg1 & mask;if ((new_ptei >=32 ) || - ((env->insn_flags &ISA_MIPS32R6 ) && + ((env->insn_flags &ISA_MIPS_R6 ) && (new_ptei ==0 || new_ptei ==1 ))) { env->CP0_PWField = (env->CP0_PWField & ~0x3FULL ) | (old_ptei <<CP0PF_PTEI );
@@ -990,7 +990,7 @@ void helper_mtc0_pwfield(CPUMIPSState *env, target_ulong arg1)uint32_t old_ptew = (env->CP0_PWField >>CP0PF_PTEW ) &0x3F ;uint32_t new_ptew = (arg1 >>CP0PF_PTEW ) &0x3F ; -if ((env->insn_flags &ISA_MIPS32R6 )) { +if ((env->insn_flags &ISA_MIPS_R6 )) {if (((arg1 >>CP0PF_GDW ) &0x3F ) <12 ) { mask &= ~(0x3F <<CP0PF_GDW ); }
@@ -1007,7 +1007,7 @@ void helper_mtc0_pwfield(CPUMIPSState *env, target_ulong arg1) env->CP0_PWField = arg1 & mask;if ((new_ptew >=32 ) || - ((env->insn_flags &ISA_MIPS32R6 ) && + ((env->insn_flags &ISA_MIPS_R6 ) && (new_ptew ==0 || new_ptew ==1 ))) { env->CP0_PWField = (env->CP0_PWField & ~0x3F ) | (old_ptew <<CP0PF_PTEW );
@@ -1026,7 +1026,7 @@ void helper_mtc0_pwsize(CPUMIPSState *env, target_ulong arg1)void helper_mtc0_wired (CPUMIPSState *env,target_ulong arg1) { -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) {if (arg1 < env->tlb->nb_tlb) { env->CP0_Wired = arg1; }
@@ -1075,10 +1075,10 @@ void helper_mtc0_hwrena(CPUMIPSState *env, target_ulong arg1)uint32_t mask =0x0000000F ;if ((env->CP0_Config1 & (1 <<CP0C1_PC )) && - (env->insn_flags &ISA_MIPS32R6 )) { + (env->insn_flags &ISA_MIPS_R6 )) { mask |= (1 <<4 ); } -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) { mask |= (1 <<5 ); }if (env->CP0_Config3 & (1 <<CP0C3_ULRI )) {
@@ -1149,7 +1149,7 @@ void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1)/* 1k pages not implemented */ #if defined(TARGET_MIPS64 ) -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) {int entryhi_r =extract64 (arg1,62 ,2 );int config0_at =extract32 (env->CP0_Config0,13 ,2 );bool no_supervisor = (env->CP0_Status_rw_bitmask &0x8 ) ==0 ;
target/mips/cpu.c +3 -3
@@ -71,7 +71,7 @@ static bool mips_cpu_has_work(CPUState *cs)if ((cs->interrupt_request &CPU_INTERRUPT_HARD ) &&cpu_mips_hw_interrupts_pending (env)) {if (cpu_mips_hw_interrupts_enabled (env) || - (env->insn_flags &ISA_MIPS32R6 )) { + (env->insn_flags &ISA_MIPS_R6 )) { has_work = true; } }
@@ -287,13 +287,13 @@ static void cpu_state_reset(CPUMIPSState *env)/* XKPhys (note, SegCtl2.XR = 0, so XAM won't be used) */ env->CP0_SegCtl1 |= (CP0SC_AM_UK <<CP0SC1_XAM );#endif /* !CONFIG_USER_ONLY */ -if ((env->insn_flags &ISA_MIPS32R6 ) && +if ((env->insn_flags &ISA_MIPS_R6 ) && (env->active_fpu.fcr0 & (1 <<FCR0_F64 ))) {/* Status.FR = 0 mode in 64-bit FPU not allowed in R6 */ env->CP0_Status |= (1 << CP0St_FR); } -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) {/* PTW = 1 */ env->CP0_PWSize =0x40 ;/* GDI = 12 */
target/mips/fpu_helper.c +2 -2
@@ -145,7 +145,7 @@ void helper_ctc1(CPUMIPSState *env, target_ulong arg1, uint32_t fs, uint32_t rt) }break ;case 25 : -if ((env->insn_flags &ISA_MIPS32R6 ) || (arg1 &0xffffff00 )) { +if ((env->insn_flags &ISA_MIPS_R6 ) || (arg1 &0xffffff00 )) {return ; } env->active_fpu.fcr31 = (env->active_fpu.fcr31 & 0x017fffff) |
@@ -172,7 +172,7 @@ void helper_ctc1(CPUMIPSState *env, target_ulong arg1, uint32_t fs, uint32_t rt) (env->active_fpu.fcr31 & ~(env->active_fpu.fcr31_rw_bitmask));break ;default : -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) {do_raise_exception (env,EXCP_RI ,GETPC ()); }return ;
target/mips/helper.c +5 -5
@@ -397,7 +397,7 @@ void cpu_mips_store_status(CPUMIPSState *env, target_ulong val)uint32_t mask = env->CP0_Status_rw_bitmask;target_ulong old = env->CP0_Status; -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) {bool has_supervisor =extract32 (mask, CP0St_KSU,2 ) ==0x3 ;#if defined(TARGET_MIPS64 )uint32_t ksux = (1 << CP0St_KX) & val;
@@ -434,7 +434,7 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val)if (env->insn_flags &ISA_MIPS_R2 ) { mask |=1 << CP0Ca_DC; } -if (env->insn_flags &ISA_MIPS32R6 ) { +if (env->insn_flags &ISA_MIPS_R6 ) { mask &= ~((1 << CP0Ca_WP) & val); }
@@ -1145,7 +1145,7 @@ void mips_cpu_do_interrupt(CPUState *cs) enter_debug_mode:if (env->insn_flags &ISA_MIPS3 ) { env->hflags |=MIPS_HFLAG_64 ; -if (!(env->insn_flags &ISA_MIPS32R6 ) || +if (!(env->insn_flags &ISA_MIPS_R6 ) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &= ~MIPS_HFLAG_AWRAP ; }
@@ -1174,7 +1174,7 @@ void mips_cpu_do_interrupt(CPUState *cs) env->CP0_Status |= (1 << CP0St_ERL) | (1 << CP0St_BEV);if (env->insn_flags &ISA_MIPS3 ) { env->hflags |=MIPS_HFLAG_64 ; -if (!(env->insn_flags &ISA_MIPS32R6 ) || +if (!(env->insn_flags &ISA_MIPS_R6 ) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &= ~MIPS_HFLAG_AWRAP ; }
@@ -1360,7 +1360,7 @@ void mips_cpu_do_interrupt(CPUState *cs) env->CP0_Status |= (1 << CP0St_EXL);if (env->insn_flags &ISA_MIPS3 ) { env->hflags |=MIPS_HFLAG_64 ; -if (!(env->insn_flags &ISA_MIPS32R6 ) || +if (!(env->insn_flags &ISA_MIPS_R6 ) || env->CP0_Status & (1 << CP0St_KX)) { env->hflags &= ~MIPS_HFLAG_AWRAP ; }
target/mips/translate.c +213 -213
1,513 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 17 lines · Philippe Mathieu-Daudé
Philippe Mathieu-Daud=C3=A9 (15):
target/mips/mips-defs: RemoveUSE_HOST_FLOAT_REGScomment target/mips/mips-defs: ReorderCPU_MIPS5definition target/mips/mips-defs: RenameCPU_MIPSxxRelease 1 asCPU_MIPSxxR1target/mips/mips-defs: IntroduceCPU_MIPS64andcpu_type_is_64bit()hw/mips/boston: Check 64-bit support withcpu_type_is_64bit()target/mips/mips-defs: UseISA_MIPS32definition to check Release 1 target/mips/mips-defs: UseISA_MIPS32R2definition to check Release 2 target/mips/mips-defs: UseISA_MIPS32R3definition to check Release 3 target/mips/mips-defs: UseISA_MIPS32R5definition to check Release 5 target/mips/mips-defs: UseISA_MIPS32R6definition to check Release 6 target/mips/mips-defs: RenameISA_MIPS32asISA_MIPS_R1target/mips/mips-defs: RenameISA_MIPS32R2asISA_MIPS_R2target/mips/mips-defs: RenameISA_MIPS32R3asISA_MIPS_R3target/mips/mips-defs: RenameISA_MIPS32R5asISA_MIPS_R5target/mips/mips-defs: RenameISA_MIPS32R6asISA_MIPS_R6
Quoted 13 lines
target/mips/cpu.h | 5 + target/mips/internal.h | 8 +- target/mips/mips-defs.h | 46 +-- hw/mips/boston.c | 6 +- linux-user/mips/cpu_loop.c | 6 +- target/mips/cp0_helper.c | 18 +- target/mips/cp0_timer.c | 4 +- target/mips/cpu.c | 6 +- target/mips/fpu_helper.c | 4 +- target/mips/helper.c | 12 +- target/mips/translate.c | 620 +++++++++++++++---------------- target/mips/translate_init.c.inc | 14 +- 12 files changed, 370 insertions(+), 379 deletions(-)
Series queued to mips-next.