Merge pull request #237 from corwinkuiper/split-asm

Split asm

agb/build.rs

@@ -1,35 +1,67 @@
+use std::path;
+
 fn main() {
-    println!("cargo:rerun-if-changed=crt0.s");
+    let asm = &["crt0.s", "interrupt_handler.s", "src/sound/mixer/mixer.s"];
+
+    println!("cargo:rerun-if-changed=gba.ld");
     println!("cargo:rerun-if-changed=gba_mb.ld");
-    println!("cargo:rerun-if-changed=src/sound/mixer/mixer.s");
     println!("cargo:rerun-if-changed=src/asm_include.s");
-    println!("cargo:rerun-if-changed=interrupt_handler.s");
     println!("cargo:rerun-if-changed=gfx/test_logo.png");
 
-    let out_file_name = "crt0.o";
+    println!("cargo:rerun-if-changed=build.rs");
+
     let out_dir = std::env::var("OUT_DIR").expect("OUT_DIR environment variable must be specified");
-    let out_file_path = format!("{}/{}", out_dir, &out_file_name);
+    let mut o_files = vec![];
 
-    let out = std::process::Command::new("arm-none-eabi-as")
+    for &a in asm.iter() {
-        .arg("-mthumb-interwork")
+        println!("cargo:rerun-if-changed={}", a);
-        .arg("-mcpu=arm7tdmi")
+        let filename = path::Path::new(a);
-        .arg("-g")
+        let filename = filename.with_extension("o");
-        .args(&["-o", out_file_path.as_str()])
+        let filename = filename
-        .arg("crt0.s")
+            .file_name()
-        .output()
+            .expect("should have filename")
-        .expect("failed to compile crt0.s");
+            .to_str()
+            .expect("Please make it valid utf-8");
 
-    assert!(
+        let out_file_path = format!("{}/{}", out_dir, filename);
-        out.status.success(),
-        "{}",
-        String::from_utf8_lossy(&out.stderr)
-    );
 
-    for warning_line in String::from_utf8_lossy(&out.stderr).split('\n') {
+        let out = std::process::Command::new("arm-none-eabi-as")
-        if !warning_line.is_empty() {
+            .arg("-mthumb-interwork")
-            println!("cargo:warning={}", warning_line);
+            .arg("-mcpu=arm7tdmi")
+            .arg("-g")
+            .args(&["-o", out_file_path.as_str()])
+            .arg(a)
+            .output()
+            .unwrap_or_else(|_| panic!("failed to compile {}", a));
+
+        assert!(
+            out.status.success(),
+            "{}",
+            String::from_utf8_lossy(&out.stderr)
+        );
+
+        for warning_line in String::from_utf8_lossy(&out.stderr).split('\n') {
+            if !warning_line.is_empty() {
+                println!("cargo:warning={}", warning_line);
+            }
         }
+
+        o_files.push(out_file_path);
     }
 
-    println!("cargo:rustc-link-search={}", out_dir);
+    let archive = format!("{out_dir}/agb.a");
+    let ar_out = std::process::Command::new("arm-none-eabi-ar")
+        .arg("-crs")
+        .arg(&archive)
+        .args(&o_files)
+        .output()
+        .expect("Failed to create static library");
+
+    assert!(
+        ar_out.status.success(),
+        "{}",
+        String::from_utf8_lossy(&ar_out.stderr)
+    );
+
+    println!("cargo:rustc-link-search={out_dir}");
 }

agb/crt0.s

@@ -1,7 +1,8 @@
-.include "src/asm_include.s"
 
     .arm
     .global __start
+    .section .crt0
+    .align
 __start:
     b .Initialise
 
@@ -73,6 +74,3 @@ b .Initialise_mb
 1:
     b 1b
 .pool
-
-.include "interrupt_handler.s"
-.include "src/sound/mixer/mixer.s"

agb/gba.ld

@@ -12,15 +12,15 @@ MEMORY {
 
 __text_start = ORIGIN(rom);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > rom
 
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
     } > rom

agb/gba_mb.ld

@@ -11,18 +11,17 @@ MEMORY {
 
 __text_start = ORIGIN(ewram);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > ewram
-
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
-    } > ewram
+    } > rom
     __text_end = .;
 
     .rodata : {

agb/src/asm_include.s

@@ -1,5 +1,5 @@
 .macro agb_arm_func functionName:req
-.section .iwram, "ax", %progbits @ "ax" = allocatable and executable, %progbits = contains data
+.section .iwram
 .arm
 .align 2
 .global \functionName

agb/src/sound/mixer/mixer.s

@@ -1,3 +1,5 @@
+.include "src/asm_include.s"
+
 .section .iwram
     .global agb_rs__buffer_size
     .balign 4

book/games/pong/gba.ld

@@ -12,15 +12,15 @@ MEMORY {
 
 __text_start = ORIGIN(rom);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > rom
 
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
     } > rom

book/games/pong/gba_mb.ld

@@ -11,18 +11,17 @@ MEMORY {
 
 __text_start = ORIGIN(ewram);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > ewram
-
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
-    } > ewram
+    } > rom
     __text_end = .;
 
     .rodata : {

examples/the-hat-chooses-the-wizard/gba.ld

@@ -12,15 +12,15 @@ MEMORY {
 
 __text_start = ORIGIN(rom);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > rom
 
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
     } > rom

examples/the-purple-night/gba.ld

@@ -12,15 +12,15 @@ MEMORY {
 
 __text_start = ORIGIN(rom);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > rom
 
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
     } > rom

examples/the-purple-night/gba_mb.ld

@@ -11,18 +11,17 @@ MEMORY {
 
 __text_start = ORIGIN(ewram);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > ewram
-
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
-    } > ewram
+    } > rom
     __text_end = .;
 
     .rodata : {

template/gba.ld

@@ -12,15 +12,15 @@ MEMORY {
 
 __text_start = ORIGIN(rom);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > rom
 
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
     } > rom

template/gba_mb.ld

@@ -11,18 +11,17 @@ MEMORY {
 
 __text_start = ORIGIN(ewram);
 
+INPUT (agb.a)
+
 SECTIONS {
     . = __text_start;
 
-    .crt0 : {
-		KEEP (crt0.o(.text));
-		. = ALIGN(4);
-    } > ewram
-
     .text : {
+        KEEP(*(.crt0));
+        *(.crt0 .crt0*);
         *(.text .text*);
         . = ALIGN(4);
-    } > ewram
+    } > rom
     __text_end = .;
 
     .rodata : {