Merge pull request kotetuco#5 from kotetuco/feature/draw_string

文字列表示処理を実装。

Cargo.toml

@@ -17,7 +17,3 @@ lto = true
 panic = "abort"
 opt-level = 2
 lto = true
-
-[dependencies]
-rlibc = "1.0.0"
-compiler_builtins = { git = "https://github.com/rust-lang-nursery/compiler-builtins" }

Makefile

@@ -13,14 +13,20 @@ default:
 	mkdir -p $(BUILD_DIR)
 	make $(BUILD_DIR)/$(BUILD_NAME).mb
 
-$(BUILD_DIR)/$(BUILD_NAME).mb: $(BUILD_DIR)/$(BUILD_NAME).elf Makefile
-	$(TARGET_ARCH)-objcopy -O binary $(BUILD_DIR)/$(BUILD_NAME).elf $(BUILD_DIR)/$(BUILD_NAME).mb
+$(BUILD_DIR)/$(BUILD_NAME).mb: $(BUILD_DIR)/$(BUILD_NAME).elf
+	$(TARGET_ARCH)-objcopy -O binary $(BUILD_DIR)/$(BUILD_NAME).elf \
+	$(BUILD_DIR)/$(BUILD_NAME).mb
 
-$(BUILD_DIR)/$(BUILD_NAME).elf: $(BUILD_DIR)/crt.o rom.ld target/$(TARGET_ARCH_RUST)/$(BUILD_MODE)/librust_basemetal_gba.a
-	$(TARGET_ARCH)-ld --gc-sections -t -T rom.ld -o $(BUILD_DIR)/$(BUILD_NAME).elf $(BUILD_DIR)/crt.o --library-path=target/$(TARGET_ARCH_RUST)/$(BUILD_MODE) -lrust_basemetal_gba -Map $(BUILD_DIR)/$(BUILD_NAME).map
+$(BUILD_DIR)/$(BUILD_NAME).elf: $(BUILD_DIR)/crt.o rom.ld \
+target/$(TARGET_ARCH_RUST)/$(BUILD_MODE)/librust_basemetal_gba.a
+	$(TARGET_ARCH)-ld --gc-sections -t -T rom.ld -o $(BUILD_DIR)/$(BUILD_NAME).elf \
+	$(BUILD_DIR)/crt.o --library-path=target/$(TARGET_ARCH_RUST)/$(BUILD_MODE) \
+	-lrust_basemetal_gba -Map $(BUILD_DIR)/$(BUILD_NAME).map
 
-target/$(TARGET_ARCH_RUST)/$(BUILD_MODE)/librust_basemetal_gba.a: $(TARGET_ARCH_RUST).json Cargo.toml src/*.rs
-	RUST_TARGET_PATH=$(PWD) rustup run nightly `which xargo` build -v --target=$(TARGET_ARCH_RUST)
+target/$(TARGET_ARCH_RUST)/$(BUILD_MODE)/librust_basemetal_gba.a: \
+$(TARGET_ARCH_RUST).json Cargo.toml src/*.rs
+	RUST_TARGET_PATH=$(PWD) rustup run nightly `which xargo` build -v \
+	--target=$(TARGET_ARCH_RUST)
 
 $(BUILD_DIR)/crt.o: crt.S
 	$(TARGET_ARCH)-as crt.S -o $(BUILD_DIR)/crt.o

arm-none-eabi.json

@@ -9,7 +9,7 @@
   "relocation-model": "static",
   "archive-format": "gnu",
   "target-env": "gnu",
-  "no-compiler-rt": false,
+  "no-compiler-rt": true,
   "linker-is-gnu": true,
   "disable-redzone": true,
   "cpu": "arm7tdmi"

crt.S

@@ -1,31 +1,7 @@
 .text
 
-	.global _start
+  .global _start
 _start:
-	b entry			@ Branch to entry()
+  b entry  @ Branch to entry()
 loop:
-	b loop
-
-	@ multi-threading is also not supportd
-	.global __sync_val_compare_and_swap_1
-	.global __sync_val_compare_and_swap_2
-	.global __sync_val_compare_and_swap_4
-__sync_val_compare_and_swap_1:
-__sync_val_compare_and_swap_2:
-__sync_val_compare_and_swap_4:
-1:      b       1b
-
-	@ floating point operations are not supported
-	.global __aeabi_ul2f
-	.global __aeabi_ul2d
-	.global __aeabi_fmul
-	.global __aeabi_fdiv
-	.global __aeabi_dmul
-	.global __aeabi_ddiv
-__aeabi_ul2f:
-__aeabi_ul2d:
-__aeabi_fmul:
-__aeabi_fdiv:
-__aeabi_dmul:
-__aeabi_ddiv:
-1:      b       1b
+  b loop

src/font.rs

@@ -0,0 +1,32 @@
+//
+// kotetuco, 2017
+//
+
+use font_def::FONT_DATAS;
+
+pub struct Font {
+    size_width: u16,
+    size_height: u16,
+}
+
+impl Font {
+    pub fn new() -> Self {
+        Font {
+            size_width: 8,
+            size_height: 16,
+        }
+    }
+
+    pub fn get_character(&self, ch: char) -> [u8; 16] {
+        let index = ch as usize;
+        return FONT_DATAS[index];
+    }
+
+    pub fn font_width(&self) -> u16 {
+        return self.size_width;
+    }
+
+    pub fn font_height(&self) -> u16 {
+        return self.size_height;
+    }
+}