Make sure that the sancus examples can be compiled with the SLLVM-based toolchain

.gitignore

@@ -6,3 +6,5 @@
 *.fst
 *.fst.*
 *.out
+*.ll
+*.s

Makefile.include

@@ -1,40 +1,146 @@
-ifndef SANCUS_DIR
-  SANCUS_SUPPORT_DIR  = "/usr/local/share/sancus-support"
+ifndef SANCUS_SECURITY
+  SANCUS_SECURITY = 64
+endif
+
+ifeq ($(SANCUS_SECURITY), 64)
+    SANCUS_KEY = deadbeefcafebabe
 else
-  SANCUS_SUPPORT_DIR  = ${SANCUS_DIR}/share/sancus-support
+    SANCUS_KEY = deadbeefcafebabec0defeeddefec8ed
 endif
 
-ifndef SANCUS_SECURITY
-  SANCUS_SECURITY   = 64
+ifndef SLLVM_INSTALL_DIR
+  CC            = sancus-cc
+  LD            = sancus-ld
+  SANCUS_CRYPTO = sancus-crypto
+  SANCUS_SIM    = sancus-sim
+else
+  SANCUS_DIR    = $(SLLVM_INSTALL_DIR)
+  CC            = $(SLLVM_INSTALL_DIR)/bin/clang
+  OPT           = $(SLLVM_INSTALL_DIR)/bin/opt
+  LLC           = $(SLLVM_INSTALL_DIR)/bin/llc
+  LD            = $(SLLVM_INSTALL_DIR)/bin/msp430-elf-gcc
+  SANCUS_CRYPTO = $(SLLVM_INSTALL_DIR)/bin/crypto.py
+  SANCUS_SIM    = $(SLLVM_INSTALL_DIR)/bin/sancus-sim
+  AS            = $(SLLVM_INSTALL_DIR)/bin/msp430-elf-gcc
 endif
-ifeq ($(SANCUS_SECURITY), 64)
-    SANCUS_KEY      = deadbeefcafebabe
+
+ifndef SANCUS_DIR
+  SANCUS_SUPPORT_DIR  = "/usr/local/share/sancus-support"
 else
-    SANCUS_KEY      = deadbeefcafebabec0defeeddefec8ed
+  SANCUS_SUPPORT_DIR  = $(SANCUS_DIR)/share/sancus-support
 endif
 
-CC                  = sancus-cc
-LD                  = sancus-ld
-SANCUS_CRYPTO       = sancus-crypto
-SANCUS_SIM          = sancus-sim
-SANCUS_LOAD         = sancus-loader
-RM                  = rm -f
-
-VENDOR_ID           = 1234
-RAM_SIZE            = 16K
-ROM_SIZE            = 41K
-FPGA_DEV            = /dev/ttyUSB0
-FPGA_RATE           = 115200
-
-VENDOR_KEY          = $(shell $(SANCUS_CRYPTO) --key $(SANCUS_KEY) --gen-vendor-key $(VENDOR_ID) | xxd -p)
-MEMFLAGS            = --ram $(RAM_SIZE) --rom $(ROM_SIZE) 
-
-CFLAGS              = -I$(SANCUS_SUPPORT_DIR)/include/ -Wfatal-errors -fcolor-diagnostics -Os -g
-LDFLAGS             = -L$(SANCUS_SUPPORT_DIR)/lib/ $(MEMFLAGS) -lsm-io -ldev --inline-arithmetic --standalone --verbose
-SIMFLAGS            = $(MEMFLAGS)
-CRYPTOFLAGS         = --key $(VENDOR_KEY) --verbose
-LOADFLAGS           = -device $(FPGA_DEV) -baudrate $(FPGA_RATE)
-
-ifeq ($(QUIET),1)
+MCU = msp430sancus
+
+SANCUS_LOAD = sancus-loader
+RM          = rm -f
+
+VENDOR_ID   = 1234
+STACK_SIZE  = 128
+RAM_SIZE    = 16K
+ROM_SIZE    = 41K
+FPGA_DEV    = /dev/ttyUSB0
+FPGA_RATE   = 115200
+VENDOR_KEY  = $(shell $(SANCUS_CRYPTO) --key $(SANCUS_KEY) --gen-vendor-key $(VENDOR_ID) | xxd -p)
+
+CFLAGS =
+CFLAGS += -Wfatal-errors 
+CFLAGS += -fcolor-diagnostics 
+
+LDFLAGS =
+LDFLAGS += -L$(SANCUS_SUPPORT_DIR)/lib/
+LDFLAGS += -lsm-io
+LDFLAGS += -ldev
+
+ifndef SLLVM_INSTALL_DIR
+  CFLAGS += -I$(SANCUS_SUPPORT_DIR)/include/ 
+  CFLAGS += -Os
+  CFLAGS += -g
+
+  ifeq ($(QUIET),1)
     CFLAGS += -DQUIET
