udb 0.1.16 → 0.1.17

data/.data/spec/std/isa/inst/{B → Zbkc}/clmul.yaml

@@ -11,9 +11,7 @@ description: |
   `clmul` produces the lower half of the 2*XLEN carry-less product
 definedBy:
   extension:
-    anyOf:
-      - name: Zbc
-      - name: Zbkc
+    name: Zbkc
 assembly: xd, xs1, xs2
 encoding:
   match: 0000101----------001-----0110011
@@ -31,10 +29,6 @@ access:
   vu: always
 data_independent_timing: true
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg xs1_val = X[xs1];
   XReg xs2_val = X[xs2];
   XReg output = 0;

data/.data/spec/std/isa/inst/{B → Zbkc}/clmulh.yaml

@@ -11,9 +11,7 @@ description: |
   `clmulh` produces the upper half of the 2*XLEN carry-less product
 definedBy:
   extension:
-    anyOf:
-      - name: Zbc
-      - name: Zbkc
+    name: Zbkc
 assembly: xd, xs1, xs2
 encoding:
   match: 0000101----------011-----0110011
@@ -31,10 +29,6 @@ access:
   vu: always
 data_independent_timing: true
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg xs1_val = X[xs1];
   XReg xs2_val = X[xs2];
   XReg output = 0;

data/.data/spec/std/isa/inst/Zbs/bclr.yaml

@@ -29,9 +29,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = X[xs2] & (xlen() - 1);
   X[xd] = X[xs1] & ~(1 << index);

data/.data/spec/std/isa/inst/Zbs/bclri.yaml

@@ -40,9 +40,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = shamt & (xlen() - 1);
   X[xd] = X[xs1] & ~(1 << index);

data/.data/spec/std/isa/inst/Zbs/bext.yaml

@@ -29,9 +29,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = X[xs2] & (xlen() - 1);
   X[xd] = (X[xs1] >> index) & 1;

data/.data/spec/std/isa/inst/Zbs/bexti.yaml

@@ -40,9 +40,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = shamt & (xlen() - 1);
   X[xd] = (X[xs1] >> index) & 1;

data/.data/spec/std/isa/inst/Zbs/binv.yaml

@@ -29,9 +29,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = X[xs2] & (xlen() - 1);
   X[xd] = X[xs1] ^ (1 << index);

data/.data/spec/std/isa/inst/Zbs/binvi.yaml

@@ -40,9 +40,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = shamt & (xlen() - 1);
   X[xd] = X[xs1] ^ (1 << index);

data/.data/spec/std/isa/inst/Zbs/bset.yaml

@@ -29,9 +29,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = X[xs2] & (xlen() - 1);
   X[xd] = X[xs1] | (1 << index);

data/.data/spec/std/isa/inst/Zbs/bseti.yaml

@@ -40,9 +40,5 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
   XReg index = shamt & (xlen() - 1);
   X[xd] = X[xs1] | (1 << index);

data/.data/spec/std/isa/inst/Zcb/c.lbu.yaml

@@ -30,8 +30,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;

data/.data/spec/std/isa/inst/Zcb/c.lh.yaml

@@ -31,8 +31,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;

data/.data/spec/std/isa/inst/Zcb/c.lhu.yaml

@@ -31,8 +31,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;

data/.data/spec/std/isa/inst/Zcb/c.mul.yaml

@@ -31,12 +31,8 @@ access:
 data_independent_timing: true
 operation(): |
 
