From 630ea6662368d0e09f1e82d7b9131905ea29f1fa Mon Sep 17 00:00:00 2001
From: marketideas <quick@marketideas.com>
Date: Wed, 20 Nov 2019 07:59:02 -0800
Subject: [PATCH] adding script to create M32 output files

---
 Makefile                                      |   1 +
 asm.cpp                                       |   1 +
 asm.h                                         |  34 ++++++++++++-----
 merlintests.sh                                |  35 ++++++++++++++++++
 runtests.sh                                   |   4 +-
 testdata/M32_expected/1000-allops-value-65816 | Bin 588 -> 0 bytes
 testdata/M32_expected/1001-allops-zero-65816  | Bin 588 -> 0 bytes
 .../M32_expected/1002-embedded-instructions   | Bin 101 -> 0 bytes
 testdata/M32_expected/1003-flags-and-branches | Bin 311 -> 0 bytes
 testdata/M32_expected/1004-data-recognition   | Bin 196 -> 0 bytes
 testdata/M32_expected/2000-allops-value-6502  | Bin 598 -> 0 bytes
 testdata/M32_expected/2001-allops-zero-6502   | Bin 598 -> 0 bytes
 testdata/M32_expected/2002-allops-value-65C02 | Bin 489 -> 0 bytes
 testdata/M32_expected/2003-allops-zero-65C02  | Bin 489 -> 0 bytes
 testdata/M32_expected/2004-numeric-types      | Bin 1024 -> 0 bytes
 testdata/M32_expected/2005-string-types       | Bin 3132 -> 0 bytes
 testdata/M32_expected/2006-operand-formats    | Bin 133 -> 0 bytes
 testdata/M32_expected/2007-labels-and-symbols | Bin 695 -> 0 bytes
 testdata/M32_expected/2008-address-changes    | Bin 203 -> 0 bytes
 testdata/M32_expected/2010-target-adjustment  | Bin 191 -> 0 bytes
 testdata/M32_expected/2011-hinting            |   2 -
 testdata/M32_expected/2012-label-localizer    | Bin 103 -> 0 bytes
 testdata/M32_expected/2013-notes-and-comments | Bin 98 -> 0 bytes
 testdata/M32_expected/2014-label-dp           | Bin 601 -> 0 bytes
 testdata/M32_expected/2019-local-variables    | Bin 151 -> 0 bytes
 testdata/M32_expected/2020-cycle-counts-65816 | Bin 126 -> 0 bytes
 testdata/M32_expected/2021-external-symbols   | Bin 329 -> 0 bytes
 testdata/M32_expected/2022-extension-scripts  | Bin 213 -> 0 bytes
 28 files changed, 63 insertions(+), 14 deletions(-)
 create mode 100755 merlintests.sh
 delete mode 100644 testdata/M32_expected/1000-allops-value-65816
 delete mode 100644 testdata/M32_expected/1001-allops-zero-65816
 delete mode 100644 testdata/M32_expected/1002-embedded-instructions
 delete mode 100644 testdata/M32_expected/1003-flags-and-branches
 delete mode 100644 testdata/M32_expected/1004-data-recognition
 delete mode 100644 testdata/M32_expected/2000-allops-value-6502
 delete mode 100644 testdata/M32_expected/2001-allops-zero-6502
 delete mode 100644 testdata/M32_expected/2002-allops-value-65C02
 delete mode 100644 testdata/M32_expected/2003-allops-zero-65C02
 delete mode 100644 testdata/M32_expected/2004-numeric-types
 delete mode 100644 testdata/M32_expected/2005-string-types
 delete mode 100644 testdata/M32_expected/2006-operand-formats
 delete mode 100644 testdata/M32_expected/2007-labels-and-symbols
 delete mode 100644 testdata/M32_expected/2008-address-changes
 delete mode 100644 testdata/M32_expected/2010-target-adjustment
 delete mode 100644 testdata/M32_expected/2011-hinting
 delete mode 100644 testdata/M32_expected/2012-label-localizer
 delete mode 100644 testdata/M32_expected/2013-notes-and-comments
 delete mode 100644 testdata/M32_expected/2014-label-dp
 delete mode 100644 testdata/M32_expected/2019-local-variables
 delete mode 100644 testdata/M32_expected/2020-cycle-counts-65816
 delete mode 100644 testdata/M32_expected/2021-external-symbols
 delete mode 100644 testdata/M32_expected/2022-extension-scripts

