tmerritt/trevors_chip8_toy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prep for trait code

Browse Source
This commit is contained in:
Trevor Merritt 2024-12-04 10:41:08 -05:00
parent cddbe0c46e
commit 494a73eb89
10 changed files with 474 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

554
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
Cargo.toml
View File

@ -1,11 +1,5 @@
[workspace]
members = [
"gemma",
"gemmaegui",
"gemmaimgui",
"gemmatelnet",
"gemmasdl2",
]
members = ["gemma", "gemmaegui", "gemmaimgui", "gemmatelnet", "gemmasdl2"]
resolver = "2"
[workspace.dependencies]

3
gemma/src/chip8/computer.rs
View File

@ -24,7 +24,9 @@ pub struct Chip8Computer {
pub keypad: Keypad,
pub stack: Chip8Stack,
pub quirk_mode: QuirkMode,
pub target_ips: u16,
}
impl Default for Chip8Computer {
fn default() -> Self {
Self {
@ -38,6 +40,7 @@ impl Default for Chip8Computer {
keypad: Keypad::default(),
stack: Chip8Stack::default(),
quirk_mode: QuirkMode::default(),
target_ips: 20,
}
}
}

5
gemma/src/chip8/computer_manager.rs
View File

@ -31,6 +31,9 @@ impl Default for Chip8ComputerManager {
}
impl Chip8ComputerManager {
pub fn target_ips(&self) -> u16 {
self.computer.target_ips
}
pub fn quirks_mode(&self) -> QuirkMode {
self.computer.quirk_mode.clone()
}
@ -118,7 +121,7 @@ impl Chip8ComputerManager {
self.computer.load_bytes_to_memory(0x200, &bytes_to_load);
}
pub fn dump_to_string(&self, dump_type: ManagerDumpables) -> String{
pub fn dump_to_string(&self, dump_type: ManagerDumpables) -> String {
match dump_type {
ManagerDumpables::Video => self.computer.video_memory.format_as_string(),
ManagerDumpables::Registers => self.computer.registers.format_as_string(),

6
gemma/src/chip8/instructions.rs
View File

@ -1,4 +1,5 @@
use crate::chip8::computer::Chip8Computer;
use crate::chip8::cpu_states::Chip8CpuStates;
use crate::chip8::cpu_states::Chip8CpuStates::WaitingForKey;
use crate::chip8::instructions::Chip8CpuInstructions::*;
use crate::chip8::quirk_modes::QuirkMode;
@ -11,7 +12,6 @@ use std::ascii::AsciiExt;
use std::fmt::{Debug, Display, Formatter};
use std::ops::BitAnd;
use std::time::Instant;
use crate::chip8::cpu_states::Chip8CpuStates;
/*
nnn or addr - A 12-bit value, the lowest 12 bits of the instruction
n or nibble - A 4-bit value, the lowest 4 bits of the instruction
@ -680,6 +680,7 @@ impl Chip8CpuInstructions {
_ => DW(addr_param),
}
}
pub fn execute(&self, input: &mut Chip8Computer) -> Chip8Computer {
println!("INSTRUCTION {}", self);
let start_time = Instant::now();
@ -1088,7 +1089,8 @@ impl Chip8CpuInstructions {
.memory
.poke(offset + i as u16, input.registers.peek(i));
}
input.registers.poke_i(offset + 1);
println!("OFFSET: {offset:04x} / X : {x:04x}");
input.registers.poke_i(offset + *x as u16);
}
Chip8CpuInstructions::LDRI(x) => {
// Read registers V0 through Vx from memory starting at location I.

4
gemmaegui/Cargo.toml
View File

@ -7,4 +7,6 @@ edition = "2021"
gemma = { path = "../gemma" }
egui.workspace = true
eframe.workspace = true
catppuccin-egui = { version = "5.3.0", default-features = false, features = ["egui29"] }
catppuccin-egui = { version = "5.3.0", default-features = false, features = [
"egui29",
] }

4
gemmaimgui/src/bin/gemmaimgui.rs
View File

@ -83,7 +83,7 @@ fn main() {
let target_ms = ui_state.frame_time;
let loop_start_time = Instant::now();
while Instant::now().duration_since(current_time).as_millis() < target_ms as u128
&& num_cycles < ui_state.target_ips
&& num_cycles < system.target_ips()
{
if system.tick() {
num_cycles += 1;
@ -95,7 +95,7 @@ fn main() {
"Ran for {}ms and executed {}/{} cycles.",
cycles_time.as_millis(),
num_cycles,
ui_state.target_ips
system.target_ips()
);
}
// GUI Parts

52
gemmaimgui/src/bin/support/emmagui_support.rs
View File

@ -11,9 +11,7 @@ use imgui::{CollapsingHeader, Condition, ImColor32, Ui};
use log::debug;
use std::fs::File;
use std::io::Read;
use std::path::{Path, PathBuf};
use imgui::sys::ImGuiIO;
use gemma::chip8::instructions::Chip8CpuInstructions;
use std::path::Path;
const ROM_ROOT: &str = "resources/roms";
@ -46,7 +44,13 @@ impl GemmaImguiSupport {
// draw area size
let (width, height) = system_to_control.video_memory.get_resolution();
ui.window("Video")
.size([gui_state.video_window_size[0] as f32, gui_state.video_window_size[1] as f32], Condition::Once)
.size(
[
gui_state.video_window_size[0] as f32,
gui_state.video_window_size[1] as f32,
],
Condition::Once,
)
.build(|| {
let draw_area_size = ui.window_size();
let draw_offset = ui.window_pos();
@ -55,8 +59,8 @@ impl GemmaImguiSupport {
// and reduce the draw area size by the same values. {}
let draw_area_size = [draw_area_size[0], draw_area_size[1] - 20.0];
// println!("DRAW_AREA_SIZE = {}x{}", draw_area_size[0], draw_area_size[1]);
let cell_width = ((draw_area_size[0] as i32 / width));
let cell_height = ((draw_area_size[1] as i32 / height));
let cell_width = (draw_area_size[0] as i32 / width);
let cell_height = (draw_area_size[1] as i32 / height);
let origin = draw_offset;
let fg = ui.get_foreground_draw_list();
@ -86,15 +90,14 @@ impl GemmaImguiSupport {
);
}
}
}).expect("cant draw the video i guess");
})
.expect("cant draw the video i guess");
}
pub fn quirks_picker(system: &mut Chip8ComputerManager,
ui: &Ui) {
pub fn quirks_picker(system: &mut Chip8ComputerManager, ui: &Ui) {
let selectors = [Chip8, SChipModern, XOChip];
for current_selector in selectors {
let mut working_selector =
ui.selectable_config(current_selector.clone().to_string());
let mut working_selector = ui.selectable_config(current_selector.clone().to_string());
match system.quirks_mode() {
Chip8 => {
working_selector = working_selector.selected(true);
@ -113,12 +116,7 @@ impl GemmaImguiSupport {
}
}
fn control_pickers(
system: &mut Chip8ComputerManager,
gui_state: &mut ImGuiUiState,
ui: &Ui,
) {
fn control_pickers(system: &mut Chip8ComputerManager, gui_state: &mut ImGuiUiState, ui: &Ui) {
if CollapsingHeader::new("Controls").build(ui) {
// if the system has no program loaded hide the buttons.
let bytes: [u8; 2] = [
@ -158,20 +156,13 @@ impl GemmaImguiSupport {
}
}
fn system_summary(
system: &Chip8ComputerManager,
ui: &Ui,
) {
fn system_summary(system: &Chip8ComputerManager, ui: &Ui) {
/* System Step Counter */
ui.text(format!("Step {:04x}", system.num_cycles()).as_str());
ui.text(format!("Mode {}", system.quirks_mode()));
}
fn rom_lister(
system: &mut Chip8ComputerManager,
gui_state: &mut ImGuiUiState,
ui: &Ui,
) {
fn rom_lister(system: &mut Chip8ComputerManager, gui_state: &mut ImGuiUiState, ui: &Ui) {
/* ROM Lister */
if CollapsingHeader::new("Roms").build(ui) {
let new_filename = GuiFileList::display_path(
@ -208,10 +199,7 @@ impl GemmaImguiSupport {
}
}
fn display_options(
gui_state: &mut ImGuiUiState,
ui: &Ui,
) {
fn display_options(gui_state: &mut ImGuiUiState, ui: &Ui) {
if CollapsingHeader::new("Options").build(ui) {
ui.checkbox("Show Memory", &mut gui_state.show_memory);
ui.same_line();
@ -220,8 +208,8 @@ impl GemmaImguiSupport {
ui.checkbox("Show Registers", &mut gui_state.show_registers);
ui.same_line();
ui.checkbox("Show Keypad", &mut gui_state.show_keypad);
ui.input_int("Target IPS", &mut gui_state.target_ips)
.build();
// ui.input_int("Target IPS", &mut system.target_ips())
// .build();
};
}

9
gemmaimgui/src/bin/support/ui_state.rs
View File

@ -15,10 +15,9 @@ pub struct ImGuiUiState {
pub is_running: bool,
pub frame_time: u32,
pub last_frame_instant: Instant,
pub target_ips: i32,
pub roms_root_path: PathBuf,
pub video_window_size: [i32; 2],
pub control_window_size: [i32; 2]
pub control_window_size: [i32; 2],
}
impl Clone for ImGuiUiState {
@ -34,10 +33,9 @@ impl Clone for ImGuiUiState {
is_running: self.is_running,
frame_time: self.frame_time,
last_frame_instant: self.last_frame_instant,
target_ips: self.target_ips,
roms_root_path: self.roms_root_path.to_owned(),
video_window_size: self.video_window_size,
control_window_size: self.control_window_size
control_window_size: self.control_window_size,
}
}
}
@ -55,10 +53,9 @@ impl Default for ImGuiUiState {
is_running: false,
frame_time: 16,
last_frame_instant: Instant::now(),
target_ips: 20,
roms_root_path: PathBuf::from(ROMPATH_DEFAULT),
control_window_size: [200, 600],
video_window_size: [800, 600]
video_window_size: [800, 600],
}
}
}

30
imgui.ini Normal file
View File

@ -0,0 +1,30 @@
[Window][Debug##Default]
Pos=60,60
Size=400,400
Collapsed=0
[Window][Video]
Pos=576,0
Size=771,600
Collapsed=0
[Window][Keypad]
Pos=99,89
Size=76,99
Collapsed=0
[Window][!!!! CONTROLS !!!!]
Pos=30,209
Size=479,651
Collapsed=0
[Window][Registers]
Pos=530,647
Size=292,237
Collapsed=0
[Window][System Memory]
Pos=1428,-5
Size=385,1042
Collapsed=0