udb 0.1.17 → 0.1.18

data/.data/spec/std/isa/csr/Smcntrpmf/mcyclecfg.yaml

@@ -7,6 +7,8 @@ kind: csr
 name: mcyclecfg
 long_name: Machine Cycle Counter Configuration
 address: 0x321
+indirect_address: 0x40
+indirect_slot: 2
 writable: true
 priv_mode: M
 length: 64

data/.data/spec/std/isa/csr/Smcntrpmf/mcyclecfgh.yaml

@@ -7,6 +7,8 @@ kind: csr
 name: mcyclecfgh
 long_name: Machine Cycle Counter Configuration High
 address: 0x721
+indirect_address: 0x40
+indirect_slot: 5
 writable: true
 priv_mode: M
 length: 32

data/.data/spec/std/isa/csr/Smcntrpmf/minstretcfg.yaml

@@ -8,6 +8,8 @@ kind: csr
 name: minstretcfg
 long_name: Machine Instructions-Retired Counter Configuration
 address: 0x322
+indirect_address: 0x42
+indirect_slot: 2
 writable: true
 priv_mode: M
 length: 64

data/.data/spec/std/isa/csr/Smcntrpmf/minstretcfgh.yaml

@@ -7,6 +7,8 @@ kind: csr
 name: minstretcfgh
 long_name: Machine Instructions-Retired Counter Configuration High
 address: 0x722
+indirect_address: 0x42
+indirect_slot: 5
 writable: true
 priv_mode: M
 length: 32

data/.data/spec/std/isa/csr/Sscofpmf/scountovf.layout

@@ -29,6 +29,9 @@ description: |
   In S/HS-mode, `scountovf` bit X is readable when `mcounteren` bit X is set, and otherwise reads as zero.
   Similarly, in VS-mode, it is readable when both `mcounteren` and `hcounteren` bit X are set.
 
+  If the Smcdeleg extension is implemented and `menvcfg.CDE` is set, attempts to read `scountovf`
+  from VS-mode or VU-mode raise a `Virtual Instruction` exception.
+
 fields:
 <%- (3..31).each do |of_num| -%>
   OF<%= of_num %>:
@@ -47,6 +50,10 @@ fields:
 <%- end -%>
 
 sw_read(): |
