lauchmelder/rusty-nes
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

rename bitshift macros

Browse source
This commit is contained in:
Lauchmelder 2022-08-25 17:03:25 +02:00
parent 9e2a912fde
commit 95bf1d2078
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/instructions.rs
View file

@ -206,7 +206,7 @@ macro_rules! cmp_fn
} }
} }
macro_rules! bit_shift_carry macro_rules! carry_condition
{ {
($val: ident, <<) => { ($val & 0x80) == 0x80 }; ($val: ident, <<) => { ($val & 0x80) == 0x80 };
($val: ident, >>) => { ($val & 0x01) == 0x01 }; ($val: ident, >>) => { ($val & 0x01) == 0x01 };
@ -218,7 +218,7 @@ macro_rules! handle_carry
($val: ident, $carry: ident, >>) => { $val |= (($carry as u8) << 7); }; ($val: ident, $carry: ident, >>) => { $val |= (($carry as u8) << 7); };
} }
macro_rules! bit_shift_fn macro_rules! bitshift_fn
{ {
($name: ident, $direction: tt, $rotate: literal) => ($name: ident, $direction: tt, $rotate: literal) =>
{ {
@ -227,7 +227,7 @@ macro_rules! bit_shift_fn
let mut val = self.fetch(); let mut val = self.fetch();
let carry = test_flag!(self.p, Bit::Carry); let carry = test_flag!(self.p, Bit::Carry);
set_flag_to!(self.p, Bit::Carry, bit_shift_carry!(val, $direction)); set_flag_to!(self.p, Bit::Carry, carry_condition!(val, $direction));
val = val $direction 1; val = val $direction 1;
match $rotate match $rotate
@ -320,10 +320,10 @@ impl CPU
inc_dec_fn!(dex, x, false); inc_dec_fn!(dex, x, false);
inc_dec_fn!(dey, y, false); inc_dec_fn!(dey, y, false);
bit_shift_fn!(asl, <<, false); bitshift_fn!(asl, <<, false);
bit_shift_fn!(lsr, >>, false); bitshift_fn!(lsr, >>, false);
bit_shift_fn!(rol, <<, true); bitshift_fn!(rol, <<, true);
bit_shift_fn!(ror, >>, true); bitshift_fn!(ror, >>, true);
pub fn adc(&mut self) pub fn adc(&mut self)