j/Chirp
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

disassemble.rs: Format with rustfmt

Browse Source
This commit is contained in:
John 2023-03-25 17:37:09 -05:00
parent 712acc5984
commit c7447a26a3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/disassemble.rs
View File

@ -1,8 +1,8 @@
//! A disassembler for Chip-8 opcodes //! A disassembler for Chip-8 opcodes
use owo_colors::{OwoColorize, Style};
use super::{Adr, Nib, Reg}; use super::{Adr, Nib, Reg};
use owo_colors::{OwoColorize, Style};
type Ins = Nib; type Ins = Nib;
#[inline] #[inline]
@ -216,7 +216,9 @@ impl Disassemble {
} }
/// `5xy0`: Skips the next instruction if register X != register Y /// `5xy0`: Skips the next instruction if register X != register Y
pub fn skip_if_x_equal_y(&self, x: Reg, y: Reg) -> String { pub fn skip_if_x_equal_y(&self, x: Reg, y: Reg) -> String {
format!("se v{x:X}, v{y:X}").style(self.normal).to_string() format!("se v{x:X}, v{y:X}")
.style(self.normal)
.to_string()
} }
/// `6xbb`: Loads immediate byte b into register vX /// `6xbb`: Loads immediate byte b into register vX
@ -239,7 +241,9 @@ impl Disassemble {
} }
/// `8xy1`: Performs bitwise or of vX and vY, and stores the result in vX /// `8xy1`: Performs bitwise or of vX and vY, and stores the result in vX
pub fn x_orequals_y(&self, x: Reg, y: Reg) -> String { pub fn x_orequals_y(&self, x: Reg, y: Reg) -> String {
format!("or v{y:X}, v{x:X}").style(self.normal).to_string() format!("or v{y:X}, v{x:X}")
.style(self.normal)
.to_string()
} }
/// `8xy2`: Performs bitwise and of vX and vY, and stores the result in vX /// `8xy2`: Performs bitwise and of vX and vY, and stores the result in vX
pub fn x_andequals_y(&self, x: Reg, y: Reg) -> String { pub fn x_andequals_y(&self, x: Reg, y: Reg) -> String {
@ -282,7 +286,9 @@ impl Disassemble {
} }
/// `9xy0`: Skip next instruction if X != y /// `9xy0`: Skip next instruction if X != y
pub fn skip_if_x_not_equal_y(&self, x: Reg, y: Reg) -> String { pub fn skip_if_x_not_equal_y(&self, x: Reg, y: Reg) -> String {
format!("sne v{x:X}, v{y:X}").style(self.normal).to_string() format!("sne v{x:X}, v{y:X}")
.style(self.normal)
.to_string()
} }
/// Aadr: Load address #adr into register I /// Aadr: Load address #adr into register I
pub fn load_indirect_register(&self, a: Adr) -> String { pub fn load_indirect_register(&self, a: Adr) -> String {