+  endif
+
+  LDFLAGS += --inline-arithmetic
+  LDFLAGS += --standalone
+  LDFLAGS += --verbose
+else
+  INCFLAGS =
+  INCFLAGS += -I $(SLLVM_INSTALL_DIR)/include
+  INCFLAGS += -I $(SLLVM_INSTALL_DIR)/msp430-elf/include
+  INCFLAGS += -I $(SLLVM_INSTALL_DIR)/share/sancus-support/include
+  INCFLAGS += -I $(SLLVM_INSTALL_DIR)/share/sancus-compiler/include
+
+  CFLAGS += $(INCFLAGS)
+  CFLAGS += -D__$(shell echo $(MCU) | tr a-z A-Z)__
+  CFLAGS += -DCONFIG_SECURITY=$(SANCUS_SECURITY)
+  CFLAGS += -Werror
+  CFLAGS += -O0
+  CFLAGS += -target msp430-elf
+  CFLAGS += -emit-llvm
+
+  SLLVM_TRANSFORM_FLAGS =  
+  SLLVM_TRANSFORM_FLAGS += --load $(SLLVM_INSTALL_DIR)/lib/SLLVM.so
+  SLLVM_TRANSFORM_FLAGS += --sllvm-transform
+  SLLVM_TRANSFORM_FLAGS += --enable-new-pm=0
+
+  SANCUS_TRANSFORM_FLAGS = 
+  SANCUS_TRANSFORM_FLAGS += --load $(SLLVM_INSTALL_DIR)/lib/SLLVM.so
+  SANCUS_TRANSFORM_FLAGS += --sancus-transform
+  SANCUS_TRANSFORM_FLAGS += --key-size $(SANCUS_SECURITY)
+  SANCUS_TRANSFORM_FLAGS += --stack-size $(STACK_SIZE)
+  SANCUS_TRANSFORM_FLAGS += --vendor-id 0x$(VENDOR_ID)
+  SANCUS_TRANSFORM_FLAGS += --enable-new-pm=0
+
+  LLCFLAGS =
+  LLCFLAGS += -O3
+  #LLCFLAGS += -debug-only=msp430-lower
+
+  ASFLAGS =
+  ASFLAGS += $(INCFLAGS)
+  ASFLAGS += -mmcu=$(MCU)
+
+  LDFLAGS += -L $(SLLVM_INSTALL_DIR)/share/sancus-compiler/lib
+  LDFLAGS += -l sancus-sm-support
+  LDFLAGS += -L $(SLLVM_INSTALL_DIR)/include # For devices.csv and $(MCU).ld
+  LDFLAGS += -Wl,-gc-sections # To garbage collect unused trusted rt functions
+  LDFLAGS += -mmcu=$(MCU)
+endif
+
+SIMFLAGS = 
+
+CRYPTOFLAGS =
+CRYPTOFLAGS += --key $(VENDOR_KEY)
+CRYPTOFLAGS += --verbose
+
+LOADFLAGS =
+LOADFLAGS += -device $(FPGA_DEV)
+LOADFLAGS += -baudrate $(FPGA_RATE)
+
+#----------------------------------------------------------------------------
+
+ifdef SLLVM_INSTALL_DIR
+
+.SUFFIXES:
+
+.PRECIOUS: %.ll
+.PRECIOUS: %.sllvm.ll
+.PRECIOUS: %.sancus.ll
+.PRECIOUS: %.s
+
+%.ll: %.c
+	$(CC) $(CFLAGS) -S $< -o $@
+
+%.sllvm.ll: %.ll
+	$(OPT) $(SLLVM_TRANSFORM_FLAGS) -S $< -o $@ > /dev/null
+
+%.sancus.ll: %.sllvm.ll
+	$(OPT) $(SANCUS_TRANSFORM_FLAGS) -S $< -o $@ > /dev/null
+
+%.s: %.sancus.ll
+	$(LLC) $(LLCFLAGS) $< -o $@
+
+%.o: %.s
+	$(AS) $(ASFLAGS) -c $< -o $@
+
 endif

arithmetic/Makefile

@@ -9,7 +9,7 @@ TARGET_NO_MAC   = no_mac_$(TARGET)
 all: $(TARGET)
 
 $(TARGET_NO_MAC): $(OBJECTS)
-	$(LD) $(LDFLAGS) -o $@ $^
+	$(LD) $^ $(LDFLAGS) -o $@
 
 $(TARGET): $(TARGET_NO_MAC)
 	$(SANCUS_CRYPTO) --fill-macs $(CRYPTOFLAGS) -o $@ $<
@@ -22,5 +22,7 @@ sim: $(TARGET)
 
 clean:
 	$(RM) $(TARGET) $(TARGET_NO_MAC) $(OBJECTS)
