From 889f85f1dd430785d66c1eebb458b2ab4ea93ca8 Mon Sep 17 00:00:00 2001 From: Will Glynn Date: Tue, 22 Feb 2022 18:36:18 -0600 Subject: [PATCH] Use Word --- src/display.rs | 99 ++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 56 deletions(-) diff --git a/src/display.rs b/src/display.rs index 0fedf81..bfa27b4 100644 --- a/src/display.rs +++ b/src/display.rs @@ -1,5 +1,6 @@ use crate::memory::{PeekPoke, PeekPokeExt}; use crate::Word; +use std::convert::TryFrom; #[derive(Copy, Clone, Debug, Eq, PartialEq)] struct DisplayRegisters { @@ -54,12 +55,7 @@ fn init_display_registers(machine: &mut P, start: Word) { } fn init_font(machine: &mut P) { - let bytes = include_bytes!("font.rom"); - let font_addr = DisplayRegisters::default().font; - - for (offset, byte) in bytes.into_iter().enumerate() { - machine.poke(Word::from(font_addr + offset as u32), *byte) - } + machine.poke_slice(DisplayRegisters::default().font, include_bytes!("font.rom")); } pub fn draw(machine: &P, frame: &mut [u8]) { @@ -86,26 +82,26 @@ pub fn reset(machine: &mut P) { fn init_palette(machine: &mut P) { let palette_addr = read_display_registers(machine, Word::from(16)).palette; - let default_palette = [ - 0x00, 0x05, 0x65, 0x11, 0xa8, 0x49, 0xeb, 0xff, 0xe1, 0xf4, 0xfc, 0x1c, 0x37, 0x8e, 0xee, - 0xfa, - ]; - for (i, b) in default_palette.into_iter().enumerate() { - machine.poke(Word::from(palette_addr + i as u32), b); - } + machine.poke_slice( + palette_addr, + &[ + 0x00, 0x05, 0x65, 0x11, 0xa8, 0x49, 0xeb, 0xff, 0xe1, 0xf4, 0xfc, 0x1c, 0x37, 0x8e, + 0xee, 0xfa, + ], + ); } -fn to_byte_address((x, y): (u32, u32), reg: DisplayRegisters) -> Word { - let row_start = (Word::from(y) + reg.row_offset % reg.height) * reg.width + reg.screen; - ((Word::from(x) + reg.col_offset) % reg.width) + row_start +fn to_byte_address((x, y): (Word, Word), reg: DisplayRegisters) -> Word { + let row_start = (y + reg.row_offset % reg.height) * reg.width + reg.screen; + ((x + reg.col_offset) % reg.width) + row_start } fn draw_direct_high_gfx(machine: &P, reg: DisplayRegisters, frame: &mut [u8]) { for (i, pixel) in frame.chunks_exact_mut(4).enumerate() { let (display_row, display_col) = (i / 640, i % 640); - let (vulcan_row, vulcan_col) = ((display_row >> 2) as u32, (display_col >> 2) as u32); + let (vulcan_row, vulcan_col) = (Word::from(display_row >> 2), Word::from(display_col >> 2)); - let vb = machine.peek(Word::from(to_byte_address((vulcan_col, vulcan_row), reg))); + let vb = machine.peek(to_byte_address((vulcan_col, vulcan_row), reg)); paint_pixel(<&mut [u8; 4]>::try_from(pixel).unwrap(), vb) } } @@ -113,12 +109,11 @@ fn draw_direct_high_gfx(machine: &P, reg: DisplayRegisters, frame: fn draw_paletted_high_gfx(machine: &P, reg: DisplayRegisters, frame: &mut [u8]) { for (i, pixel) in frame.chunks_exact_mut(4).enumerate() { let (display_row, display_col) = (i / 640, i % 640); - let (vulcan_row, vulcan_col) = ((display_row >> 2) as u32, (display_col >> 2) as u32); + let (vulcan_row, vulcan_col) = (Word::from(display_row >> 2), Word::from(display_col >> 2)); let addr = to_byte_address((vulcan_col, vulcan_row), reg); - let color_idx = machine.peek(Word::from(addr)); - let color = machine.peek(Word::from(reg.palette + color_idx as u32)); - let (red, green, blue) = (color >> 5, (color >> 2) & 7, (color & 3) << 1); + let color_idx = machine.peek(addr); + let color = machine.peek(reg.palette + color_idx); paint_pixel(<&mut [u8; 4]>::try_from(pixel).unwrap(), color) } @@ -127,21 +122,19 @@ fn draw_paletted_high_gfx(machine: &P, reg: DisplayRegisters, frame fn draw_paletted_high_text(machine: &P, reg: DisplayRegisters, frame: &mut [u8]) { for (i, pixel) in frame.chunks_exact_mut(4).enumerate() { let (display_row, display_col) = (i / 640, i % 640); - let (vulcan_row, vulcan_col) = ((display_row >> 3) as u32, (display_col >> 3) as u32); + let (vulcan_row, vulcan_col) = (Word::from(display_row >> 2), Word::from(display_col >> 2)); let addr = to_byte_address((vulcan_col, vulcan_row), reg); - let char_idx = machine.peek(Word::from(addr)); + let char_idx = machine.peek(addr) as u32; let (char_row, char_col) = (display_row % 8, display_col % 8); - let char_byte = machine.peek(Word::from( - reg.font + ((char_idx as u32) << 3) + char_row as u32, - )); + let char_byte = machine.peek(reg.font + (char_idx << 3) + char_row); let color_addr = addr + (reg.width * reg.height); - let color_byte = machine.peek(Word::from(color_addr)); + let color_byte = machine.peek(color_addr); let (fg_color_idx, bg_color_idx) = (color_byte & 0xf, color_byte >> 4); - let fg_color = machine.peek(Word::from(reg.palette + fg_color_idx as u32)); - let bg_color = machine.peek(Word::from(reg.palette + bg_color_idx as u32)); + let fg_color = machine.peek(reg.palette + fg_color_idx); + let bg_color = machine.peek(reg.palette + bg_color_idx); draw_text_pixel( <&mut [u8; 4]>::try_from(pixel).unwrap(), @@ -164,17 +157,15 @@ fn draw_text_pixel(pixel: &mut [u8; 4], char_col: u8, char_byte: u8, fg_color: u fn draw_direct_high_text(machine: &P, reg: DisplayRegisters, frame: &mut [u8]) { for (i, pixel) in frame.chunks_exact_mut(4).enumerate() { let (display_row, display_col) = (i / 640, i % 640); - let (vulcan_row, vulcan_col) = ((display_row >> 3) as u32, (display_col >> 3) as u32); + let (vulcan_row, vulcan_col) = (Word::from(display_row >> 2), Word::from(display_col >> 2)); let addr = to_byte_address((vulcan_col, vulcan_row), reg); - let char_idx = machine.peek(Word::from(addr)); + let char_idx = machine.peek(addr) as u32; let (char_row, char_col) = (display_row % 8, display_col % 8); - let char_byte = machine.peek(Word::from( - reg.font + ((char_idx as u32) << 3) + char_row as u32, - )); + let char_byte = machine.peek(reg.font + (char_idx << 3) + char_row); let color_addr = addr + (reg.width * reg.height); - let color = machine.peek(Word::from(color_addr)); + let color = machine.peek(color_addr); draw_text_pixel( <&mut [u8; 4]>::try_from(pixel).unwrap(), @@ -189,17 +180,15 @@ fn draw_direct_high_text(machine: &P, reg: DisplayRegisters, frame: fn draw_direct_low_text(machine: &P, reg: DisplayRegisters, frame: &mut [u8]) { for (i, pixel) in frame.chunks_exact_mut(4).enumerate() { let (display_row, display_col) = (i / 640, i % 640); - let (vulcan_row, vulcan_col) = ((display_row >> 4) as u32, (display_col >> 4) as u32); + let (vulcan_row, vulcan_col) = (Word::from(display_row >> 2), Word::from(display_col >> 2)); let addr = to_byte_address((vulcan_col, vulcan_row), reg); - let char_idx = machine.peek(Word::from(addr)); + let char_idx = machine.peek(addr) as u32; let (char_row, char_col) = ((display_row / 2) % 8, (display_col / 2) % 8); - let char_byte = machine.peek(Word::from( - reg.font + ((char_idx as u32) << 3) + char_row as u32, - )); + let char_byte = machine.peek(reg.font + (char_idx << 3) + char_row); let color_addr = addr + (reg.width * reg.height); - let color = machine.peek(Word::from(color_addr)); + let color = machine.peek(color_addr); draw_text_pixel( <&mut [u8; 4]>::try_from(pixel).unwrap(), @@ -214,21 +203,19 @@ fn draw_direct_low_text(machine: &P, reg: DisplayRegisters, frame: fn draw_paletted_low_text(machine: &P, reg: DisplayRegisters, frame: &mut [u8]) { for (i, pixel) in frame.chunks_exact_mut(4).enumerate() { let (display_row, display_col) = (i / 640, i % 640); - let (vulcan_row, vulcan_col) = ((display_row >> 4) as u32, (display_col >> 4) as u32); + let (vulcan_row, vulcan_col) = (Word::from(display_row >> 2), Word::from(display_col >> 2)); let addr = to_byte_address((vulcan_col, vulcan_row), reg); - let char_idx = machine.peek(Word::from(addr)); + let char_idx = machine.peek(addr) as u32; let (char_row, char_col) = ((display_row >> 1) % 8, (display_col >> 1) % 8); - let char_byte = machine.peek(Word::from( - reg.font + ((char_idx as u32) << 3) + char_row as u32, - )); + let char_byte = machine.peek(reg.font + (char_idx << 3) + char_row); let color_addr = addr + (reg.width * reg.height); let color_byte = machine.peek(Word::from(color_addr)); let (fg_color_idx, bg_color_idx) = (color_byte & 0xf, color_byte >> 4); - let fg_color = machine.peek(Word::from(reg.palette + fg_color_idx as u32)); - let bg_color = machine.peek(Word::from(reg.palette + bg_color_idx as u32)); + let fg_color = machine.peek(reg.palette + fg_color_idx); + let bg_color = machine.peek(reg.palette + bg_color_idx); draw_text_pixel( <&mut [u8; 4]>::try_from(pixel).unwrap(), @@ -250,11 +237,11 @@ fn draw_direct_low_gfx(machine: &P, reg: DisplayRegisters, frame: & && display_col < (320 + 64 * 3) { let (vulcan_row, vulcan_col) = ( - ((display_row - (240 - 64 * 3)) / 3) as u32, - ((display_col - (320 - 64 * 3)) / 3) as u32, + Word::from((display_row - (240 - 64 * 3)) / 3), + Word::from((display_col - (320 - 64 * 3)) / 3), ); - let vb = machine.peek(Word::from(to_byte_address((vulcan_col, vulcan_row), reg))); + let vb = machine.peek(to_byte_address((vulcan_col, vulcan_row), reg)); paint_pixel(<&mut [u8; 4]>::try_from(pixel).unwrap(), vb) } else { paint_pixel(<&mut [u8; 4]>::try_from(pixel).unwrap(), 0) @@ -272,13 +259,13 @@ fn draw_paletted_low_gfx(machine: &P, reg: DisplayRegisters, frame: && display_col < (320 + 64 * 3) { let (vulcan_row, vulcan_col) = ( - ((display_row - (240 - 64 * 3)) / 3) as u32, - ((display_col - (320 - 64 * 3)) / 3) as u32, + Word::from((display_row - (240 - 64 * 3)) / 3), + Word::from((display_col - (320 - 64 * 3)) / 3), ); let color_idx = - machine.peek(Word::from(to_byte_address((vulcan_col, vulcan_row), reg))); - let vb = machine.peek(Word::from(reg.palette + color_idx as u32)); + machine.peek(to_byte_address((vulcan_col, vulcan_row), reg)); + let vb = machine.peek(reg.palette + color_idx); paint_pixel(<&mut [u8; 4]>::try_from(pixel).unwrap(), vb); } else { paint_pixel(<&mut [u8; 4]>::try_from(pixel).unwrap(), 0);