Skip to content

Commit fd26764

Browse files
committed
in-progress aux function defs
1 parent 1f50dba commit fd26764

1 file changed

Lines changed: 37 additions & 26 deletions

File tree

document/core/exec/relaxed.rst

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,7 @@ The execution of a WebAssembly program gives rise to a :ref:`trace <relaxed-trac
1919
Preliminary Definitions
2020
~~~~~~~~~~~~~~~~~~~~~~~
2121

22-
.. math::
23-
\begin{array}{lcl}
24-
\timeevt \ldots & = & \ldots \\
25-
\\
26-
\readingact \ldots & = & \ldots \\
27-
\ordact \ldots & = & \ldots \\
28-
\overlapact \ldots & = & \ldots \\
29-
\\
30-
\readact \ldots & = & \ldots \\
31-
\\
32-
\writingact \ldots & = & \ldots \\
33-
\\
34-
\writeact \ldots & = & \ldots \\
35-
\offsetact \ldots & = & \ldots \\
36-
\\
37-
\syncact \ldots & = & \ldots \\
38-
\rangeact \ldots & = & \ldots \\
39-
\\
40-
\tearfreeact \ldots & = & \ldots \\
41-
\sameact \ldots & = & \ldots \\
42-
\\
43-
\X{func}_{\reg}(\evt) \ldots & = & \X{func}(\act) \ldots \\
44-
\end{array}
22+
Bla bla
4523

4624

4725
.. _relaxed-trace:
@@ -85,12 +63,12 @@ Consistency
8563
\sizeaux(\ARMW~\loc~{\byte_1}^n~{\byte_2}^n) & = & n \\
8664
&&\\
8765
\readaux(\ARD_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \byte^\ast \\
88-
\readaux(\AWR_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \epsilon \\
8966
\readaux(\ARMW~\loc~{\byte_1}^\ast~{\byte_2}^\ast) & = & {\byte_1}^\ast \\
67+
\readaux(\act) & = & \epsilon \qquad \otherwise \\
9068
&&\\
9169
\writeaux(\ARD_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \epsilon \\
92-
\writeaux(\AWR_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \byte^\ast \\
9370
\writeaux(\ARMW~\loc~{\byte_1}^\ast~{\byte_2}^\ast) & = & {\byte_2}^\ast \\
71+
\writeaux(\act) & = & \epsilon \qquad \otherwise \\
9472
&&\\
9573
\addraux(\act) & = & \addraux(\regionaux(\act) \\
9674
\addraux(\loc) & = & \addraux(\regionaux(\reg) \\
@@ -105,6 +83,39 @@ Consistency
10583
\offsetaux(\reg[i]) & = & i \\
10684
\end{array}
10785
86+
.. math::
87+
\begin{array}{rcl}
88+
\timeevt(\act^\ast~\AT~\time) & = & \time \\
89+
\\
90+
\ordact(\ARD_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \ord \\
91+
\ordact(\AWR_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \ord \\
92+
\ordact(\ARMW~\loc~{\byte_1}^\ast~{\byte_2}^\ast) & = & \SEQCST \\
93+
\\
94+
\overlapact(\act_1, \act_2) \ldots & = & \rangeact(\act_1) \cup \rangeact(\act_2) \neq \epsilon \\
95+
\sameact \ldots & = & \rangeact(\act_1) = \rangeact(\act_2) \\
96+
\\
97+
\readingact(\act) & = & \readact(\act) \neq \epsilon \\
98+
\writingact(\act) & = & \writeact(\act) \neq \epsilon \\
99+
\\
100+
\readact(\ARD_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \byte^\ast \\
101+
\readact(\ARMW~\loc~{\byte_1}^\ast~{\byte_2}^\ast) & = & {\byte_1}^\ast \\
102+
\readact(\act) & = & \epsilon \qquad \otherwise \\
103+
&&\\
104+
\writeact(\ARD_{\ord}~\loc~\byte^\ast~\NOTEARS^?) & = & \epsilon \\
105+
\writeact(\ARMW~\loc~{\byte_1}^\ast~{\byte_2}^\ast) & = & {\byte_2}^\ast \\
106+
\writeact(\act) & = & \epsilon \qquad \otherwise \\
107+
&&\\
108+
\offsetact(\act) & = & \u32 \qquad \iff \locaux(\act) = \reg[\u32] \ \\
109+
\\
110+
\syncact \ldots & = & \ldots \\
111+
\rangeact \ldots & = & \ldots \\
112+
\\
113+
\tearfreeact \ldots & = & \ldots \\
114+
\\
115+
\X{func}_{\reg}(\act_1^\ast~\act~\act_2^\ast~\AT~\time) & = & \X{func}(\act) \qquad \iff \locaux(\act) = \reg[\u32] \\
116+
\X{func}_{\reg}(\act_1^\ast~\act~\act_2^\ast~\AT~\time, \act_3^\ast~\act'~\act_4^\ast~\AT~\time') & = & \X{func}(\act.\act') \qquad \iff \locaux(\act) = \locaux(\act') = \reg[\u32] \\
117+
\end{array}
118+
108119
.. todo:: Add more auxiliary functions
109120

110121
.. todo:: add prose intuition
@@ -122,7 +133,7 @@ Consistency
122133
\forall \evt_R \in \readingact_{\reg}(\trace), \exists \evt_W^\ast,
123134
\trace \vdash_{\reg} \evt_R \readseachfrom \evt_W^\ast \\
124135
\forall \evt_I, \evt \in \trace, \,
125-
\F{ord}_r(\evt_I) = \INIT \wedge
136+
\ordact_{\reg}(\evt_I) = \INIT \wedge
126137
\evt_I \neq \evt \wedge
127138
\overlapact(\evt_I, \evt) \Rightarrow \evt_I \prechb \evt
128139
\end{array}

0 commit comments

Comments
 (0)