lwcpu/src/lib.rs

@@ -2,7 +2,7 @@
 
 use core::ptr::{read_volatile, write_volatile};
 
-const BASE_POINTER: u32 = 0x1000_0000;
+const BASE_POINTER: u32 = 0x2000_0000;
 
 const NUMBER_DISPLAY_OFFSET: u32 = 0x00;
 const RANDOM_NUMBER_OFFSET: u32 = 0x04;

test/Makefile

@@ -17,4 +17,4 @@ disassemble: extract
 
 clean:
 	cargo clean
-	rm /tmp/text.bin /tmp/rodata.bin
+	rm text.bin

test/build.rs

@@ -1,14 +0,0 @@
-// build.rs
-use std::env;
-use std::fs;
-use std::path::PathBuf;
-
-fn main() {
-    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-
-    // Put the linker script somewhere the linker can find it.
-    fs::write(out_dir.join("memory.x"), include_bytes!("memory.x")).unwrap();
-    println!("cargo:rustc-link-search={}", out_dir.display());
-    println!("cargo:rerun-if-changed=memory.x");
-    println!("cargo:rerun-if-changed=build.rs");
-}

test/memory.x

@@ -1,9 +1,9 @@
 MEMORY
 {
   INST  : ORIGIN = 0x00000000, LENGTH = 256K
-  IO    : ORIGIN = 0x10000000, LENGTH = 1K
-  CONST : ORIGIN = 0x20000000, LENGTH = 16K
-  RAM   : ORIGIN = 0x40000000, LENGTH = 16K
+  IO    : ORIGIN = 0x20000000, LENGTH = 1K
+  CONST : ORIGIN = 0x40000000, LENGTH = 16K
+  RAM   : ORIGIN = 0x80000000, LENGTH = 16K
 }
 
 REGION_ALIAS("REGION_TEXT", INST);

test/src/main.rs

@@ -1,9 +1,8 @@
 #![no_std]
 #![no_main]
 
-use core::fmt::Write;
-use core::panic::PanicInfo;
-use lwcpu::{NumberDisplay, TextDisplay};
+use core::{fmt::Write, panic::PanicInfo};
+use lwcpu::{NumberDisplay, Screen, TextDisplay};
 use riscv_rt::entry;
 
 #[panic_handler]
@@ -12,9 +11,15 @@ fn panic_handler(_info: &PanicInfo) -> ! {
     loop {}
 }
 
+const HELLO_WORLD: &str = " Hello world!";
+
 #[entry]
 fn main() -> ! {
     let mut text = TextDisplay{};
-    let _ = write!(text, "LMAO: {}", 47);
-    loop {}
+    for i in 0..31 {
+        Screen::set_line(i, 1 << i);
+    }
+    loop {
+        let _ = text.write_str(HELLO_WORLD);
+    }
 }