[MC6809] Fix HD6309 native TFR instruction pattern

debugger/mc6800/signals_mc6800.h

@@ -3,8 +3,8 @@
 
 #include "signals.h"
 
-//#define LOG_MATCH(e) e
-#define LOG_MATCH(e)
+#define LOG_MATCH(e) e
+//#define LOG_MATCH(e)
 
 namespace debugger {
 namespace mc6800 {

debugger/mc6809/hd6309-P00.txt

@@ -31,7 +31,7 @@ op  nemo       oper    ~      #     sequence
 1C  ANDCC      #n8     3      2     1:2:N:N
 1D  SEX        -       2/1    1     1:N:N/1:N
 1E  EXG        #n8     8/5    2     1:2:x:x:x:x:x:x:N/1:2:x:x:x:N
-1F  TFR        #n8     6/4    2     1:2:x:x:x:x:N/1:N:x:x:N
+1F  TFR        #n8     6/4    2     1:2:x:x:x:x:N/1:2:x:x:N
 20  BRA        r8      3      2     1:2:x:j
 21  BRN        r8      3      2     1:2:x:N
 22  BHI        r8      3      2     1:2:x:j

debugger/mc6809/inst_hd6309.awk

@@ -63,87 +63,87 @@ BEGIN {
     CYCLES[17]="34xRrx/34Rrx";
     CYCLES[18]="34x";
     CYCLES[19]="34xRrx";
-    CYCLES[20]="123xN";
-    CYCLES[21]="123xN@123xxk/123xk";
-    CYCLES[22]="12xN";
-    CYCLES[23]="1NxwWN";
-    CYCLES[24]="1NxRrN";
-    CYCLES[25]="1NxwWWWWWWWWWWWxVvxJ/1NxwWWWWWWWWWWWWWXVvxJ";
-    CYCLES[26]="1NN/1N";
-    CYCLES[27]="123xN/123N";
-    CYCLES[28]="123N";
-    CYCLES[29]="12xRrxN/12RrN";
-    CYCLES[30]="12xRrN/12RrN";
-    CYCLES[31]="12xWwN/12WwN";
-    CYCLES[32]="12YRrxN/12YRrN";
-    CYCLES[33]="12YRrN";
-    CYCLES[34]="12YWwN";
-    CYCLES[35]="123xAaxN/123AaN";
-    CYCLES[36]="123xAaN/123AaN";
-    CYCLES[37]="123xBbN/123BbN";
-    CYCLES[38]="12xRrrrN/12RrrrN";
-    CYCLES[39]="12xWwwwN/12WwwwN";
-    CYCLES[40]="12YRrrrN";
-    CYCLES[41]="12YWwwwN";
-    CYCLES[42]="123xAaaaN/123AaaaN";
-    CYCLES[43]="123xBbbbN/123BbbbN";
-    CYCLES[44]="123xRxN/123RxN";
-    CYCLES[45]="123xRxWN/123RxWN";
-    CYCLES[46]="12xxxTN";
-    CYCLES[47]="12XxN";
-    CYCLES[48]="12N";
-    CYCLES[49]="12NZN";
-    CYCLES[50]="123NZN";
-    CYCLES[51]="12xRN/12RN";
-    CYCLES[52]="12xWN/12WN";
-    CYCLES[53]="12xRZN";
-    CYCLES[54]="12xRrZN";
-    CYCLES[55]="12YRN";
-    CYCLES[56]="12YWN";
-    CYCLES[57]="12YRZN";
-    CYCLES[58]="12YRrZN";
-    CYCLES[59]="123xAN/123AN";
-    CYCLES[60]="123xBN/123BN";
-    CYCLES[61]="123xRZN";
-    CYCLES[62]="123xRrZN";
-    CYCLES[63]="12xRxWN/12RxWN";
-    CYCLES[64]="123RxWN";
-    CYCLES[65]="123RN";
-    CYCLES[66]="12xRxxN/12RxN";
-    CYCLES[67]="12xi/12i";
-    CYCLES[68]="1NXXN";
-    CYCLES[69]="1NxxN";
-    CYCLES[70]="123xxk/123xk";
-    CYCLES[71]="123xxXxwWk/123xxwWk";
-    CYCLES[72]="12NN";
-    CYCLES[73]="12xxxxxxN/12xxxN";
-    CYCLES[74]="12xxxxN/1NxxN";
-    CYCLES[75]="12xj";
-    CYCLES[76]="12YxN";
-    CYCLES[77]="12xxXQN/12xXQN";
-    CYCLES[78]="12xxPXi/12xPXi";
-    CYCLES[79]="1NRrxJ/1NRrJ";
-    CYCLES[80]="1NxN/1N";
-    CYCLES[81]="1NRrrrrrrrrrrrXJ@1NRrrXJ/1NRrrrrrrrrrrrrrXJ";
-    CYCLES[82]="12NxwWWWWWWWWWWWN/12NxwWWWWWWWWWWWWWN";
-    CYCLES[83]="1NZN";
-    CYCLES[84]="12YRxWN";
-    CYCLES[85]="123YRxWN";
-    CYCLES[86]="123YRN";
-    CYCLES[87]="12YRxxN/12YRxN";
-    CYCLES[88]="12Yi";
-    CYCLES[89]="123xAxBN/123RxWN";
-    CYCLES[90]="1234AxBN";
-    CYCLES[91]="1234AN";
-    CYCLES[92]="123xAxxN/123RxN";
-    CYCLES[93]="123xJ/123J";
-    CYCLES[94]="12xXxwWj/12xxwWj";
-    CYCLES[95]="12xXxwWi/12xXwWi";
-    CYCLES[96]="12YXxwWi/12YXwWi";
-    CYCLES[97]="123xWN/123WN";
-    CYCLES[98]="123xAxwWJ/123xAwWJ";
-    CYCLES[99]="123xWwN/123WwN";
-    CYCLES[100]="12345N";
+    CYCLES[20]="12xRxWN/12RxWN";
+    CYCLES[21]="123RxWN";
+    CYCLES[22]="123RN";
+    CYCLES[23]="12xRxxN/12RxN";
+    CYCLES[24]="12xi/12i";
+    CYCLES[25]="1NN/1N";
+    CYCLES[26]="1NXXN";
+    CYCLES[27]="1NxxN";
+    CYCLES[28]="123xxk/123xk";
+    CYCLES[29]="123xxXxwWk/123xxwWk";
+    CYCLES[30]="12NN";
+    CYCLES[31]="12xxxxxxN/12xxxN";
+    CYCLES[32]="12xxxxN/12xxN";
+    CYCLES[33]="12xj";
+    CYCLES[34]="12xN";
+    CYCLES[35]="12YxN";
+    CYCLES[36]="12xxXQN/12xXQN";
+    CYCLES[37]="12xxPXi/12xPXi";
+    CYCLES[38]="1NRrxJ/1NRrJ";
+    CYCLES[39]="1NxN/1N";
+    CYCLES[40]="1NRrrrrrrrrrrrXJ@1NRrrXJ/1NRrrrrrrrrrrrrrXJ";
+    CYCLES[41]="12NxwWWWWWWWWWWWN/12NxwWWWWWWWWWWWWWN";
+    CYCLES[42]="1NZN";
+    CYCLES[43]="1NxwWWWWWWWWWWWxVvxJ/1NxwWWWWWWWWWWWWWXVvxJ";
+    CYCLES[44]="12YRxWN";
+    CYCLES[45]="123YRxWN";
+    CYCLES[46]="123YRN";
+    CYCLES[47]="12YRxxN/12YRxN";
+    CYCLES[48]="12Yi";
+    CYCLES[49]="123xAxBN/123RxWN";
+    CYCLES[50]="1234AxBN";
+    CYCLES[51]="1234AN";
+    CYCLES[52]="123xAxxN/123RxN";
+    CYCLES[53]="123xJ/123J";
+    CYCLES[54]="12N";
+    CYCLES[55]="123xN/123N";
+    CYCLES[56]="12xXxwWj/12xxwWj";
+    CYCLES[57]="123N";
+    CYCLES[58]="12xRN/12RN";
+    CYCLES[59]="12xRrxN/12RrN";
+    CYCLES[60]="12xWN/12WN";
+    CYCLES[61]="12xXxwWi/12xXwWi";
+    CYCLES[62]="12xRrN/12RrN";
+    CYCLES[63]="12xWwN/12WwN";
+    CYCLES[64]="12YRN";
+    CYCLES[65]="12YRrxN/12YRrN";
+    CYCLES[66]="12YWN";
+    CYCLES[67]="12YXxwWi/12YXwWi";
+    CYCLES[68]="12YRrN";
+    CYCLES[69]="12YWwN";
+    CYCLES[70]="123xAN/123AN";
+    CYCLES[71]="123xAaxN/123AaN";
+    CYCLES[72]="123xWN/123WN";
+    CYCLES[73]="123xAxwWJ/123xAwWJ";
+    CYCLES[74]="123xAaN/123AaN";
+    CYCLES[75]="123xWwN/123WwN";
+    CYCLES[76]="12345N";
+    CYCLES[77]="123xBN/123BN";
+    CYCLES[78]="123xBbN/123BbN";
+    CYCLES[79]="123xN";
+    CYCLES[80]="123xN@123xxk/123xk";
+    CYCLES[81]="1NxwWN";
+    CYCLES[82]="1NxRrN";
+    CYCLES[83]="12xRrrrN/12RrrrN";
+    CYCLES[84]="12xWwwwN/12WwwwN";
+    CYCLES[85]="12YRrrrN";
+    CYCLES[86]="12YWwwwN";
+    CYCLES[87]="123xAaaaN/123AaaaN";
+    CYCLES[88]="123xBbbbN/123BbbbN";
+    CYCLES[89]="123xRxN/123RxN";
+    CYCLES[90]="123xRxWN/123RxWN";
+    CYCLES[91]="12xxxTN";
+    CYCLES[92]="12XxN";
+    CYCLES[93]="12NZN";
+    CYCLES[94]="123NZN";
+    CYCLES[95]="12xRZN";
+    CYCLES[96]="12xRrZN";
+    CYCLES[97]="12YRZN";
+    CYCLES[98]="12YRrZN";
+    CYCLES[99]="123xRZN";
+    CYCLES[100]="123xRrZN";
 
     if (GENERATE_CYCLES == 1)
         delete CYCLES;