Renaming to reserve the external_ prefix for direct softfloat calls.

1 files changed, 17 insertions, 17 deletions

diff --git a/model/riscv_insts_dext.sail b/model/riscv_insts_dext.sail
index 0ef6ab2..255ff9b 100644
--- a/model/riscv_insts_dext.sail
+++ b/model/riscv_insts_dext.sail
@@ -264,10 +264,10 @@ function clause execute (F_MADD_TYPE_D(rs3, rs2, rs1, rm, rd, op)) = {
   let rm_3b       = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
   let (fflags, rd_val_64b) : (bits(5), bits(64)) =
     match op {
-      FMADD_D  => external_f64MulAdd (rm_3b, rs1_val_64b, rs2_val_64b, rs3_val_64b),
-      FMSUB_D  => external_f64MulAdd (rm_3b, rs1_val_64b, rs2_val_64b, negate_D (rs3_val_64b)),
-      FNMSUB_D => external_f64MulAdd (rm_3b, negate_D (rs1_val_64b), rs2_val_64b, rs3_val_64b),
-      FNMADD_D => external_f64MulAdd (rm_3b, negate_D (rs1_val_64b), rs2_val_64b, negate_D (rs3_val_64b))
+      FMADD_D  => riscv_f64MulAdd (rm_3b, rs1_val_64b, rs2_val_64b, rs3_val_64b),
+      FMSUB_D  => riscv_f64MulAdd (rm_3b, rs1_val_64b, rs2_val_64b, negate_D (rs3_val_64b)),
+      FNMSUB_D => riscv_f64MulAdd (rm_3b, negate_D (rs1_val_64b), rs2_val_64b, rs3_val_64b),
+      FNMADD_D => riscv_f64MulAdd (rm_3b, negate_D (rs1_val_64b), rs2_val_64b, negate_D (rs3_val_64b))
     };
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_64b;
@@ -323,10 +323,10 @@ function clause execute (F_BIN_RM_TYPE_D(rs2, rs1, rm, rd, op)) = {
   let rs2_val_64b = F(rs2);
   let rm_3b       = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
   let (fflags, rd_val_64b) : (bits(5), bits(64)) = match op {
-    FADD_D  => external_f64Add (rm_3b, rs1_val_64b, rs2_val_64b),
-    FSUB_D  => external_f64Sub (rm_3b, rs1_val_64b, rs2_val_64b),
-    FMUL_D  => external_f64Mul (rm_3b, rs1_val_64b, rs2_val_64b),
-    FDIV_D  => external_f64Div (rm_3b, rs1_val_64b, rs2_val_64b)
+    FADD_D  => riscv_f64Add (rm_3b, rs1_val_64b, rs2_val_64b),
+    FSUB_D  => riscv_f64Sub (rm_3b, rs1_val_64b, rs2_val_64b),
+    FMUL_D  => riscv_f64Mul (rm_3b, rs1_val_64b, rs2_val_64b),
+    FDIV_D  => riscv_f64Div (rm_3b, rs1_val_64b, rs2_val_64b)
   };
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_64b;
@@ -402,7 +402,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FSQRT_D)) = {
   let rs1_val_D = F(rs1);
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_D) = external_f64Sqrt   (rm_3b, rs1_val_D);
+  let (fflags, rd_val_D) = riscv_f64Sqrt   (rm_3b, rs1_val_D);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_D;
@@ -413,7 +413,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_W_D)) = {
   let rs1_val_D = F(rs1);
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_W) = external_f64ToI32 (rm_3b, rs1_val_D);
+  let (fflags, rd_val_W) = riscv_f64ToI32 (rm_3b, rs1_val_D);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   X(rd) = EXTS (rd_val_W);
@@ -424,7 +424,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_WU_D)) = {
   let rs1_val_D = F(rs1);
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_WU) = external_f64ToUi32 (rm_3b, rs1_val_D);
+  let (fflags, rd_val_WU) = riscv_f64ToUi32 (rm_3b, rs1_val_D);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   X(rd) = EXTZ (rd_val_WU);
@@ -435,7 +435,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_D_W)) = {
   let rs1_val_W = X(rs1) [31..0];
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_D) = external_i32ToF64 (rm_3b, rs1_val_W);
+  let (fflags, rd_val_D) = riscv_i32ToF64 (rm_3b, rs1_val_W);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_D;
@@ -446,7 +446,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_D_WU)) = {
   let rs1_val_WU = X(rs1) [31..0];
   let rm_3b      = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_D) = external_ui32ToF64 (rm_3b, rs1_val_WU);
+  let (fflags, rd_val_D) = riscv_ui32ToF64 (rm_3b, rs1_val_WU);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_D;
@@ -457,7 +457,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_L_D)) = {
   let rs1_val_D = F(rs1);
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_L) = external_f64ToI64 (rm_3b, rs1_val_D);
+  let (fflags, rd_val_L) = riscv_f64ToI64 (rm_3b, rs1_val_D);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   X(rd) = rd_val_L;
@@ -468,7 +468,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_LU_D)) = {
   let rs1_val_D = F(rs1);
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_LU) = external_f64ToUi64 (rm_3b, rs1_val_D);
+  let (fflags, rd_val_LU) = riscv_f64ToUi64 (rm_3b, rs1_val_D);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   X(rd) = rd_val_LU;
@@ -479,7 +479,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_D_L)) = {
   let rs1_val_L = X(rs1);
   let rm_3b     = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_D) = external_i64ToF64 (rm_3b, rs1_val_L);
+  let (fflags, rd_val_D) = riscv_i64ToF64 (rm_3b, rs1_val_L);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_D;
@@ -490,7 +490,7 @@ function clause execute (F_UN_RM_TYPE_D(rs1, rm, rd, FCVT_D_LU)) = {
   let rs1_val_LU = X(rs1);
   let rm_3b      = encdec_rounding_mode (select_instr_or_fcsr_rm  (rm));
 
-  let (fflags, rd_val_D) = external_ui64ToF64 (rm_3b, rs1_val_LU);
+  let (fflags, rd_val_D) = riscv_ui64ToF64 (rm_3b, rs1_val_LU);
 
   writeCSR (csr_name_map ("fflags"), EXTZ (fflags));
   F(rd) = rd_val_D;