diff --git a/Makefile b/Makefile
index 75353fe..98d38ea 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ debug:
 distclean:
 	rm -rf ./build 
 	-rm -rf ./testout
+	-rm -rf ./m32out
 
 clean:
 	-rm -rf ./build
diff --git a/asm.cpp b/asm.cpp
index 9324727..b57ae41 100644
--- a/asm.cpp
+++ b/asm.cpp
@@ -1554,6 +1554,7 @@ void CLASS::initpass(void)
 	truncdata = 0;
 	variables.clear(); // clear the variables for each pass
 
+	macros.clear();
 	while (!PCstack.empty())
 	{
 		PCstack.pop();
diff --git a/asm.h b/asm.h
index aa0e88e..5a9573c 100644
--- a/asm.h
+++ b/asm.h
@@ -280,11 +280,12 @@ public:
 	{
 		clear();
 	}
-	void clear(void) {
-		lupct=0;
-		lupoffset=0;
-		luprunning=0;
-		lupskip=false;
+	void clear(void)
+	{
+		lupct = 0;
+		lupoffset = 0;
+		luprunning = 0;
+		lupskip = false;
 	}
 	uint16_t lupct;
 	bool lupskip;
@@ -299,9 +300,10 @@ public:
 	{
 		clear();
 	}
-	void clear(void) {
-		doskip=false;
-		value=0;
+	void clear(void)
+	{
+		doskip = false;
+		value = 0;
 	}
 	uint32_t value;
 	bool doskip;
@@ -334,7 +336,7 @@ public:
 		value = 0;
 		used = false;
 		//text = "";
-		var_text="";
+		var_text = "";
 		name = "";
 		namelc = "";
 		stype = 0;
@@ -343,6 +345,17 @@ public:
 	}
 };
 
+
+class TMacro
+{
+public:
+	std::string name;
+	std::string lcname;
+	uint32_t currentline;
+	std::vector<MerlinLine> lines;
+	std::vector<std::string> variables;
+};
+
 class TPsuedoOp;
 
 class T65816Asm : public TFileProcessor
@@ -371,8 +384,8 @@ public:
 
 	std::string currentsymstr;
 	std::vector<MerlinLine> lines;
+	Poco::HashMap<std::string, TMacro> macros;
 	Poco::HashMap<std::string, TSymbol>opcodes;
-	Poco::HashMap<std::string, TSymbol> macros;
 	Poco::HashMap<std::string, TSymbol> symbols;
 	Poco::HashMap<std::string, TSymbol> variables;
 
@@ -386,6 +399,7 @@ public:
 	std::stack<TLUPstruct> LUPstack;
 	std::stack<TDOstruct> DOstack;
 	std::stack<bool> LSTstack;
+	std::stack<TMacro> curMacro;
 
 	TPsuedoOp *psuedoops;
 
diff --git a/merlintests.sh b/merlintests.sh
new file mode 100755
index 0000000..6f39cd2
--- /dev/null
+++ b/merlintests.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+OUTDIR=./m32out
+
+rm -rf $OUTDIR
+mkdir -p $OUTDIR
+
+SRC=`ls ./testdata | grep -E '^([0-9]+)(.*)\.[Ss]'`
+
+#SRC=`ls ./testdata | grep -E '^([0-9]+)(.*)\.[Ss]' | grep -i 2007`
+
+for S in $SRC ; do
+
+	S1=$S
+	S1=${S1/.S/}
+	S1=${S1/.s/}
+
+	BASE=${S/.S/}
+	BASE=${BASE/.s/}
+	cd ./testdata
+	#merlin32 $S 2>/dev/null >/dev/null
+	merlin32 . $S 2>/dev/null 
+
+	R=?$
+	cd - >/dev/null
+	cp ./testdata/$S1 $OUTDIR/$S1.bin 2>/dev/null
+	rm -f ./testdata/*.txt 2>/dev/null
+	rm -f ./testdata/$S1 2>/dev/null
+	R=?$
+
+done
+ls $OUTDIR
+
+
+
diff --git a/runtests.sh b/runtests.sh
index 6e4ae83..044b44b 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -40,8 +40,8 @@ for S in $SRC ; do
 	MSHA="Q"
 	QSHA="M"
 
-	if [ -f ./testdata/M32_expected/$BASE ] ; then
-	  MSHA=`sha256sum ./testdata/M32_expected/$BASE | awk '{ print $1;}'` 2>/dev/null >/dev/null
+	if [ -f ./m32out/$BASE.bin ] ; then
+	  MSHA=`sha256sum ./m32out/$BASE.bin | awk '{ print $1;}'` 2>/dev/null >/dev/null
     fi
 
     if [ -f $OUTDIR/$BASE.bin ] ; then
diff --git a/testdata/M32_expected/1000-allops-value-65816 b/testdata/M32_expected/1000-allops-value-65816
deleted file mode 100644
index 204a57bf01c9a3ffe9401651388e6a830e531aec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmWN{b9k0v07mgAtrp)edvDgVmTlX%ZMS9HcFQ)FZJVnvFRrco^!#_O>-+*DTtCMR
zcHA(>_3^mA9@pRFhI`ydkJsxpL?J5Ch)xWAh)FD8V#kS#;-UB`0s7|{4+%*`Vv>-Q
zWF$|4Ql?6c(x9}+&k`4<BfX6bWF!-r$wJm_WY6J`a-v))w|#j`Uh<Kj0u-bWg$XEv
ziWV!5N}!UclqIFhP?mC(M-`|@B`Q~;YPISiP7PEO)v}_tsY6}rQ6Dv+A&qF<1T}5e
zJk&8QP)pRxqSkF_i`vni4s@gwox9MrTX)n0^+dg_=xzGYmwxnT00SAs;2~(}u;FL~
z8i__(GTMw`tTBNEF^=&}VB#buPnn9Qq3LLbB{R(|W;2Jm%ws+aShxr+Ua}M|L(9<$
zOIEUq)vRGH>sZeQHf~~b@D{WcZA06w*kN|Ei{0#DFZ<ZffrIGK;UnlMI);v0a)OhD
zm{XkQ3}-pV`3qdUbQxViSJ5>quA3X&<QBKN!(Hxi{{edV=rMYNo}y=#Jm&>3%`0B>
qhPQ<B?mgZQAJHfD8GW(htNBJ4-}!-l@{8a62}ge;BJDy#*!T~Z-KH=A

diff --git a/testdata/M32_expected/1001-allops-zero-65816 b/testdata/M32_expected/1001-allops-zero-65816
deleted file mode 100644
index a885f04bd0f2c668cac1bf7f403633cf11091aab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmWN{XV^{!0D$4!ri}MRiNry+%rcVfRc3bfreQ?c*?Vu<v$FS0!`^#kWY13&McK~3
z=enM|@RJ~YBv>2??ni?7(I8PY$Q2D9MT4i&n3x!1i7k$};)ySTgo(WJYGRU*lw^pA
zN-l+zUh}$C-bhWFH`DSK=|~@vfDAH*k;&UK%Ob06+2zQYi+9LPp77<BPksfw>pcY(
zQn(237yW=@d`R(-lqji`(#lX)IptNT=%bG-ZH-i>3ROc<O?98Bp(eG|R!7}>d|JQ3
zjfjRcqH&0tG}Y|I^X6J;sg>5+wDsBNU+^XEXdj9WI{Hc{oqg>aU3Be6_Z~gz#kceh
zNgsXnqrU+L8f35`Lk$}~f{~13bV$Y+Yn<^Wm}rv8rhLcLY15g(OlE~-wmIgSXTAl#
z_k$l7TC{ixOIgP9P^_@hDyyxr);jBL*vO`zHuE#T@M}nZv&B~1Y`4QsyX@X$@4o#U
z;2?)Wao7<@9dq0XC!O;9Y0jKI#~+;MLP##U<gzQSy5_nYZr&1e`%mt0m%l>sw|nmU
W$G<%A(0~4a#N#JVdB$^Igytpk*^H?G

diff --git a/testdata/M32_expected/1002-embedded-instructions b/testdata/M32_expected/1002-embedded-instructions
deleted file mode 100644
index cffff3c6b4f59ff3aca169f2ed3cbfc821ddd335..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 101
zcmb36{m4K;L_k4CKtW4DL0>>2QXpX^gU(9E4}TIK87yV^z`T-yq2E=RF+m~WRl^@0
z7<l!HYr-e42_Lv7yyKeihHC<l`+{r2Gp-3wxF$T}n(!b&=hfP!3|td_a!vTL9sms1
BD9!)?

diff --git a/testdata/M32_expected/1003-flags-and-branches b/testdata/M32_expected/1003-flags-and-branches
deleted file mode 100644
index 34e3a42337dcfd5f5aefa5a4db4f7a256643cf68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmXv}p>D%K4E3D`8g?Bz7}yk@)PjQn1A~Kup)DF5Yd)c$5Jf65m=rkdFDRVUjNI6y
zO@);r)wR=>Jiqt+Y|DN~{Q33ju|{)xkH{-XOf{91lcNbekR_AU17iF;#{roFve%j?
zhXAc<Y?3sZ7N7x00pWQ@wX?zngH$SCRF!Ya%~rYTl-s>>dsJjJq7De64o+De6uB53
zgo3prdb7VLxVUB@8#CE$L$=ZRZ0vpfxVV-@y<dyjBgDCk_kI#*TR9s$<9CbW(AnM7
cufCMerxfxqO$s+7g$kFCEmz3xfAd{k04Ruh4gdfE

diff --git a/testdata/M32_expected/1004-data-recognition b/testdata/M32_expected/1004-data-recognition
deleted file mode 100644
index 7687e6283dcd72b03f2d0b45e0ec3b894d9e7005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 196
ucmZ3xMu2yZK!UNcaf1mEG?;=wgD*v(!G|)?$iTn=!Vm&Vg7{F-ga!cUOE!}L

diff --git a/testdata/M32_expected/2000-allops-value-6502 b/testdata/M32_expected/2000-allops-value-6502
deleted file mode 100644
index 52f4f7a1148edc7865276278ff8977cd38b084a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 598
zcmV~$1z?R~0EW?z>HPm;nh(<*<Ld5i)6I1Eba%JuX1a~(&gq_Zwdr^t=hy(pdK??*
z*kH$oI5y0&;f{@TtZ}W6YyDj7@7f^OhPpP&wH{xu*K3GIbRS|6lUT$iPF&)}Cjm-`
z5~0M%F)qGINJ=vNNKT5BC{=2d2Bk&mP<muh1~O*CpUh+-E7`J>BPY2~Zj=Y*MfpsA
z3KXOe0TiYPo}#E&aa018M5Rz^RHiKD%2R=gRH8Cfs#2{wH6omvs1~Y?>X^FJt4{+O
z(ul@12}Dhsq2{OsYKdB*)@^9pj`nn*Bc13RM3=5~L)}pi)D!hGz3J1Je)MMm0~s_J
z4H=4tp<px|jX)zA#c0MbmT`<{0uv`Oc?wg}G&CK}Kr_uOX3t?R^O(;97A``Im!PF+
z845wm(F#_wiq))PE$dj%hK+36%oem2g`#a}yV=3cUF>ELd)deS1L)u(bQp!9Bj_j!
z=NQL1!AVYWnlqd|$N39fM3>NIbOl{C*SH?R4Q_Ia+uXT}?%hWZ&_nbHJw{K6<SEa1
r&I?}hiq~)OzU3Wyk3OJ}=#%-(mngpSjqm*6=P&g85BiJ#AtBIzxRa!h

diff --git a/testdata/M32_expected/2001-allops-zero-6502 b/testdata/M32_expected/2001-allops-zero-6502
deleted file mode 100644
index 4e99391d3cba3d9da59ce00d4dfb7629f07b8bc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 598
zcmV~$2cV5*007VvMP>b$vd1S+R<iZ%5oKqWQCXSUva)w(_8!^0p%hXmyRv60r0~cd
zm3dAm7KQjIG>St1D9nq(<|u55!kH+Dg~YLtHWuPyp<OJjjfI=B5T80BA%Q0(O6*Bb
zNg}DIpYd!m$w@&<QW1$soyK#XmsUFIGmtS8naM&{vJuGcg&gAK^rBpH=aDy`m&nh{
z6ri9&3KvmSF~z+iz62#pQJON8r5xoesQ9W%DtpcAs#I02x*CU~n$+SAYOAAeJ@qxv
z(3{?BMB^qj<!#>KU79u5qNP^e(^?yC+iBmy`*freo#~>hZr%0pfu4Hl-G{y((vSWO
zU?77GHpEcF3^&3^qdqcvjIoSkJQMiXM3W|)VybDTn=zAFvzfzO<}sfIKC#dui!HI#
zGRs$3xyowRu$E8x%;&yX=SyE%?`z*|VB;pfWi#LLJzH$G%@2OG-3~kL+HKEXKk+la
zu#f!?IC#imM;vv`@e`c<l~er2@BG1OXPot?bN=$T^DbPJaLHx<;R;u|=DHg<-E!L<
Rcm4Yx|KH<24|vEU9s}{0jOhRX

diff --git a/testdata/M32_expected/2002-allops-value-65C02 b/testdata/M32_expected/2002-allops-value-65C02
deleted file mode 100644
index 264d1f64b2d88e78084f7068de3174a44a86de82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 489
zcmV~$1z=8L0EW>|w_Qw3UQ?43)6Hy5&2&%qbjS2;YHE6z+;rPC({01lbp5)f-^V$&
zvt@@^cC2M5Say=-a5xOfNKT5Bq#`wG(xxMQhKwi^%8Z;WlZC8gb0#}E$eGIp<<65A
z<wN;V0UH&>l|qFnLQ#sj6{keWQm8a4gWSuSa+Ifn2NkJA<tkNCwdyrcO;iiju2YwK
z)c2$TUU)Zbgiqrp;Z{@B3^n&PE%2jdD_YZrw(Z)Z4jnt8&ZrCO>fep-^yo=1def(G
zKl%?Chz6kmG<b*^$}onHU?ig$J!UK#H+}+|h$f-H$z}>unKqpn%p_=5Fd?(&pt)!s
znjdNwu#iQISwa{~mn}ytR<1&;Q8-$&mUTq1eghlX#O5uLL~Y%Mwxb<r=Pt9GJ?!1b
zehzT(P&A4;d;}du$I$T;oa7XzV>!cF&Yi!&#Y>mb6?7F{yKZi9lel<pahp2{chSB3
z570xDh#o!W2~T<UoEN<0)$2Dn-o8Wc(FgSLlljaSzJB97N&NWv3;q7{7yUy*{0H|t
BQWyXL

diff --git a/testdata/M32_expected/2003-allops-zero-65C02 b/testdata/M32_expected/2003-allops-zero-65C02
deleted file mode 100644
index 094abe61d314a64733ed702f454c00e8b17a3220..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 489
zcmV~$1E3WK006+tu9saeW7+1i-LkcoZP$LbZEm%NE!)P@GJocly9>q(1VaMB1A*Y>
zK=6GaG&Gbj!U`8&1QA7w97WV<(TPD!Vg<w&N8EVgOCVvQ#3V_YjO3&sWsp=-OOsYQ
z>1D{6N#-B2kd<s?&mpH=a_5m(KKTn2q)_1^6r~u&OO#Yf=^vF*R=M&ORIF5aL7)m%
zsa9PLHPx!Ej=JjA|A__-8_}31G;P*g3oTn|t&O(r+UxLhM}DCboxA9&o9;dI)JyL^
zed*VK00SAs;30+@X7~srjWT-7uR_L-V>}a>ILTyFOr2)B8D`F!&78UOn9l+hF0$AX
zOP5)0g_WyTTeEf@>)F6>zuRb&KmN4Y7F)Od#oya^u#;Wv-ea$Q_8)N2A%~9~b?o>F
zPI8LVXPkA;`3o+(<e$q|xO(k6|8j$yx7>Ee-FxnP;NhdkLZ3Y48P9p~(krjMdF!3`
Q{`>y}A3uHO3t##69j_CI4FCWD

diff --git a/testdata/M32_expected/2004-numeric-types b/testdata/M32_expected/2004-numeric-types
deleted file mode 100644
index 47e2524502e99c91732705abac5d18b216389e39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmYcgR1!2+5_AD#K_FAf7>HaL7#bKL7|eh&fkGn|G@KdfK(GOnGD6eJJ7xkC1)RNV
z_nEuz{uAQ=e|PuH?o~58%F{wYDUG3F)nEaQ6ej7$)%XF_c*aHnD68@AT?(zFs&)XH
C3~EpS

diff --git a/testdata/M32_expected/2005-string-types b/testdata/M32_expected/2005-string-types
deleted file mode 100644
index df57058d0d0483766bc909c5897bfe0d18f3f4fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3132
zcmeHJyG|QH6y5wlkjM{Qxp8AznDDYFA`4NtL6P`@jCb#9N1mN=X2#xZs&$e7u-qV}
zh?I1ch{`pe00^j}5GRUK<<5c=9Ja7niWH$hqnUHg+;iD`hF3x*(AwW=x4~GQU0z*W
zj*d=_CzH|F>2+46)9UNKvKUmVRf}(IHg=Hlmv5h^=Vu4w@$~%1G+Sw`K3`kk*xYJ9
z&Z>l9wOTE~-YQ9NmgTRM7HB+FVPmsWsXVB6^oK7&ZI<D#lp;5XJ$zs4Co9EXfIJ+a
zhIV^rzXgdB+4uA7(PVObax}WUxVp^hh>-=YLNG!o3zoz7%}NODfIEy;l;ns+$u1Bk
zkZ3^T03{$XQ9D#18Po#FyOPBqIRrQmYCwyaK^xHYnNNB(jKN@Jxa2VpAhHYtFpiSS
z7C@b}5|D`kl$=CEMHhpi3%L#<o$WY0gOGz^KxHOiTDR0xD=Ss3bniaE7!<i7!vT9r
z_jjSj$cd{y?Lf*BMpZ|KB|w!1O88ErO;t%w7djZ#V>NTyH7lt^y33y(ppV?0kb3UN
zH3+stfrffYMAQUF*CQr!%nYgahF&(8qHn#wa`dNHkfdHwlzI;uz*+jz=$8{Hif@nX
zJ)QH{$d=~ciI3TG!AtS1=&5*7bj6~3F4|r$3SJa9^vIt#XK*!J^5z|W%9gz%i(a8e
zZ_&GpaJk7+3Pq~fyC-{!hFJnPkpC7;1~nQ~%QXT82)8s~;Wp5BuhZX1=y941cWxsD
zUlE)p$JS_4dQ98dLCm<U1GGch_k{|egOD&2Q9RIGrqD@qzCl)l-M&^mbagmM8Zc9b
zmVpF?0A_$Yjh?0ykXBJ835Cji069_m=Jpgq%~1vhW;;|Os6^gUp(S%ahT?(Q2m;D3
z$*DF2G1jP3pY;t=%27&iIZ$FiRdeZD(B-a2)F@Y~#!ykKq-zkRpxac?mGu7;?L!i&
zI5*UBKCBYLY*SBfRyl$sus;0rp#}cc-JCc(<@Zx!S`ZSpWJVm6;um~ehr?^`2X`JR
geRX<v_mw)_+T2)Qd%oIOX+Fv-`|$tS`v;!AUpJ-_{Qv*}

diff --git a/testdata/M32_expected/2006-operand-formats b/testdata/M32_expected/2006-operand-formats
deleted file mode 100644
index ff2319e7c481960f3a60bfa1c853c422a533e47c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133
zcmb36{m5V`<60)h^~_9+n2ZKFMn)z^CT1XF!Nyvdu{2|C2E+Oc28NaLD-~8MtyEuG
zx3Yd^!^-(97pz>ga{0=CEB_xdSee1F@&v=mjEsbghK!5`djWd^1_Ap50T5&mC;$M|
C947n#

diff --git a/testdata/M32_expected/2007-labels-and-symbols b/testdata/M32_expected/2007-labels-and-symbols
deleted file mode 100644
index a200c62e91cd8a28de3ff5baa42ff17824d08e13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmcJN&2G~`5XWa9pkZ(l)Z<9L5Cl;RmJmot9FmAb4n3r)KsjKyZemF6kT`|57uS4$
zKLv+5SbhiY$r}`*T%b{%Q-lymYu14i;)?X&nVsMMXLk>?`g6L*V?O2;PFV6KPPxR$
zCwzvhtg~1oa#7V60v1hUp}}9}he<Sncmfce%J@`5G?(#QrJ5esbP-kbxT4aQ5pNk<
zv}wefhW1fC2Yd{?BDjQ%z$IW<Dv>OKlN{#+3*f5G`f}4W*w9#mU}K!fsxHP*LWB|k
zBvL|>%ZaM43jwudl*u?d012SHx&Q&7NQN>7>PMiIVc@gS5L!hOzoRuzLx2__%x1Ic
zS_De#5nPVoN^ngf>qlyRPpxk$<&g?VMGQ`Yufdmanued#@KajPW4(a&BDV4ft%6!b
z1UiRw9_a$oMWiy)I+B5O73n(C4Wye$6{K4ju8QC&eEj6;v*#~fzIy%U?YsB?yKZ!x
zAt{;E_1rcM{ek1Q%d|1_Gh|wJmrQquw!L1@c75_(a(wbV1>9X{&?CQNs=8zU)7#xA
zv){MPLDrX<RLjt(uH)KeqJ{zwM$YzqvIgEmmv+5JbZ^w_56RoJ2Y)U-*ry$@JuLG9
Q-)2Ki&S8`9WW#Xx7cd<T1^@s6

diff --git a/testdata/M32_expected/2008-address-changes b/testdata/M32_expected/2008-address-changes
deleted file mode 100644
index cfec9c03de3c6ef489e71abec623d2a280cf9a81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmajSy$ymu7zW@Mqp|TP7aQ%~P(gCV9jrjf0JhSbxB(X?&<!pm78Ku7mRHdbLntsz
z;L|<l=`$0GTUCM@s#C4<s`}1uSQfXjkE?MmH)?6#=02~c*^L_PPwt}0e%)LVw4)?s
zLP^P#Qj;~sk&bWlHwmGHL4rRtOjoppFPZ^}Rywk>GqN{wFmf~k+uuV#q#G+wD=#a^
K+#>{y4ABoowLAO(

diff --git a/testdata/M32_expected/2010-target-adjustment b/testdata/M32_expected/2010-target-adjustment
deleted file mode 100644
index 5b3cfa680579537c525423eb7ff4a911d8b49142..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmZ1}xJYS%@k*Bl3uVT1*VUcx&k8aaD>Z~<q$(7aW+rDVBo*bC=P9J+S2Q>YI0`rm
zFra~kwOj&g9R>J!1oZd>@&p8Qg#>s-1lAe~^qLB+wG`;J6;NOjSj#5xB|{+T=l``?
z0&BAcR=(;j7wD}P=&cuMs^@QLY--kFQdrv}u$DogfxD)*t{x=R(%QC`S79xm!diZX
ewE_xj1r^o`DXbM%SSzBiR#aiFn8I3dg#-ZOnK|JA

diff --git a/testdata/M32_expected/2011-hinting b/testdata/M32_expected/2011-hinting
deleted file mode 100644
index 07cb179..0000000
--- a/testdata/M32_expected/2011-hinting
+++ /dev/null
@@ -1,2 +0,0 @@
-,,��,��� 
-�,���  V$��"  ( V$�3�D : =�V$ E` V$�U�f`�����`
\ No newline at end of file
diff --git a/testdata/M32_expected/2012-label-localizer b/testdata/M32_expected/2012-label-localizer
deleted file mode 100644
index 7a2358e88df2fbc5c448750d19ab52d2b81b1313..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmaF0mRDdczrb1nfwg=BuYh2!h`>t0S8K%u*2;tUYh?wNGJIfDkQY#36j-UW)=c2l
pT63VpO5?STK&CTD%}N&qFR)$(AAtsjS8F>uKnAU3xbP1K697C=GxPue

diff --git a/testdata/M32_expected/2013-notes-and-comments b/testdata/M32_expected/2013-notes-and-comments
deleted file mode 100644
index 233ba0563752d1a6f2f771284ebfcdd42b2476ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmb8i$pHWm3;;nP#H|qzC24QFRD<~qf+wIv5=N#_X><mYwcWW+e9)LIm)iQ6>-P`M
CBMkfi

diff --git a/testdata/M32_expected/2014-label-dp b/testdata/M32_expected/2014-label-dp
deleted file mode 100644
index 5c8e85e8d3da44f1b76ebca6fcf24b1f2dc23ec0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 601
zcmXBOV|14R9L4dQTm1jCd$N{o+qP|6-?sJ3w#{YRwr#DJm)pYA>D)K>ocnok3xql;
zJx-v<3Gq0Qy^fF9@%1`CyiS-mI5=2@BRmm^NF*W?g{VG6iyp%i(-g}TdyM3fmpH^F
z9`Q*)LJ}o5B}tmhl-!iUl+q=RDHW;Rl7_UTBRv_&n2F3;d`($R*-Y8pEr)WFi`?WP
zFZsw%fr6$&g^QSqnu?i<yQD-(N>Q3J{sCnvM|mn#q*CQ7M?6(c)lAi0QA0JUMQ!T%
z2h^n=^=Z)1)TnWjAdi}wnwgrrs6|U!{rTORHngQ3?di~wPMy1$x|+I~y1Sx>deV#D
z^r0{P=+A(Gra^;;n1-5$nTERrjlfUxCxDR{qZmDgvE#;@CYUCgCb?v?rZAOhOlJl&
znZ@imrn&Rxn--WBnijcaF-us=GM2M~m8@d*8rBA`Gp#pmFl}_jCT(U5TiM2TcCeFO
zyG?uc?lbK-9WWhq$srDNL`ONsaZYfOQ>Qs|_MGXw>4NE^D=z6WSGdYGu5*K%+`4VL
zbN8O<zUhJKp-Ud|m?wJ5GoJH;AYQ&A`1KppThlw!dslqWM?(0-XVVwH@{R95Og}@z
TOutOOO@CaI*6&|@|6l(L!r$`z

diff --git a/testdata/M32_expected/2019-local-variables b/testdata/M32_expected/2019-local-variables
deleted file mode 100644
index 2e009386ec607b6ea99ad0184bfa3d057906fa57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmYkuy$!-J5C+h5oB^D$fQ7iu1%WUED^O<)N=t|d7=imvN<k1}D_5qBg!qxtM6Y>5
z4|BF!Ui0ZCv+v1f5DW@flyImJmDFev`mc}}`R9}0Qxlw4Qa{~gp<b7|O5!KH=7u-C
d<(7BzBl<{PLcB$~N1{FqZJkGi;dsbn_XFbbJ4pZl

diff --git a/testdata/M32_expected/2020-cycle-counts-65816 b/testdata/M32_expected/2020-cycle-counts-65816
deleted file mode 100644
index a35ec67be954b01a496ed7252e682586d4d48c21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmcEc-5|n%1vD_MWca|uz;NN;S`#54gK@Ev2$LAI#P34}D+L)AC^3kzh_S9S1xYb2
zHvYiWu<ek-BY{?dHo+F5LjsQ!S_RvLT7(Z70Ci`kG31&G{m3k5$TbtP`2Diut+~*R
Lmowj52qgdjlFKF)

diff --git a/testdata/M32_expected/2021-external-symbols b/testdata/M32_expected/2021-external-symbols
deleted file mode 100644
index b1d9202bba3b99a8fab52d6edc7f10ddcd06ea43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmWO0JyOFk6h&dle{m8Zb~X@MwPy0X0TKcQbXo!n!t4T9Ia$N=c2uRL!nixdcV{m1
z?q-^+ZFq0_Xo+p&@4$S(IChT4(K_~ygTpyGhj$6n(R8?Ou^n@V@mNph$vuUq^i-ae
zr}nHp8_(7+^vHa~2v*31TquN6sDzbJ3u|E`Y=sBmQFsz|LL<vkm<7{gd$OLqr|2nr
zsy>a+<7qsPFXLr=9p4i333JAt`JI32<!HplTNbZ*984T+{LbQ69#b$H8VydvT~n|c
sS`FP&nTEXvuZdhKlv1gbl@5gtr4E%2OV^rQxnMJeW(sZ!_bGk;1Hhz!761SM

diff --git a/testdata/M32_expected/2022-extension-scripts b/testdata/M32_expected/2022-extension-scripts
deleted file mode 100644
index f110a86fb257bb4fe58ead65cee10ee3e3146c3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213
zcmb36{m4L}Tfo53$k@cx%v_;Iz}(E##MsEtK%rM4uQVq|w<NVFSE0D1C^IjeL5V?t
zQ3S$PD9<d(P{>KmOE1aLH&kL!U=(4%B4eb)V8H0&><Ka9xx!Wf1%5#V4nYRSJ^==%
zRRXURS_M>AGPM4Gl>h`vg2pbPY2_U=JId42jyW83I_z@P?KsfvRRRrb1sV>%d2{sT
f^A}%$PD?7v&rZ!#V1zm>0ptKKh6JEYYF-Ke=88um