Implement changing-size opcodes

2022-10-12 14:45:10 +03:00
parent e8ee8435e9
commit 1294c1c253
5 changed files with 47 additions and 13 deletions
--- a/src/da65/main.c
+++ b/src/da65/main.c
@@ -55,6 +55,7 @@
 #include "data.h"
 #include "error.h"
 #include "global.h"
+#include "handler.h"
 #include "infofile.h"
 #include "labels.h"
 #include "opctable.h"
@@ -447,6 +448,14 @@ static void OneOpcode (unsigned RemainingBytes)
                }
                /* Output the insn */
                D->Handler (D);
+                if (CPU == CPU_65816 && (D->Flags & flSizeChanges)) {
+                    if ((D->Handler == OH_Immediate65816M &&
+                        GetAttr (PC) & atMem16) ||
+                        (D->Handler == OH_Immediate65816X &&
+                        GetAttr (PC) & atIdx16)) {
+                        PC++;
+                    }
+                }
                PC += D->Size;
                break;
            }