Change to raw instead of str

Fix riscv#1370 (comment)

Signed-off-by: Ariel Xiong <[email protected]>

Author: Arielfoever

c_emulator/riscv_callbacks.cpp

@@ -118,8 +118,7 @@ unit trap_callback(bool is_interrupt, fbits cause)
   return UNIT;
 }
 // Page table walk callback
-unit ptw_start_callback(uint64_t vpn, const_sail_string access_type,
-                        const_sail_string privilege)
+unit ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege)
 {
   for (auto c : callbacks) {
     c->ptw_start_callback(vpn, access_type, privilege);

c_emulator/riscv_callbacks.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "sail.h"
+#include "sail_riscv_model.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,8 +27,7 @@ unit pc_write_callback(sbits new_pc);
 unit redirect_callback(sbits new_pc);
 unit trap_callback(bool is_interrupt, fbits cause);
 // Page table walk callbacks
-unit ptw_start_callback(uint64_t vpn, const_sail_string access_type,
-                        const_sail_string privilege);
+unit ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege);
 unit ptw_step_callback(sail_int level, sbits pte_addr, uint64_t pte);
 unit ptw_success_callback(uint64_t final_ppn, sail_int level);
 unit ptw_fail_callback(const char *error_type, sail_int level, sbits pte_addr);

c_emulator/riscv_callbacks_if.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "sail.h"
+#include "sail_riscv_model.h"
 
 // This class is not declared in "riscv_callbacks.h" as that file is
 // included in the C model generated by Sail.
@@ -34,8 +35,7 @@ class callbacks_if {
   virtual void redirect_callback(sbits new_pc) = 0;
   virtual void trap_callback(bool is_interrupt, fbits cause) = 0;
   // Page table walk callbacks
-  virtual void ptw_start_callback(uint64_t vpn, const char *access_type,
-                                  const char *privilege)
+  virtual void ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege)
       = 0;
   virtual void ptw_step_callback(sail_int level, sbits pte_addr, uint64_t pte)
       = 0;

c_emulator/riscv_callbacks_log.cpp

@@ -128,13 +128,13 @@ void log_callbacks::trap_callback(bool is_interrupt, fbits cause)
 }
 
 // Page table walk callback
-void log_callbacks::ptw_start_callback(uint64_t vpn,
-                                       const_sail_string access_type,
-                                       const_sail_string privilege)
+void log_callbacks::ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege)
 {
   if (trace_log != nullptr && config_print_ptw) {
-    fprintf(trace_log, "PTW: Start, vpn=%ld, access_type=%s, privilege=%s", vpn,
-            access_type, privilege);
+    sail_string str_ac,str_pr;
+    zaccessType_to_str(&str_ac,access_type);
+    zprivLevel_to_str(&str_pr,privilege);
+    fprintf(trace_log, "PTW: Start, vpn=%ld, access_type=%s, privilege=%s", vpn,str_ac,str_pr);
   }
 }
 

c_emulator/riscv_callbacks_log.h

@@ -29,8 +29,7 @@ class log_callbacks : public callbacks_if {
   void redirect_callback(sbits new_pc) override;
   void trap_callback(bool is_interrupt, fbits cause) override;
   // Page table walk callback
-  void ptw_start_callback(uint64_t vpn, const_sail_string access_type,
-                          const_sail_string privilege) override;
+  void ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege) override;
   void ptw_step_callback(sail_int level, sbits pte_addr, uint64_t pte) override;
   void ptw_success_callback(uint64_t final_ppn, sail_int level) override;
   void ptw_fail_callback(const char *error_type, sail_int level,

c_emulator/riscv_callbacks_rvfi.cpp

@@ -1,4 +1,5 @@
 #include "riscv_config.h"
+#include "sail_riscv_model.h"
 #include "riscv_callbacks_rvfi.h"
 #include <stdlib.h>
 #include <vector>
@@ -79,9 +80,7 @@ void rvfi_callbacks::trap_callback(bool is_interrupt, fbits cause)
 
 // Page table walk callback
 
-void rvfi_callbacks::ptw_start_callback(uint64_t /*vpn*/,
-                                        const_sail_string /*access_type*/,
-                                        const_sail_string /*privilege*/)
+void rvfi_callbacks::ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege)
 {
 }
 

c_emulator/riscv_callbacks_rvfi.h

@@ -24,8 +24,7 @@ class rvfi_callbacks : public callbacks_if {
   void redirect_callback(sbits new_pc) override;
   void trap_callback(bool is_interrupt, fbits cause) override;
   // Page table walk callback
-  void ptw_start_callback(uint64_t vpn, const_sail_string access_type,
-                          const_sail_string privilege) override;
+  void ptw_start_callback(uint64_t vpn, struct zMemoryAccessTypezIuzK access_type,enum zPrivilege privilege) override;
   void ptw_step_callback(sail_int level, sbits pte_addr, uint64_t pte) override;
   void ptw_success_callback(uint64_t final_ppn, sail_int level) override;
   void ptw_fail_callback(const char *error_type, sail_int level,

model/core/callbacks.sail

@@ -85,7 +85,7 @@ function long_csr_write_callback(name : string, name_high : string, value : bits
 }
 
 // Page table walk callback
-val ptw_start_callback = pure {c: "ptw_start_callback"} : (/* vpn */ bits(64), /* access type */ string, /* privilege */ string) -> unit
+val ptw_start_callback = pure {c: "ptw_start_callback"} : (/* vpn */ bits(64), /* access type */ MemoryAccessType(ext_access_type), /* privilege */ Privilege) -> unit
 function ptw_start_callback(_) = ()
 
 val ptw_step_callback = pure {c: "ptw_step_callback"} : (/* level */ int, /* pte_addr */ physaddrbits, /* pte */ bits(64)) -> unit

model/sys/vmem.sail

@@ -87,7 +87,7 @@ function pt_walk(
   global,
   ext_ptw,
 ) = {
-  ptw_start_callback(zero_extend(vpn), to_str(ac), to_str(priv));
+  ptw_start_callback(zero_extend(vpn), ac, priv);
 
   // Extract the PPN component for this level; 10 bits on Sv32, otherwise 9.
   let 'vpn_i_size = if 'v == 32 then 10 else 9;