Utilize extension function instead of haveZfinx()

ThinkOpenly · Apr 9, 2024 · 59b3b5a · 59b3b5a
1 parent 4d30229
commit 59b3b5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/model/riscv_fdext_control.sail b/model/riscv_fdext_control.sail
@@ -79,9 +79,9 @@
 
 /* val clause ext_is_CSR_defined : (csreg, Privilege) -> bool */
 
-function clause ext_is_CSR_defined (0x001, _) = extension("F") | haveZfinx()
-function clause ext_is_CSR_defined (0x002, _) = extension("F") | haveZfinx()
-function clause ext_is_CSR_defined (0x003, _) = extension("F") | haveZfinx()
+function clause ext_is_CSR_defined (0x001, _) = extension("F") | extension("Zfinx")
+function clause ext_is_CSR_defined (0x002, _) = extension("F") | extension("Zfinx")
+function clause ext_is_CSR_defined (0x003, _) = extension("F") | extension("Zfinx")
 
 function clause ext_read_CSR (0x001) = Some (zero_extend (fcsr.FFLAGS()))
 function clause ext_read_CSR (0x002) = Some (zero_extend (fcsr.FRM()))

diff --git a/model/riscv_insts_fext.sail b/model/riscv_insts_fext.sail
@@ -321,7 +321,7 @@ function fle_S   (v1,       v2,        is_quiet) = {
 /* **************************************************************** */
 /* Helper functions for 'encdec()'                                  */
 
-function haveSingleFPU() -> bool = extension("F") | haveZfinx()
+function haveSingleFPU() -> bool = extension("F") | extension("Zfinx")
 
 /* ****************************************************************** */
 /* Floating-point loads                                               */