m-labs · Aug 2, 2015
diff --git a/Diff for: ‎artiq/coredevice/comm_generic.py
+2-2 b/Diff for: ‎artiq/coredevice/comm_generic.py
+2-2
diff --git a/Diff for: ‎soc/runtime/Makefile
+21-14 b/Diff for: ‎soc/runtime/Makefile
+21-14
diff --git a/Diff for: ‎soc/runtime/artiq_personality.c
+3-1 b/Diff for: ‎soc/runtime/artiq_personality.c
+3-1
diff --git a/Diff for: ‎soc/runtime/bridge.c
+1-1 b/Diff for: ‎soc/runtime/bridge.c
+1-1
diff --git a/Diff for: ‎soc/runtime/dds.c
+4-4 b/Diff for: ‎soc/runtime/dds.c
+4-4
diff --git a/Diff for: ‎soc/runtime/elf_loader.c
-240 b/Diff for: ‎soc/runtime/elf_loader.c
-240
@@ -16,7 +16,7 @@ class _H2DMsgType(Enum):
     IDENT_REQUEST = 2
     SWITCH_CLOCK = 3
 
-    LOAD_OBJECT = 4
+    LOAD_LIBRARY = 4
     RUN_KERNEL = 5
 
     RPC_REPLY = 6
@@ -124,7 +124,7 @@ def switch_clock(self, external):
             raise IOError("Incorrect reply from device: {}".format(ty))
 
     def load(self, kcode):
-        self._write_header(len(kcode) + 9, _H2DMsgType.LOAD_OBJECT)
+        self._write_header(len(kcode) + 9, _H2DMsgType.LOAD_LIBRARY)
         self.write(kcode)
         _, ty = self._read_header()
         if ty != _D2HMsgType.LOAD_COMPLETED:
 
@@ -1,9 +1,15 @@
 include $(MSCDIR)/software/common.mak
 
-OBJECTS := isr.o flash_storage.o clock.o rtiocrg.o elf_loader.o services.o session.o log.o test_mode.o kloader.o bridge_ctl.o mailbox.o ksupport_data.o net_server.o moninj.o main.o
-OBJECTS_KSUPPORT := ksupport.o exception_jmp.o exceptions.o mailbox.o bridge.o rtio.o ttl.o dds.o
+OBJECTS := isr.o clock.o rtiocrg.o flash_storage.o mailbox.o \
+	session.o log.o moninj.o net_server.o bridge_ctl.o \
+	ksupport_data.o kloader.o test_mode.o main.o
+OBJECTS_KSUPPORT := ksupport.o artiq_personality.o mailbox.o \
+	bridge.o rtio.o ttl.o dds.o
 
-CFLAGS += -Ilwip/src/include -Iliblwip
+CFLAGS += -I$(MSCDIR)/software/include/dyld \
+	-I$(MSCDIR)/software/unwinder/include \
+	-I$(MSCDIR)/software/libunwind \
+	-Ilwip/src/include -Iliblwip
 
 all: runtime.bin runtime.fbi
 
@@ -19,7 +25,7 @@ all: runtime.bin runtime.fbi
 
 runtime.elf: $(OBJECTS) libs
 	$(LD) $(LDFLAGS) \
-		-T linker.ld \
+		-T runtime.ld \
 		-N -o $@ \
 		$(MSCDIR)/software/libbase/crt0-$(CPU).o \
 		$(OBJECTS) \
@@ -29,24 +35,23 @@ runtime.elf: $(OBJECTS) libs
 		-lbase -lcompiler-rt -llwip
 	@chmod -x $@
 
-ksupport.elf: $(OBJECTS_KSUPPORT)
+ksupport.elf: $(OBJECTS_KSUPPORT) libs
 	$(LD) $(LDFLAGS) \
+		--eh-frame-hdr \
 		-T ksupport.ld \
 		-N -o $@ \
 		$(MSCDIR)/software/libbase/crt0-$(CPU).o \
-		$^ \
+		$(OBJECTS_KSUPPORT) \
+		-L$(MSCDIR)/software/libbase \
 		-L$(MSCDIR)/software/libcompiler-rt \
-		-lcompiler-rt
+		-L$(MSCDIR)/software/libunwind \
+		-L$(MSCDIR)/software/libdyld \
+		-lbase -lcompiler-rt -lunwind -ldyld
 	@chmod -x $@
 
