From d7abbaca364bfbee1f061122490f95072e9a18ba Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sun, 6 Oct 2024 18:33:53 +0200
Subject: [PATCH 1/2] Fixed issue #1869 by adding a new option, -to or
 --top-output to strmxor

---
 src/buddies/src/bd/strmxor.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/buddies/src/bd/strmxor.cc b/src/buddies/src/bd/strmxor.cc
index 33d8e6ca3..b4797bca1 100644
--- a/src/buddies/src/bd/strmxor.cc
+++ b/src/buddies/src/bd/strmxor.cc
@@ -360,7 +360,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
   generic_reader_options_b.set_group_prefix ("Input B");
 
   std::string infile_a, infile_b, output;
-  std::string top_a, top_b;
+  std::string top_a, top_b, top_output;
   bool dont_summarize_missing_layers = false;
   bool silent = false;
   bool no_summary = false;
@@ -393,6 +393,10 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
       << tl::arg ("-tb|--top-b=name",          &top_b,      "Specifies the top cell for the second layout",
                   "See --top-a for details."
                  )
+      << tl::arg ("-to|--top-output=name",     &top_output, "Specifies the top cell for the output layout",
+                  "This option is only used if an output layout is given. It will specify the name of top cell to use there. "
+                  "If not specified, KLayout uses the top cell name of the first layout or the one given with --top-a."
+                 )
       << tl::arg ("-u|--deep",                 &deep,       "Deep (hierarchical mode)",
                   "Enables hierarchical XOR (experimental). In this mode, tiling is not supported "
                   "and the tiling arguments are ignored."
@@ -518,7 +522,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
 
   if (! output.empty ()) {
     output_layout.reset (new db::Layout ());
-    output_top = output_layout->add_cell ("XOR");
+    output_top = output_layout->add_cell (top_output.empty () ? top_a.c_str () : top_output.c_str ());
   }
 
   std::map<std::pair<int, db::LayerProperties>, ResultDescriptor> results;

From b4f38138e889727edbc26ab8cf327515f9a62688 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 19 Oct 2024 16:52:17 +0200
Subject: [PATCH 2/2] Updating test data

---
 testdata/bd/strmxor_au1.oas      | Bin 578 -> 577 bytes
 testdata/bd/strmxor_au1d.oas     | Bin 818 -> 743 bytes
 testdata/bd/strmxor_au2.oas      | Bin 603 -> 599 bytes
 testdata/bd/strmxor_au2d.oas     | Bin 843 -> 767 bytes
 testdata/bd/strmxor_au3.oas      | Bin 2571 -> 1667 bytes
 testdata/bd/strmxor_au3_heal.oas | Bin 576 -> 615 bytes
 testdata/bd/strmxor_au3d.oas     | Bin 818 -> 743 bytes
 testdata/bd/strmxor_au4.oas      | Bin 5124 -> 1740 bytes
 testdata/bd/strmxor_au4_heal.oas | Bin 816 -> 657 bytes
 testdata/bd/strmxor_au4d.oas     | Bin 1033 -> 889 bytes
 testdata/bd/strmxor_au5.oas      | Bin 798 -> 628 bytes
 testdata/bd/strmxor_au5d.oas     | Bin 1026 -> 882 bytes
 testdata/bd/strmxor_au6.oas      | Bin 477 -> 475 bytes
 testdata/bd/strmxor_au6d.oas     | Bin 498 -> 512 bytes
 14 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/testdata/bd/strmxor_au1.oas b/testdata/bd/strmxor_au1.oas
index 93919a14e3992ec04aaf77eb54974c707c4e9a69..5516527dd3c9057696e363847c306a563b3a2df3 100644
GIT binary patch
delta 331
zcmV-R0kr<Y1i=K56@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03ras0kZ)Usb^+LdBJp2YK0^d#|06Q7=NxM%rAI2I2amEF)h#&
zwPj-z*kU2F(BcB?2H^)n7g!$(Es%f8D)NJMq5K1(pFr+j{<~}-ouW335;J%jSUZFp
zS&vAFY?NqV-3VlU<i5bVfUSY`f?Ol(10k@^he8dkKY`pMoV{!eq9%+SEj%J1Wgob~
z(tnv4IT$X8d^`{pwP56U!YXo+^#TxrrS3{ikrb)sVBB(p@rces`IRC70|in^PDf81
d7XS!)0s*xG0RRCb0doNW0RWRx0q+BV004~Lf-C?4

literal 578
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF@p$R22p!v21cd}tRhR8U+{2n
zFf^QETA(Lt0}?vHcv5PGBooI45m8$<MvfL9k&oOLSU+$-Wfl3s`j@E}D8_I><bx<s
zwZIk&k%bl)ST_hi5W2wnP-uZXSkXfH2SPuA+`asF*}&#lFmgO$6}iZI0SLh=?n+IO
z1nQTV!PCInA>7D%L_%bvL<8$aAQNQS0=5R$3v!LD4}`#~9||?F{seN5aQ3n>h+1<n
WGBR~UzSzLLP=2KdQ^QCG3=9AjsoDPk

diff --git a/testdata/bd/strmxor_au1d.oas b/testdata/bd/strmxor_au1d.oas
index 012da78437b2662a4b065b156b0b1dac5ed20c9f..a90086579ea6da5d3ed56f7784746e79ea3736d3 100644
GIT binary patch
delta 476
zcmV<20VDph2ImEk6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-01W{V=m4Px3jpvH5)o;j1^^X50{{U6(2<@Qe<A?-0+0e#P_IwK
zFcfY}TH4&@2D{gATNY*zC=whA5dIE4e+VIn6FWDBI$UuJ3Uh{x<c^$}KpbLjVkC$K
zwTVk;J1VI9^4|CBb$^KmynsFT<P}4hBn*_-QKC2U0+W`)RD2AP!I08i%oygVfIB85
z<$=Y|o{Vyl22PWWe_`RR80YBroy<?nXgY>`lrYDDo6Ts(tm*dz6dYSvQCMDTn_W$U
zG9>8rz>+KaMgC$NX(sa+KE;dg+}6IXoWy;{mTq-vM~)U=*()C+Q*v|aM9q;dS@(x!
z6Uc=MdV{t9rVqB7A7Uo=L)iY$Zw644jv}dL*6+*)mtlKoN?}D;VHy}%Q0PDf@|<J+
z3D<SD^B6zDF9QWsQbA5r92WoxdIJPWPF6A;7XS!+0|in^PDf817XS#W0RjQT0|5X5
SBLQ;(0097#K?3gsfB*peLcw(a

literal 818
zcmd^*KTE?<6vf|r@ui7POk3|m8-iUF9JHvDpdv+s1~iqX{+qJ6_$`V!bf{Y=rwR^r
zD^4yhQlS-x4h}kW>kz@AIJJY|OJYUAZ{VHI%f09PZtj$0Zd<e2jAJ?KFc#+1bI6OJ
zpJg!Jakn!Eu48T3=DKUyd2_?ex%<|7ep4DUR3mKf+J6lgY}j%0*&TPy+}cuvgKSQq
z`CP_!gdxk`TM+y&DpGOWLl<Hcby*^QToDml6%ZyZ3YUVXMA18mu|@ygz)iiHR7t#n
zqf!fEgJP>9pNAg(AU%pD)PgQ!#;w*CgU7kSjJo_hPq>FIV?F~#`AI>(E{;Ndq{NY2
zS5ojI-y{Nks=x<13;jHdci+aL3e$rO=+M{S{SJl3N;yd)90F~fpt~{O)}4e~%~J-x
zk_c6;PXh*&X<hzeoQTY*Y7p#ut@-=%D1YA>Olq8*3>`<$BWK~VwNaki6eS529!Mn}
zprYWB{`Uc(E)S@W2~I7g!i>knJ^%ZF^iIOVLZ1_S$#2-!dlP}|(57BavLy-gGaY(0
N;UaYfr0|~$p-*<P1_A&8

diff --git a/testdata/bd/strmxor_au2.oas b/testdata/bd/strmxor_au2.oas
index f88ca5cbdaa7d753322018596959897166c622de..dfbe699e2c69f8638de39a84706f0ea9a2213d68 100644
GIT binary patch
delta 352
zcmV-m0iXWc1lI(R6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03ra>0m%Uqsb^+LdBJp2YK0^d#|06Q7=NxM%rAI2I2amEF)h#&
zwPj-z*kU2F(BcB?2H^)n7g!$(Es%f8D)NJMq5K1(pFr+j{<~}-ouW335;J%jSUZFp
zS&vAFY?NqV-3VlU<i5bVfUSY`f?Ol(10k@^he8dkKY`pMoV{!eq9%+SEj%J1Wgob~
z(tnv4IT$X8d{Ph<wP56U!YXo+^#TxrrS3{ikrb)sVBB(p@rces`IRCf_qiBOFn03Y
yWZ`C+z^uT{q>#kT1ONjCQb|rnPaGEj2zmkm%K`xa0V4r(0RRC2lVJhy0ssJItd8{n

literal 603
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF@p$R22p!v21cd}tRhR8U+{2n
zFf^QETA(Lt0}?vHcv5PGBooI45m8$<MvfL9k&oOLSU+$-Wfl3s`j@E}D8_I><bx<s
zwZIk&k%bl)ST_hi5W2wnP-uZXSkXfH2SPuA+`asF*}&#lFmgO$6}iZI0SLh=?n+IO
z1nQTV!PCInA>7D%L_%bvL<8$aAQNQS0=5R$3v!LD4}`#~9||?F{seN5aQ3n>h+1<n
vGBR~UzSzLLP=2L|s67|ZBNLb>Fn99ZWZ`C+z^uT{q>#kT#MCg70Rsa7nG)Vu

diff --git a/testdata/bd/strmxor_au2d.oas b/testdata/bd/strmxor_au2d.oas
index fcef4685e51f364718d469cba67b5141ad617688..da3127ce748010c4f972326363b005d9a2727a5d 100644
GIT binary patch
delta 499
zcmV<P0Sx}j2LA<+6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-01W{V=m4Px3jpvH5)o;j1^^X50{{U6(2<@Qe<A>r1E>O3P`^vV
zKom|cy)!W-(excQA(##hPJ)}D(!ax1{6j<>Dx{DhlT+Q|7MxtVNQ728WN>JQY#Aar
z1gB&ucz5vzZ~A!m{d#YIp_+OQd-BmSQB)KXNbD9P_CqgJ)L@txpM8a6h;e32iK;6(
z+!5+0HVFJ;Q$I6ee^+YK0nF_s(RJna1I<qOXflAz3W;RE&Dxq0VfsCU1datPF)S{b
z%?=|$;UVSiK#)uPh5lk|$|th`HpZ(X-Bu2(90py-25(tuN%rS<(J3E&UUGdZMfDLY
zS#^u0L&%K8?F?4VJ6l+2eh{DB_hI`#zc!&lEmkO#3BNNDVqAF5p@1b`da=u4j-iFb
zrRTcJj&N0_+EefhbiB(h9chvFU~PJ4FVaRP8eN;{7Xt-UQbA5r92WoxdIJPWPF6A;
p7XS!+0|in^PDf817XS#W0RjQr0|5X5BLQ;(0097#Q3CJ+001kQ#<u_f

literal 843
zcmd^*KWp1i6vf{kKSi=6D|YUqwGeTJ6gs4#=~QToF^xzCiCiqVNhU$*l5Y`0h7=s|
z;Hi@X9o)@y>XN0nV3!OYIwXTP4=Qvpnd~9ZE2$1G^c(a}=jq;ieplyS;O=-2s+GVC
z%q-;_>kmn^K>jR8+CjKe*$V@2%Xc?J&#${%ZY|vPHtR3cjAJ@!`<4H%0Y_$ouwH!`
zK6kgb4Zc^caZ#^T{D5aX|Mepte=&(k^AR~ybTW~J{6SkGvdjr(LjfOnWa#9YEy~C7
zyH5vpr)aW#pX%xm7Uw0)3eLk++_0&jDjC8=O6S}fDaqr#Bb}ahxxsKpKBYJVC)#&|
z#QJ0jdbtK7QMXHQrF||W`q+RQcAD;^8Fqi(g$~@Gd%#%y_`5$A(0|q{vIT^|$Y$ir
zop^1s3g=d2%=a1!bgY?37|;?u?Kk5{kxs{g<lawKd@owX_pVXaMRGCSczc;UO^@v^
zq3=LZRdV=^wbv7r4iTH(1^_*6PQ54~wNXkvE(%}q?-SBBOM`_O5@LxNj_m1jBFAE2
rw~F$KN-?JWsLRhvA3>J07<H33`McazM$a_)iq2Nv=!_ly&qc^DML7yv

diff --git a/testdata/bd/strmxor_au3.oas b/testdata/bd/strmxor_au3.oas
index 6206bfe2d64089bc99d628d0103d8c4ffa30c3b9..6ea7c70d4a56a7561a6e12bf829b07bbf6b4bb3e 100644
GIT binary patch
delta 1429
zcmV;G1#0?>6oU<r6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03rbO5cLUlRZ(agM-bKS?e3j)vgC$YaDPHb^5evXP)rCkAI?{y
z6#C=;<};;V{ppv<M<W+GaS|IGuv>+y;J~%W&=eOOupxm^&Y%<*E~!jqkfEg)dI1Hb
zpimcV=<Mvt5e=0<zPX)!GxO%n7_K^*T*3n<$$MU=^fO<62QFQHe5`iVcOw|4&#7UU
ze7|yy!{mwJI)B#}72^;U;}08oKl73w(G#pt$(Q6K4%>WMcKt{$tC9>n*zl%h`O>`d
zGYg*#qnl`F?=z^g+Sjao#?P#NYF>KfJeWHj|Cxk68JtFcfuT>~*WP*Mz^tf${`!h)
zscG5s;191PYfv3A{^*YW=b4(Cmdyfe7D_UH*8<^@0e>pxI!y1fc&ZO{-n^UC7Y}$w
zpJl3&$LFp;F|RT<?ly;n*H5<37+ckfuvCoXVi6t|cU2m)kG$aM10Ek8NU_3UhDWl@
zAvoO_{ZB<p5^6HxuM<(F+@74y>2~&sd|32{Cs*Y%i`X(Vzy0S9f5bc7KCeof{;JU5
zh;WJZ<A3tV<hSK9FB3uHY6uJczUt#U+3E=QBB1>8#75U|AtR<m=KeTSu*Nz*b*a(g
z`T`SGvE}IvZ}v0%gC@~1$KpTvt}-?(IN12LZN4Yb^q|ZKnjZ|!D+KkR=M20>XA4{v
z`i7{7%pwCIx4kbdZvG8LP3X7F)12^>In*yi*MDz|V1}W)!a5_lS%79C#?13nNh~8t
znhMWSYKw!qTx+s<by&~?8Qe|_iX}Xe>sasl5z1;+nEING>QfL5Me^GrSRaZvImST`
z65?2LjqjZ>9+f<aq3iGSu$RUl%w{%u!7OMyt6^;RD-?jSS_-Y&2CI%3i-bdW8>9Ag
zQ-45HB)2%8k25j#qkvGvEmO82rBB4avBjh2jLa4bf8~c!_j2{;oT9!-DPlZk@jj;{
z74*DFzVcu;+xVN=(g>j@YmY1fHta!BuM{!!v}J3|^z06^)DaU+QCnk3#dvDhS^Wzq
zy)5;L0kfA0JmJX)h&`T~vjyA@DKd@@N`H_@;ByRun}Y;ZMbNQlNciuL{>AC~TTYn8
zQpQpqwj3mdq#;lmhQn}Wu&#=`lclm0Dx>4mOy09xV1qt}so7hM8idR^9iO&P<BB~m
z<tS#DwH-t$7xWF2`@oRw<3g~!Ox<=MaKdKV!Iq-=s$V?hY~86}AobYd%t+eiSAWHR
zUO&&*PY&Q#&AbyZZ*W5kDbp~9(q5bZ$`~SvqFVdN)>{?dyZR2+o3^dz7;>-J7*lr{
z-VF<uU5v=}bL@(BE#+v^aLR0@wo7Jc`-(s<?-*s1Kdui{)_ou9{yj4u*b5}r1RJ$z
znASrxYlP+zTGSuY-DA`+M4aJJ;eWNF4N1+ULAS?NH^@nUmZ-O=a&#Xv8O{0npIlmL
zC{Uo~XLhzxDzq=VKFKGQec<3kJFxDA-|=*FG~7sTySP8o9f&^2ZBTZAtOhr#KmI?9
zYRl0ZPJFH}lx3#p&AOyw-t=w@y(7XO(nSHw3{QihblEH-UrRZt<*-)+1Al1-Fx^g}
zFo|8~w(AYv@#()7PH?(;FAuKcn|8Lq2xWu8q2MMCcz@Xt6ZPwkRRbcL=HWgVg{vNW
zsuK6^$r;yI=N8`kYj|w%2j*75=k)$3hGr{q58j$_*$7YE#D%j@)e5kYOya&A{TBlT
jQb|rnPaGEj2zmkm_X+_30S6-ia{&MW0Fx03@B#n;DB-*Z

literal 2571
zcmd^B|7%-S6wkfy-j|oWd~=)&?I^Clbc>*4j)4<1WNc+C?i=gGfkJ;#{K;SZsq6<y
zCEYUDK?kjN7@>nGDLARnK?@rU$>2>oc*7J^$Urf}3^GVZh80@yob!@VssDi~l-&2u
zJ?C>j=W{+c1H*$Shh95<cz9?y9u?N>d-sJJ;n3DkpV>J)a`N!`k>R0Zrv{IX44pbR
zcx>?O$a_Oa&mDJEU%W4P{qCv%3g|P@;gNHv&x{-yJaHmsoj-lnqJQy_dCLk3>FWtG
zb5WLhO@<awv>GwT31xqlvwO`!dXy<%qSpuLyC?4Nbi+QR_|u;<Z`wkYk}#dTt&7*>
zBO9~WHG53A9r)eJ>Jk)sT;)T5svm<h!pX&8&GmK5eXL<!7k6K^>2(U<r?8sB@<j)V
zISVjYWuq-&9*O#BbB`OE|AZsB*o3J65foF+$h3x%Zph}I5M`*@2GXS^QRv}(fa#`|
z1f{dH(RDo*HO<IFeJ6=2Q)lM&tnkGw{`sQ&y(RC;mJFWHYqL*aiH~43e?@S@vYJXl
z?lDzAAZ$kCYkYJk**RybpK8s-&X_}MZe~;B2^sqVk(h~P^<4=oa!eBmvvyV^yd`H$
z=RR;llOOW|vr%80JH%#l4^^ydc&PJ<($`{f2dxY0wl;IRbXP7rw5}%LUZN(-zsRXx
zT95vypseb(E(4PmmRwko>$<Z$Y37pouV^>nlrWBc%}FTkt_=LE7hHJJ$$uKug$038
zmA0%55GhcRwET-%;m{Ig?Zj3jQqt~2lDY^p^<M=8v|$R{&rQ3D<WK<23dC592M`%j
zK^0q63Ey(^^{Drxn;a<jm!1A+qe%27a`i$XOvtiTj$k<i%FCuIjx$o$WmT0H#QMuG
zk~d=BE(DIjTx%x08o_rCe7L1U#V<qvwt#vttC7Z25%AA&H)Odj7_I|3xpiAS*u{zS
z$}4xe$igY8^0eTY!JI1+8q(Vp$T+r5D$ABxvg-STY@^pKoRo4^vdXsyXUr?Pu@1RG
zZ%8lPo9)3(WmZ-B2Rhz967IY*->5a0J3usW0$=-@NA}UqKxQZhYQuHHe^A&6$JgIl
zuxORPla&}zTTmM@^8~47o@}UueZ3NfMwm3j5lq5{toL$`?Z|4v+!yr?ItaQ!GjdCS
zCvXq~j%--KA-d&)=ia1*2p*<zc&4LJidHTV1nv#aAa};bvGDah1yxm^6N~^)J879s
zx#n^MnOqy%j<26PkdL6c1E4jVw>7Q=gez8&C%n%sR*{?#fcn5@q=l?VG&U+edP5*d
z<pe%vFJoS@;T@wYsPDt(I!Y~&Q8xOUWgehvaq4j{N5?b^H>>M!1QtpTO4fp|$e8QB
zUCpCzn-K<xGeVVNUeU}~MR(>WT=O>#5YM~>KUsgL5_3b(<PJ<IeR8j5M>ruLyJMi7
zcyR&rtwstx((xf^XhE6Fq~QQ^&E|%Cmn@bc8tqm~!}5Wm&?#CjtGnYCC=6+y$i{I@
zgV+nIkT93Y;IIgGgn3wVX@a>SWM_0KT#|&shI&_u<yV95G$Z2@W@HIHJ%EXMm(aHu
zC3Zc5T~9zYQTIAs$F{Uw786R5K|0X3woEPBC1t`mx;`>|dLDx+&3(t?rpPr>d1O+k
z|2XPD4vX>ny^gxG(OF@x(oMy<YydQNNH4tK)f6M}4l#KO0g#_wz;wt73%7<hAHhJs
zfi!w+Cr#UGxz8=gtI7q$j+f9(jIYTxmo@}8$b+2K<|z(x;C*Ql4nGN4;^Q>133wVF
zE>7uv)=?)be9`g_qQDUkFVl^S(!A{mA&c>1{Kl?1aOM8VBY&oT5|c*)A^FM8m&U`Q
pM>fK!B>Ksaq)6B1xHJWK|Ir2{4L8hz=)vDS&jw`n|NIGs{sG=}9>xFw

diff --git a/testdata/bd/strmxor_au3_heal.oas b/testdata/bd/strmxor_au3_heal.oas
index 0faf2da27657e7ef7554d3486991e46480a353e9..29700b89add6823e406ddbb7266fd3cc8d239e60 100644
GIT binary patch
delta 368
zcmV-$0gwK`1m^^h6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03rbF0oef)sb^;3dcm}W`2`OX!zU&Yk$)$lOl%iKL_}5?F|h;b
zn3R)JD<rvrOaU-Z5D>LsWV*mAazy6^4}^JwaYh@{3Q190Hb#Lh79tBRF0gJ8ejs##
z^`X!L`KPQRKUf#aKM?u}<nHCa%f`fUK}6JsQDO#918awHBkK_fk&O}!tQ&#MkK7kn
z7qB(3UXW{KePSR4*7;DVf%PYldxW!>jX~6ek)wr21f=W(H(2^F6C(%11(6S;K$mbl
zVHLT^dI1Q*Qg@}MNQzo>FfuZAM84R-yik6n2mk{GQb|rnPaGEj2zmkm+X4Xq0V4r(
O0RRC2lR*LS0ssIyx{i<l

literal 576
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF@p$R22p!v21cd}tS1;xO0AG&
z;<z9pY6IenEMb1Z!@<GOaEfVxo~R`oBgYd~k&CPsfbc1+$Pd=LQd1;>DmhwsL_Ts~
zVEw=i7X8cA3slK)LF9v|s0pLQ44wwo4&g@DBN8GTB^p>a0+}Gi3)mW1FUU2rJ`e(H
zdMMPu`V+`K!U?rrV2g#wLW>Km8-yPSU0{7Ev_KxLZlU}Gp`SqRUjDmm45HQ?jEqbj
TkuNqdFO**?!qhO50Rsa7Q^DC}

diff --git a/testdata/bd/strmxor_au3d.oas b/testdata/bd/strmxor_au3d.oas
index 012da78437b2662a4b065b156b0b1dac5ed20c9f..a90086579ea6da5d3ed56f7784746e79ea3736d3 100644
GIT binary patch
delta 476
zcmV<20VDph2ImEk6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-01W{V=m4Px3jpvH5)o;j1^^X50{{U6(2<@Qe<A?-0+0e#P_IwK
zFcfY}TH4&@2D{gATNY*zC=whA5dIE4e+VIn6FWDBI$UuJ3Uh{x<c^$}KpbLjVkC$K
zwTVk;J1VI9^4|CBb$^KmynsFT<P}4hBn*_-QKC2U0+W`)RD2AP!I08i%oygVfIB85
z<$=Y|o{Vyl22PWWe_`RR80YBroy<?nXgY>`lrYDDo6Ts(tm*dz6dYSvQCMDTn_W$U
zG9>8rz>+KaMgC$NX(sa+KE;dg+}6IXoWy;{mTq-vM~)U=*()C+Q*v|aM9q;dS@(x!
z6Uc=MdV{t9rVqB7A7Uo=L)iY$Zw644jv}dL*6+*)mtlKoN?}D;VHy}%Q0PDf@|<J+
z3D<SD^B6zDF9QWsQbA5r92WoxdIJPWPF6A;7XS!+0|in^PDf817XS#W0RjQT0|5X5
SBLQ;(0097#K?3gsfB*peLcw(a

literal 818
zcmd^*KTE?<6vf|r@ui7POk3|m8-iUF9JHvDpdv+s1~iqX{+qJ6_$`V!bf{Y=rwR^r
zD^4yhQlS-x4h}kW>kz@AIJJY|OJYUAZ{VHI%f09PZtj$0Zd<e2jAJ?KFc#+1bI6OJ
zpJg!Jakn!Eu48T3=DKUyd2_?ex%<|7ep4DUR3mKf+J6lgY}j%0*&TPy+}cuvgKSQq
z`CP_!gdxk`TM+y&DpGOWLl<Hcby*^QToDml6%ZyZ3YUVXMA18mu|@ygz)iiHR7t#n
zqf!fEgJP>9pNAg(AU%pD)PgQ!#;w*CgU7kSjJo_hPq>FIV?F~#`AI>(E{;Ndq{NY2
zS5ojI-y{Nks=x<13;jHdci+aL3e$rO=+M{S{SJl3N;yd)90F~fpt~{O)}4e~%~J-x
zk_c6;PXh*&X<hzeoQTY*Y7p#ut@-=%D1YA>Olq8*3>`<$BWK~VwNaki6eS529!Mn}
zprYWB{`Uc(E)S@W2~I7g!i>knJ^%ZF^iIOVLZ1_S$#2-!dlP}|(57BavLy-gGaY(0
N;UaYfr0|~$p-*<P1_A&8

diff --git a/testdata/bd/strmxor_au4.oas b/testdata/bd/strmxor_au4.oas
index 67526e2d4df089e8d2c857c1ce9c6af0629b6d3c..8437417d92b201a1bea48853bc9dbbdde9504f22 100644
GIT binary patch
delta 1502
zcmV<41tI!`D9jCz6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03rbDBfbjlRZVDAR}`Lm-rV=*H<O0*7JnmBT{O^wXcz)@k*stf
zU0B7sYB!~?-4%)}1;t7FT4oVxq+=UtEE7!O1!5X;3bB|n(pik{2roGP1Tr!$qr6H2
z5iDd8Y0v$cnJBc2W>uI3Lhd_%-}%mW&&9Jw$O+&<kC%>HKKAM#JRKWl(?+p35(#C0
zfx=$g^OyyR5PzP|1aNByIfpX6c>K%5&V!!+5O;Z!y&U*X=GG2ny!PZ@j6W~HKN;;|
zlZDq!teZvF%$zghAwSh;59)6<D9^EwJ;cHu&xP$jjq=-0JT(7tFMTp6V1r)-+l3|m
z9BTXGeMbt+X9YIT#ow3zpXcgJfl+KsX7_o)%<>^TI)B2;Q7R4V!vw8e{25h?Ge7l7
zp8(*(S{SoDI7F3N2+BPpe2n3#EcdY38|T#DZt+Vt@Kd;$a#)1<7+ChsX2#te2^odG
z**v$=OVR(?Q6>+|Q93j(%EL|%9f<g-D%KgUGw=A8ijBw!m*BFz+@ng$iqcrJ@QUU0
zSqq!#x_=oDYnw1-W4IRe`Dzr2s{R&I3fsd>k8ki9Zs++DcO=&naMJ$JJ<uvUD86{y
zzQ7k#A#rkH7>_JRLki>-z!C&5BQ!L-G>CGV-W8L|5wV?eGUB#@4I>xb5&-C@R!`It
zafoG|Pt$K@9g)T3L~INfV`4te3%wE|t%nxM{eLWsvp~IXE<)WDM+w4dULpk2x?)xh
ztop2$5XU^HCUQ&65r=9LuP4Wi${(=MN9Rae9yPFULi0XTDLhWZP(r7jKF_Cr)kZhr
zg8h^QYbvD+=NJ}PB@4w~ZBE!v<CQX*2Sh5#C`AinxkoyC54E$zlT9s0C7du4|1q4s
z%6~SvN?kW`-SqA=<t>LRk<|J-(Y&%tMHAskY$Uym^2Q-jfuNyZ;E=I`q;}xCz^EdH
zwo6c{vyE5jXyR(v=kgXjO6Suu*I1l5UHKLir{o|8a6s`-ClUY|6+cp)(?<D6J)XQu
zRk^I_#4$#xZv3UkGXWD|e+JE;SZ$wTNPp_A@;htMSv2h_)B8rTja5TbE-{tcg+-1&
z&)sR0pHJB%#HVr|BHs%!>Dn3fGsFJPDBsa&Me79?ye~T^WhF$PQyQEL&jH5`uc*P{
z3KN_jQ}nxuX3SoS1&18fNQK!y&~8(%B5%X+mO&@J!G$Pqw+O5nLpb>X3br?d*nj9s
z)^}*GR~XS*Jx2HjScFdP<uyA8s!{;<U9mA$DY}{oEG2StZOR<`XzqmbLf1uRPciqs
zmV{{qjgW8@O$&xl-JlYk6pC1hs!80m1n^^odqCnA!{h3b=!W$*SWMC7_BOXFyCCMK
zrCm)5W?xhNHzF5-ZgKgVhAcJXxPJ#)Q@s?%`EX^wW_=b!(NR4V>6@n=rPX&MMb_0-
z&8)0@BzHnrJt;by1KC;xC&L{s2Nf04-=`t!JCvAC+UJvA2|D|tWaYjV`{H$Bu37d?
zORGza$!~21I2Xr4Jebk_=eb_$TlS7ftIABkf?<Cr?nq1Za#sc)QSgAE=YJGklj-k4
z@!T4>({A4t7e<qnm^SS5Vx`G}<0f=^ysE(wgCw^GLoI3x$0L<@^_o}>lcvSh?pKq!
zPUAM3Z))opqsTg7XKjehM_mkmb-4SWcOUfbgWi46yAOKzLGM23|MLeO&qmlo2&}1H
zYdtJv+`G#H3&&<K4w?CbUr@YqkIf&%mB4zGCUe>dEVAx-2s6mip}>0l2A-KXysdC=
za(m?$o@_6^vH;tPfAG1njrhL-0|in^PDf817XS!)0s+7a0RRCb0doNW0RWQ`6Yv56
E0IwCqasU7T

literal 5124
zcmeHLUuauZ7{BM-oSU0}O&sSuWE9s2`yjYKmWms6jM0{@vbEi^;Xt8?SKkEL)Ap9m
ztK^}>4KvMflay7sg{*cgLMN$on1`qx+_LOXp^+$=L}{Ue34LhM?>pzF?L<(pFJe*%
z_w=6go$veo`OeL4PxKz`+c|JB(U*t>iT>iQJzCwbZT_^1?TMkI2Tu(p`VRH?_6+s)
zpXfc*dwl5CzMd0@O<!xIRoy<>|5p=QMKCdRVqkEnyZ6YEuzqUbxQ<^DO&riQLS1Hk
zyWNS0w2qkQBGjgQOwY$mQ%inFv%AC#gwE=`9@g-t%Sz;73rzOAJm!7GOCR-nQT|1Y
zYgfqTAf1i9p5E!^um5D$H&gWQW9>7DvBJ)Xx8|5t*`AJzy~M{CeTxCU@EI+)<8U^@
zZ$&QXrC;dOHXM%-ezvMR^K|7|0K=D|4ilHybhNxXq)omPlMzM;pjG&tl*5e`GqhA8
zutLROFfjgk1BZ6l630@fEwKl$$8>QK_rg1J=d9s;O4QDFxa=3V{i#o=g*z`BykeAT
zae|yTLYf<u+1d0w;aO5j(!5G#HUg<EJf|{om`rx;dt%8<a$&qV>gCC2^_-ut&X9@$
z@r`7VF9lo%SgZjQAqHf(#oF4uusT-AAS`5J(>pq^>Zw3JhKa;w_E1YiT#Ps~kS$gX
zKm~d323cWpxIh4e*@VJi#?P<&ZCd*pw}#2Gv^0Y})%`SE^6?}qUGrj1=@_e1g(|jO
zryTJ8i9pGck(5vTrWXe`GqUQ3d}k947)nHZNopMu#|#Dj?e6k!6t~Y|-fBz3Ok`$h
zpcfJYg5=P$yYUtZAxr9SNF5k5WtTxwYe4MNXh|exIZ9GCoo3u+sk<IYl4vMzhvJ!c
z0S%Xe3JShpVCJsJksY?f;&G@{R19XQS4nxd=tLs+^TGLm5+dq}UiI-wUuiGqTQx6J
zo}<N^h*P7qF}?T|RXfQnt=d(kd($f@Ydq1#k9zU0C)W(kQ1L!e1zSQCUWh_|i;Gl2
z%ST8Tzfz$b6;x~)W{6UfIUJ<nDJa&4>txN#q`u^dJ42^*@i}HAOEEHZg<Yn?rgLnK
zhPDl6iA%C%lHvECuP2%MPnKY0fQX967+KP5Q>mT$;Z1S?mxOpWR3G;UNV5vz%fvY;
zrK%i{$^||EMMY0^KCnJmMgnB@i$1hWw?Z(@0RGe*>?^%o3yQg5{V>j}nr8u-u`e2~
z90>tv*kZ6jnEZ+_Yb040KQ_#Aol5e>7HMSX2V5elT=Vk_X6ZG#ZI0r$(;jnG^A<=%
zue~e{U^r}rjWdyE2%Xh{T^U!B`~=O>uAD2qQ@24A8`gzbK;oOoA?0p#@pL&HqQRu~
zUi_7$M98LVlwZ)DJc<BMgeaemTErwSulq%7t;23JH9fm4nP!4JQMgW?BXTewfI;=L
z9JD&zqNa=6D92-7;2q*d-<8cw0za5KEp1`)Rl0%F4eSgcF^7S;f_yqS%!&b7EA%M%
zlPDD!TIY@@O&ieS%ZBs7)4v_g8)6jOtH&24I}9d-r3Rb<uIf3D;@+u{qku`3aE$EW
zkpWIYff-eEm`SrFS+OM_!?v+uo-!4;Y3+g6$1=1|#XW4<$~@3GBfJ`MI+P=2y))S0
zp<;+EyN%0$>RP;FgnTZS#jWF&hZeS}_wzH@6(_(rI0MR6n%<;)-UZzpdr3P=iZ2ix
zCZ0+-PsAv(Usocu>Gd$538yAJ$aohvZP%*?nhD@rIOnw{hc${rjhGO9gRY77!!8{a
z!(b&TBZ(SzoQCA(F;ah9$~d^*fIMdu15hhn-VaY4$bkgQ1%Iig2|YCmT6I>@FZ(|3
zZ=UPTbG>=4qfwgYdh=XYkL1mBy?L&y-<<!^bNzq`zx)fVz(#kB^APQr?D_DS`(&~Q
zo_F9G)QvuhFSU@kUiZUOD7>;LFgH5RNgUp!{QSI{gG*tKrr*CuVA9SEytTl9TNKX0
h7Z_U@Zwg;^Y+<|-z7*NQcn?3&w=f<}{+~aZ_6Iyj;7kAj

diff --git a/testdata/bd/strmxor_au4_heal.oas b/testdata/bd/strmxor_au4_heal.oas
index b6301286ece6fe25ee23a1f832c84d19b728e613..e8875bf504b21264afc4ba310ee1d5121e919885 100644
GIT binary patch
delta 411
zcmV;M0c8HL29X7j6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03ra_1A_t+wP$8vWV*mAvV{2s4+jTB!+$BJ1$rViDKD6A@U4*K
zX1^dJ00p83Aay4gPfCf}PWHppBZFImi0I-uj5qigL<K<X&94yb!#kLuY*AY_Mu9CB
zA`2}pux=23AasHCq0j>Pr>r7BSQpAa5c&z^?&ZJB#>8<!MAU{+Vg^qGYlm<n>k$c&
zjS>y48-dJ^+<zBX7qB(3UXW{KeINwZ`B12V^(T;fgtM28LDYniqlHHVr0fGXSo$v$
zBL~9;kq@Gx7K|KESVb<fUI0R{)Lp45lA^ZL{05zytT`ANnK~k0Y+zm}zfwe$afY8L
z<BB<qqKrFU0f`ekm_!+Gv@rt!0|in^PDf817XS!)0u2F$0|5X5BLQ;(0097#F#_-c
F002&7p|t=2

literal 816
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF@p$R22p!v21cd}tS1;xO0AG&
z;<z9pY6IenEMb1Z!@<GOaEfVxo~Z3)KOz(@p2LWyigoiVMg~#V!#kK5L~Yp^Ia+u`
zK5}1R{lNW{RpbZjU#4E57{djT52B(bj1n_=8dy7o8(EJ?h-{Q-VBH90f)p=cYhb+~
z*U0)n2(0O$Py_2vAomC-*s&Ij98Xw9F0x(#La_W@sVR~`F9>Y05Lsw(fpvrM1ECA7
z4}})UgJl=WKM?u}<nHCa%La7PG`~UTCTk90Aa+E)*ucC{ex-;g;|xDh#ualIMHzRz
V0um>7Fo`nWXk%t-7|DQv0Ra4sCa3@a

diff --git a/testdata/bd/strmxor_au4d.oas b/testdata/bd/strmxor_au4d.oas
index 996d58443acb516f23b99cdc952e0c4ce346ffc9..0724ac6fecc583ed7d471a5f2e360630c2e8e00a 100644
GIT binary patch
delta 653
zcmV;80&@L{2>Aw(6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-01W{m09Hg3e8I4gjho?vsE}ah0yYLwdw*sIMy3m_B1@QG@NhGH
zViFLw0P#;So|IZ4DQY{}4=&4qBEz_N4x=dJ=2t-C@D3&b4FVznrUZurRZ%fZ!$1_y
zU3oE~rK#yVOiO7N2PZ*rC}{B?ba(fMq$1Lx-HH@(Xt%hv;?SjwM5y8r!J!U?3Kgn2
zRHtSr`0m;uUVq^D?%nr&?|YZcAxjz|X5uA|bdB-4j=mKEryFs|_yVwIzN9pXu?d0M
z(3zoyc&dwnZ=u3BmM8>fGZ$;RSsYjox?yPEBX94@QZ0)?x~|6zJQ<}Mx-$K8(8nDG
zr+~vU*=!IA$9b;ZZ7K2;KKQ!rT*yk>#aFX$$8JwHMSrfltBea+Qs|gm7+B+#^0FX9
zj`m{Fe49efR)cjN3`{?_GI+A@X<()K;j(g;!sY+|^CZrA1eze3@++yv<NTti;1nM6
z&76cGV1#~7lrJjGX{9`<WvdW4*mFGS5&TYu(AGT&i&dD|??5hZwg(X%<x^{7pBdC&
z(&kBZy?^9?K{B@`?36<2W+!$?!nUg@9d}|!bd<BN;~Dg}&k)k57-Jdlz+m)aj%VFO
z$Gt|uS{1?kD<)X~leS@>3pP4W`~m|7R8m1sQydon2zmnqNlsQW92Woxd;<kiNlr&k
n92Wox#sLBW)dT?m0V4r(0RRC2fPjF2fPjF2fRh>n=K=r#`}iNx

literal 1033
zcmd^7L2DC16rP#wY&YFalWb-%2}^TP@Sw$d3TP?8hPu#hBpbD!_Tt5Vu@#XV(vv}o
zcu3Ggyrt?PmtHhNB0a3&Aszw|BCO&e_LLk7zS(U`3;qLVV0mx9_rC9&H*?7@Y?)V!
zdE2z33s_oNzJ~mHbaoj$V>?^<ZO1k@tirluTIIq<q2$~**UPt+IU{O>@LlU)1qNTR
zopSMxbE~kqsY%<#l0?g;yk$#srgiVSB>qHE6eoPtkX1D1dg4)CMtn^|n0S=EmV8Y`
zM<mX3BJbi}rkUoe&#Y4vokQ@emzd*szu@z+O`;^x#j4`5_-yet8Hm}09+L^h3i8;P
zbK@X3kb~rf!HrI&ze1pg-^5VEDv_@m5^*KTI*V2C25~*hzD3%45I@n_G1(3Kfeg^!
zDb{3{XB=!qf1bxjlyz5YX)+HYY>*-7!v)bczQ_(@zBcQt%B&fi(m;dNXeV-_@mS_Y
zGsXhHZ)3tQPzk?RFlm8uI_!AZU)&ANwvxcxlNANIpGkc=kW!gXrl$j7oybh}PzTj&
zHsm<eKf&n(r6Ur~nN2}KgfPQFX0jB7BihT<;98zrIJKv_w36JRofO+oxpW`GKdMLT
zvP-?C9Xiy1P-y+GyL1YvIMs=C{C$o!avp6Zhq?y^^=wet$PV=>q~eZ*D+T5)2*+vw
zpB;S;D=^wG)Po&>1L5k1g5mNW_${fCeZx53vp8;wSJD=*q}wJO_n%6{{ht>?e*vd?
BOg{hs

diff --git a/testdata/bd/strmxor_au5.oas b/testdata/bd/strmxor_au5.oas
index 7d444c23277ca03dd8f7ab9d8cc8a7a8dd1da4d5..a032116c65f20a99c141127b96210171a788bb51 100644
GIT binary patch
delta 381
zcmV-@0fPRX2J{4w6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-03raE1Lgq}sb^+LdBJp2YK0^d#|06Q7=NxM%rAI2I2amEF)h#&
ziG9tUf>Z7?KSGXmw>X0c>tcBZQCl`ffh`sy3oS0NZV-MTbb<Au&;t3VtRg>H7s@{n
z`U&Lj<-g0uAZo)XF@vXpwL`d(^@xPXMu`U2jX>r{?hC97*cw<b$ThM)5CUs^DAd6E
z6UaTn*$dQW!f(jY!XpAw_JJEL{g;W6gW-b62T@TAMvf<}A{SXN03lfFuGADsQQLRy
z#5f4#3wpUpq?&_q%MHdOIt%4jiij|NU>9M$!7sviKwN}zg}eyk1a$xd1yV^)M^79V
b00?>l0q6n&00AQba{&MW0FxmC@B#n;re&E3

literal 798
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF@p$R22p!v21cd}tRhR8U+{2n
zFf^QETA(Lt0}?vHcv5PGBooI45mDRM?1UAuUgl>IW!)_fBo@mvh}yC-a<uS>eB{2s
z`hoi?tH=-5zf8SAF@_5wA4GvR2yC$sS!i*Ab%XE&p$n`Jg%-$z6)lv1AoLT+-OGQM
z4Q#gsBgYd~k&CPsfDo+WuGADspni!NJPoWJ!i}s)Bt$k!G_Y<2GC`ItU~6E#AlJzH
zKnSe*p-=<sPayXQXD=IrsOdX)OjixCo2)q)8JRjFUu<ArD8Eufl<@<*DB}%&QN{z}
TqKqr#MHwfkGc}B4z`y_iB|#pS

diff --git a/testdata/bd/strmxor_au5d.oas b/testdata/bd/strmxor_au5d.oas
index fed55a71321fc55a3d4f6f0d9ce31a4d367185a8..ab41c95ad4d7e5d0c1896cf87a689c5984cdf18b 100644
GIT binary patch
delta 638
zcmV-^0)hR42=WGy6@LL77Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?bI~PDf7-01W{m08>H}e8I4gjho?vsE}ah0yYLwdw*sIMy3m_B1@QG@NhGH
zViFLw0P#;So|IZ4DQf$g9WKj&BExu@UzBmTxG3Xdc>oOpA^@TUf&*1iF-yZh6waNz
zG@+%b={uU1(ky~bg5Xfl;_q<xhos`rp#_Hy;?!<&YsJAu5Q)%AhX@XJC{(CWK_ogg
zL&0~~2JvqB?tk6)eeZjBn*)|MLd+#g9O)Y4O&xtJ22MBPknsgz!+gnT5@Q<zv!ydb
z3-MGJW#2-DuPspy%yu!+^zwLT4RyoNyeHn-m8C`=gKSez7<e+ywsd9s>7b803eErr
zHL^(&2`444Jropq1|NLgHWISZaq-o>wG+3IO_7`KDu3ewmJ~W6m+!2}N_kn9A;)`(
zDB7Zs^VMKI2LsbDt_()@BMq!HKU`MMGPwNTKT6}A$Dj$4DZi>}JSi<I3eI3yY8NF8
z0b}%wqV|<y&PB$9M!pV#gMG(?KEdyF2p!#nuu_Mq{SM^vW_u9RQ9iXM_L)KbB`r#;
z>m~mSl5e}IVz(MXFF&<I5_Vig>AF)prlXvF9nYY*eTI;>VoYSb1B21W9M5|jUH1wF
zi&BD(Ey3;!g88ms=i9#n1yoW&PE#Bg00?>m1W8U-G8`8G2z&ztQb|rnPaGEj2*d#b
Y0nP*g00AQba{&MW0Fw~|?*o7U00H6-)c^nh

literal 1026
zcmd^7L2DC16rP#wY&P9ZH`&b4BrM&Fq6aP3Q$R}zHq?bSk!;lVl#3Vt#a2Azkb;LC
z#8ZME;w=>qf)qp|B+|o*9^xSoA;O9xv8Uuv@Xc;hTJRtE_VV6-?|t7lZ|0(t-?Fb3
zbB^uA=CQQ0d=2>#bT&+$aVlH6?TTY>6!Pm8yHL(=<V%(N_ImlYGH1rj5WZXZSA)st
zol3cQr*bR5xv5Fp#gatJrCh<0=Ip|~>yr2rLouB2QBzjYm>Y?Q4H@w@31Q+<_CoSC
z6&;Z{&x*Q>dzn_6ul|gjqUaogKkFR7UF7(=6(fl*RuzxMXTjHGU}Y0}OePd7$YW#9
z%>#WP2gNg!o1JKXg}@BIiJ^y8qhB;6@@kTG7HVJ&@`lB}M&B4g{#awjWG|ctGC+T&
zSc_eraj+5naULI0)?KZqNd!dLAVbjmMKLzMzz%d@o6Xf^*3zdm&|r1iiJoXYlDXN^
zS>X4TF8l(O@OuT5HYlgVi3k0Kz0hns3A{a7QIPwQG?oJ?mHA|Px&YRR&QuQ#P_0=Z
z$D#27P9G>8k#Nau3JM~H9S$;+r63*AUZxIr@;ic4Pc@fTle@H&V*4qV?nC-V^=LzO
zskgLChsJjbqu&gdPN5X1I+2dQ&a!6KqwVC-@Sve#1)WW6XiT9LcO+aXux~*)Rs;C#
x>a$pZ)qbKLd;vHRu5Kt8E^o(gOHJz~<9Hn5xDQX{9Xyei#qpC%#QmQGp}(drNB#f+

diff --git a/testdata/bd/strmxor_au6.oas b/testdata/bd/strmxor_au6.oas
index 64faa866c2cbaa0f2b5b20d55c290ae064af3754..1580f4c2f398b43f9ac07530c03610fa9b73fd7c 100644
GIT binary patch
delta 226
zcmcc1e4BZKXg#BhI1>kp3_r7sI14|65<{v_?ip*Y1_J@s14WJ(m^-EmZtiUSb0Ru$
zb@~5jj$2XuJv|SWX>P3IH=TLl!GUYpm-DutNr=-|YFpH|aR%F4o5h=Br=9Qnw3<0%
z>)xNtoGhMxVMe?RBK6D+TrZfGFu&m8X86P;AQF*sQfh^yNNp(F3#K2eEBSx2a<fce
zR!|V;Q&14KVC1;KI)iD0a3kvho(rrW*&2YfhKR)sv6cKM*+eRy0F64x^MZ#NY`Tm%
a14ktj;{`@W21aGZVj#&d@!<z11_l5kK1;;_

literal 477
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF@p$R22p!v21cd}tRhR8U+{1<
zd}0z1wE*!?FrJiJAt`Fh#>n)6`vU7q{-3PeY!jFjm=uKhfP|<9Bhv<*3#=#EpvpxL
j^1R>yvN<lW&S2Ug+{k)>=K||Twgw=r!PGF40Rsa7)grVK

diff --git a/testdata/bd/strmxor_au6d.oas b/testdata/bd/strmxor_au6d.oas
index 2b90eba605162f66effed2900f71099ac85e40b1..909af0996bf152562ac31dd1b06924ace3e238f2 100644
GIT binary patch
delta 246
zcmV<S015x{1AqjO6=VS%7Xk<b91jB=7X%LgA^>GfZOl6gfG`jRz;Z#*1BjOqvx$NH
z$XijXcmG=m+FB2cjNqmzv3d_RnZV${)@##lx6EK(FCvDbj<J{q?L4EiU6#*|@~Z=A
zwY~WR2?R+_Rx*)(7k?rETT~N#!LX2xo8g0~kYMHlHU?2^HU>tH3#>DkHV8Me9^kpa
z`jM>xNNb2%Ffwh>xxl)T|0ElTeS!6a=s}(rJffz|AdbiqW^RU0Oaf3T#*<PjBmn~j
wR8m1sQydon2zdhpNlsQW92WoxjsXGz=m7x$0V4r(0RRC2fRh3N?gM}T0LpS(egFUf

literal 498
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fh}?YF|&pQIr;@NgV?+bqV{YIj7%T6
zFR*rU{$%B5SimO0%P9DQVIdng!v|3z!OR7045HQ`H5XV<h#us5!6RzH$h1M{0_#ft
zlWagX#|73IOdEt7Sr71BVExF}0HifUZJ9ypMV2tX;NfQY#3TUH1JuuWQfh@HQ^QCG
G3=9Ax2)VTY