Almost working text buffer

Author: commonkestrel

examples/screen.asm

@@ -0,0 +1,12 @@
+@org 0x0000
+@define BUF_START 0xF800
+
+_start:
+    mv A, 0
+.loop:
+    lda [BUF_START]
+    add16 H, L, 0x00, A
+    st A
+    inc A
+    jnz A, [.loop]
+    halt

src/emulator.rs

@@ -628,8 +628,11 @@ impl State {
             )
         } else if cw.contains(ControlWord::LA) {
             match self.addr {
-                0x0000..=0xFFBF => self.mem[self.addr as usize],
-                0xFFC0..=0xFFFC => match self.peripherals.get(&((self.addr - 0xFFC0) as u8)) {
+                0x0000..=0xF7FF => self.mem[self.addr as usize],
+                0xF800..=0xFFCF => {
+                    self.text_buffer.get(self.addr - 0xF800)
+                }
+                0xFFD0..=0xFFFC => match self.peripherals.get(&((self.addr - 0xFFC0) as u8)) {
                     Some(periph) => unsafe {
                         if let Ok(stateful_read) =
                             periph.lib.library.get::<StatefulReadFn>(b"stateful_read")
@@ -670,10 +673,13 @@ impl State {
 
         if cw.contains(ControlWord::SA) {
             match self.addr {
-                0x0000..=0xFFBF => {
+                0x0000..=0xF7FF => {
                     self.mem[self.addr as usize] = bus;
                 }
-                0xFFC0..=0xFFFC => match self.peripherals.get(&((self.addr - 0xFFC0) as u8)) {
+                0xF800..=0xFFCF => {
+                    self.text_buffer.set(self.addr - 0xF800, bus);
+                }
+                0xFFD0..=0xFFFC => match self.peripherals.get(&((self.addr - 0xFFC0) as u8)) {
                     Some(periph) => unsafe {
                         if let Ok(stateful_write) =
                             periph.lib.library.get::<StatefulWriteFn>(b"stateful_write")

src/emulator/display.rs

@@ -25,12 +25,22 @@ impl TextBuffer {
 
         TextBuffer {data, handle}
     }
+
+    pub fn get(&self, addr: u16) -> u8 {
+        self.data[addr as usize]
+    }
+
+    pub fn set(&mut self, addr: u16, data: u8) {
+        self.data[addr as usize] = data;
+        println!("{}", self.data[addr as usize]);
+    }
 }
 
 async fn run_handle(buffer: BufferPtr) {
     let mut opts = WindowOptions::default();
     opts.scale = Scale::FitScreen;
-    opts.scale_mode = ScaleMode::Center;
+    opts.scale_mode = ScaleMode::AspectRatioStretch;
+    opts.resize = true;
 
     let mut window = minifb::Window::new("f8ful", WIDTH, HEIGHT, opts).expect("should be able to create window");
     let mut fb = [0x00000000; WIDTH*HEIGHT];
@@ -48,14 +58,16 @@ async fn run_handle(buffer: BufferPtr) {
                     (*buffer.0)[char_idx]
                 };
 
-                let font_addr = (character as usize) << 4 + font_y;
-                let lit = FONT[font_addr] & !(1 << font_x) > 0;
+                let font_addr = ((character as usize) << 4) + font_y;
+                let lit = FONT[font_addr] & (1 << (7 - font_x)) > 0;
+
 
                 // This part isn't part of the actual CPU,
                 // the real value will be transmitted via wire instead of stored.
                 fb[x + y*WIDTH] = if lit {0x00FFFFFF} else {0x00000000};
-                window.update_with_buffer(&fb, WIDTH, HEIGHT).expect("should be able to update window");
             }
         }
+
+        window.update_with_buffer(&fb, WIDTH, HEIGHT).expect("should be able to update window");
     }
 }