Fix flags in some instrunctions

drhelius · Aug 3, 2024 · 2b8e073 · 2b8e073
1 parent 840bc99
commit 2b8e073
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/huc6280_names.h b/src/huc6280_names.h
@@ -254,7 +254,7 @@ static const GG_OPCode_Info k_opcode_names[256] = {
     { "INY", GG_OPCode_Type_Implied },
     { "CMP #$%02X", GG_OPCode_Type_1b },
     { "DEX", GG_OPCode_Type_Implied },
-    { "NOP  [UNOFFICIAL]", GG_OPCode_Type_Implied },
+    { "NOP  [UNOFFICIAL WAI]", GG_OPCode_Type_Implied },
     { "CPY $%04X", GG_OPCode_Type_2b },
     { "CMP $%04X", GG_OPCode_Type_2b },
     { "DEC $%04X", GG_OPCode_Type_2b },

diff --git a/src/huc6280_opcodes.cpp b/src/huc6280_opcodes.cpp
@@ -71,6 +71,7 @@ void HuC6280::OPCode0x07()
 void HuC6280::OPCode0x08()
 {
     // PHP
+    ClearFlag(FLAG_TRANSFER);
     SetFlag(FLAG_BREAK);
     StackPush8(m_P.GetValue());
 }

diff --git a/src/huc6280_opcodes_inline.h b/src/huc6280_opcodes_inline.h
@@ -154,6 +154,7 @@ inline void HuC6280::OPCodes_BRK()
 {
     m_PC.Increment();
     StackPush16(m_PC.GetValue());
+    ClearFlag(FLAG_TRANSFER);
     SetFlag(FLAG_BREAK);
     StackPush8(m_P.GetValue());
     SetFlag(FLAG_INTERRUPT);