Skip to content

Commit 71801eb

Browse files
authored
Rename Sm#XLEN parameter -> Sm#MXLEN (#575)
* Rename Sm#XLEN parameter -> Sm#MXLEN * fix: missing base in hpmcounterNh * fix: use MXLEN in Zilsd instructions
1 parent df8d9de commit 71801eb

File tree

127 files changed

+253
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+253
-257
lines changed

arch/certificate_model/MC100-32.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,6 @@ extensions:
136136
M_MODE_ENDIANESS:
137137
schema:
138138
const: little
139-
XLEN:
139+
MXLEN:
140140
schema:
141141
const: 32

arch/certificate_model/MC100-64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ base: 64
1515
extensions:
1616
Sm:
1717
parameters:
18-
XLEN:
18+
MXLEN:
1919
schema:
2020
const: 64

arch/certificate_model/MC200-64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ base: 64
1515
extensions:
1616
Sm:
1717
parameters:
18-
XLEN:
18+
MXLEN:
1919
schema:
2020
const: 64

arch/certificate_model/MC300-64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ base: 64
1515
extensions:
1616
Sm:
1717
parameters:
18-
XLEN:
18+
MXLEN:
1919
schema:
2020
const: 64

arch/certificate_model/MockCertificateModel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ extensions:
145145
# version: "=1.1.0"
146146
# then:
147147
# enum: [little, big]
148-
XLEN:
148+
MXLEN:
149149
schema:
150150
const: 64
151151
CONFIG_PTR_ADDRESS:

arch/csr/H/vsatp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fields:
9696
return UNDEFINED_LEGAL_DETERMINISTIC;
9797
}
9898
} else {
99-
XReg shamt = ((XLEN == 32) || (CSR[mstatus].SXL == $bits(XRegWidth::XLEN32))) ? 9 : 16;
99+
XReg shamt = ((xlen() == 32) || (CSR[mstatus].SXL == $bits(XRegWidth::XLEN32))) ? 9 : 16;
100100
XReg all_ones = ((1 << shamt) - 1);
101101
XReg largest_allowed_asid = (1 << shamt) - 1;
102102

arch/csr/I/pmpaddr0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fields:
4141
sw_read(): |
4242
# when the mode is NAPOT and PMP_GRANULARITY >= 16,
4343
# bits (PMP_GRANULARITY-4):0 must read as ones
44-
if (XLEN == 32) {
44+
if (MXLEN == 32) {
4545
if ((PMP_GRANULARITY >= 16) &&
4646
(CSR[pmpcfg0].pmp0cfg[4] == 1)) {
4747
return CSR[pmpaddr0].ADDR | {PMP_GRANULARITY-3{1'b1}};

arch/csr/I/pmpaddr1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fields:
4141
sw_read(): |
4242
# when the mode is NAPOT and PMP_GRANULARITY >= 16,
4343
# bits (PMP_GRANULARITY-4):0 must read as ones
44-
if (XLEN == 32) {
44+
if (MXLEN == 32) {
4545
if ((PMP_GRANULARITY >= 16) &&
4646
(CSR[pmpcfg0].pmp1cfg[4] == 1)) {
4747
return CSR[pmpaddr1].ADDR | {PMP_GRANULARITY-3{1'b1}};

arch/csr/I/pmpaddr10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fields:
4141
sw_read(): |
4242
# when the mode is NAPOT and PMP_GRANULARITY >= 16,
4343
# bits (PMP_GRANULARITY-4):0 must read as ones
44-
if (XLEN == 32) {
44+
if (MXLEN == 32) {
4545
if ((PMP_GRANULARITY >= 16) &&
4646
(CSR[pmpcfg2].pmp10cfg[4] == 1)) {
4747
return CSR[pmpaddr10].ADDR | {PMP_GRANULARITY-3{1'b1}};

arch/csr/I/pmpaddr11.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fields:
4141
sw_read(): |
4242
# when the mode is NAPOT and PMP_GRANULARITY >= 16,
4343
# bits (PMP_GRANULARITY-4):0 must read as ones
44-
if (XLEN == 32) {
44+
if (MXLEN == 32) {
4545
if ((PMP_GRANULARITY >= 16) &&
4646
(CSR[pmpcfg2].pmp11cfg[4] == 1)) {
4747
return CSR[pmpaddr11].ADDR | {PMP_GRANULARITY-3{1'b1}};

0 commit comments

Comments
 (0)