Fix Figure A.2 to make it draw the correct test (#228)

Luc had provided the correct figure originally, but I must have messed
something up in the merge upstream.  This restores the correct figure.

3 files changed, 17 insertions, 15 deletions

diff --git a/src/figs/litmus_sb_fwd.pdf b/src/figs/litmus_sb_fwd.pdf
index 1de7036..432dd9a 100644
--- a/src/figs/litmus_sb_fwd.pdf
+++ b/src/figs/litmus_sb_fwd.pdf
diff --git a/src/figs/litmus_sb_fwd.pdf_t b/src/figs/litmus_sb_fwd.pdf_t
index f6bdb0e..2eb0d6e 100644
--- a/src/figs/litmus_sb_fwd.pdf_t
+++ b/src/figs/litmus_sb_fwd.pdf_t
@@ -14,37 +14,39 @@
   \fontfamily{#3}\fontseries{#4}\fontshape{#5}%
   \selectfont}%
 \fi\endgroup%
-\begin{picture}(2128,2823)(-11,-1972)
+\begin{picture}(3447,1984)(-14,-1133)
 %  eiid0 
-\put(441,599){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}a: Wx=1}%
+\put(821,599){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}a: Wx=1}%
 }}}}
 %  eiid1 
-\put(441,-211){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}b: Wx=2}%
+\put(821,-211){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}b: Rx=1}%
 }}}}
 %  eiid2 
-\put(441,-1021){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}c: Rx=3}%
+\put(821,-1021){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}d: Ry=0}%
 }}}}
 %  eiid3 
-\put(441,-1831){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}d: Wx=3}%
+\put(2981,599){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}e: Wy=1}%
 }}}}
 %  eiid4 
-\put(1665, -8){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}e: Wx=4}%
+\put(2981,-211){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}f: Ry=1}%
 }}}}
 %  eiid5 
-\put(1665,-818){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}f: Wx=5}%
+\put(2981,-1021){\makebox(0,0)[b]{\smash{{\SetFigFont{8}{9.6}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}h: Rx=0}%
 }}}}
-\put(221,281){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,1}co}%
+\put(661,281){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{1,0,0}rf}%
 }}}}
-\put(221,-529){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,0}po}%
+\put(  1,-485){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0.000,0.392,0.000}fence}%
 }}}}
-\put(938,-931){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,1}co}%
+\put(450,-485){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0.294,0.000,0.510}ppo}%
 }}}}
-\put(559,-1340){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{1.000,0.627,0.251}fr}%
+\put(1539,-122){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{1.000,0.627,0.251}fr}%
 }}}}
-\put(164,-1337){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{1,0,0}rf}%
+\put(3021,281){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{1,0,0}rf}%
 }}}}
-\put(1241,-1861){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,1}co}%
+\put(3061,-485){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0.000,0.392,0.000}fence}%
 }}}}
-\put(1445,-326){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0,0,1}co}%
+\put(3511,-485){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{0.294,0.000,0.510}ppo}%
+}}}}
+\put(2103,-122){\makebox(0,0)[lb]{\smash{{\SetFigFont{11}{13.2}{\rmdefault}{\mddefault}{\updefault}{\color[rgb]{1.000,0.627,0.251}fr}%
 }}}}
 \end{picture}%
diff --git a/src/memory.tex b/src/memory.tex
index 619bd38..5d96bc7 100644
--- a/src/memory.tex
+++ b/src/memory.tex
@@ -154,7 +154,7 @@ Any other hart will therefore observe the load as performing before the store.
 
 \begin{figure}[h!]
   \centering
-  \begin{tabular}{m{.4\linewidth}@{\qquad}m{.4\linewidth}}
+  \begin{tabular}{m{.4\linewidth}@{\qquad}m{.45\linewidth}}
   {
     \tt\small
     \begin{tabular}{cl||cl}