mirror of
https://github.com/transistorfet/moa.git
synced 2024-06-08 10:30:21 +00:00
Configured to use rustfmt version 2 which fixes some comment formatting
This commit is contained in:
parent
868e5b868f
commit
101b3fabd5
|
@ -1,4 +1,5 @@
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
version = "Two"
|
||||||
|
|
||||||
max_width = 132
|
max_width = 132
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ impl Z80InstructionCycles {
|
||||||
return Ok(Z80InstructionCycles::Repeating {
|
return Ok(Z80InstructionCycles::Repeating {
|
||||||
repeating: 21 + extra,
|
repeating: 21 + extra,
|
||||||
terminating: 16 + extra,
|
terminating: 16 + extra,
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
Instruction::CPL => 4,
|
Instruction::CPL => 4,
|
||||||
|
|
|
@ -460,7 +460,7 @@ impl Ym7101State {
|
||||||
|
|
||||||
|
|
||||||
fn is_inside_window(&mut self, x: usize, y: usize) -> bool {
|
fn is_inside_window(&mut self, x: usize, y: usize) -> bool {
|
||||||
x >= self.window_pos.0 .0 && x <= self.window_pos.1 .0 && y >= self.window_pos.0 .1 && y <= self.window_pos.1 .1
|
x >= self.window_pos.0.0 && x <= self.window_pos.1.0 && y >= self.window_pos.0.1 && y <= self.window_pos.1.1
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_palette_colour(&self, palette: u8, colour: u8, mode: ColourMode, encoding: PixelEncoding) -> u32 {
|
fn get_palette_colour(&self, palette: u8, colour: u8, mode: ColourMode, encoding: PixelEncoding) -> u32 {
|
||||||
|
@ -595,8 +595,8 @@ impl Ym7101State {
|
||||||
};
|
};
|
||||||
|
|
||||||
if self.window_addr != 0 && self.is_inside_window(x, y) {
|
if self.window_addr != 0 && self.is_inside_window(x, y) {
|
||||||
let pixel_win_x = x - self.window_pos.0 .0 * 8;
|
let pixel_win_x = x - self.window_pos.0.0 * 8;
|
||||||
let pixel_win_y = y - self.window_pos.0 .1 * 8;
|
let pixel_win_y = y - self.window_pos.0.1 * 8;
|
||||||
let pattern_win_addr = self.get_pattern_addr(self.window_addr, pixel_win_x / 8, pixel_win_y / 8);
|
let pattern_win_addr = self.get_pattern_addr(self.window_addr, pixel_win_x / 8, pixel_win_y / 8);
|
||||||
let pattern_win_word = self.memory.read_beu16(Memory::Vram, pattern_win_addr);
|
let pattern_win_word = self.memory.read_beu16(Memory::Vram, pattern_win_addr);
|
||||||
|
|
||||||
|
|
|
@ -80,9 +80,9 @@ pub fn build_macintosh_512k<H: Host>(host: &mut H) -> Result<System, Error> {
|
||||||
|
|
||||||
//cpu.add_breakpoint(0x400170); // Failed, loops infinitely
|
//cpu.add_breakpoint(0x400170); // Failed, loops infinitely
|
||||||
cpu.add_breakpoint(0x4000f4); // Failed, should show the sad mac
|
cpu.add_breakpoint(0x4000f4); // Failed, should show the sad mac
|
||||||
//cpu.add_breakpoint(0x4006ae);
|
//cpu.add_breakpoint(0x4006ae);
|
||||||
//cpu.add_breakpoint(0x400706);
|
//cpu.add_breakpoint(0x400706);
|
||||||
//cpu.add_breakpoint(0x400722); // end of ram test
|
//cpu.add_breakpoint(0x400722); // end of ram test
|
||||||
|
|
||||||
//cpu.add_breakpoint(0x40026c); // System Initialization
|
//cpu.add_breakpoint(0x40026c); // System Initialization
|
||||||
//cpu.add_breakpoint(0x402adc);
|
//cpu.add_breakpoint(0x402adc);
|
||||||
|
@ -96,12 +96,12 @@ pub fn build_macintosh_512k<H: Host>(host: &mut H) -> Result<System, Error> {
|
||||||
//cpu.add_breakpoint(0x40045c);
|
//cpu.add_breakpoint(0x40045c);
|
||||||
//cpu.add_breakpoint(0x400614); // Start of InitIO
|
//cpu.add_breakpoint(0x400614); // Start of InitIO
|
||||||
cpu.add_breakpoint(0x40062a); // Loop in InitIO
|
cpu.add_breakpoint(0x40062a); // Loop in InitIO
|
||||||
//cpu.add_breakpoint(0x400648);
|
//cpu.add_breakpoint(0x400648);
|
||||||
//cpu.add_breakpoint(0x40064c);
|
//cpu.add_breakpoint(0x40064c);
|
||||||
//cpu.add_breakpoint(0x4014a6); // DrvrInstall
|
//cpu.add_breakpoint(0x4014a6); // DrvrInstall
|
||||||
//cpu.add_breakpoint(0x401262); // $A000 handler, which is where the rom write happens
|
//cpu.add_breakpoint(0x401262); // $A000 handler, which is where the rom write happens
|
||||||
//cpu.add_breakpoint(0x4012ec);
|
//cpu.add_breakpoint(0x4012ec);
|
||||||
//cpu.add_breakpoint(0x40133a);
|
//cpu.add_breakpoint(0x40133a);
|
||||||
|
|
||||||
// Issue of writing to 0x100000 which doesn't exist
|
// Issue of writing to 0x100000 which doesn't exist
|
||||||
cpu.add_breakpoint(0x400d62);
|
cpu.add_breakpoint(0x400d62);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user