-ksupport_data.o: ksupport.bin
+ksupport_data.o: ksupport.elf
 	$(LD) -r -b binary -o $@ $<
 
-service_table.h: ksupport.elf gen_service_table.py
-	@echo " GEN     " $@ && ./gen_service_table.py ksupport.elf > $@
-
-services.c: service_table.h
-
 main.o: main.c
 	$(compile-dep)
 
@@ -58,13 +63,15 @@ main.o: main.c
 
 libs:
 	$(MAKE) -C $(MSCDIR)/software/libcompiler-rt
+	$(MAKE) -C $(MSCDIR)/software/libunwind
 	$(MAKE) -C $(MSCDIR)/software/libbase
+	$(MAKE) -C $(MSCDIR)/software/libdyld
 	$(MAKE) -C liblwip
 
 clean:
 	$(MAKE) -C liblwip clean
 	$(RM) $(OBJECTS) $(OBJECTS:.o=.d) $(OBJECTS_KSUPPORT) $(OBJECTS_KSUPPORT:.o=.d)
 	$(RM) runtime.elf runtime.bin runtime.fbi .*~ *~
-	$(RM) service_table.h ksupport.elf ksupport.bin
+	$(RM) ksupport.elf ksupport.bin
 
 .PHONY: all main.o clean libs load
@@ -246,7 +246,9 @@ struct artiq_raised_exception {
 static struct artiq_raised_exception inflight;
 
 void __artiq_raise(struct artiq_exception *artiq_exn) {
-  EH_LOG("===> raise (name=%s)", artiq_exn->name);
+  EH_LOG("===> raise (name=%s, msg=%s, params=[%lld,%lld,%lld])",
+         artiq_exn->name, artiq_exn->message,
+         artiq_exn->param[0], artiq_exn->param[1], artiq_exn->param[2]);
 
   memmove(&inflight.artiq, artiq_exn, sizeof(struct artiq_exception));
   inflight.unwind.exception_class = ARTIQ_EXCEPTION_CLASS;
 
@@ -32,7 +32,7 @@ static void send_ready(void)
     struct msg_base msg;
 
     msg.type = MESSAGE_TYPE_BRG_READY;
-    mailbox_send_and_wait(&msg);    
+    mailbox_send_and_wait(&msg);
 }
 
 void bridge_main(void)
 
@@ -1,7 +1,7 @@
 #include <generated/csr.h>
 #include <stdio.h>
 
-#include "exceptions.h"
+#include "artiq_personality.h"
 #include "rtio.h"
 #include "log.h"
 #include "dds.h"
@@ -179,7 +179,7 @@ static struct dds_set_params batch[DDS_MAX_BATCH];
 void dds_batch_enter(long long int timestamp)
 {
     if(batch_mode)
-        exception_raise(EID_DDS_BATCH_ERROR);
+        artiq_raise_from_c("DDSBatchError", "DDS batch error", 0, 0, 0);
     batch_mode = 1;
     batch_count = 0;
     batch_ref_time = timestamp;
@@ -191,7 +191,7 @@ void dds_batch_exit(void)
     int i;
 
     if(!batch_mode)
-        exception_raise(EID_DDS_BATCH_ERROR);
+        artiq_raise_from_c("DDSBatchError", "DDS batch error", 0, 0, 0);
     rtio_chan_sel_write(RTIO_DDS_CHANNEL);
     /* + FUD time */
     now = batch_ref_time - batch_count*(DURATION_PROGRAM + DURATION_WRITE);
@@ -208,7 +208,7 @@ void dds_set(long long int timestamp, int channel,
 {
     if(batch_mode) {
         if(batch_count >= DDS_MAX_BATCH)
-            exception_raise(EID_DDS_BATCH_ERROR);
+            artiq_raise_from_c("DDSBatchError", "DDS batch error", 0, 0, 0);
         /* timestamp parameter ignored (determined by batch) */
         batch[batch_count].channel = channel;
         batch[batch_count].ftw = ftw;
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ static void send_ready(void)`
`32`	`32`	`struct msg_base msg;`
`33`	`33`
`34`	`34`	`msg.type = MESSAGE_TYPE_BRG_READY;`
`35`		`- mailbox_send_and_wait(&msg);`
	`35`	`+ mailbox_send_and_wait(&msg);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`void bridge_main(void)`