fox32: Rename CPU to Cpu
This commit is contained in:
parent
cf835927cb
commit
3c6fda4b5c
|
@ -149,7 +149,7 @@ pub enum Interrupt {
|
|||
Request(u8), // u8 contains the interrupt vector value
|
||||
}
|
||||
|
||||
pub struct CPU {
|
||||
pub struct Cpu {
|
||||
pub instruction_pointer: u32,
|
||||
pub stack_pointer: u32,
|
||||
|
||||
|
@ -162,9 +162,9 @@ pub struct CPU {
|
|||
pub bus: Bus,
|
||||
}
|
||||
|
||||
impl CPU {
|
||||
impl Cpu {
|
||||
pub fn new(bus: Bus) -> Self {
|
||||
CPU {
|
||||
Cpu {
|
||||
instruction_pointer: 0xF0000000,
|
||||
stack_pointer: 0x02000000,
|
||||
register: [0; 32],
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
pub mod cpu;
|
||||
pub mod mouse;
|
||||
use cpu::{Bus, CPU, Memory, Interrupt, IO};
|
||||
use cpu::{Bus, Cpu, Memory, Interrupt, IO};
|
||||
use mouse::Mouse;
|
||||
|
||||
use std::convert::TryInto;
|
||||
|
@ -219,7 +219,7 @@ fn main() {
|
|||
let cpu_mouse = Arc::clone(&mouse);
|
||||
|
||||
let bus = Bus { memory, mouse: cpu_mouse };
|
||||
CPU::new(bus)
|
||||
Cpu::new(bus)
|
||||
};
|
||||
|
||||
if args.len() >= 2 {
|
||||
|
|
Loading…
Reference in New Issue
Block a user