From 1da090f1ee3a3d75e93b4a01c8dcf9843840f2da Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Sat, 27 Jul 2024 07:50:24 -0400
Subject: [PATCH] macaw-riscv: Add riscvPLTStubInfo

Now that we can load RISC-V relocations in `macaw` (building on top of the work
in GaloisInc/elf-edit#45), this patch adds PLT stub heuristics for RISC-V
binaries. I have added some test cases in `macaw-riscv-symbolic` which
demonstrate that the basic idea works.

Note that due to #416, these test cases will print warnings when loaded into
`macaw`. These warnings are ultimately harmless, however, as the same
relocations are loaded at the same addresses multiple times, which causes no
change in behavior.

Fixes #414.
---
 macaw-riscv-symbolic/tests/Main.hs            |  10 ++----
 macaw-riscv-symbolic/tests/pass/Makefile      |  31 ++++++++++++++++++
 macaw-riscv-symbolic/tests/pass/so/fib.c      |   8 +++++
 macaw-riscv-symbolic/tests/pass/so/fib.h      |   1 +
 macaw-riscv-symbolic/tests/pass/so/getone.c   |   5 +++
 macaw-riscv-symbolic/tests/pass/so/getone.h   |   1 +
 .../tests/pass/so/libfib.opt32.so             | Bin 0 -> 5160 bytes
 .../tests/pass/so/libfib.opt64.so             | Bin 0 -> 5664 bytes
 .../tests/pass/so/libfib.unopt32.so           | Bin 0 -> 5160 bytes
 .../tests/pass/so/libfib.unopt64.so           | Bin 0 -> 5664 bytes
 .../tests/pass/so/libgetone.opt32.so          | Bin 0 -> 5004 bytes
 .../tests/pass/so/libgetone.opt64.so          | Bin 0 -> 5424 bytes
 .../tests/pass/so/libgetone.unopt32.so        | Bin 0 -> 5004 bytes
 .../tests/pass/so/libgetone.unopt64.so        | Bin 0 -> 5424 bytes
 macaw-riscv-symbolic/tests/pass/so/so.c       |   9 +++++
 .../tests/pass/so/so.opt32.exe                | Bin 0 -> 5432 bytes
 .../tests/pass/so/so.opt64.exe                | Bin 0 -> 6032 bytes
 .../tests/pass/so/so.unopt32.exe              | Bin 0 -> 5432 bytes
 .../tests/pass/so/so.unopt64.exe              | Bin 0 -> 6032 bytes
 macaw-riscv/macaw-riscv.cabal                 |   1 +
 macaw-riscv/src/Data/Macaw/RISCV.hs           |  11 +++++++
 21 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 macaw-riscv-symbolic/tests/pass/so/fib.c
 create mode 100644 macaw-riscv-symbolic/tests/pass/so/fib.h
 create mode 100644 macaw-riscv-symbolic/tests/pass/so/getone.c
 create mode 100644 macaw-riscv-symbolic/tests/pass/so/getone.h
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libfib.opt32.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libfib.opt64.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libfib.unopt32.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libfib.unopt64.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libgetone.opt32.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libgetone.opt64.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libgetone.unopt32.so
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/libgetone.unopt64.so
 create mode 100644 macaw-riscv-symbolic/tests/pass/so/so.c
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/so.opt32.exe
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/so.opt64.exe
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/so.unopt32.exe
 create mode 100755 macaw-riscv-symbolic/tests/pass/so/so.unopt64.exe

diff --git a/macaw-riscv-symbolic/tests/Main.hs b/macaw-riscv-symbolic/tests/Main.hs
index f6b9ad54..cb62f6cc 100644
--- a/macaw-riscv-symbolic/tests/Main.hs
+++ b/macaw-riscv-symbolic/tests/Main.hs
@@ -32,7 +32,6 @@ import qualified Test.Tasty.Runners as TTR
 import qualified Data.Macaw.Architecture.Info as MAI
 import qualified Data.Macaw.CFG as MC
 import qualified Data.Macaw.Discovery as M
-import qualified Data.Macaw.Memory.ElfLoader.PLTStubs as MMELP
 import qualified Data.Macaw.Symbolic as MS
 import qualified Data.Macaw.Symbolic.Testing as MST
 import qualified Data.Macaw.RISCV as MR
@@ -133,8 +132,8 @@ symExTestSized :: forall rv w arch
                   , 16 <= w
                   , MC.ArchConstraints arch
                   , arch ~ MR.RISCV rv
+                  , Elf.ElfWidthConstraints w
                   , KnownNat w
-                  , Show (Elf.ElfWordType w)
                   , MS.ArchInfo arch
                   )
                => MST.SimulationResult
@@ -147,12 +146,7 @@ symExTestSized :: forall rv w arch
                -> MAI.ArchitectureInfo arch
                -> TTH.Assertion
 symExTestSized expected mmPreset exePath saveSMT saveMacaw step ehi archInfo = do
-   binfo <- MST.runDiscovery ehi exePath MST.toAddrSymMap archInfo
-                             -- Test cases involving shared libraries are not
-                             -- yet supported on the RISC-V backend. At a
-                             -- minimum, this is blocked on
-                             -- https://github.com/GaloisInc/elf-edit/issues/36.
-                             (MMELP.noPLTStubInfo "RISC-V")
+   binfo <- MST.runDiscovery ehi exePath MST.toAddrSymMap archInfo MR.riscvPLTStubInfo
    let funInfos = Map.elems (MST.binaryDiscState (MST.mainBinaryInfo binfo) ^. M.funInfo)
    let testEntryPoints = mapMaybe hasTestPrefix funInfos
    F.forM_ testEntryPoints $ \(name, Some dfi) -> do
diff --git a/macaw-riscv-symbolic/tests/pass/Makefile b/macaw-riscv-symbolic/tests/pass/Makefile
index c6ec3a4d..27b942fb 100644
--- a/macaw-riscv-symbolic/tests/pass/Makefile
+++ b/macaw-riscv-symbolic/tests/pass/Makefile
@@ -2,6 +2,7 @@
 CC64=riscv64-linux-musl-gcc
 CC32=riscv32-linux-musl-gcc
 CFLAGS=-nostdlib -no-pie -static -fno-stack-protector
+SO_CFLAGS=-nostdlib -fno-stack-protector -fcf-protection=none
 
 unopt32 = $(patsubst %.c,%.unopt32.exe,$(wildcard *.c))
 unopt64 = $(patsubst %.c,%.unopt64.exe,$(wildcard *.c))
@@ -21,3 +22,33 @@ all: $(unopt32) $(opt32) $(unopt64) $(opt64)
 
 %.opt64.exe : %.c
 	$(CC64) $(CFLAGS) -O2 $< -o $@
