[MC6809] Fix DIVD/DIVQ/MULD immediate mode bus cycles

tgtakaoka · May 2, 2024 · 51fe02b · 51fe02b
1 parent 1e38dd4
commit 51fe02b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/debugger/mc6809/hd6309-P11.txt b/debugger/mc6809/hd6309-P11.txt
@@ -141,9 +141,9 @@ op  nemo       oper    ~      #     sequence
 8A  -          -       -      -     -
 8B  ADDE       #n8     2      2     1:2:N
 8C  CMPS       #n16    4/3    3     1:2:3:x:N/1:2:3:N
-8D  DIVD       #n8    24      2     1:2:N:Z:N
-8E  DIVQ       #n16   33      3     1:2:3:N:Z:N
-8F  MULD       #n18   27      2     1:2:3:N:Z:N
+8D  DIVD       #n8    24      2     1:2:Z:N
+8E  DIVQ       #n16   33      3     1:2:3:Z:N
+8F  MULD       #n18   27      2     1:2:3:Z:N
 90  SUBE       d8      4/3    2     1:2:x:R:N/1:2:R:N
 91  CMPE       d8      4/3    2     1:2:x:R:N/1:2:R:N
 92  -          -       -      -     -

diff --git a/debugger/mc6809/inst_hd6309.awk b/debugger/mc6809/inst_hd6309.awk
@@ -136,8 +136,8 @@ BEGIN {
     CYCLES[90]="123xRxWN/123RxWN";
     CYCLES[91]="12xxxTN";
     CYCLES[92]="12XxN";
-    CYCLES[93]="12NZN";
-    CYCLES[94]="123NZN";
+    CYCLES[93]="12ZN";
+    CYCLES[94]="123ZN";
     CYCLES[95]="12xRZN";
     CYCLES[96]="12xRrZN";
     CYCLES[97]="12YRZN";

diff --git a/debugger/mc6809/inst_hd6309.cpp b/debugger/mc6809/inst_hd6309.cpp
@@ -104,8 +104,8 @@ constexpr const char *const SEQUENCES[/*seq*/] = {
         "123xRxWN/123RxWN",                             // 90
         "12xxxTN",                                      // 91
         "12XxN",                                        // 92
-        "12NZN",                                        // 93
-        "123NZN",                                       // 94
+        "12ZN",                                         // 93
+        "123ZN",                                        // 94
         "12xRZN",                                       // 95
         "12xRrZN",                                      // 96
         "12YRZN",                                       // 97
@@ -1038,9 +1038,9 @@ constexpr uint8_t P11_TABLE[] = {
         0,   // 8A: -         -      -     -    -
         54,  // 8B: ADDE      #n8    2     2    1:2:N
         55,  // 8C: CMPS      #n16   4/3   3    1:2:3:x:N/1:2:3:N
-        93,  // 8D: DIVD      #n8   24     2    1:2:N:Z:N
-        94,  // 8E: DIVQ      #n16  33     3    1:2:3:N:Z:N
-        94,  // 8F: MULD      #n18  27     2    1:2:3:N:Z:N
+        93,  // 8D: DIVD      #n8   24     2    1:2:Z:N
+        94,  // 8E: DIVQ      #n16  33     3    1:2:3:Z:N
+        94,  // 8F: MULD      #n18  27     2    1:2:3:Z:N
         58,  // 90: SUBE      d8     4/3   2    1:2:x:R:N/1:2:R:N
         58,  // 91: CMPE      d8     4/3   2    1:2:x:R:N/1:2:R:N
         0,   // 92: -         -      -     -    -

diff --git a/debugger/mc6809/pins_mc6809.cpp b/debugger/mc6809/pins_mc6809.cpp
@@ -490,7 +490,7 @@ bool PinsMc6809::matchAll(Signals *begin, const Signals *end) {
 
 const Signals *PinsMc6809::findFetch(Signals *begin, const Signals *end) {
     const auto cycles = begin->diff(end);
-    const auto limit = cycles < 30 ? cycles : 30;
+    const auto limit = cycles < 40 ? cycles : 40;
     LOG_MATCH(cli.print("@@ findFetch: begin="));
     LOG_MATCH(begin->print());
     LOG_MATCH(cli.print("@@              end="));