+  if (virtual_mode?() && implemented?(ExtensionName::Smcdeleg) && CSR[menvcfg].CDE == 1) {
+    # Smcdeleg/Ssccfg: when menvcfg.CDE=1, reads from VS-mode or VU-mode raise a virtual-instruction exception
+    raise(ExceptionCode::VirtualInstruction, mode(), $encoding);
+  }
   Bits<32> mask;
   if (mode() == PrivilegeMode::VS) {
     # In VS-mode, scountovf.OFX access is determined by mcounteren/hcounteren

data/.data/spec/std/isa/csr/Sscofpmf/scountovf.yaml

@@ -32,6 +32,9 @@ description: |
   In S/HS-mode, `scountovf` bit X is readable when `mcounteren` bit X is set, and otherwise reads as zero.
   Similarly, in VS-mode, it is readable when both `mcounteren` and `hcounteren` bit X are set.
 
+  If the Smcdeleg extension is implemented and `menvcfg.CDE` is set, attempts to read `scountovf`
+  from VS-mode or VU-mode raise a `Virtual Instruction` exception.
+
 fields:
   OF3:
     alias: mhpmevent3.OF
@@ -412,6 +415,10 @@ fields:
       return HPM_COUNTER_EN[31] ? UNDEFINED_LEGAL : 0;
 
 sw_read(): |
+  if (virtual_mode?() && implemented?(ExtensionName::Smcdeleg) && CSR[menvcfg].CDE == 1) {
+    # Smcdeleg/Ssccfg: when menvcfg.CDE=1, reads from VS-mode or VU-mode raise a virtual-instruction exception
+    raise(ExceptionCode::VirtualInstruction, mode(), $encoding);
+  }
   Bits<32> mask;
   if (mode() == PrivilegeMode::VS) {
     # In VS-mode, scountovf.OFX access is determined by mcounteren/hcounteren

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter10.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter10
 long_name: Machine Hardware Performance Counter 10
 address: 0xB0A
+indirect_address: 0x4A
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 10
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter10h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter10h
 long_name: Machine Hardware Performance Counter 10, Upper half
 address: 0xB8A
+indirect_address: 0x4A
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 10
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter11.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter11
 long_name: Machine Hardware Performance Counter 11
 address: 0xB0B
+indirect_address: 0x4B
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 11
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter11h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter11h
 long_name: Machine Hardware Performance Counter 11, Upper half
 address: 0xB8B
+indirect_address: 0x4B
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 11
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter12.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter12
 long_name: Machine Hardware Performance Counter 12
 address: 0xB0C
+indirect_address: 0x4C
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 12
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter12h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter12h
 long_name: Machine Hardware Performance Counter 12, Upper half
 address: 0xB8C
+indirect_address: 0x4C
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 12
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter13.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter13
 long_name: Machine Hardware Performance Counter 13
 address: 0xB0D
+indirect_address: 0x4D
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 13
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter13h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter13h
 long_name: Machine Hardware Performance Counter 13, Upper half
 address: 0xB8D
+indirect_address: 0x4D
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 13
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter14.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter14
 long_name: Machine Hardware Performance Counter 14
 address: 0xB0E
+indirect_address: 0x4E
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 14
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter14h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter14h
 long_name: Machine Hardware Performance Counter 14, Upper half
 address: 0xB8E
+indirect_address: 0x4E
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 14
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter15.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter15
 long_name: Machine Hardware Performance Counter 15
 address: 0xB0F
+indirect_address: 0x4F
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 15
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter15h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter15h
 long_name: Machine Hardware Performance Counter 15, Upper half
 address: 0xB8F
+indirect_address: 0x4F
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 15
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter16.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter16
 long_name: Machine Hardware Performance Counter 16
 address: 0xB10
+indirect_address: 0x50
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 16
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter16h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter16h
 long_name: Machine Hardware Performance Counter 16, Upper half
 address: 0xB90
+indirect_address: 0x50
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 16
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter17.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter17
 long_name: Machine Hardware Performance Counter 17
 address: 0xB11
+indirect_address: 0x51
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 17
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter17h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter17h
 long_name: Machine Hardware Performance Counter 17, Upper half
 address: 0xB91
+indirect_address: 0x51
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 17
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter18.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter18
 long_name: Machine Hardware Performance Counter 18
 address: 0xB12
+indirect_address: 0x52
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 18
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter18h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter18h
 long_name: Machine Hardware Performance Counter 18, Upper half
 address: 0xB92
+indirect_address: 0x52
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 18
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter19.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter19
 long_name: Machine Hardware Performance Counter 19
 address: 0xB13
+indirect_address: 0x53
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 19
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter19h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter19h
 long_name: Machine Hardware Performance Counter 19, Upper half
 address: 0xB93
+indirect_address: 0x53
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 19
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter20.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter20
 long_name: Machine Hardware Performance Counter 20
 address: 0xB14
+indirect_address: 0x54
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 20
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter20h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter20h
 long_name: Machine Hardware Performance Counter 20, Upper half
 address: 0xB94
+indirect_address: 0x54
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 20
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter21.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter21
 long_name: Machine Hardware Performance Counter 21
 address: 0xB15
+indirect_address: 0x55
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 21
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter21h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter21h
 long_name: Machine Hardware Performance Counter 21, Upper half
 address: 0xB95
+indirect_address: 0x55
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 21
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter22.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter22
 long_name: Machine Hardware Performance Counter 22
 address: 0xB16
+indirect_address: 0x56
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 22
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter22h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter22h
 long_name: Machine Hardware Performance Counter 22, Upper half
 address: 0xB96
+indirect_address: 0x56
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 22
-        equal: true
 fields:
   COUNT:
     location: 31-0

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter23.yaml

@@ -11,17 +11,14 @@ kind: csr
 name: mhpmcounter23
 long_name: Machine Hardware Performance Counter 23
 address: 0xB17
+indirect_address: 0x57
+indirect_slot: 1
 writable: true
 priv_mode: M
 length: 64
 definedBy:
-  allOf:
-    - extension:
-        name: Sm
-    - param:
-        name: HPM_COUNTER_EN
-        index: 23
-        equal: true
+  extension:
+    name: Sm
 description: |
   Programmable hardware performance counter.
 

data/.data/spec/std/isa/csr/Zihpm/mhpmcounter23h.yaml

@@ -11,6 +11,8 @@ kind: csr
 name: mhpmcounter23h
 long_name: Machine Hardware Performance Counter 23, Upper half
 address: 0xB97
+indirect_address: 0x57
+indirect_slot: 4
 writable: true
 priv_mode: M
 length: 32
@@ -67,10 +69,6 @@ definedBy:
     - extension:
         name: Sm
     - xlen: 32
-    - param:
-        name: HPM_COUNTER_EN
-        index: 23
-        equal: true
 fields:
   COUNT:
     location: 31-0