Adjust Go code as well

chipsalliance · Feb 21, 2025 · dbd46fa · dbd46fa
1 parent 5fc3c0b
commit dbd46fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/hw-model/c-binding/examples/Makefile b/hw-model/c-binding/examples/Makefile
@@ -37,7 +37,6 @@ $(OUT)/%.o: $(SOURCE)
 	$(CC) ${CFLAGS} -g -c $< -o $@
 
 $(TARGET): $(OUT)/debug/libcaliptra_hw_model_c_binding.a $(OBJS)
-	$(CC) --version
 	$(CC) -o $(TARGET) $(OBJS) $(CFLAGS) -Wl,-L$(OUT)/debug -lcaliptra_hw_model_c_binding -lpthread -lstdc++ -ldl -lrt -lm
 
 clean:

diff --git a/test/dpe_verification/transport.go b/test/dpe_verification/transport.go
@@ -43,6 +43,8 @@ static int set_fuses()
     return status;
 }
 
+// This is  needed if CFI is enabled.
+__attribute__((aligned(4))) static uint8_t CFI_STATE_ORG[256] = {0}; // leave some extra room
 */
 import "C"
 
@@ -66,6 +68,12 @@ 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)