-	rm -f sim-input.bin sim-output.bin
-	rm -f *.fst *.vcd
+	$(RM) sim-input.bin sim-output.bin
+	$(RM) -f *.fst *.vcd
+	$(RM) *.ll
+	$(RM) *.s

arithmetic/data.ld

@@ -0,0 +1,9 @@
+sllvm_pm_bar_data_start = .;
+*(.sllvm.data.bar)
+*(.sllvm.data.lr1addr.bar) /* Make sure the pointer to local sp is put last */
+sllvm_pm_bar_data_end = .;
+
+sllvm_pm_foo_data_start = .;
+*(.sllvm.data.foo)
+*(.sllvm.data.lr1addr.foo) /* Make sure the pointer to local sp is put last */
+sllvm_pm_foo_data_end = .;

arithmetic/foo.h

@@ -6,5 +6,6 @@
 extern struct SancusModule foo;
 
 int SM_ENTRY(foo) enter_foo(int i);
+int SM_ENTRY(foo) foo_mul(int a, int b, int c);
 
 #endif

arithmetic/text.ld

@@ -0,0 +1,14 @@
+sllvm_pm_bar_text_start = .;
+*(.sllvm.text.dispatch.bar)  /* Make sure the dispatcher is put first */
+*(.sllvm.text.bar)
+*(.sllvm.text.bar.*)         /* Internalized runtime functions */
+sllvm_pm_bar_text_end = .;
+
+sllvm_pm_foo_text_start = .;
+*(.sllvm.text.dispatch.foo)  /* Make sure the dispatcher is put first */
+*(.sllvm.text.foo)
+*(.sllvm.text.foo.*)         /* Internalized runtime functions */
+sllvm_pm_foo_text_end = .;
+
+/* Symbols for secure linking */
+*(.sllvm.slink.*)

fileio/Makefile

@@ -12,7 +12,7 @@ CFLAGS         += -DTEST_DATA=\"$(TEST_DATA)\"
 all: $(TARGET)
 
 $(TARGET_NO_MAC): $(OBJECTS)
-	$(LD) $(LDFLAGS) -ldev-fileio -o $@ $^
+	$(LD) $^ $(LDFLAGS) -ldev-fileio -o $@
 
 $(TARGET): $(TARGET_NO_MAC)
 	$(SANCUS_CRYPTO) --fill-macs $(CRYPTOFLAGS) -o $@ $<
@@ -28,5 +28,7 @@ sim: $(TARGET)
 
 clean:
 	$(RM) $(TARGET) $(TARGET_NO_MAC) $(OBJECTS)
-	rm -f sim-input.bin sim-output.bin
-	rm -f *.fst *.vcd
+	$(RM) sim-input.bin sim-output.bin
+	$(RM) *.fst *.vcd
+	$(RM) *.ll
+	$(RM) *.s

hello-library/Makefile

@@ -1,6 +1,13 @@
 include ../Makefile.include # Examples include
 include ./Makefile.include  # Library project include
 
+ifdef SLLVM_INSTALL_DIR
+sim: 
+clean:
+else
+  LDFLAGS += --prepare-for-sm-text-section-wrapping
+  LDFLAGS += --scan-libraries-for-sm 
+
 SOURCES         = $(shell ls *.c)
 OBJECTS         = $(SOURCES:.c=.o)
 
@@ -19,7 +26,7 @@ else
 endif
 
 # We need to give the full path of the library so that the linker can detect
-LDFLAGS += -L$(LIBRARY_FOLDER) -l:$(CURDIR)/$(LIBRARY_FOLDER)/$(LIBRARY_FILENAME) --scan-libraries-for-sm 
+LDFLAGS += -L$(LIBRARY_FOLDER) -l:$(CURDIR)/$(LIBRARY_FOLDER)/$(LIBRARY_FILENAME)
 CFLAGS  += -I$(LIBRARY_FOLDER) 
 
 .PHONY: all $(LIBRARY_FOLDER) sim 
@@ -32,12 +39,12 @@ archive: $(LIBRARY_FOLDER)
 	$(MAKE) -C $(LIBRARY_FOLDER) $(LIB_MODE)
 
 $(TARGET_NO_WRAP): $(OBJECTS)
-	$(LD) $(LDFLAGS) --prepare-for-sm-text-section-wrapping -o $@ $^
+	$(LD) $(LDFLAGS) -o $@ $^
 
 $(TARGET): $(TARGET_NO_WRAP)
 	$(SANCUS_CRYPTO) --wrap-sm-text-sections $(CRYPTOFLAGS) -o $@ $<
 
-load: $(TARGET)
+load: thin-archive $(TARGET)
 	$(SANCUS_LOAD) $(LOADFLAGS) $<
 
 run-simulation: $(TARGET)