+
+so/libfib.unopt32.so: so/fib.c so/libgetone.unopt32.so
+	$(CC32) $(SO_CFLAGS) -O0 -Lso/ -Iso/ -shared $< -lgetone.unopt32 -o $@
+so/libfib.opt32.so: so/fib.c so/libgetone.opt32.so
+	$(CC32) $(SO_CFLAGS) -O2 -Lso/ -Iso/ -shared $< -lgetone.opt32 -o $@
+
+so/libgetone.unopt32.so : so/getone.c
+	$(CC32) $(SO_CFLAGS) -O0 -Iso/ -shared $< -o $@
+so/libgetone.opt32.so : so/getone.c
+	$(CC32) $(SO_CFLAGS) -O2 -Iso/ -shared $< -o $@
+
+so/so.unopt32.exe : so/so.c so/libfib.unopt32.so
+	$(CC32) $(SO_CFLAGS) -O0 -Lso/ -Iso/ $< -lfib.unopt32 -lgetone.unopt32 -o $@
+so/so.opt32.exe : so/so.c so/libfib.opt32.so
+	$(CC32) $(SO_CFLAGS) -O2 -Lso/ -Iso/ $< -lfib.opt32 -lgetone.opt32 -o $@
+
+so/libfib.unopt64.so: so/fib.c so/libgetone.unopt64.so
+	$(CC64) $(SO_CFLAGS) -O0 -Lso/ -Iso/ -shared $< -lgetone.unopt64 -o $@
+so/libfib.opt64.so: so/fib.c so/libgetone.opt64.so
+	$(CC64) $(SO_CFLAGS) -O2 -Lso/ -Iso/ -shared $< -lgetone.opt64 -o $@
+
+so/libgetone.unopt64.so : so/getone.c
+	$(CC64) $(SO_CFLAGS) -O0 -Iso/ -shared $< -o $@
+so/libgetone.opt64.so : so/getone.c
+	$(CC64) $(SO_CFLAGS) -O2 -Iso/ -shared $< -o $@
+
+so/so.unopt64.exe : so/so.c so/libfib.unopt64.so
+	$(CC64) $(SO_CFLAGS) -O0 -Lso/ -Iso/ $< -lfib.unopt64 -lgetone.unopt64 -o $@
+so/so.opt64.exe : so/so.c so/libfib.opt64.so
+	$(CC64) $(SO_CFLAGS) -O2 -Lso/ -Iso/ $< -lfib.opt64 -lgetone.opt64 -o $@
diff --git a/macaw-riscv-symbolic/tests/pass/so/fib.c b/macaw-riscv-symbolic/tests/pass/so/fib.c
new file mode 100644
index 00000000..60f439fd
--- /dev/null
+++ b/macaw-riscv-symbolic/tests/pass/so/fib.c
@@ -0,0 +1,8 @@
+#include "fib.h"
+#include "getone.h"
+
+int fib(int n) {
+  if (n <= 0) return 0;
+  if (n == 1) return getone();
+  return fib(n - 1) + fib(n - 2);
+}
diff --git a/macaw-riscv-symbolic/tests/pass/so/fib.h b/macaw-riscv-symbolic/tests/pass/so/fib.h
new file mode 100644
index 00000000..a55848d7
--- /dev/null
+++ b/macaw-riscv-symbolic/tests/pass/so/fib.h
@@ -0,0 +1 @@
+int fib(int x);
diff --git a/macaw-riscv-symbolic/tests/pass/so/getone.c b/macaw-riscv-symbolic/tests/pass/so/getone.c
new file mode 100644
index 00000000..6cef4ed8
--- /dev/null
+++ b/macaw-riscv-symbolic/tests/pass/so/getone.c
@@ -0,0 +1,5 @@
+#include "getone.h"
+
+int getone(void) {
+  return 1;
+}
diff --git a/macaw-riscv-symbolic/tests/pass/so/getone.h b/macaw-riscv-symbolic/tests/pass/so/getone.h
new file mode 100644
index 00000000..a528347d
--- /dev/null
+++ b/macaw-riscv-symbolic/tests/pass/so/getone.h
@@ -0,0 +1 @@
+int getone(void);
diff --git a/macaw-riscv-symbolic/tests/pass/so/libfib.opt32.so b/macaw-riscv-symbolic/tests/pass/so/libfib.opt32.so
new file mode 100755
index 0000000000000000000000000000000000000000..ec72edb6cb7b0b5431a62069e363c35caee8dc68
GIT binary patch
literal 5160
zcmeHLT}WJ45I(x8YpojV8cdUvE(r;#(2GAYg$1pDyBBr+H(e|Z>w2?Mi@N@7pguKP
zO-q9%tR;&-0qaAdLi->k(ua1-RzyU^E+VuKK4?s62&J_(#zwpSzI(l?`GL~M!VY|A
zX3or+IcLtj4|CqL+HFx$Q9>t!_+3z2#Bc`u!HYsX2YyDF!B2}sk)Yaje{!Ee1N}sj
zQ0?^xg{Xf;!&jIlV)pFO;QQ@k&<WZP09EVW3t&$X?FcWbVSm<ouI1hd%GlOp#JmLO
z>7(vf)Iai@>iqBpOg}}e1<4?cduud38H^^{gFrIu;$m}yXmoo$ZEn%h+@ML4r`?;C
zDRp^-h&3ZGHvx(_Lw;hD{u4rE8NSaqd}+92G8FC(_JY@(5buu{h(=UDRl+``kJlRw
ziNb^!n!a#L*Xug2ERQdJ7MfdJSP0E8&;2yJGP62;J9ziIwiTsn>`1??#BClPG;W4X
z@#|sJ)}3&c@m`)~xu>MRD0e<OxGF1`{VA(*^z?3O?!tzwT=gey$k8*<7JD7a6@Ox{
zBYGBE$mdW#^2hreQKhE7t+0~#Nt`L+R@fBxNBHj5ODR#sO6+jl%E0lto?>O-Mr=s#
zv77qg*XNJTUHbg>amU2ycIxg{NZx+=_Rw}}?%djqgq`jq<wM;m+eg=u<96QZD;Zfk
zl<=p|Q6O)pzU9viS!RFO>UCtwK^y!R&-yJh-)wEj$K^@t3(%)OeYh$o%j4ANp$7*Z
z`s9WWz8#))C<k|9l*G~4?qh?-t?)|$ch1CU)l^x|#8Ai7rR=nk=D_*vG|1NMpgiHv
zoplB3awZWQ^30@dLq6+g4$JhK-}p;M;ESAb<biE^+_tLO<}JZBpYdLP;OiXbge~Zk
znR)Hd&V!qkr)sa)#?;*}zF1-_y;*w7e%&5ZwsHQ={^b(4tM_tG$;s@A;hzINB|irE
zWke`afk*`+6^K+IQh`VXA{B^KAX0%y1^$l}V1F17upeClHvbBHeg$XmSqY=s(}KrA
zN4qT8fU?I`+d{L}uO5b;0-(DTsX#mYDU-*7)BZfbJpYx#Ag;NFSOj}^xv<b;J}sA@
zd)1tgA!SM#=FIfWjEs!T^k+xsxkv`J8y14+BN^0g8|Oh>P1l;;%11h@qMbvtYaKcF
zq3P<2f!bedI!~?bQPX*PkXap(k5%}G45;c}D0T9H_)R^l?m?Xqd1g`+bk<(aPdyEK
zk{JVtdY&q21N(m&SVWTj{lBCLXHi{wepzv$a8_1V6k3bURa>3*;_}jb+3Kv#FR)vk
z!YSJ;3i9pF3Y)FQTC30QJst2BK}cQQtzK6HxVKZ|O}f<Bc1db-bu|g;LU$Y7H16#b
zQm4DcCAGJBh2(X=ixGBLYqKJxMh`T_)7t88^X@yuzlbaiZ-q}5yl3JVpg&vi28pA<
z{czYrKi)rK2A=dgi8+4b^h-kBh&;%Q!8vl?!D|55a;_3S#NIVwMtgT5&jz@r0BDB~
z!T*74`8CkS|H1;mr2cQ$AP{-bbz)B94M6u>gh23ab>e<VR)Ak8^YHuOd(;?Y<|C2w
z>nsPjT&;r{0+OVF=|n%G2B2R$KuUohYpN4%I`lozmJUBN3_K%5H5NI~uI2<MRpK45
XR1?*au}GMH%x?q}Z>tt<(Ea`f?*V@&

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libfib.opt64.so b/macaw-riscv-symbolic/tests/pass/so/libfib.opt64.so
new file mode 100755
index 0000000000000000000000000000000000000000..a600fbf18263434160498fa14b6dffb4e7f80c90
GIT binary patch
literal 5664
zcmeHL|4&<06u+-;qkL@;7Dt9kGo4{ed;uI{+KrVjh4E!DVazWv>)-(o9A73>yBe1X
z6I2{#i4wBm0+NhmOEk`3NF>5i{|dh(gBBPfN*6%r0zS{_yQh>6j9KDuy-DBae7)z~
zbMJl4d6%rE1v)`sG(@(<kh`kWBo?k1O3;Yi02cN#+YL_xi}Tx}Y^QO4m!=_P@fwdY
zBH(w|pz(K~*@_K3B|`GUwEoS{!u<#%wQ1QaGxl2a`>%ti$tu7Pm#|Zw6o-(9XNc%0
zh6LngWr(OlJAYpOI#~ktqir9@gt$J!icBBaCsN{G@U0?|A2Cisko_bjTHjd1lsbEB
zOC4)!tkEc`^}PM1!%}-IWAR398l0DMM@f<qpA62y);0D&%h-$Jk2&JF_)DUgxAA!=
zU}Yk^{9Pwg;Kb~ez&_jXvmzQ;BKT_jXFm~N^>+8n@YM4g#lEtYiU+6vc;mM-Gc{AQ
z>+@@WF3V?z_H`8=`cRHt**BnHQIqvEs&8OSziJs@=qT>WAJ8wW*=xFKmqWhXpX74r
z<~Fjj*WC`ew||e@p<CF<8lUV|<d6Cjx)q%lxako^?&*&oQG}9#E32y9^Q9rVXI)Lc
z@~b-V>4GX0$r0BL1HCb<X1SwC?!FPb|5f2c@@}w<>5u+?ZqaL7E>O&IHw9-_^Xjm}
zcXTZ3sNl=WUiMs%TX&kwpBxmNM|@__)6oxoN6ayef@d&xZA8&Id|77w?`(Y9<o!YI
zR%(>acYTms=Adce=91fytGMf7mUZCgZY{YS`xO`RYrs$UEe$Kq!(%-U*{mW*E;G-Q
zUw9Y2_vXi<tAuaP8fxe5#m?K#==X}x-98uHH2Z$R#gU7ryXN0&tnT~(@}0wMuT3m^
zC+?3$WeRtIO1W>2sS~~)UG!d>HAfxrYwyi;I&KYSd;36|GUHZq72p=!^=?PzAZBKo
z^YrQGZ-Dlg$EEB??VPLLrD@kp)1E>7>{l?iZE6^G(|1NYihJRAZ353sc!Vnuu0Xf~
z;R=K+5UxPD0^tgTEAY4#pf)C!Pr%zv_8M2L{H;P4!`KDR2YOZB%ur7_#P!j9o)nJM
zge7r4(9an)0rf;_T)&5-p5tDQMs7%Q;;BC+|0r%x@i_axfyxI3ILY%Qq`tf`FVAF5
zEi9`#XiQI+GNg24Mp{OCdU^&WP7`c{B6PX5AHix7I!fA?t#Xmker%P)?oz>n6e4t?
zRL>wW^wJTG*0ELoXy1%_kwr3E?^b)*6=SeOqeVuiWmAX8Xcv2+Zb~+(?c{hK1h5Z{
zi{Bqm9-99lE;ky12pSfkx9j^0{qoKAPV#fkpzoJtX3KxQEayZ~9<!aSD9^LzS5;VT
zrA1{WIfYi+shr$WtBu(TOUrX}N^Ru@1(nuQB;}tB@aqAS+MUhz>KZ_Mn}!WUDJ}0v
z4b|-pOsaLZfSHE&HYT;zHC0RJo9s-o*Ij@o=&PF>WhN=Dz{#!6&2=sIpaniAiT618
z+XbCN!l(GWbg$_?(t9Ks^na;pD;+yJuY}L-;LpYE01)^NA^#y>f5Nle5aXc@#i#rK
z0?05o@(&PPK<_Cq@ekTw;xmE3xpTR|$o&ZE`eF=x_k_kbfeh!Q_avQ1LJR1E2cBCT
zgvWpm_P@&G6HbOC%+>xm@L`1?#-{zDdqUsiEZm>=i}I)VW#Ee@<j;)2;NS+S8W(ty
zKVc<k&_69;p%JOvAJ0ed;OY2%P>y`)noxe6`+v(F@c#=%6qoiN_au-z&@|Sb(5Mm;
VaHRMoMzihw^Z3i+O)}iU{~s72q4xj)

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libfib.unopt32.so b/macaw-riscv-symbolic/tests/pass/so/libfib.unopt32.so
new file mode 100755
index 0000000000000000000000000000000000000000..04fa164d8c5b1375d5b72c80ad8c7b81ef203d8d
GIT binary patch
literal 5160
zcmeHL%}Z2K6hG5bvoiB53<`QCnFT#&M%}nj$C+^uN1gmw1i?6t(<tbS=o4}gl_s?c
zp@oY!5)t8|RnQ+$s|b<kPe|HY(bq!l_q*3ymM(1n4*c#p=bm%Fe)qk_xwoS64xi5_
zMlAUv^w!WcLjNciDTHnm8@gUf<+zHQd}{lU2J@s$RD9@!$k17h7w9I6cH&5v-SK7k
z1mgw3m34OnYL76E>7@_x{l;@F_fF8ZfZf7%3HCEb?N^3==e?Y|e+=Dwgj`T8IlMDQ
z`xQ_OF`j^~KwPem4NErT=5rYt9~;(|Gn30tx(z{RI?s{CHrD1wASE{JT^n7h6=|?u
zg{<e+$4V=_`EU-pzgFfSw@Vi6S3B5;^I$z|l}aVXYk&2F@qOh*tLNU<y^*rox+h!n
z7hZ3rBO7uj*0gNFUWlbnewUfnm3x6_jBQr8EZl5exl8*e>~2J!F10LtZX1rgixj5j
zZes~gJO(@lJO(@lJO(@lJO(@lJO(@lJO(@l4!{8G!xDh?=zHMn)^>ganzd&FK~>X2
zABA57umEL^t4cy!*Q=-CR{^Llr5bRNPn)_Jn(-q5*ZE)BhH%Ux<|0_L$HL)eyFS)4
zc+n07oS+l1gZ^M35D5DBpPlETSgINp;rS?*s<v?+%&UD}=<?j!CoB3K+Se61_o02V
zqw8z!^VE8e+UMyZwra5+S@<IsSlyXQbr#4cbykx>pEL5z6d!zYZ`P-O34WQ421370
zS-N5U9|P8~NCMi_|4v$xk*htS?#{3z6MenmXk@T2nv8e$bcJHk<UpuB9!*Lz7Vm8j
z#gn}q9sSV()4TI@z*huure`PI)G)L=rS+(>vbh;&G&Mac&d6*IX<EBe;!I`6Q_keL
zD~_AFffn)9#8_IKY#v@ZKQWQXxqANxX-N%lh0hhdXW|TCo-BBS#A)E$_I93mynn(5
z{>?j&K7QlOD+6yt8*I+OK5E{<Wq@PZmmt4D4QwNDl{BH{n0A2w1Hu1+WBD~O#{Z%j
z;23^Ui!g{b*haV}(F&NnH5f#~BtdgOlqkTtxQ=?~!h6>;Y_3P4=GWN+a6ZL@4Fii*
zK^b8l(GM`s4^XO*M^23}W?=Tfm>+pI0z4y3H5WC{uGWO6B=C;crA^gxE(*H;%6o*4
KYbv4}llKe4=E14}

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libfib.unopt64.so b/macaw-riscv-symbolic/tests/pass/so/libfib.unopt64.so
new file mode 100755
index 0000000000000000000000000000000000000000..5231b2326ed248998307d992715f2994ce2ba866
GIT binary patch
literal 5664
zcmeHL+iO&35TE3j#Ci$Vlp2VbW4$B_9<phxC7|wRv)M}4#3lw5gmtsoYy!z{Opail
zYN8UKeDT3Y7eOd_Dt+mj2<;!y`Y8A&81dd3*O~Lp@8oQ5h*0Rm`5^n7`OVBX^Igsf
zbAC>wx~r?I2*aWmBwDH3Fi|y>b{e6EAxb|`4gc2DcF$M1^+v5_EI`^}bjeZ6e-G=8
z{%}tvj%rCj#7S8j#YHs^xY<lgKRt1WCGJy)mP!2_w~2$+s}p&Enw|tDPM7be)omp~
zv5B8ompJpD!vFWFn_Gq1XjoL|pA-D#EcB>Ac_?{y2K+~09T^*<e9kQvax^|RWF+Tu
zp*ZOt{mz*#!fl6bB$*#;5T?<VU*h|)dac6W*+=xP^+(KlU_ENE;!C&Z7zY~Y+HZ4|
z=Nq)k;kXm^f9I`wYG8k(-}(#s%%$3w-z*+{N{tKi`<$2WueJQSG~1HxTBO<J@n1x1
zny;f9$?Vr}=-FcW--Y=DC1ID2&9<Dl@oe!VGY_r{^G=!Oe-`HN-xce<$!hoUa3V8z
zRVocfxC7x1ggX%KK)3_p4um@p?m)N$;ST)YcL4p?HZ9a^qgXzthF2fTUJr9cb-!2D
zCdTW%*uSLqEjrI$MKocJs-r(6+Yso5+SLA)Vx8hH#a49$4;}p};=fRT<Wu!OgR%}J
zxTtjk(U&LV@eaE+**kd1jzpYxCt|m^wMQb6b`*{Y)<BE9T%1SHY;h-vbE)Jl|2!&r
zK3!~hz+iFriTw=F+)LLI)=|l??wiGK(PqMWEB*OY>>y)gi*Q?(ZE}q^(ev^$vn;K}
z%YCR~|CM>=`-AW+>p!f#ZL<&<QI^;0`;#8Oyxw5n?_??6b-p)t`c$0KXZri%iLSx^
zL^^e<w<nfNq|e4WQ;9UClc~PWSSsDu-93;v3syfF$kzjMre`MH%n+kHWpETyzHr$Y
z%}kGyGdxpZH-qjJIa9guj59gzlH=yC@Gsjl6JuF&@<rCN#fgbr!3`|%GsR|(3x2b}
zJp}I7dGTE1dBl69iS4h;<sz;f?kjNrI`K-=0T$#Pg7}hL5FWsbo@Txki4XGQ`9H#(
z)P{IpP-3sf19W<*^gT<mmQH2xoB;9oN)CDVtjyoRoXm;$B<>?H%C_K;dn*HYlI380
zN$Ups_tA?AtW)&_qvXc<;5otfxTr1|=Y{%_zn5dh1@UCFB10WojpqL%9yq`jiEr~g
zjL@p_azBDY%kg4_7u`R*fa8xE|EmVb|1Y7C7w0c$;@2LCfBU6TdIFq?$PZfF){2ko
M%i;nY6<5Z81PM6O%K!iX

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libgetone.opt32.so b/macaw-riscv-symbolic/tests/pass/so/libgetone.opt32.so
new file mode 100755
index 0000000000000000000000000000000000000000..5076d04034aabdf40ba51570582b394d93a527d4
GIT binary patch
literal 5004
zcmeI0&rVZ86vj_2C<;;3jfo5I#)u1VY=awhQ`$>KD`16%Zf+17aM3n_YXXUh#Em4r
zijU(fxO1T~y0m`3nL7l9MBUFxzI*2UnbVnXri(Lgvd(;^Qn4Ua`({`zeP*RUTr?Y(
zp0z}J#-?o2#X~;&fpP(PHf=6`aKY^0n#XIo!Ra!7O8RJgS2iF%COr96Y)Bmw;wo=l
z#ZQ{gTrI<)D$Va46>LBbYuztX@ZEU-ZX|U~-~p*>219Iq=Moh*d&O|jv+?ZhzFbiv
z1CfEqKx7~?5E+OJL<S-Qk%7oSWFRu|R|e=QKMLP}j)tG5=}+&g*QDp2l0GLrAxsMN
zz-I&mA97Zha-;wI(4)7T&AZ7=dvWz<Qmdu)w3gIw*K4&}{r1VVSSM0-9kChfMXF`T
z&3e5}7w-4rZFcE<Xm7h01NTngZFVb3+*kF&E`vQ${-U?X?CWnmJ2pJAC!`|#vh;Gf
z9_(8L5<WiOls=)SPuDGPJzH!%UT9jr++AvBt<`RpcNP{OHQHIe(wOUHx#jK7(p;mH
zFU`+C%~pc9d=;>CXRlwZy^t=pz1|9=&B3d5Yi(!C(v7`=(!4IVEiHPxg|pWBFV`*I
z9LicB_WQj-;nw^wAGQy(ylZe);ELc+!@pl}5?6&EqtTE&&JZNRpLy5i<KB_S*#fQx
zHSnRilW@yieB50S?x$RbXLqL@bJ}np_$LQpK5|bWhnns!NpDKL6Zu=@HT7G9%J_9B
z8fY;gN0u97F9_s?YdxksI0!;4AgqB{qP#EC+^zEhwd8XDxxkf7o7P*|Lk6W#3z7Sf
OQ|#w*bQzQq@_qqhJ#?c0

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libgetone.opt64.so b/macaw-riscv-symbolic/tests/pass/so/libgetone.opt64.so
new file mode 100755
index 0000000000000000000000000000000000000000..0c151921aa614419c32e49347600ce2a94e5c7fb
GIT binary patch
literal 5424
zcmeHLF>ljA6n?1_S}20FEJzGw08s|4I1&<qrK#hDfJq><5=>S|ql6(bYK=rEDi#J7
zMt&O;3lalE5dtw0-izN?*(M1{i0w{FzI&hF=ezrSw)F0$=hv5VIYP7OD@pW8sZG65
zUXMEkhE2Lb1^z!xtJ7TJ=C#jyA0QRuOrcNkuXr|&ix<=QBMu1&-4gSQbVsTKu4w$=
zW3(%}zim2A>aZ@)qIvVgI6z(Q)EA3&GT&sASbkW)Tszdkgun9U^+dQu&0_cQe2^#i
zTTk#Z=V=@Cqj21(g7@lB83V=v<A8C%IA9zw4j2cF1I7X4fN{V$zz(2pdZdNix1W<x
zjCrOpYTXYSqo#bP@hNo?b?2(a=M|R~0mwsqQai{8|GyA*cf)mWmNpu#ovS6su`9My
zs+22^<5bFj9@*k*7JenOEv|IoTbj2Bex><5!PhkZd%Y{yEj|gr{L}gDaw*BgeT%Yg
z$8~s~zRaw-XYulUbDW<Y_nh)ax(_h=HRZGOahYFGuiHHeYL8phdrg;u`<=Gy)pj~w
z;5S=$s|_#Mu5S5WKtaQAZ&m%EU9Ug%w!vz}Pxk)7DC$08jP_z2qBj^nw};*RA=$eJ
zV@``P+9Nyazlf$$cl5MJ_8{b_7mh~#afBuP6Us4<yhAt_!M*`v-^<yFG(0i9mlv4(
zKAD8jV}AiJO;xft;s(8jbeTKyPC}1;2)wO{GM?l>k9o=SOrGmtzXFl3x8c2#Zr3>!
z4&M!&;{dTvs4!2&w^WPuVISgr3g=L`59XssOjKjNj1T?szSIQdV?4ybrs}hwg%#Dy
z^GP<WKZ)5jN&bfFhngtw*%|&}T=*~F$K$zkAMNd0+`9up5#xfEv|0N1s_!6ij{X-+
C=y`bn

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libgetone.unopt32.so b/macaw-riscv-symbolic/tests/pass/so/libgetone.unopt32.so
new file mode 100755
index 0000000000000000000000000000000000000000..266904d527bfa93d5e8518e746adf92bd706f3fe
GIT binary patch
literal 5004
zcmeHL&ubGw6n^VQjW%ej7r}#zAl8FRcd3_Fgl%@SMAxLo^q`j|rXlf=1lko^5G+Em
z;J@PE;a}jt;LU>~dNh9D%ucB`2ffdOZ{NHhGkNpP<nZQAk~JL15hJdA7g{kstI!{o
zM9xC5iU++cHCa$`lTY16F2Oum6cs<ZEOK;1<2BsGxiWqR`eb|$Ho<rWc=EZ}hB_sT
zV|nQyK5stfq6`HWn!j^WXcNp~tp{ZaeYfAgn?aot@<4GhgG1V^;R;t64vOhyAkosz
zk5WBM9~_2p<h(sV*otMqGGH073|Iy%1C{~HfMvikU>UFsSO(@Yz~1!}@Z;BP`URT(
z>3#H??0IX@7on@b0>J+BJV2q3asjBR(f@teqo?)ynzx*`w(fXA;D>(Tg)3nY1mVj3
zwOA*`RUNSi>!rA5$IW`R%`RN;L)+Y??xD4<UJTSbfws9@h^M|-&+O9J)$$j$U6F5p
z^z5|B6Zb@MU|)saEbF0tmjRC-9j`;r>FNEx<ngms^tf4<e6!Q8C-GJ%$+KqbQIsZm
zH`>UOT=Fz)Z$w$%ZZw`IUE?iZ1;pRo9~ZqB(8Z3{BQqLKUiqWm?nwOY{Rz^vE_TE(
z2786FdgGUU@rP4b{pol-m=vn!fBA6xWR~w5JS*ZFpie`;vG63W13zc8Df4)Sga`bc
zcMCq=JLd6h30@7ZK_4~mB)R2W`gnH<b3fraKD&G6n5Rwd4gbuca6V-nU=G(*Z%KGl
z;yaPPMOt(H7{D^RZVv+#V{%}rG3_S6Jaerp$Rh_v7&9<6Fy<leD>U!cC4g(erT%k<
dE10r~x3Y&El)|+ra36C@`#BsP4oWe3zX5Szcpd-%

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/libgetone.unopt64.so b/macaw-riscv-symbolic/tests/pass/so/libgetone.unopt64.so
new file mode 100755
index 0000000000000000000000000000000000000000..a69d687ee2ab060668fc09139757a8c93d00e4ec
GIT binary patch
literal 5424
zcmeHL&ubG=5T0~XjaD?R7r}#}DAt2ZHXw+Cben8qG$tBb(9@D8A@Ptz+7;}{A`}l^
zJo>kJ@}S_cB1%ujne2RVHzrXKPriZ8_vYLA-j8{21M^;ZmEuAoK`@KHka(YzTGtoZ
zm9VkMuuj)$k$+Fo(kNEAS$3rT04W_t3Vn>9^qJ64Ux?#T=n@dR1?K1J4pj$CssG?(
z&=TFBnog7ItV^<J);uu|P?tN(i^V#bZ`8z>2kV!2`#PBLmtVgc3OCOz&OY`Banj#P
zgvb1;(+&pxHo42IA1HNDx^=MHauYB2p)+VQU@~AbU@~AbU@~AbU@~AbU@~Ab@V{n2
zYCW+>TF8C<J{*YuRDIOC@6|_5`Bwdt63m9Wb18J`oZ@js0OH`E&<5hc|0_h@UCQTg
zWY$X6tt%PFv2(VQ$z^kn<K(ixAKBt+7Ws-sTU_ZPZ*krt<SWi633-k4zt+3*-r}18
z%s(E_S<Xb6ux*WZ<>x!uwj_O?T60h1Wq%VKKRNDM<q!27V1%p6PtGUL{G58-ZjxVk
zTy^i2^W@*J*YaLrtM2)ga`moT^88JAqvHAGmnyXlx8m1|#fRP|SgrWU-reg3jcvwY
zC&VsVo&Gbs+t}@r-P-GOSct(6*+KhxF!CC`Crz?D1NNGOUa#E`u%y32x#p2?2=^j5
zH$a?wxjPZV_kr*7JagZM!vXX-U%-nam7I;xpjVeJaYMdI=y48#w>414lNjhRFWJxN
zy$;SR5b@d#pOv^>V^=u*Z{QvWIKH=08Rm&zZmJgR!#TwL)S(6<UziX2E%198ANujR
z)Bwb5H{<n#FRMO_0L7H*Wq+cE^+$1XO%lJR`mP4bcXpZ|jEnrs|KoV>+=jhb4qJCX
TC}LdD5;jf$PW5#J&d~n=RoZ<b

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/so.c b/macaw-riscv-symbolic/tests/pass/so/so.c
new file mode 100644
index 00000000..b8583a9d
--- /dev/null
+++ b/macaw-riscv-symbolic/tests/pass/so/so.c
@@ -0,0 +1,9 @@
+#include "fib.h"
+
+int __attribute__((noinline)) test_fib(void) {
+  return fib(6) == 8;
+}
+
+void _start(void) {
+  test_fib();
+}
diff --git a/macaw-riscv-symbolic/tests/pass/so/so.opt32.exe b/macaw-riscv-symbolic/tests/pass/so/so.opt32.exe
new file mode 100755
index 0000000000000000000000000000000000000000..d06d5e36142ef4d84875beda8afeb96bdd245fa2
GIT binary patch
literal 5432
zcmeHL&u<e)6n^efNckB^0)-w}iAoJpv&063gjBU_XX8XQPKiUMs)u16FODnQ8+jK*
z)I+QEUV%8kg$sWGs<^<t65_}o&_k=L#~!K*E~rhvZ^jcAH;4AVPx|(~H}B27H*a=E
zn)xQE%@+y<vE;~~LT&Obk#pcb9}#&Q{G7P5N2cYF9F*N!H+JnqKVa7o4)`Pnu{Z&p
zpq*nASvrbX1mnoKu`e7FSvYC%49x`N(hgV2+MhrtXlIPezojj(e-Z8IF3Yg*)ZgZJ
zrrT+r>9%Hi*OTtdpp&fLI9u|P*ejwhbLae+Lze8kM(39G*_MZ$9T|J07AUpIwN6tI
zAIyu_QyrLkJ4)kz^tx%xMZHFoK=-?+M9w-t`p!e=*9oWc*PTu9#wq#kL0Q^ZyJH^m
z_rCw7?HrT|`1^;C2fLsCe&Nw4;nc+WDe()N-@bSZLr!@G@(Sb?$SaUnAg@4PfxH5F
z1@a2y704^FV+DBc<NcL<3gBIG7Rrmix8enG+HQgK4tf=QFZeXD58$1YeMr1pifitd
z`yoyOdw^rW6ZE4@J_b(vJ460zYb%Dx=Kn=oAa;0;F?rvvRw@_W>1zGTX}4JPN?y?|
z&6bMAVrh2gVR^?VIm4SQ=WKLyIpy4qu4ks_Zgf`2)Wqoe_OIt=bbZ^`c^REE2W9Tg
zRGBl$(UpMUQlriaza|Hj9;TujcgY`m-qwRUBiiu_(D4MZ9iRGX==)uKK-52`z(oX&
zL%&S!Qlq|CLJG*2Yj^}p^EEi%RX7FeUx8=+Z;a@h(CvIU-t7_ly%GHy{fDIA67XiR
zDr)YFx_@c0BI>i{rAjb&WjRo_#rmgyHBc*lxfUo<)!I_ouc@W^`9`p^-KyH%xEXfU
zdfe%!(cpbisxjxU_^KRK7wbw%8YQXXgN0J%MneVlIW#KOOcIr(;UI<lhQEqhVH%2x
z`gou5l8s&(Ho?<@;cHgX;nu}#_pf_vVX`J(YoiZ$!_$FygQy#N>)lkmG`fi|>|w97
ziY_s<)wtJ-`l+qOf8p=JiT?-JCi`w>``Ul!12phYr62!w;$6t*Z#JAVo?+xA_9Xqd
z2Z){gW?<(TK)<W-A-L6S435R~;XJ?{M88|`A%?#mT1@Wb9|7!B26#>oJSW)39YIc=
zc9`^e^c(__-QtW%R5N}$I1)IDHcQNhbP3@8VUGIU4x5K>a%NYXxICOb2N+kM1}+2y
zVH``$kN6Ux-z-2HhZEPx5^WYX2iiV_-w!YxfP5I>SR9|{q>c$r`U%GSM$})9MPi?<
O-v%~POIysx`uzhvf6#dV

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/so.opt64.exe b/macaw-riscv-symbolic/tests/pass/so/so.opt64.exe
new file mode 100755
index 0000000000000000000000000000000000000000..2c1c0959acd4e76dd6e799b8a121de32582acd4e
GIT binary patch
literal 6032
zcmeHLzi%8>5FTd}I|;&ZVobshp_M?2Q+VSu1R*5Ad*}6GaXAy8gM=s^d%n&2(EZZw
zCL*E$nI@$X1vE7L1&D?Y3YwG@(5C>21`&jakWgY~cIWf$ZG0#Nf@Ys|_r3Sc%$wPH
zZ{KR(`(9=B(8L6xS@b)}=+2>pSysV!vq|R&!!o@<Q~ZB|rfHJLhhr|0FDJm#q}|Y|
zfk&0M7{%_U%Cq>m>H!g<pu{k){i$&SX(rJWJBf97IvMXil|gl|3rA`v)BTfOU-f}_
zzDqwv4Y7OBrtWBi?IbVb;)EX{!ad(^)z7yZ3!STBdtuNDx2`?^oD=q(f(9UZl5<Uu
zvJ|hi$S}{o-~l=o9i>~D31yyB2iaa})rn(daC-eH4o=3+AnJ94AvI$s#<Iqlsbj$>
zPZK?Bed}6ZTR+TNrMn;RFxF=2!!LKJ$@}rN!_WEh^!H6`nq<qmCm-`BfBg0KH}^h&
z+n<}gFh}mh&IiAIm3Ybj^9<w}$TN^<AkRRafjk3w2J#H#8TdalfI0*<9>#MTl+;Gj
zepbOB_x5@*p~V91wsnje%+~SoSea;E@gc=CitwYuxMqs`cEX@0f&L?^IHh=6aaR?=
zV~qL`_QzBo<G=Rwd5DXv|Df$@gR3tzZq&!+Qt3r|zFfV0&Mp+3C8uC7EiM%bg{4JU
zj7N*BO4RjfEsHBVtlucl6)F;(5?Fjwfb~n!yf#M&>paR&67oIDPZ6GPl)t}@6}d&n
z2zeOQ=Urr{nWS$KcGFNM+w?H~wl`#ky@Pn!uM@1F^?O43Z2aexKVx$z)n4KLjQGVy
zSJ|bQKTfu-go4j_Dpk)vs{DJ(<30$>^A7VfbpJfp#_&7JXY=;a82wMj@K=~W@P2{s
zI=0BHyjgWGu9e8VzOi2NRxWRNrm|Lj%`JOo(=Ap!L#A9=FS-@8zPeiTHuqW6Z1?JZ
z+w^;_ZWIijA!BMQ?xt&sUU{u*3`Id08M(wTrdX>Pue!pdG4(JsVdM`Y?vLo3py5Y8
znV{Psa>DDK$geX-g9NwHi{16fX?CwV+kUuBPUCu))f0>c<P3tg@ATUdIZ^N~|Fhih
zw6@r!$D^%YrxSD|PRqa2p5R$z&tjeN{sM6y2WO(2ZfALrzPrJD4#YW!a~y{p#(cd)
zclZp1|NTIecv77~ANGi0fjjaR!XD=a@KserjIc*s7g(OYC&T#yoL755_W568fy7o+
z1)M`b_z@lX7G?d5oy>{v7T$MY_SnU}A+VgWzom%)!au9U4SB-&B6q~M<UktEA>2pe
z-Vxtf#1H>(u#LnId$M^TO%?2TF#Ll(@GTaJ{o+t1?%8TD`!n4{S6Ujg&m{6?wZEal
phnYLcKlnvn<a@jyJNMCU>Y?))2u1h>Epr}ZAL#vg1Bzqp{{}bc<Z}Q3

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/so.unopt32.exe b/macaw-riscv-symbolic/tests/pass/so/so.unopt32.exe
new file mode 100755
index 0000000000000000000000000000000000000000..d588d15abbe0aafd2e131b029a4a70a0bb367ff4
GIT binary patch
literal 5432
zcmeHL&2Jk;6n|z*8%k;Vg~G>yRa%KuYPPXkii8AZ{Sha^b!eO-Ar8}ZymgFhZ{*!n
zL>xdth#M-(0WMrPazKa+9JqlH$6k?&L{;$zR0w)NV1B<DPuQ3o=(+o(-@f<ey_xss
z&CW<O?^J5@xm->xIr5uOn|?^-JoqoiL>>k|FRmPr8JU#BvR~`Qu6^hS>>I%WKY>9k
zo`O!$&asI!T|g{?apZ`xFHDLoJY(=9nhD0G9j=nLe*>MMoiQ%|nzX?FL$ss2EW^H6
zf1BUgZl`&++nVid#NF9JCtkgNuHeOymq%ab&iOHiG}(EL&n@k<Bab>eGO?=`D7DD7
zPE!yc%-iTk>xmA{mUfs#{V?4);i6_^iF|xg<ec-J?|k9hIqsDH+TH?hoRs%ID@q${
zH{~IJ@59?|=dc_{IREJWAEv*Ti6<*RKmYj$x2Lwho|5f*_a<L@|Erg$%YJU_UF-4F
z#hlnSCYn)Jfvf^q1+ofc704=(RUoTCR)MSnSp^=<3h>^?`z!erz`Nuel;8gzMhoDy
z-2mqu^eXs4@H4=p0Pm!a10>!p#WnZKLl92@2LO)wE&5R=p8%)*krDrMIE)~&`Mzif
zVuza;llSdvsq}(7Q>|Y)?dJ1d!OOdaxk5glFU;*dEbsUvXLOV0oQ-ZSrkuOc_006#
zjm`?0niyT*{`K69u5bG~FQaqjpw!)&Dsv_|x)KmvYSdZbf5}0mN2%z>eR5aN+j>xE
zL_1y%I-VeQ;!{5j{g8_fi26keGyHH3?+!1MyVR&3lz;;Aod!FGrFk2i?<!nV>TiOl
z{jZPdThQ%%INnEN_D{z2YxEzHeoMfc#j2?C>vjLqVoB7i%S)w7`O0!d)fVfo_|=M9
z@r$*J5>>4&75$o8nxAh}R(4udyBjrwu3C>e{UjWm5~Uhtf5lhDN_DZWlq6xCC_Y#y
zRctg=rCvs(Qq4G4aS{v?$h-Vi*b0(BRM^M+j2CbAlAsBm3=Chhk`A{nUc0~Htp)L#
zc&*Jo+zn3#;tj%X;H`HP@sjW@d|?lIomF&+pshx|Uf54;E&dOG8czH_usplot!!WW
z?>vhJ{;BlizfL>>+5F9hQ^qrl{DD15KkflyFTYvXc?Qt$DtriTH5-Ft@qBm=;0~hS
z4fqf|KP*Aj^di3OQv`TU5IiT?#vMUUop$!&KYtSfk>28rNmK#rr-LJb3uv>%d`Oo7
zj>R1HyB#(U-{j1$HgS14y#{bReHyqB5QK3oF+buBfPQlT=?I*-MwV!^usP6n27X_{
n@EGKy0LS9^JSTNbaMCRpKQ*HMax4=2r2RIrky_efKGyFa&WYY!

literal 0
HcmV?d00001

diff --git a/macaw-riscv-symbolic/tests/pass/so/so.unopt64.exe b/macaw-riscv-symbolic/tests/pass/so/so.unopt64.exe
new file mode 100755
index 0000000000000000000000000000000000000000..805d29d16ab3bd30cb779f4e6385ae914ffb41a4
GIT binary patch
literal 6032
zcmeHLJ!~9R5T5fUwiCd1V!+`?Xcdr>NO<EjKSD^D`|<g(xSWa4K|&Odvu|@gbbq>A
zM?@3>Bb1azE=WTGB^82#j)o>BMW}HB5?z82xBy~icIWf$ZG0j{M71N`eeZp5=FPm>
zw{JD?O0KXllt>W7qTfk+4_X0}(t#f)gT`To6um?v{69`(G|c@&J{OFq0^rd=uIbdk
zQRQWNvAdz;QG8tWfQV2~Vi+VRHEtkH1e#(ev2Kk8{jH}Ws1CN^NbQFH!>+CRK&<cl
zFJ49b-K(fOT4p=R%b+;n2Z(Ub)@!S0>y_!oMz=oQsdd*bz4*M-Z8=E|K=dRvvYxOA
zk6)O-m$pTtv=f<7<~n|m@x|IIaf}SkMzhuS{P2XSx?Zd4hDkA>u!BkDS%+PG`ZUpV
z*7s@aJL|_uEBnv(CSz%mKKgo-s=Obk9A4+#*v+anMzUqo$A*7CxkICm<!;@+a_7sd
zb5}ple>1Y1+WvNmws&{OKRh+}@fYt5Rnm#g51@PN_D_E&2y75X{2yl^&On@jI0JD8
z;ta$Yh%*ppAkM)3&w$hqBB=4up9*NdW|ZcyI`GGxy_P?uMFQ;BwT~Li*8WkQ=UK%E
z6i+BVq6pA(lE@Ai)FRM-SQSSU5$APP1dl%IL)aftJM{nB)AbM+SO0_Tsle4&8aL|W
zd^Y>CeL7#faK=t1omnSo&(6#ylgZf`SPVvsD@)Y%VJ(X*Iy}FAp0kYvhXyQu>Ue%3
zn(Nuagy-DP4-@j;&yNt+*U#Tw$I7@xM+kZ7*XLbihnb*l5q48=Ot$GE`fabr^jZh;
zvR@OdAN4z~d^G+u%Ac^g5t3KAJt2Nihe&Ro_xYn_+x>i*yT?QIJl>D@mB)S1qiXgp
z;{@G3&!qwUrt;CeeKJ7*`T+hS^9SB9@Lk6mnfbSh>2r%&GH)y|WpncvmUE`CSbRO5
z&zY5UrjRpa@`a^Lx?q+T7D~C5eb!X#t<`efv|F{N=XRbUV@mVsm9)v^@{2`d$aA}%
zkxL9?GNqEq73Y~WX0_WjU9a5nxZS63+)CLilX06BBBy(~;gwezy-tAZX!-8i<W!p*
z&U(4KPEO@=lhp(CI^=ZRdf92$J#swvJ^ttMa-+7!CN1u*wHgh#>2X@_i#)-z$ezV(
zi1!zW`#3lg-LRbEPWa9S?>P|XoZNAV;E+R~uXpHAJ_F%@KM*CJ^sR!s!?3;5G|dfp
z3t^9Q1NfRMB1ZT}TrcprocXZF`2xgyq0{)eLR;_^{>fT0(qX|l1cV>ak#AAdzt~Am
z@!i7v4vZeVxHkmmBlbJG5Fp}WHD7cXT{_1t@r~~u&LP}K;@%P8S;P<jZ?dh#4|}q?
zBcckn-|79q9{4s7iTzAZ#c$baFZ(krqAL={=$d3arS{i!@FC`o@eh9ST;zMaA3L`p
aH}uf?41^;5f|fZCvUm0VyaL4m_WuGV#q`tw

literal 0
HcmV?d00001

diff --git a/macaw-riscv/macaw-riscv.cabal b/macaw-riscv/macaw-riscv.cabal
index abc79976..088f9701 100644
--- a/macaw-riscv/macaw-riscv.cabal
+++ b/macaw-riscv/macaw-riscv.cabal
@@ -25,6 +25,7 @@ library
                        bv-sized,
                        bytestring,
                        containers,
+                       elf-edit,
                        grift,
                        lens,
                        macaw-base,
diff --git a/macaw-riscv/src/Data/Macaw/RISCV.hs b/macaw-riscv/src/Data/Macaw/RISCV.hs
index acac5628..c7a79ea3 100644
--- a/macaw-riscv/src/Data/Macaw/RISCV.hs
+++ b/macaw-riscv/src/Data/Macaw/RISCV.hs
@@ -12,6 +12,7 @@ module Data.Macaw.RISCV (
   module Data.Macaw.RISCV.RISCVReg,
   -- * Macaw configurations
   riscv_info,
+  riscvPLTStubInfo,
   -- * Type-level tags
   G.RV(..),
   G.RVRepr(..),
@@ -25,10 +26,12 @@ module Data.Macaw.RISCV (
 
 import GHC.Stack (HasCallStack)
 
+import qualified Data.ElfEdit as EE
 import qualified Data.Macaw.CFG as MC
 import qualified Data.Macaw.CFG.DemandSet as MD
 import           Data.Macaw.Discovery ( defaultClassifier )
 import qualified Data.Macaw.Architecture.Info as MI
+import qualified Data.Macaw.Memory.ElfLoader.PLTStubs as MMEP
 import Data.Parameterized ( type(<=) )
 import qualified GRIFT.Types as G
 
@@ -79,3 +82,11 @@ riscv_info rvRepr =
         , MI.postArchTermStmtAbsState = \_ _ _ _ _ -> error $ "postArchTermStmtAbsState unimplemented in riscv_info"
         , MI.archClassifier = defaultClassifier
         }
+
+-- | PLT stub information for ARM32 relocation types.
+riscvPLTStubInfo :: MMEP.PLTStubInfo (EE.RISCV_RelocationType w)
+riscvPLTStubInfo = MMEP.PLTStubInfo
+  { MMEP.pltFunSize     = 32
+  , MMEP.pltStubSize    = 16
+  , MMEP.pltGotStubSize = error "Unexpected .plt.got section in RISC-V binary"
+  }