-  if (implemented?(ExtensionName::M) && (CSR[misa].M == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = X[creg2reg(xd)] * X[creg2reg(xs2)];

data/.data/spec/std/isa/inst/Zcb/c.not.yaml

@@ -28,8 +28,8 @@ access:
 data_independent_timing: true
 operation(): |
 
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = ~X[creg2reg(xd)];

data/.data/spec/std/isa/inst/Zcb/c.sb.yaml

@@ -30,8 +30,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;

data/.data/spec/std/isa/inst/Zcb/c.sext.b.yaml

@@ -30,12 +30,8 @@ access:
   vu: always
 operation(): |2
 
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = $signed(X[creg2reg(xd)][7:0]);

data/.data/spec/std/isa/inst/Zcb/c.sext.h.yaml

@@ -30,12 +30,8 @@ access:
   vu: always
 operation(): |2
 
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = $signed(X[creg2reg(xd)][15:0]);

data/.data/spec/std/isa/inst/Zcb/c.sh.yaml

@@ -31,8 +31,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;

data/.data/spec/std/isa/inst/Zcb/c.zext.b.yaml

@@ -29,8 +29,8 @@ access:
 data_independent_timing: true
 operation(): |2
 
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = X[creg2reg(xd)][7:0];

data/.data/spec/std/isa/inst/Zcb/c.zext.h.yaml

@@ -30,12 +30,8 @@ access:
   vu: always
 operation(): |2
 
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = X[creg2reg(xd)][15:0];

data/.data/spec/std/isa/inst/Zcb/c.zext.w.yaml

@@ -31,12 +31,8 @@ access:
   vu: always
 operation(): |2
 
-  if (implemented?(ExtensionName::B) && (CSR[misa].B == 1'b0)) {
-    raise (ExceptionCode::IllegalInstruction, mode(), $encoding);
-  }
-
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   X[creg2reg(xd)] = X[creg2reg(xd)][31:0];

data/.data/spec/std/isa/inst/Zcd/c.fld.yaml

@@ -32,10 +32,10 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;
 
-  F[fd] = sext(read_memory(64, virtual_address, $encoding), 64);
+  F[creg2reg(fd)] = sext(read_memory(64, virtual_address, $encoding), 64);

data/.data/spec/std/isa/inst/Zcd/c.fldsp.yaml

@@ -30,11 +30,11 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
-  if (implemented?(ExtensionName::D) && (CSR[misa].D == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::D) && MISA_CSR_IMPLEMENTED && (CSR[misa].D == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[2] + imm;

data/.data/spec/std/isa/inst/Zcd/c.fsd.yaml

@@ -32,10 +32,10 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;
 
-  write_memory(64, virtual_address, X[creg2reg(fs2)], $encoding);
+  write_memory(64, virtual_address, F[creg2reg(fs2)][63:0], $encoding);

data/.data/spec/std/isa/inst/Zcd/c.fsdsp.yaml

@@ -30,11 +30,11 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
-  if (implemented?(ExtensionName::D) && (CSR[misa].D == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::D) && MISA_CSR_IMPLEMENTED && (CSR[misa].D == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[2] + imm;

data/.data/spec/std/isa/inst/Zcf/c.flw.yaml

@@ -32,10 +32,10 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;
 
-  X[creg2reg(fd)] = sext(read_memory(32, virtual_address, $encoding), 32);
+  F[creg2reg(fd)] = read_memory(32, virtual_address, $encoding);

data/.data/spec/std/isa/inst/Zcf/c.flwsp.yaml

@@ -30,11 +30,11 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
-  if (implemented?(ExtensionName::F) && (CSR[misa].F == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::F) && MISA_CSR_IMPLEMENTED && (CSR[misa].F == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[2] + imm;

data/.data/spec/std/isa/inst/Zcf/c.fsw.yaml

@@ -32,10 +32,10 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[creg2reg(xs1)] + imm;
 
-  write_memory(32, virtual_address, X[creg2reg(fs2)][31:0], $encoding);
+  write_memory(32, virtual_address, F[creg2reg(fs2)][31:0], $encoding);

data/.data/spec/std/isa/inst/Zcf/c.fswsp.yaml

@@ -30,11 +30,11 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::C) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::C) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
-  if (implemented?(ExtensionName::F) && (CSR[misa].F == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::F) && MISA_CSR_IMPLEMENTED && (CSR[misa].F == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg virtual_address = X[2] + imm;

data/.data/spec/std/isa/inst/Zcmp/cm.mva01s.yaml

@@ -27,8 +27,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::Zcmp) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::Zcmp) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
   XReg xreg1 = (r1s[2:1]>0) ? {1,0,r1s[2:0]} : {0,1,r1s[2:0]};
   XReg xreg2 = (r2s[2:1]>0) ? {1,0,r2s[2:0]} : {0,1,r2s[2:0]};

data/.data/spec/std/isa/inst/Zcmp/cm.mvsa01.yaml

@@ -29,8 +29,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::Zcmp) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::Zcmp) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
   XReg xreg1 = (r1s[2:1]>0) ? {1,0,r1s[2:0]} : {0,1,r1s[2:0]};
   XReg xreg2 = (r2s[2:1]>0) ? {1,0,r2s[2:0]} : {0,1,r2s[2:0]};

data/.data/spec/std/isa/inst/Zcmp/cm.pop.yaml

@@ -36,8 +36,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::Zcmp) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::Zcmp) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg size = xlen() / 8;

data/.data/spec/std/isa/inst/Zcmp/cm.popret.yaml

@@ -36,8 +36,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::Zcmp) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::Zcmp) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg size = xlen() / 8;

data/.data/spec/std/isa/inst/Zcmp/cm.popretz.yaml

@@ -36,8 +36,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::Zcmp) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::Zcmp) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg size = xlen() / 8;

