Add ISR stuff to new build system

.gitignore

@@ -4,3 +4,6 @@
 Cargo.lock
 target
 .cargo
+*.o
+*.bin
+*.lst

Cargo.toml

@@ -7,13 +7,6 @@ authors = ["Zinc Developers <[email protected]>"]
 name = "zinc"
 crate-type = ["lib"]
 
-[features]
-mcu_lpc17xx = []
-mcu_stm32f4 = []
-mcu_stm32l1 = []
-mcu_k20 = []
-mcu_tiva_c = []
-
 [dependencies.ioreg]
 path = "./ioreg"
 

Makefile

@@ -1,29 +1,40 @@
 TARGET=thumbv7m-none-eabi
+STRIP=arm-none-eabi-strip
 OBJCOPY=arm-none-eabi-objcopy
 OBJDUMP=arm-none-eabi-objdump
 
 PLATFORM_DIR=src/hal/$(PLATFORM)
 LINK_SCRIPT=$(PLATFORM_DIR)/layout.ld
 
-LDFLAGS=-mthumb -mcpu=cortex-m3 -T$(LINK_SCRIPT) -lm -lgcc -v
+OUT_DIR=target/$(TARGET)/release
+EXAMPLE_FILE=$(OUT_DIR)/examples/$(EXAMPLE_NAME)
 
-EXAMPLE_FILE=target/$(TARGET)/release/examples/$(EXAMPLE_NAME)
+ISR_SRC=src/hal/isr.rs
+ISR_CRATE=$(shell rustc --print crate-name $(ISR_SRC))
+ISR_FILE=$(ISR_CRATE).o
+
+LDFLAGS=-mthumb -mcpu=cortex-m3 -T$(LINK_SCRIPT) -lm -lgcc $(ISR_FILE)
 
 .PHONY: build clean listing
 build: $(EXAMPLE_NAME).bin
 
 clean:
 	-rm *.bin
 	-rm *.lst
+	-rm $(ISR_FILE)
 	cargo clean
 
 listing: $(EXAMPLE_NAME).lst
 
-$(EXAMPLE_FILE):
+$(EXAMPLE_FILE): $(ISR_FILE)
 	cargo rustc --example $(EXAMPLE_NAME) --release --target=$(TARGET) --verbose -- -C link-args="$(LDFLAGS)"
 
 $(EXAMPLE_NAME).bin: $(EXAMPLE_FILE)
 	$(OBJCOPY) -O binary $< $@
 
 $(EXAMPLE_NAME).lst: $(EXAMPLE_FILE)
 	$(OBJDUMP) -D $< > $@
+
+$(ISR_FILE): $(ISR_SRC)
+	rustc --target=$(TARGET) --emit=obj --cfg mcu_$(PLATFORM) -C opt-level=2 $<
+	$(STRIP) -N rust_begin_unwind -N rust_stack_exhausted -N rust_eh_personality $@

src/hal/cortex_m3/isr.rs

@@ -34,12 +34,9 @@ extern {
   fn isr_reserved_1();
 }
 
-// TODO(mcoffin) I removed "extern" here because it made no sense
-// and created assertion problems in rustc. It may have been necessary; i don't
-// really know what I'm doing with this.
 #[cfg(not(test))]
 #[no_mangle]
-pub unsafe fn isr_handler_wrapper() {
+pub unsafe extern fn isr_handler_wrapper() {
   asm!(".weak isr_nmi, isr_hardfault, isr_mmfault, isr_busfault
       .weak isr_usagefault, isr_svcall, isr_pendsv, isr_systick
       .weak isr_debugmon

src/hal/isr.rs

@@ -16,16 +16,24 @@
 //! This file is not part of zinc crate, it is linked separately, alongside the
 //! ISRs for the platform.
 
+#![feature(core, asm, lang_items, no_std)]
+#![crate_name = "isr"]
+#![crate_type = "staticlib"]
+#![no_std]
+
 #![allow(missing_docs)]
 
-//#[path="cortex_m3/isr.rs"] pub mod isr_cortex_m3;
-/*
-#[cfg(feature = "mcu_lpc17xx")]
+extern crate core;
+
+#[path="cortex_m3/isr.rs"] pub mod isr_cortex_m3;
+
+#[cfg(mcu_lpc17xx)]
 #[path="lpc17xx/isr.rs"] pub mod isr_lpc17xx;
 
-#[cfg(feature = "mcu_k20")]
+#[cfg(mcu_k20)]
 #[path="k20/isr.rs"] pub mod isr_k20;
 
-#[cfg(feature = "mcu_tiva_c")]
+#[cfg(mcu_tiva_c)]
 #[path="tiva_c/isr.rs"] pub mod isr_tiva_c;
-*/
+
+#[path="../util/lang_items.rs"] mod lang_items;

src/hal/mod.rs

@@ -38,5 +38,3 @@ pub mod spi;
 pub mod stack;
 pub mod timer;
 pub mod uart;
-
-pub mod isr;