Fix inverted conditional jump Conditions

Author: rzumer

src/instruction.rs

@@ -221,13 +221,13 @@ impl fmt::Display for InstructionType {
             // Conditional instructions: format the associated condition as its standard abbreviation
             Call(Some(cond)) | Jp(Some(cond)) | Jr(Some(cond)) | Ret(Some(cond)) => match cond {
                 Condition::FlagSet(flag) => match flag {
-                    Flag::PV => write!(f, " PO"), // Parity Odd
-                    Flag::S => write!(f, " P"),   // Sign Positive
+                    Flag::PV => write!(f, " PE"), // Parity Even
+                    Flag::S => write!(f, " M"),   // Sign Positive
                     _ => write!(f, " {}", flag),
                 },
                 Condition::FlagNotSet(flag) => match flag {
-                    Flag::PV => write!(f, " PE"), // Parity Even
-                    Flag::S => write!(f, " M"),   // Sign Negative
+                    Flag::PV => write!(f, " PO"), // Parity Odd
+                    Flag::S => write!(f, " P"),   // Sign Negative
                     _ => write!(f, " N{}", flag),
                 },
                 _ => Ok(()),
@@ -1050,35 +1050,35 @@ impl Instruction {
             0xDD => decode_index_instruction(bytes, IX)?,
             0xDE => root!(Sbc, OctetImmediate(next_byte!()), RegisterImplied(A)),
             0xDF => root!(Rst(0x18)),
-            0xE0 => root!(Ret(Some(FlagSet(Flag::PV)))),
+            0xE0 => root!(Ret(Some(FlagNotSet(Flag::PV)))),
             0xE1 => root!(Pop, destination: RegisterPairImplied(HL)),
-            0xE2 => root!(Jp(Some(FlagSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
+            0xE2 => root!(Jp(Some(FlagNotSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
             0xE3 => root!(Ex, RegisterPairImplied(HL), MemoryIndirect(SP)),
-            0xE4 => root!(Call(Some(FlagSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
+            0xE4 => root!(Call(Some(FlagNotSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
             0xE5 => root!(Push, source: RegisterPairImplied(HL)),
             0xE6 => root!(And, source: OctetImmediate(next_byte!())),
             0xE7 => root!(Rst(0x20)),
-            0xE8 => root!(Ret(Some(FlagNotSet(Flag::PV)))),
+            0xE8 => root!(Ret(Some(FlagSet(Flag::PV)))),
             0xE9 => root!(Jp(None), source: RegisterPairImplied(HL)),
-            0xEA => root!(Jp(Some(FlagNotSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
+            0xEA => root!(Jp(Some(FlagSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
             0xEB => root!(Ex, RegisterPairImplied(HL), RegisterPairImplied(DE)),
-            0xEC => root!(Call(Some(FlagNotSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
+            0xEC => root!(Call(Some(FlagSet(Flag::PV))), source: DoubletImmediate(next_doublet!())),
             0xED => decode_extended_instruction(bytes)?,
             0xEE => root!(Xor, source: OctetImmediate(next_byte!())),
             0xEF => root!(Rst(0x28)),
-            0xF0 => root!(Ret(Some(FlagSet(Flag::S)))),
+            0xF0 => root!(Ret(Some(FlagNotSet(Flag::S)))),
             0xF1 => root!(Pop, destination: RegisterPairImplied(AF)),
-            0xF2 => root!(Jp(Some(FlagSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
+            0xF2 => root!(Jp(Some(FlagNotSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
             0xF3 => root!(Di),
-            0xF4 => root!(Call(Some(FlagSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
+            0xF4 => root!(Call(Some(FlagNotSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
             0xF5 => root!(Push, source: RegisterPairImplied(AF)),
             0xF6 => root!(Or, source: OctetImmediate(next_byte!())),
             0xF7 => root!(Rst(0x30)),
-            0xF8 => root!(Ret(Some(FlagNotSet(Flag::S)))),
+            0xF8 => root!(Ret(Some(FlagSet(Flag::S)))),
             0xF9 => root!(Ld, RegisterPairImplied(HL), RegisterPairImplied(SP)),
-            0xFA => root!(Jp(Some(FlagNotSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
+            0xFA => root!(Jp(Some(FlagSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
             0xFB => root!(Ei),
-            0xFC => root!(Call(Some(FlagNotSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
+            0xFC => root!(Call(Some(FlagSet(Flag::S))), source: DoubletImmediate(next_doublet!())),
             0xFD => decode_index_instruction(bytes, IY)?,
             0xFE => root!(Cp, source: OctetImmediate(next_byte!())),
             0xFF => root!(Rst(0x38)),