atreyabain/byte-pusher-emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[???] Lots of work

Browse Source 
Cleanup un-needed elements, simplify memory management
This commit is contained in:
Atreya Bain
2024-02-19 12:30:27 +05:30
parent 56bf1bbd4d
commit fbf38e4925
11 changed files with 227 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/main.rs
View File

@@ -1,13 +1,17 @@
use std::fs::File;
use std::io::Read;
use std::time::Duration;
use sdl2::event::Event;
use sdl2::EventPump;
use sdl2::keyboard::Keycode;
use sdl2::pixels::Color;
use sdl2::render::WindowCanvas;
use simple_logger::SimpleLogger;
use crate::emu::cpu::Cpu;
use crate::emu::iomem::MemoryMappedIO;
use crate::emu::ram::RamMemory;
use crate::emu::mmu::{Memory, MappedMemory};
use crate::emu::program_counter::ProgramCounter;
use crate::emu::graphics::GraphicsProcessor;
use crate::emu::ram::{MEM_LENGTH, RamMemory};
use crate::emu::mmu::{Memory};
use crate::graphics::graphics_adapter::SDLGraphicsAdapter;
use crate::misc::result::EmulatorResult;
@@ -17,51 +21,60 @@ mod misc;
mod graphics;
fn main() -> EmulatorResult<()> {
let mut fileLoc = File::open("rom.BytePusher").unwrap();
let mut filebytes = vec![0u8; MEM_LENGTH];
let x = fileLoc.read(&mut filebytes).unwrap();
assert!(x < MEM_LENGTH);
SimpleLogger::new().env().init().unwrap();
let program_counter = ProgramCounter::new();
let mmio = MemoryMappedIO::new(&program_counter);
let ram = RamMemory::try_new()?;
let mmu = MappedMemory::new(&mmio,&ram);
let ram = RamMemory::try_from(filebytes.as_slice())?;
let (mut canvas,mut event_pump) = initiate_sdl();
let graphics_processor = GraphicsProcessor::try_new(&ram)?;
let sdl2_graphics_adapter = SDLGraphicsAdapter::new(&graphics_processor);
let cpu = Cpu::new(&ram,&graphics_processor);
let mut i = 0;
'running: loop {
i = (i + 1) % 255;
canvas.set_draw_color(Color::RGB(0,0,0));
canvas.clear();
for event in event_pump.poll_iter() {
match event {
Event::Quit {..} |
Event::KeyDown { keycode: Some(Keycode::Escape), .. } => {
break 'running
},
event => {
log::info!("Received window event {:?}",event);
}
}
}
let mut cpu = Cpu::new(&mmu,&program_counter);
for i in 0..1{
cpu.cycle()?;
// The rest of the game loop goes here...
sdl2_graphics_adapter.draw(&mut canvas)?;
canvas.present();
::std::thread::sleep(Duration::new(0, 1_000_000_000u32 / 60));
}
// let sdl_context = sdl2::init().unwrap();
// let video_subsystem = sdl_context.video().unwrap();
//
// let window = video_subsystem.window("rust-sdl2 demo", 512, 512)
// .position_centered()
// .build()
// .unwrap();
// let mut canvas = window.into_canvas().build().unwrap();
//
// canvas.set_draw_color(Color::RGB(0, 255, 255));
// canvas.clear();
// canvas.present();
// let mut event_pump = sdl_context.event_pump().unwrap();
// let mut i = 0;
// 'running: loop {
// i = (i + 1) % 255;
// canvas.set_draw_color(Color::RGB(i, 64, 255 - i));
// canvas.clear();
// for event in event_pump.poll_iter() {
// match event {
// Event::Quit {..} |
// Event::KeyDown { keycode: Some(Keycode::Escape), .. } => {
// break 'running
// },
// event => {
// log::info!("Received window event {:?}",event);
// }
// }
// }
// // The rest of the game loop goes here...
//
// canvas.present();
// ::std::thread::sleep(Duration::new(0, 1_000_000_000u32 / 60));
// }
Ok(())
}
fn initiate_sdl() -> (WindowCanvas, EventPump) {
let sdl_context = sdl2::init().unwrap();
let video_subsystem = sdl_context.video().unwrap();
let window = video_subsystem.window("rust-sdl2 demo", 512, 512)
.position_centered()
.build()
.unwrap();
let mut canvas = window.into_canvas().build().unwrap();
canvas.set_draw_color(Color::RGB(0, 255, 255));
canvas.clear();
canvas.present();
let mut event_pump = sdl_context.event_pump().unwrap();
(canvas, event_pump)
}