@@ -48,3 +55,4 @@ clean:
 	$(MAKE) -C $(LIBRARY_FOLDER) clean
 	rm -f sim-input.bin sim-output.bin
 	rm -f *.fst *.vcd
+endif

hello-world/Makefile

@@ -1,5 +1,9 @@
 include ../Makefile.include
 
+ifndef SLLVM_INSTALL_DIR
+  LDFLAGS += --prepare-for-sm-text-section-wrapping
+endif
+
 SOURCES         = $(shell ls *.c)
 OBJECTS         = $(SOURCES:.c=.o)
 
@@ -9,7 +13,7 @@ TARGET_NO_WRAP  = no_wrap_$(TARGET)
 all: $(TARGET)
 
 $(TARGET_NO_WRAP): $(OBJECTS)
-	$(LD) $(LDFLAGS) --prepare-for-sm-text-section-wrapping -o $@ $^
+	$(LD) $^ $(LDFLAGS) -o $@
 
 $(TARGET): $(TARGET_NO_WRAP)
 	$(SANCUS_CRYPTO) --wrap-sm-text-sections $(CRYPTOFLAGS) -o $@ $<
@@ -22,5 +26,7 @@ sim: $(TARGET)
 
 clean:
 	$(RM) $(TARGET) $(TARGET_NO_MAC) $(OBJECTS)
-	rm -f sim-input.bin sim-output.bin
-	rm -f *.fst *.vcd
+	$(RM) sim-input.bin sim-output.bin
+	$(RM) *.fst *.vcd
+	$(RM) *.ll
+	$(RM) *.s

hello-world/data.ld

@@ -0,0 +1,4 @@
+sllvm_pm_hello_data_start = .;
+*(.sllvm.data.hello)
+*(.sllvm.data.lr1addr.hello) /* Make sure the pointer to local sp is put last */
+sllvm_pm_hello_data_end = .;

hello-world/text.ld

@@ -0,0 +1,8 @@
+sllvm_pm_hello_text_start = .;
+*(.sllvm.text.dispatch.hello)  /* Make sure the dispatcher is put first */
+*(.sllvm.text.hello)
+*(.sllvm.text.hello.*)         /* Internalized runtime functions */
+sllvm_pm_hello_text_end = .;
+
+/* Wrap information */
+*(.sllvm.wrap.*)

sancus-step/Makefile

@@ -9,7 +9,7 @@ TARGET_NO_MAC   = no_mac_$(TARGET)
 all: $(TARGET)
 
 $(TARGET_NO_MAC): $(OBJECTS)
-	$(LD) $(LDFLAGS) -lsancus-step  -o $@ $^
+	$(LD) $^ $(LDFLAGS) -lsancus-step -o $@
 
 $(TARGET): $(TARGET_NO_MAC)
 	$(SANCUS_CRYPTO) --fill-macs $(CRYPTOFLAGS) -o $@ $<
@@ -24,3 +24,5 @@ clean:
 	$(RM) $(TARGET) $(TARGET_NO_MAC) $(OBJECTS)
 	rm -f sim-input.bin sim-output.bin
 	rm -f *.fst *.vcd
+	$(RM) *.ll
+	$(RM) *.s

sancus-step/data.ld

@@ -0,0 +1,9 @@
+sllvm_pm_foo_data_start = .;
+*(.sllvm.data.foo)
+*(.sllvm.data.lr1addr.foo) /* Make sure the pointer to local sp is put last */
+sllvm_pm_foo_data_end = .;
+
+sllvm_pm_sancus_step_data_start = .;
+*(.sllvm.data.sancus_step)
+*(.sllvm.data.lr1addr.sancus_step) /* Make sure pointer to local sp is last */
+sllvm_pm_sancus_step_data_end = .;

sancus-step/main.c → sancus-step/foo.c

@@ -5,6 +5,12 @@
 
 #define MAX_COUNTER (0xf)
 
+#if __clang_major__ >= 5
+asm(".section __interrupt_vector_10,\"ax\",@progbits \n\t"
+    ".word timerA_isr_entry2                         \n\t");
+#endif
+
+
 int counter = 0x0;
 int oldCounterValue = 0x0;
 int instrAfterCtr = 0;

sancus-step/text.ld

@@ -0,0 +1,9 @@
+sllvm_pm_foo_text_start = .;
+*(.sllvm.text.dispatch.foo)  /* Make sure the dispatcher is put first */
+*(.sllvm.text.foo)
+sllvm_pm_foo_text_end = .;
+
+sllvm_pm_sancus_step_text_start = .;
+*(.sllvm.text.dispatch.sancus_step)  /* Make sure the dispatcher is put first */
+*(.sllvm.text.sancus_step)
+sllvm_pm_sancus_step_text_end = .;