[brw] Remove clone and satisfy the borrow checker

This commit is contained in:
2024-02-18 19:45:34 +05:30
parent ba1c1a1412
commit f6eca76b0c
9 changed files with 87 additions and 76 deletions

View File

@@ -8,12 +8,12 @@ pub enum CpuState{
}
#[derive(Debug)]
pub struct Cpu{
mapped_memory: MappedMemory,
pub struct Cpu<'a>{
mapped_memory:&'a mut MappedMemory<'a>,
}
impl Cpu{
pub fn new(mapped_memory: MappedMemory)->Cpu{
impl <'a> Cpu<'a>{
pub fn new(mapped_memory: &'a mut MappedMemory<'a>)->Cpu<'a>{
Cpu{
mapped_memory
}

View File

@@ -4,6 +4,7 @@ use crate::misc::result::EmulatorResult;
pub const DEVICE_FRAMEBUFFER_SIZE: usize = 256 * 256;
#[derive(Debug, Clone)]
pub struct GraphicsProcessor {
framebuffer: Box<[u8; DEVICE_FRAMEBUFFER_SIZE]>,
}
@@ -20,10 +21,10 @@ impl GraphicsProcessor {
framebuffer
})
}
pub fn set_framebuffer(&mut self,memory_slice: &[u8]){
pub fn set_framebuffer(&mut self, memory_slice: &[u8]) {
self.framebuffer.copy_from_slice(memory_slice);
}
pub fn get_framebuffer(&self) -> &[u8;DEVICE_FRAMEBUFFER_SIZE] {
pub fn get_framebuffer(&self) -> &[u8; DEVICE_FRAMEBUFFER_SIZE] {
&self.framebuffer
}
}

View File

@@ -5,11 +5,11 @@ use crate::misc::emulator_error::DeviceType::MMU;
use crate::misc::endian::{read_big_endian_u16, read_big_endian_u24};
use crate::misc::result::EmulatorResult;
#[derive(Debug, Copy, Clone)]
pub struct MemoryMappedIO {
#[derive(Debug)]
pub struct MemoryMappedIO<'a> {
//FIXME use a keyboard
keyboard_bytes: [u8; 2],
program_counter: ProgramCounter,
program_counter: &'a mut ProgramCounter,
//FIXME use a device
pixel_reg: u8,
//FIXME use a device
@@ -17,7 +17,7 @@ pub struct MemoryMappedIO {
}
/// Represents the memory mapped segment of IO. Aggregates the mapping logic.
impl MemoryMappedIO {
impl <'a> MemoryMappedIO<'a> {
// 2 byte keyboard bits
pub const KEYBOARD_BIT_START: u32 = 0;
const KEYBOARD_BIT_END: u32 = 1;
@@ -35,7 +35,7 @@ impl MemoryMappedIO {
pub const AUDIO_SAMPLE_BASE_LEN: u32 = 2;
const AUDIO_SAMPLE_BASE_END: u32 = Self::AUDIO_SAMPLE_BASE_START + Self::AUDIO_SAMPLE_BASE_LEN - 1;
pub fn new(program_counter: ProgramCounter) -> MemoryMappedIO {
pub fn new(program_counter: &'a mut ProgramCounter) -> MemoryMappedIO<'a> {
MemoryMappedIO {
keyboard_bytes: [0, 0],
program_counter,
@@ -46,7 +46,7 @@ impl MemoryMappedIO {
}
impl Memory for MemoryMappedIO {
impl <'a> Memory for MemoryMappedIO<'a> {
fn try_get_byte(&self, address: u32) -> EmulatorResult<u8> {
let byte = match address {
Self::KEYBOARD_BIT_START..=Self::KEYBOARD_BIT_END => {

View File

@@ -20,14 +20,14 @@ pub trait Memory {
fn try_set_byte(&mut self, address: u32, value: u8) -> EmulatorResult<()>;
}
#[derive(Debug, Clone)]
pub struct MappedMemory {
memory_mapped_io: MemoryMappedIO,
ram_memory: RamMemory,
#[derive(Debug)]
pub struct MappedMemory<'a> {
memory_mapped_io: &'a mut MemoryMappedIO<'a>,
ram_memory: &'a mut RamMemory,
}
impl MappedMemory {
pub fn new(memory_mapped_io: MemoryMappedIO, ram_memory: RamMemory) -> MappedMemory {
impl <'a> MappedMemory<'a> {
pub fn new(memory_mapped_io: &'a mut MemoryMappedIO<'a>, ram_memory:&'a mut RamMemory) -> MappedMemory<'a> {
MappedMemory {
memory_mapped_io,
ram_memory,
@@ -35,7 +35,7 @@ impl MappedMemory {
}
}
impl Memory for MappedMemory {
impl <'a> Memory for MappedMemory<'a> {
fn try_get_byte(&self, address: u32) -> EmulatorResult<u8> {
let byte_at_addr = match address {
0..=MMAPPEDIO_END => {

View File

@@ -5,7 +5,7 @@ use crate::misc::endian::{read_big_endian_u24, write_big_endian_u24};
use crate::misc::result::EmulatorResult;
#[derive(Debug, Default, Copy, Clone)]
#[derive(Debug, Default, Clone)]
pub struct ProgramCounter {
/// 24bit location register
program_counter_register: [u8; 3],
@@ -42,8 +42,11 @@ impl Memory for ProgramCounter {
}
/// TODO: Set a byte of PC from the memory.
fn try_set_byte(&mut self, address: u32, value: u8) -> EmulatorResult<()> {
log::error!("Unsupported Method!");
todo!()
match address {
0..=2 => { self.program_counter_register[address as usize] = value }
_ => { return Err(EmulatorError::UnreachableMemory(PC, address)); }
}
Ok(())
}
}