data/.data/spec/std/isa/inst/Zcmp/cm.push.yaml

@@ -36,8 +36,8 @@ access:
   vs: always
   vu: always
 operation(): |
-  if (implemented?(ExtensionName::Zcmp) && (CSR[misa].C == 1'b0)) {
-    raise(ExceptionCode::IllegalInstruction, mode(), $encoding);
+  if (implemented?(ExtensionName::Zcmp) && MISA_CSR_IMPLEMENTED && (CSR[misa].C == 1'b0)) {
+    reserved_instruction($encoding);
   }
 
   XReg size = xlen() / 8;

data/.data/spec/std/isa/inst/Zicbom/cbo.clean.yaml

@@ -18,7 +18,7 @@ description: |
 
   `cbo.clean` is ordered by `FENCE` instructions but not `FENCE.I` or `SFENCE.VMA`.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Both PMP and PMA access control must be the same for all bytes in the block; otherwise, `cbo.clean` has UNSPECIFIED behavior.
   <%- end -%>
 
@@ -31,7 +31,7 @@ description: |
     * `Store/AMO Page Fault` if virtual memory translation fails <% if ext?(:H) %>when V=0 or during VS-stage translation<% end %>
     * `Store/AMO Access Fault` if a PMP or PMA access check fails
 
-  <%- if CACHE_BLOCK_SIZE.bit_length <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Because cache blocks are naturally aligned and always fit in a single PMP or PMA regions, the PMP
   and PMA access checks only need to check a single address in the line.
   <%- end -%>

data/.data/spec/std/isa/inst/Zicbom/cbo.flush.yaml

@@ -12,7 +12,7 @@ description: |
 
   `cbo.flush` is ordered by `FENCE` instructions but not `FENCE.I` or `SFENCE.VMA`.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Both PMP and PMA access control must be the same for all bytes in the block; otherwise, `cbo.flush` has UNSPECIFIED behavior.
   <%- end -%>
 
@@ -25,7 +25,7 @@ description: |
     * `Store/AMO Page Fault` if virtual memory translation fails <% if ext?(:H) %>when V=0 or during VS-stage translation<% end %>
     * `Store/AMO Access Fault` if a PMP or PMA access check fails.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Because cache blocks are naturally aligned and always fit in a single PMP or PMA regions, the PMP
   and PMA access checks only need to check a single address in the line.
   <%- end -%>

data/.data/spec/std/isa/inst/Zicbom/cbo.inval.yaml

@@ -51,7 +51,7 @@ description: |
 
   `cbo.inval` is ordered by `FENCE` instructions but not `FENCE.I` or `SFENCE.VMA`.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Both PMP and PMA access control must be the same for all bytes in the block; otherwise, `cbo.inval` has UNSPECIFIED behavior.
   <%- end -%>
 
@@ -64,7 +64,7 @@ description: |
     * `Store/AMO Page Fault` if virtual memory translation fails <% if ext?(:H) %>when V=0 or during VS-stage translation<% end %>
     * `Store/AMO Access Fault` if a PMP or PMA access check fails.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Because cache blocks are naturally aligned and always fit in a single PMP or PMA regions, the PMP
   and PMA access checks only need to check a single address in the line.
   <%- end -%>

data/.data/spec/std/isa/inst/Zicboz/cbo.zero.yaml

@@ -14,7 +14,7 @@ description: |
 
   `cbo.zero` is ordered by `FENCE` instructions but not `FENCE.I` or `SFENCE.VMA`.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) > [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Both PMP and PMA access control must be the same for all bytes in the block; otherwise, `cbo.zero` has UNSPECIFIED behavior.
   <%- end -%>
 
@@ -27,7 +27,7 @@ description: |
     * `Store/AMO Page Fault` if virtual memory translation fails <% if ext?(:H) %>when V=0 or during VS-stage translation<% end %>
     * `Store/AMO Access Fault` if a PMP or PMA access check fails.
 
-  <%- if CACHE_BLOCK_SIZE.bit_length <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
+  <%- if (CACHE_BLOCK_SIZE.bit_length - 1) <= [PMP_GRANULARITY, PMA_GRANULARITY].min -%>
   Because cache blocks are naturally aligned and always fit in a single PMP or PMA regions, the PMP
   and PMA access checks only need to check a single address in the line.
   <%- end -%>

data/.data/spec/std/isa/inst/Zvfbfmin/vfncvtbf16.f.f.w.yaml

@@ -11,7 +11,9 @@ description: |
   Converts each single-precision floating-point element in vector register vs2 to BFloat16 format, storing results in vector register vd according to mask vm. This is a narrowing conversion that compresses 32-bit single-precision values to 16-bit BFloat16 values.
 definedBy:
   extension:
-    name: Zvfbfmin
+    anyOf:
+      - name: Zvfbfmin
+      - name: Zvfofp8min
 assembly: vd, vs2, vm
 encoding:
   match: 010010------11101001-----1010111

data/.data/spec/std/isa/inst/Zvfbfmin/vfwcvtbf16.f.f.v.yaml

@@ -11,7 +11,9 @@ description: |
   Converts each BFloat16 element in vector register vs2 to single-precision floating-point format, storing results in vector register vd according to mask vm. This is a widening conversion that expands 16-bit BFloat16 values to 32-bit single-precision values.
 definedBy:
   extension:
-    name: Zvfbfmin
+    anyOf:
+      - name: Zvfbfmin
+      - name: Zvfofp8min
 assembly: vd, vs2, vm
 encoding:
   match: 010010------01101001-----1010111

data/.data/spec/std/isa/inst/Zvfofp4min/vfext.vf2.yaml

@@ -0,0 +1,35 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+# yaml-language-server: $schema=../../../../schemas/inst_schema.json
+$schema: "inst_schema.json#"
+kind: instruction
+name: vfext.vf2
+long_name: Vector OFP4 to OFP8 widening conversion
+description: |
+  Converts a vector of OFP4 E2M1 values in vector register vs2 (EEW=4,
+  EMUL=LMUL/2) to a vector of OFP8 E4M3 values in vector register vd
+  (EEW=8, EMUL=LMUL), according to mask vm. Defined only for SEW=8,
+  altfmt=0, and LMUL >= 1/4. No rounding occurs, and no floating-point
+  exception flags are set. This instruction does not access the fcsr
+  and is not considered a floating-point instruction for the purposes
+  of the floating-point context status (FS) setting.
+definedBy:
+  extension:
+    name: Zvfofp4min
+assembly: vd, vs2, vm
+encoding:
+  match: "010010------10110010-----1010111"
+  variables:
+    - name: vm
+      location: 25-25
+    - name: vs2
+      location: 24-20
+    - name: vd
+      location: 11-7
+access:
+  s: always
+  u: always
+  vs: always
+  vu: always
+data_independent_timing: false
+operation(): |