From 7e4a2f2e2053ef0e5811050168564f8e5ef8a16d Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Wed, 12 Jul 2023 12:10:05 +0100 Subject: [PATCH] Create skeleton projects --- agb-tracker/.cargo/config.toml | 14 ++++ agb-tracker/Cargo.toml | 11 +++ agb-tracker/gba.ld | 115 ++++++++++++++++++++++++++++++++ agb-tracker/rust-toolchain.toml | 3 + agb-tracker/src/lib.rs | 20 ++++++ agb-xm/Cargo.toml | 13 ++++ agb-xm/src/lib.rs | 14 ++++ 7 files changed, 190 insertions(+) create mode 100644 agb-tracker/.cargo/config.toml create mode 100644 agb-tracker/Cargo.toml create mode 100644 agb-tracker/gba.ld create mode 100644 agb-tracker/rust-toolchain.toml create mode 100644 agb-tracker/src/lib.rs create mode 100644 agb-xm/Cargo.toml create mode 100644 agb-xm/src/lib.rs diff --git a/agb-tracker/.cargo/config.toml b/agb-tracker/.cargo/config.toml new file mode 100644 index 00000000..62ebedb7 --- /dev/null +++ b/agb-tracker/.cargo/config.toml @@ -0,0 +1,14 @@ +[unstable] +build-std = ["core", "alloc"] +build-std-features = ["compiler-builtins-mem"] + +[build] +target = "thumbv4t-none-eabi" + +[target.thumbv4t-none-eabi] +rustflags = ["-Clink-arg=-Tgba.ld", "-Ctarget-cpu=arm7tdmi"] +runner = "mgba-test-runner" + +[target.armv4t-none-eabi] +rustflags = ["-Clink-arg=-Tgba.ld", "-Ctarget-cpu=arm7tdmi"] +runner = "mgba-test-runner" diff --git a/agb-tracker/Cargo.toml b/agb-tracker/Cargo.toml new file mode 100644 index 00000000..e81ec1bd --- /dev/null +++ b/agb-tracker/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "agb_tracker" +version = "0.15.0" +edition = "2021" +license = "MPL-2.0" +description = "Library for playing tracker music. Designed for use with the agb library for the Game Boy Advance." +repository = "https://github.com/agbrs/agb" + +[dependencies] +agb_xm = { version = "0.15.0", path = "../agb-xm" } +agb = { version = "0.15.0", path = "../agb" } \ No newline at end of file diff --git a/agb-tracker/gba.ld b/agb-tracker/gba.ld new file mode 100644 index 00000000..525260d9 --- /dev/null +++ b/agb-tracker/gba.ld @@ -0,0 +1,115 @@ +OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") +OUTPUT_ARCH(arm) + +ENTRY(__start) +EXTERN(__RUST_INTERRUPT_HANDLER) + +EXTERN(__agbabi_memset) +EXTERN(__agbabi_memcpy) + +MEMORY { + ewram (w!x) : ORIGIN = 0x02000000, LENGTH = 256K + iwram (w!x) : ORIGIN = 0x03000000, LENGTH = 32K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 32M +} + +__text_start = ORIGIN(rom); + +SECTIONS { + . = __text_start; + + + .text : { + KEEP(*(.crt0)); + *(.crt0 .crt0*); + *(.text .text*); + . = ALIGN(4); + } > rom + __text_end = .; + + .rodata : { + *(.rodata .rodata.*); + . = ALIGN(4); + } > rom + + __iwram_rom_start = .; + .iwram : { + __iwram_data_start = ABSOLUTE(.); + + *(.iwram .iwram.*); + . = ALIGN(4); + + *(.text_iwram .text_iwram.*); + . = ALIGN(4); + + __iwram_data_end = ABSOLUTE(.); + } > iwram AT>rom + + . = __iwram_rom_start + (__iwram_data_end - __iwram_data_start); + + __ewram_rom_start = .; + .ewram : { + __ewram_data_start = ABSOLUTE(.); + + *(.ewram .ewram.*); + . = ALIGN(4); + + *(.data .data.*); + . = ALIGN(4); + + __ewram_data_end = ABSOLUTE(.); + } > ewram AT>rom + + .bss : { + *(.bss .bss.*); + . = ALIGN(4); + __iwram_end = ABSOLUTE(.); + } > iwram + + __iwram_rom_length_bytes = __iwram_data_end - __iwram_data_start; + __iwram_rom_length_halfwords = (__iwram_rom_length_bytes + 1) / 2; + + __ewram_rom_length_bytes = __ewram_data_end - __ewram_data_start; + __ewram_rom_length_halfwords = (__ewram_rom_length_bytes + 1) / 2; + + .shstrtab : { + *(.shstrtab) + } + + /* debugging sections */ + /* Stabs */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + + .debug_ranges 0 : { *(.debug_ranges) } + + /* discard anything not already mentioned */ + /DISCARD/ : { *(*) } +} \ No newline at end of file diff --git a/agb-tracker/rust-toolchain.toml b/agb-tracker/rust-toolchain.toml new file mode 100644 index 00000000..6e1f5327 --- /dev/null +++ b/agb-tracker/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "nightly" +components = ["rust-src", "clippy", "rustfmt"] diff --git a/agb-tracker/src/lib.rs b/agb-tracker/src/lib.rs new file mode 100644 index 00000000..e9471c40 --- /dev/null +++ b/agb-tracker/src/lib.rs @@ -0,0 +1,20 @@ +#![no_std] +#![no_main] +// This is required to allow writing tests +#![cfg_attr(test, feature(custom_test_frameworks))] +#![cfg_attr(test, reexport_test_harness_main = "test_main")] +#![cfg_attr(test, test_runner(agb::test_runner::test_runner))] + +#[cfg(test)] +mod tests { + #[test_case] + fn it_works(_gba: &mut agb::Gba) { + assert_eq!(1, 1); + } +} + +#[cfg(test)] +#[agb::entry] +fn main(gba: agb::Gba) -> ! { + loop {} +} diff --git a/agb-xm/Cargo.toml b/agb-xm/Cargo.toml new file mode 100644 index 00000000..cddb48f5 --- /dev/null +++ b/agb-xm/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "agb_xm" +version = "0.15.0" +authors = ["Gwilym Kuiper "] +edition = "2021" +license = "MPL-2.0" +description = "Library for converting XM tracker files for use with agb-tracker on the Game Boy Advance" +repository = "https://github.com/agbrs/agb" + +[lib] +proc-macro = true + +[dependencies] diff --git a/agb-xm/src/lib.rs b/agb-xm/src/lib.rs new file mode 100644 index 00000000..2ecdc793 --- /dev/null +++ b/agb-xm/src/lib.rs @@ -0,0 +1,14 @@ +fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +}