xenia/fox32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fox32: Rename CPU to Cpu

Browse Source
This commit is contained in:
ry755 2022-01-27 16:20:17 -08:00 committed by Ry
parent cf835927cb
commit 3c6fda4b5c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu.rs
View File

@ -149,7 +149,7 @@ pub enum Interrupt {
Request(u8), // u8 contains the interrupt vector value Request(u8), // u8 contains the interrupt vector value
} }
pub struct CPU { pub struct Cpu {
pub instruction_pointer: u32, pub instruction_pointer: u32,
pub stack_pointer: u32, pub stack_pointer: u32,
@ -162,9 +162,9 @@ pub struct CPU {
pub bus: Bus, pub bus: Bus,
} }
impl CPU { impl Cpu {
pub fn new(bus: Bus) -> Self { pub fn new(bus: Bus) -> Self {
CPU { Cpu {
instruction_pointer: 0xF0000000, instruction_pointer: 0xF0000000,
stack_pointer: 0x02000000, stack_pointer: 0x02000000,
register: [0; 32], register: [0; 32],

4
src/main.rs
View File

@ -2,7 +2,7 @@
pub mod cpu; pub mod cpu;
pub mod mouse; pub mod mouse;
use cpu::{Bus, CPU, Memory, Interrupt, IO}; use cpu::{Bus, Cpu, Memory, Interrupt, IO};
use mouse::Mouse; use mouse::Mouse;
use std::convert::TryInto; use std::convert::TryInto;
@ -219,7 +219,7 @@ fn main() {
let cpu_mouse = Arc::clone(&mouse); let cpu_mouse = Arc::clone(&mouse);
let bus = Bus { memory, mouse: cpu_mouse }; let bus = Bus { memory, mouse: cpu_mouse };
CPU::new(bus) Cpu::new(bus)
}; };
if args.len() >= 2 { if args.len() >= 2 {