Just include it in the binding maybe

chipsalliance · Feb 22, 2025 · 96825fa · 96825fa
1 parent 1260622
commit 96825fa
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hw-model/c-binding/Cargo.toml b/hw-model/c-binding/Cargo.toml
@@ -6,6 +6,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+caliptra-cfi-lib.workspace = true
 caliptra-emu-bus.workspace = true
 caliptra-emu-types.workspace = true
 caliptra-hw-model.workspace = true
@@ -19,4 +20,4 @@ itrng = ["caliptra-hw-model/itrng"]
 verilator = ["caliptra-hw-model/verilator"]
 
 [build-dependencies]
-cbindgen.workspace = true
+cbindgen.workspace = true
diff --git a/hw-model/c-binding/examples/Makefile b/hw-model/c-binding/examples/Makefile
@@ -19,7 +19,7 @@ TARGET = $(OUT)/smoke_test
 RTL_SOC_IFC_INCLUDE_PATH = ../../../hw/latest/rtl/src/soc_ifc/rtl
 BUILDER_PATH = ../../../builder
 CALIPTRA_MODEL_PATH = ../out
-CFLAGS += -flto -I$(RTL_SOC_IFC_INCLUDE_PATH) -I$(CALIPTRA_MODEL_PATH)
+CFLAGS += -I$(RTL_SOC_IFC_INCLUDE_PATH) -I$(CALIPTRA_MODEL_PATH)
 
 SOURCE += api/caliptra_api.c
 SOURCE += smoke_test.c

diff --git a/hw-model/c-binding/examples/smoke_test.c b/hw-model/c-binding/examples/smoke_test.c
@@ -9,14 +9,6 @@
 
 static const uint32_t RT_READY_FOR_COMMANDS = 0x600;
 
-// These are needed if CFI is enabled.
-void cfi_panic_handler(void)
-{
-    exit(-ENOENT);
-}
-
-uint8_t CFI_STATE_ORG[256] = {0}; // leave some extra room
-
 static struct caliptra_buffer read_file_or_die(const char *path)
 {
     // Open File in Read Only Mode
@@ -60,11 +52,6 @@ static void display_usage(void)
 
 int main(int argc, char *argv[])
 {
-    for (int i = 0; i < 256; i++)
-    {
-	CFI_STATE_ORG[i] = 0;
-    }
-
     // Process Input Arguments
     int opt;
     const char *rom_path = NULL;

diff --git a/hw-model/c-binding/src/caliptra_model.rs b/hw-model/c-binding/src/caliptra_model.rs
@@ -1,13 +1,25 @@
 // Licensed under the Apache-2.0 license
 
 use caliptra_api::soc_mgr::SocManager;
+use caliptra_cfi_lib::CfiState;
 use caliptra_emu_bus::Bus;
 use caliptra_hw_model::{DefaultHwModel, HwModel, InitParams, SecurityState};
 use std::ffi::*;
 use std::slice;
 
 use caliptra_emu_types::RvSize;
 
+// These are needed if CFI is enabled.
+#[no_mangle]
+pub extern "C" fn cfi_panic_handler(code: u32) -> ! {
+    std::process::exit(code as i32);
+}
+
+#[allow(unused)]
+#[no_mangle]
+static mut CFI_STATE_ORG: [u8; std::mem::size_of::<CfiState>()] =
+    [0; std::mem::size_of::<CfiState>()];
+
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct caliptra_model {

diff --git a/libcaliptra/examples/hwmodel/interface.c b/libcaliptra/examples/hwmodel/interface.c
@@ -19,11 +19,6 @@ struct caliptra_model *model = NULL;
 
 static struct caliptra_model_init_params init_params;
 
-// These are needed if CFI is enabled.
-void cfi_panic_handler(void) {}
-
-uint8_t CFI_STATE_ORG[256] = {0}; // leave some extra room
-
 // ONLY for testing. Not part of actual libcaliptra interface
 void testbench_reinit(void)
 {

diff --git a/test/dpe_verification/transport.go b/test/dpe_verification/transport.go
@@ -42,9 +42,6 @@ static int set_fuses()
     }
     return status;
 }
-
-// This is  needed if CFI is enabled.
-__attribute__((aligned(4))) uint8_t CFI_STATE_ORG[256] = {0}; // leave some extra room
 */
 import "C"
 
@@ -68,12 +65,6 @@ type CptraModel struct {
 // APIs need to be callable from C
 var CALIPTRA_C_MODEL *C.struct_caliptra_model
 
-// This is  needed if CFI is enabled.
-//export cfi_panic_handler
-func cfi_panic_handler() {
-	os.Exit(-1)
-}
-
 //export caliptra_write_u32
 func caliptra_write_u32(address C.uint32_t, data C.uint32_t) C.int {
 	result := C.caliptra_model_apb_write_u32(CALIPTRA_C_MODEL, address, data)