From c8d57f91c17f3915bbbb022fc090426666b719e3 Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Wed, 12 Mar 2025 18:15:30 +0100 Subject: [PATCH 1/9] feat: TRM redesign Signed-off-by: F Bojarski --- pkg/trm.sty | 2 ++ trm/_all_trm.tex | 2 ++ trm/_inputs.tex | 3 ++- trm/binary.tex | 5 +++-- trm/columns.tex | 12 +++++++----- trm/constancies.tex | 6 +++--- trm/heartbeat.tex | 42 ++++++++++++++++++++-------------------- trm/introduction.tex | 4 +++- trm/lookup.tex | 25 ++++++++++++++++++++++++ trm/setting_wcp_flag.tex | 2 ++ 10 files changed, 70 insertions(+), 33 deletions(-) create mode 100644 trm/lookup.tex create mode 100644 trm/setting_wcp_flag.tex diff --git a/pkg/trm.sty b/pkg/trm.sty index 50b78ee4..fc17ceec 100644 --- a/pkg/trm.sty +++ b/pkg/trm.sty @@ -5,3 +5,5 @@ \newcommand{\rawAddrLo} {\col{RAW\_ADDR\_LO}} \newcommand{\isPrecompile} {\col{IS\_PRECOMPILE}} \newcommand{\plateauBit} {\col{PLATEAU\_BIT}} + +\newcommand{\maxPrecompileAddress} {\red{9}} \ No newline at end of file diff --git a/trm/_all_trm.tex b/trm/_all_trm.tex index a8f17396..0f294260 100644 --- a/trm/_all_trm.tex +++ b/trm/_all_trm.tex @@ -14,6 +14,8 @@ \usepackage{../pkg/exponent} \usepackage{../pkg/thm_env} \usepackage{../pkg/offset_processor} +\usepackage{../pkg/iomf_done} +\usepackage{../pkg/wc3} \title{Address trimming module} \author{Rollup team} diff --git a/trm/_inputs.tex b/trm/_inputs.tex index a37acb04..ec53bf2d 100644 --- a/trm/_inputs.tex +++ b/trm/_inputs.tex @@ -9,4 +9,5 @@ \subsection{Binary constraints} \input{binary} \subsection{\plateauBit{} contraints} \input{plateau} \subsection{Byte decomposition} \input{byteDec} \subsection{Target constraints} \input{target} -\subsection{Identifying precompiles} \input{precompiles} +\subsection{Setting $\wcpFlag$} \input{setting_wcp_flag} +\subsection{Lookup} \input{lookup} diff --git a/trm/binary.tex b/trm/binary.tex index 190efe6e..8d5b444e 100644 --- a/trm/binary.tex +++ b/trm/binary.tex @@ -1,8 +1,9 @@ The following columns are binary: -\begin{multicols}{3} +\begin{multicols}{2} \begin{enumerate} \item $\isPrecompile$ \item $\plateauBit$ - \item $\bit{1}$ + \item $\iomf$ \quad (\trash) + \item $\done$ \quad (\trash) \end{enumerate} \end{multicols} diff --git a/trm/columns.tex b/trm/columns.tex index c4aff184..b0bc4e8e 100644 --- a/trm/columns.tex +++ b/trm/columns.tex @@ -1,6 +1,8 @@ \begin{enumerate} - \item $\trmStamp$: - stamp column; starts at $0$ and grows by 1 with every served request; like many other stamp columns its main purpose is to separate the different requests to that module; + \item $\iomf$: + monotonous bit column that lights up for non-padding rows; + \item $\done$: + bit column that lights up precisely at the last row of all counter-loop; \item $\rawAddrHi$ and $\rawAddrLo$: \godGiven{} \ccc{}; contains the high and low part of some stack value which ought to be interpreted as an address; @@ -9,7 +11,7 @@ \ccc{}; contains the trimmed version of the high part of the address argument; \item $\isPrecompile$: \godGiven{} - \ccbc{}; equals $1$ \emph{if and only if} the trimmed address is in the range $\{1, 2,\dots, 9\}$; + \ccbc{}; equals $1$ \emph{if and only if} the trimmed address is in the range $\{1, 2,\dots, \maxPrecompileAddress\}$; \item $\ct$: counter column: counts continuously from $0$ to $\llargeMO$ and resets; \item $\byteCol{HI}$ and $\acc{HI}$: @@ -20,6 +22,6 @@ accumulator column; accumulates some of the bytes from $\byteCol{HI}$; \item $\plateauBit$: binary column that implements a \textbf{binary plateau constraint} in that it switches from $0$ to $1$ when $\ct_{i} = 12$; - \item $\bit{1}$: - binary column; used in establishing that a (trimmed) address is that of a precompile. + \item $\wcpFlag$: + binary flags used as selectors for lookups; \end{enumerate} diff --git a/trm/constancies.tex b/trm/constancies.tex index e9de0368..94a30a00 100644 --- a/trm/constancies.tex +++ b/trm/constancies.tex @@ -3,11 +3,11 @@ \If \ct_{i} \neq 0 ~ \Then \col{X}_{i} = \col{X}_{i - 1}. \] We impose that the following columns be counter constant: -\begin{multicols}{4} +\begin{multicols}{2} \begin{enumerate} \item $\rawAddrHi$ \item $\rawAddrLo$ - \item $\trmAddrHi$ - \item $\isPrecompile$ + \item $\trmAddrHi$ \quad (\trash) + \item $\isPrecompile$ \quad (\trash) \end{enumerate} \end{multicols} diff --git a/trm/heartbeat.tex b/trm/heartbeat.tex index e0bafd4b..ebcf392b 100644 --- a/trm/heartbeat.tex +++ b/trm/heartbeat.tex @@ -1,28 +1,28 @@ -The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\llargeMO$ unless the $\trmStamp$ is zero, in which case it hovers at $0$. +The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\llargeMO$ unless $\iomf$ is zero, in which case it hovers at $0$. \begin{enumerate} - \item $\trmStamp_{0} = 0$ - \item $\trmStamp_{i + 1} \in \{ \trmStamp_{i}, 1 + \trmStamp_{i} \}$ - \item \If $\trmStamp_{i} = 0$ \Then + \item $\iomf_{0} = 0$ + \item $\iomf_{i + 1} \in \{ \iomf_{i}, 1 + \iomf_{i} \}$ + \item \If $\iomf_{i} = 0$ \Then \[ \left\{ \begin{array}{lcl} - \rawAddrHi_{i} & \!\!\! = \!\!\! & 0 \\ - \rawAddrLo_{i} & \!\!\! = \!\!\! & 0 \\ - \trmAddrHi_{i} & \!\!\! = \!\!\! & 0 \\ - \isPrecompile_{i} & \!\!\! = \!\!\! & 0 \\ - \end{array} \right. - \qquad - \left\{ \begin{array}{lcl} - \ct_{i} & \!\!\! = \!\!\! & 0 \quad (\trash) \\ - \byteCol{HI}_{i} & \!\!\! = \!\!\! & 0 \quad (\trash) \\ - \byteCol{LO}_{i} & \!\!\! = \!\!\! & 0 \quad (\trash) \\ + \done_{i} & \!\!\! = \!\!\! & 0 \\ + \ct_{i+1} & \!\!\! = \!\!\! & 0 \\ \end{array} \right. \] - %$\ct_{i} = 0$ - \item \If $\trmStamp_{i + 1} \neq \trmStamp_{i}$ \Then $\ct_{i + 1} = 0$ - \item \If $\trmStamp_{i} \neq 0$ \Then - \begin{enumerate} - \item \If $\ct_{i} \neq \llargeMO$ \Then $\ct_{i + 1} = 1 + \ct_{i}$ - \item \If $\ct_{i} = \llargeMO$ \Then $\trmStamp_{i + 1} = 1 + \trmStamp_{i}$ + + \item \If $\iomf_{i} \neq 0$ \Then + \begin{enumerate} + \item \If $\ct_{i} \neq \llargeMO$ \Then + \begin{enumerate} + \item $\done_{i} = 0$ + \item $\ct_{i + 1} = 1 + \ct_{i}$ + \end{enumerate} + + \item \If $\ct_{i} = \llargeMO$ \Then + \begin{enumerate} + \item $\done_{i} = 1$ + \item $\ct_{i + 1} = 0$ + \end{enumerate} \end{enumerate} - \item \If $\trmStamp_{N} \neq 0$ \Then $\ct_{N} = \llargeMO$ + \item \If $\iomf_{N} = 1$ \Then $\ct_{i} = \llargeMO$ \end{enumerate} diff --git a/trm/introduction.tex b/trm/introduction.tex index d4bb1d31..d51307bb 100644 --- a/trm/introduction.tex +++ b/trm/introduction.tex @@ -1,8 +1,10 @@ -The \textbf{address trimming module} is a tiny module whose purpose is twofold: +The \textbf{address trimming module} is a tiny module whose purpose is manyfold: (\emph{a}) reduce 32 byte strings modulo $2^{160}$ (\emph{b}) identify addresses of precompiles. +(\emph{c}) +proving the smallness of addresses fon behalf of \rlpTxnMod{}. Recall that some opcodes take an address stack argument which may require trimming to be interpreted as an address. Furthermore when computing a deployment address associated with an invokation of a \inst{CREATE}-type instruction the \rlpAddrMod{} module is called, too, to trim down the raw \texttt{KECCAK} hash. Also every new address appearing in the \hubMod{} module is automatically trimmed upon first encounter. diff --git a/trm/lookup.tex b/trm/lookup.tex new file mode 100644 index 00000000..fd5feb9e --- /dev/null +++ b/trm/lookup.tex @@ -0,0 +1,25 @@ +\begin{description} + \item[\underline{Selector:}] $\wcpFlag_{i}$ + \item[\underline{Source columns:}] --- + \begin{multicols}{3} + \begin{enumerate} + \item 0 + \item $\rawAddrLo_{i}$ + \item 0 + \item $\maxPrecompileAddress$ + \item $\isPrecompile$ + \item $\inst{LEQ}$ + \end{enumerate} + \end{multicols} + \item[\underline{Target columns:}] --- + \begin{multicols}{3} + \begin{enumerate} + \item $\argOneHi$ + \item $\argOneLo$ + \item $\argTwoHi$ + \item $\argTwoLo$ + \item $\res$ + \item $\INST$ + \end{enumerate} + \end{multicols} +\end{description} \ No newline at end of file diff --git a/trm/setting_wcp_flag.tex b/trm/setting_wcp_flag.tex new file mode 100644 index 00000000..a3f5a5ad --- /dev/null +++ b/trm/setting_wcp_flag.tex @@ -0,0 +1,2 @@ +We want to set $\wcpFlag$ on the last row if and only if the trimmed address is all zeros but the last byte. +$\wcpFlag_{i} = \done_{i} \cdot (1 - \sim \acc{HI}_{i}) \cdot (1 - \sim \acc{LO}_{i-1}) \cdot (\sim \acc{LO}_{i})$ \ No newline at end of file From 92eaa47ce3ab8fc4ff5f0d9f94a30569c6a9fb52 Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Thu, 13 Mar 2025 18:24:56 +0100 Subject: [PATCH 2/9] build: update jetbrain font Signed-off-by: F Bojarski --- .github/workflows/compile.yml | 4 +- alu/add/lua/layout.lua.tex | 2 +- alu/add/lua/small.lua.tex | 2 +- alu/add/lua/sparse.lua.tex | 2 +- block_data/lua/flags_and_ct.lua.tex | 2 +- block_data/lua/layout.lua.tex | 2 +- block_hash/lua/representation.lua.tex | 2 +- hash_data/lua/layout.lua.tex | 2 +- .../lua/abort/will_revert.lua.tex | 2 +- .../lua/abort/wont_revert.lua.tex | 2 +- .../call/generalities/lua/entry.lua.tex | 2 +- .../generalities/lua/exceptions/mxpx.lua.tex | 2 +- .../generalities/lua/exceptions/oogx.lua.tex | 2 +- .../lua/exceptions/staticx.lua.tex | 2 +- .../call/precompiles/blake/lua/common.lua.tex | 2 +- .../precompiles/blake/lua/failure_KTH.lua.tex | 2 +- .../precompiles/blake/lua/failure_KTR.lua.tex | 2 +- .../precompiles/blake/lua/success.lua.tex | 2 +- .../call/precompiles/common/lua/setup.lua.tex | 2 +- .../common/lua/setup_ecpairing.lua.tex | 2 +- .../lua/ecaddmul_common.lua.tex | 2 +- .../lua/ecaddmul_failure_KTH.lua.tex | 2 +- .../lua/ecaddmul_failure_KTR.lua.tex | 2 +- .../lua/ecaddmul_success.lua.tex | 2 +- .../lua/ecpairing_common.lua.tex | 2 +- .../lua/ecpairing_failure_KTH.lua.tex | 2 +- .../lua/ecpairing_failure_KTR.lua.tex | 2 +- .../lua/ecpairing_success.lua.tex | 2 +- .../precompiles/ecrecover/lua/common.lua.tex | 2 +- .../ecrecover/lua/failure_KTH.lua.tex | 2 +- .../precompiles/ecrecover/lua/success.lua.tex | 2 +- .../identity/lua/failure_KTH.lua.tex | 2 +- .../precompiles/identity/lua/success.lua.tex | 2 +- .../precompiles/modexp/lua/common.lua.tex | 2 +- .../modexp/lua/failure_KTR.lua.tex | 2 +- .../precompiles/modexp/lua/success.lua.tex | 2 +- .../sha2_ripemd/lua/failure_KTH.lua.tex | 2 +- .../sha2_ripemd/lua/success.lua.tex | 2 +- .../create/lua/abort.lua.tex | 2 +- .../create/lua/empty/will_revert.lua.tex | 2 +- .../create/lua/empty/wont_revert.lua.tex | 2 +- .../create/lua/exceptions/mxpx.lua.tex | 2 +- .../create/lua/exceptions/oogx.lua.tex | 2 +- .../create/lua/exceptions/staticx.lua.tex | 2 +- .../lua/failure_condition/generic.lua.tex | 2 +- .../lua/failure_condition/will_revert.lua.tex | 2 +- .../lua/failure_condition/wont_revert.lua.tex | 2 +- .../lua/nonempty/failure_will_revert.lua.tex | 2 +- .../lua/nonempty/failure_wont_revert.lua.tex | 2 +- .../lua/nonempty/success_will_revert.lua.tex | 2 +- .../lua/nonempty/success_wont_revert.lua.tex | 2 +- .../create/lua/unexceptional.lua.tex | 2 +- .../halt/revert/lua/exceptional.lua.tex | 2 +- .../halt/revert/lua/unexceptional.lua.tex | 2 +- .../halt/selfdestruct/lua/oogx.lua.tex | 2 +- .../halt/selfdestruct/lua/staticx.lua.tex | 2 +- .../halt/selfdestruct/lua/will_revert.lua.tex | 2 +- .../lua/wont_revert_already_marked.lua.tex | 2 +- .../lua/wont_revert_not_yet_marked.lua.tex | 2 +- hub/tx_prewarm/lua/layout.lua.tex | 2 +- mmio/lua/mmu_mmio_interface.lua.tex | 2 +- .../lua/preprocessing.lua.tex | 2 +- .../lua/preprocessing_old.lua.tex | 2 +- .../_lua_modexp_parameter_extraction.tex | 2 +- mmu/lua/blake_r_f_input_transfer.lua.tex | 2 +- mmu/lua/extraction.lua.tex | 2 +- mmu/lua/interface.lua.tex | 2 +- mmu/lua/left_right_padded_extraction.lua.tex | 2 +- ...exp_byte_size_parameter_extraction.lua.tex | 2 +- ...ecRecAddMul_padded_data_extraction.lua.tex | 2 +- mmu/lua/precompile_result_transfer.lua.tex | 2 +- ...return_invalid_code_prefix_testing.lua.tex | 2 +- mmu/lua/specialized/isolate_chunk.lua.tex | 2 +- mmu/lua/specialized/isolate_prefix.lua.tex | 2 +- mmu/lua/specialized/isolate_suffix.lua.tex | 2 +- mmu/lua/specialized/plateau.lua.tex | 2 +- mmu/lua/specialized/power_generic.lua.tex | 2 +- mmu/lua/specialized/power_plateau.lua.tex | 2 +- mmu/lua/specialized/power_test | 2 +- .../surgical_patterns/[1_Full_to_2].lua.tex | 2 +- .../[1_Partial_to_1].lua.tex | 2 +- .../[1_Partial_to_2].lua.tex | 2 +- .../surgical_patterns/[1_to_1_Padded].lua.tex | 2 +- .../surgical_patterns/[2_to_1_Padded].lua.tex | 2 +- mmu/lua/surgical_patterns/byteSwap.lua.tex | 2 +- mmu/lua/surgical_patterns/excision.lua.tex | 2 +- mmu/lua/type3.lua.tex | 2 +- mmu/utilities/row_types_diagram.tex | 2 +- oob/opcodes/lua/layout.lua.tex | 2 +- oob/precompiles/lua/layout.lua.tex | 2 +- prc/blkmdx/lua/blake.lua.tex | 2 +- prc/blkmdx/lua/modexp.lua.tex | 2 +- prc/shakira/lua/layout.lua.tex | 2 +- trm/precompiles.tex | 37 ------------------- txn_data/lua/computations.lua.tex | 2 +- txn_data/lua/layout.lua.tex | 2 +- 96 files changed, 96 insertions(+), 133 deletions(-) delete mode 100644 trm/precompiles.tex diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 03e3ac6c..7cb7db80 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Install JetBrainsMono # https://www.guyrutenberg.com/2020/01/29/install-jetbrains-mono-in-debian-ubuntu/ + - name: Install JetBrainsMono run: mkdir JetBrainsMono && cd JetBrainsMono - && wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/JetBrainsMono.zip + && wget https://github.com/JetBrains/JetBrainsMono/releases/tag/v2.304 && unzip JetBrainsMono.zip && sudo mv JetBrainsMono*.ttf /usr/share/fonts/ && cd - diff --git a/alu/add/lua/layout.lua.tex b/alu/add/lua/layout.lua.tex index 5356e285..13505aff 100644 --- a/alu/add/lua/layout.lua.tex +++ b/alu/add/lua/layout.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/alu/add/lua/small.lua.tex b/alu/add/lua/small.lua.tex index 217ac89b..531020ee 100644 --- a/alu/add/lua/small.lua.tex +++ b/alu/add/lua/small.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/alu/add/lua/sparse.lua.tex b/alu/add/lua/sparse.lua.tex index fdee01df..3b80e205 100644 --- a/alu/add/lua/sparse.lua.tex +++ b/alu/add/lua/sparse.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/block_data/lua/flags_and_ct.lua.tex b/block_data/lua/flags_and_ct.lua.tex index af481ae6..26cbefba 100644 --- a/block_data/lua/flags_and_ct.lua.tex +++ b/block_data/lua/flags_and_ct.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/block_data/lua/layout.lua.tex b/block_data/lua/layout.lua.tex index ecde05a7..f9616b03 100644 --- a/block_data/lua/layout.lua.tex +++ b/block_data/lua/layout.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/block_hash/lua/representation.lua.tex b/block_hash/lua/representation.lua.tex index 31c32464..1d44de86 100644 --- a/block_hash/lua/representation.lua.tex +++ b/block_hash/lua/representation.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hash_data/lua/layout.lua.tex b/hash_data/lua/layout.lua.tex index 036ad62a..19cc082c 100644 --- a/hash_data/lua/layout.lua.tex +++ b/hash_data/lua/layout.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/generalities/lua/abort/will_revert.lua.tex b/hub/instruction_handling/call/generalities/lua/abort/will_revert.lua.tex index a91faca5..cf6a83b4 100644 --- a/hub/instruction_handling/call/generalities/lua/abort/will_revert.lua.tex +++ b/hub/instruction_handling/call/generalities/lua/abort/will_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/generalities/lua/abort/wont_revert.lua.tex b/hub/instruction_handling/call/generalities/lua/abort/wont_revert.lua.tex index cd8d5786..33b02dda 100644 --- a/hub/instruction_handling/call/generalities/lua/abort/wont_revert.lua.tex +++ b/hub/instruction_handling/call/generalities/lua/abort/wont_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/generalities/lua/entry.lua.tex b/hub/instruction_handling/call/generalities/lua/entry.lua.tex index 5f00d9f8..9506315e 100644 --- a/hub/instruction_handling/call/generalities/lua/entry.lua.tex +++ b/hub/instruction_handling/call/generalities/lua/entry.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/generalities/lua/exceptions/mxpx.lua.tex b/hub/instruction_handling/call/generalities/lua/exceptions/mxpx.lua.tex index 4cc56e27..002a2765 100644 --- a/hub/instruction_handling/call/generalities/lua/exceptions/mxpx.lua.tex +++ b/hub/instruction_handling/call/generalities/lua/exceptions/mxpx.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/generalities/lua/exceptions/oogx.lua.tex b/hub/instruction_handling/call/generalities/lua/exceptions/oogx.lua.tex index 7f6e8a8d..64f9f52e 100644 --- a/hub/instruction_handling/call/generalities/lua/exceptions/oogx.lua.tex +++ b/hub/instruction_handling/call/generalities/lua/exceptions/oogx.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/generalities/lua/exceptions/staticx.lua.tex b/hub/instruction_handling/call/generalities/lua/exceptions/staticx.lua.tex index c0f05df0..a2777101 100644 --- a/hub/instruction_handling/call/generalities/lua/exceptions/staticx.lua.tex +++ b/hub/instruction_handling/call/generalities/lua/exceptions/staticx.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/blake/lua/common.lua.tex b/hub/instruction_handling/call/precompiles/blake/lua/common.lua.tex index 28aaf071..8b21cb38 100644 --- a/hub/instruction_handling/call/precompiles/blake/lua/common.lua.tex +++ b/hub/instruction_handling/call/precompiles/blake/lua/common.lua.tex @@ -11,7 +11,7 @@ )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/blake/lua/failure_KTH.lua.tex b/hub/instruction_handling/call/precompiles/blake/lua/failure_KTH.lua.tex index ae1d67a5..a723ffa1 100644 --- a/hub/instruction_handling/call/precompiles/blake/lua/failure_KTH.lua.tex +++ b/hub/instruction_handling/call/precompiles/blake/lua/failure_KTH.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/blake/lua/failure_KTR.lua.tex b/hub/instruction_handling/call/precompiles/blake/lua/failure_KTR.lua.tex index fa3d9796..cdeb42db 100644 --- a/hub/instruction_handling/call/precompiles/blake/lua/failure_KTR.lua.tex +++ b/hub/instruction_handling/call/precompiles/blake/lua/failure_KTR.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/blake/lua/success.lua.tex b/hub/instruction_handling/call/precompiles/blake/lua/success.lua.tex index c1f5417a..5cc89931 100644 --- a/hub/instruction_handling/call/precompiles/blake/lua/success.lua.tex +++ b/hub/instruction_handling/call/precompiles/blake/lua/success.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/common/lua/setup.lua.tex b/hub/instruction_handling/call/precompiles/common/lua/setup.lua.tex index 8c97b73f..ac98a66c 100644 --- a/hub/instruction_handling/call/precompiles/common/lua/setup.lua.tex +++ b/hub/instruction_handling/call/precompiles/common/lua/setup.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/common/lua/setup_ecpairing.lua.tex b/hub/instruction_handling/call/precompiles/common/lua/setup_ecpairing.lua.tex index fad5ebc2..3f3602ed 100644 --- a/hub/instruction_handling/call/precompiles/common/lua/setup_ecpairing.lua.tex +++ b/hub/instruction_handling/call/precompiles/common/lua/setup_ecpairing.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_common.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_common.lua.tex index 65c9ac56..ea87d2dc 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_common.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_common.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTH.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTH.lua.tex index bfebd78a..09d26931 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTH.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTH.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTR.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTR.lua.tex index a7fe7219..78fba526 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTR.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_failure_KTR.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_success.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_success.lua.tex index ef6a1238..7c98959f 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_success.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecaddmul_success.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_common.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_common.lua.tex index 1cf7e469..b1c85253 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_common.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_common.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTH.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTH.lua.tex index 0f2c91b8..0a21da3c 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTH.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTH.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTR.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTR.lua.tex index 5a7e2608..9254a32c 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTR.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_failure_KTR.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_success.lua.tex b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_success.lua.tex index d1794f0d..eebf247a 100644 --- a/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_success.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecadd_ecmul_ecpairing/lua/ecpairing_success.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecrecover/lua/common.lua.tex b/hub/instruction_handling/call/precompiles/ecrecover/lua/common.lua.tex index 956ea1ef..9153f000 100644 --- a/hub/instruction_handling/call/precompiles/ecrecover/lua/common.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecrecover/lua/common.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecrecover/lua/failure_KTH.lua.tex b/hub/instruction_handling/call/precompiles/ecrecover/lua/failure_KTH.lua.tex index 9214533d..0ca9f1e0 100644 --- a/hub/instruction_handling/call/precompiles/ecrecover/lua/failure_KTH.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecrecover/lua/failure_KTH.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/ecrecover/lua/success.lua.tex b/hub/instruction_handling/call/precompiles/ecrecover/lua/success.lua.tex index 28a6d692..0bb203f0 100644 --- a/hub/instruction_handling/call/precompiles/ecrecover/lua/success.lua.tex +++ b/hub/instruction_handling/call/precompiles/ecrecover/lua/success.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/identity/lua/failure_KTH.lua.tex b/hub/instruction_handling/call/precompiles/identity/lua/failure_KTH.lua.tex index 929779ef..269acc71 100644 --- a/hub/instruction_handling/call/precompiles/identity/lua/failure_KTH.lua.tex +++ b/hub/instruction_handling/call/precompiles/identity/lua/failure_KTH.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/identity/lua/success.lua.tex b/hub/instruction_handling/call/precompiles/identity/lua/success.lua.tex index 46a534bb..63ce5760 100644 --- a/hub/instruction_handling/call/precompiles/identity/lua/success.lua.tex +++ b/hub/instruction_handling/call/precompiles/identity/lua/success.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/modexp/lua/common.lua.tex b/hub/instruction_handling/call/precompiles/modexp/lua/common.lua.tex index cca1e5d6..fe1504fb 100644 --- a/hub/instruction_handling/call/precompiles/modexp/lua/common.lua.tex +++ b/hub/instruction_handling/call/precompiles/modexp/lua/common.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/modexp/lua/failure_KTR.lua.tex b/hub/instruction_handling/call/precompiles/modexp/lua/failure_KTR.lua.tex index 1e6778ec..eb38cf33 100644 --- a/hub/instruction_handling/call/precompiles/modexp/lua/failure_KTR.lua.tex +++ b/hub/instruction_handling/call/precompiles/modexp/lua/failure_KTR.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/modexp/lua/success.lua.tex b/hub/instruction_handling/call/precompiles/modexp/lua/success.lua.tex index 14cf8b37..16d1ff2a 100644 --- a/hub/instruction_handling/call/precompiles/modexp/lua/success.lua.tex +++ b/hub/instruction_handling/call/precompiles/modexp/lua/success.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/failure_KTH.lua.tex b/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/failure_KTH.lua.tex index e514dac0..3f6f7565 100644 --- a/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/failure_KTH.lua.tex +++ b/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/failure_KTH.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/success.lua.tex b/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/success.lua.tex index fa7ad9d7..63cc3d07 100644 --- a/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/success.lua.tex +++ b/hub/instruction_handling/call/precompiles/sha2_ripemd/lua/success.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/abort.lua.tex b/hub/instruction_handling/create/lua/abort.lua.tex index f028061e..4d41335f 100644 --- a/hub/instruction_handling/create/lua/abort.lua.tex +++ b/hub/instruction_handling/create/lua/abort.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/empty/will_revert.lua.tex b/hub/instruction_handling/create/lua/empty/will_revert.lua.tex index 9a36ab94..acccb6c3 100644 --- a/hub/instruction_handling/create/lua/empty/will_revert.lua.tex +++ b/hub/instruction_handling/create/lua/empty/will_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/empty/wont_revert.lua.tex b/hub/instruction_handling/create/lua/empty/wont_revert.lua.tex index f2d01efd..a2e9d7b4 100644 --- a/hub/instruction_handling/create/lua/empty/wont_revert.lua.tex +++ b/hub/instruction_handling/create/lua/empty/wont_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/exceptions/mxpx.lua.tex b/hub/instruction_handling/create/lua/exceptions/mxpx.lua.tex index b5868283..48a0e94f 100644 --- a/hub/instruction_handling/create/lua/exceptions/mxpx.lua.tex +++ b/hub/instruction_handling/create/lua/exceptions/mxpx.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/exceptions/oogx.lua.tex b/hub/instruction_handling/create/lua/exceptions/oogx.lua.tex index d4fa4c55..315e06d4 100644 --- a/hub/instruction_handling/create/lua/exceptions/oogx.lua.tex +++ b/hub/instruction_handling/create/lua/exceptions/oogx.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/exceptions/staticx.lua.tex b/hub/instruction_handling/create/lua/exceptions/staticx.lua.tex index 09eeb18a..d579a389 100644 --- a/hub/instruction_handling/create/lua/exceptions/staticx.lua.tex +++ b/hub/instruction_handling/create/lua/exceptions/staticx.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/failure_condition/generic.lua.tex b/hub/instruction_handling/create/lua/failure_condition/generic.lua.tex index 3f1028f0..8dca145f 100644 --- a/hub/instruction_handling/create/lua/failure_condition/generic.lua.tex +++ b/hub/instruction_handling/create/lua/failure_condition/generic.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/failure_condition/will_revert.lua.tex b/hub/instruction_handling/create/lua/failure_condition/will_revert.lua.tex index 4c645c00..dbbfeddd 100644 --- a/hub/instruction_handling/create/lua/failure_condition/will_revert.lua.tex +++ b/hub/instruction_handling/create/lua/failure_condition/will_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/failure_condition/wont_revert.lua.tex b/hub/instruction_handling/create/lua/failure_condition/wont_revert.lua.tex index 4b540b82..62dbc3f7 100644 --- a/hub/instruction_handling/create/lua/failure_condition/wont_revert.lua.tex +++ b/hub/instruction_handling/create/lua/failure_condition/wont_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/nonempty/failure_will_revert.lua.tex b/hub/instruction_handling/create/lua/nonempty/failure_will_revert.lua.tex index e456b87b..16406eaf 100644 --- a/hub/instruction_handling/create/lua/nonempty/failure_will_revert.lua.tex +++ b/hub/instruction_handling/create/lua/nonempty/failure_will_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/nonempty/failure_wont_revert.lua.tex b/hub/instruction_handling/create/lua/nonempty/failure_wont_revert.lua.tex index 20d7facf..1edc38be 100644 --- a/hub/instruction_handling/create/lua/nonempty/failure_wont_revert.lua.tex +++ b/hub/instruction_handling/create/lua/nonempty/failure_wont_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/nonempty/success_will_revert.lua.tex b/hub/instruction_handling/create/lua/nonempty/success_will_revert.lua.tex index dc7b2e0a..1ed01bdb 100644 --- a/hub/instruction_handling/create/lua/nonempty/success_will_revert.lua.tex +++ b/hub/instruction_handling/create/lua/nonempty/success_will_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/nonempty/success_wont_revert.lua.tex b/hub/instruction_handling/create/lua/nonempty/success_wont_revert.lua.tex index 9b7ea006..c20643f4 100644 --- a/hub/instruction_handling/create/lua/nonempty/success_wont_revert.lua.tex +++ b/hub/instruction_handling/create/lua/nonempty/success_wont_revert.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/create/lua/unexceptional.lua.tex b/hub/instruction_handling/create/lua/unexceptional.lua.tex index f92d061a..7f8df3a3 100644 --- a/hub/instruction_handling/create/lua/unexceptional.lua.tex +++ b/hub/instruction_handling/create/lua/unexceptional.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/halt/revert/lua/exceptional.lua.tex b/hub/instruction_handling/halt/revert/lua/exceptional.lua.tex index b01dd51c..1b2b2b72 100644 --- a/hub/instruction_handling/halt/revert/lua/exceptional.lua.tex +++ b/hub/instruction_handling/halt/revert/lua/exceptional.lua.tex @@ -10,7 +10,7 @@ \usepackage{../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/halt/revert/lua/unexceptional.lua.tex b/hub/instruction_handling/halt/revert/lua/unexceptional.lua.tex index 2a55c2da..2c9d1813 100644 --- a/hub/instruction_handling/halt/revert/lua/unexceptional.lua.tex +++ b/hub/instruction_handling/halt/revert/lua/unexceptional.lua.tex @@ -10,7 +10,7 @@ \usepackage{../../../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ RawFeature={fallback=emojifallback} ] +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] \begin{document} \begin{verbatim} diff --git a/hub/instruction_handling/halt/selfdestruct/lua/oogx.lua.tex b/hub/instruction_handling/halt/selfdestruct/lua/oogx.lua.tex index 05340222..f294c4ee 100644 --- a/hub/instruction_handling/halt/selfdestruct/lua/oogx.lua.tex +++ b/hub/instruction_handling/halt/selfdestruct/lua/oogx.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/halt/selfdestruct/lua/staticx.lua.tex b/hub/instruction_handling/halt/selfdestruct/lua/staticx.lua.tex index d47dea24..a726af6c 100644 --- a/hub/instruction_handling/halt/selfdestruct/lua/staticx.lua.tex +++ b/hub/instruction_handling/halt/selfdestruct/lua/staticx.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/halt/selfdestruct/lua/will_revert.lua.tex b/hub/instruction_handling/halt/selfdestruct/lua/will_revert.lua.tex index 4fbc1c26..7c812dc8 100644 --- a/hub/instruction_handling/halt/selfdestruct/lua/will_revert.lua.tex +++ b/hub/instruction_handling/halt/selfdestruct/lua/will_revert.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_already_marked.lua.tex b/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_already_marked.lua.tex index e73f2904..560281f3 100644 --- a/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_already_marked.lua.tex +++ b/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_already_marked.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_not_yet_marked.lua.tex b/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_not_yet_marked.lua.tex index 11856718..244a106c 100644 --- a/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_not_yet_marked.lua.tex +++ b/hub/instruction_handling/halt/selfdestruct/lua/wont_revert_not_yet_marked.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/hub/tx_prewarm/lua/layout.lua.tex b/hub/tx_prewarm/lua/layout.lua.tex index b2c2c871..e42c119a 100644 --- a/hub/tx_prewarm/lua/layout.lua.tex +++ b/hub/tx_prewarm/lua/layout.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmio/lua/mmu_mmio_interface.lua.tex b/mmio/lua/mmu_mmio_interface.lua.tex index bc0eb5bc..ff19a9dc 100644 --- a/mmio/lua/mmu_mmio_interface.lua.tex +++ b/mmio/lua/mmu_mmio_interface.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/instructions/anyToRamWithPadding/lua/preprocessing.lua.tex b/mmu/instructions/anyToRamWithPadding/lua/preprocessing.lua.tex index d9b40607..9365041c 100644 --- a/mmu/instructions/anyToRamWithPadding/lua/preprocessing.lua.tex +++ b/mmu/instructions/anyToRamWithPadding/lua/preprocessing.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/instructions/anyToRamWithPadding/lua/preprocessing_old.lua.tex b/mmu/instructions/anyToRamWithPadding/lua/preprocessing_old.lua.tex index 99e81bee..41a9e5c6 100644 --- a/mmu/instructions/anyToRamWithPadding/lua/preprocessing_old.lua.tex +++ b/mmu/instructions/anyToRamWithPadding/lua/preprocessing_old.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/instructions/modexpData/_lua_modexp_parameter_extraction.tex b/mmu/instructions/modexpData/_lua_modexp_parameter_extraction.tex index 544bd835..900f219d 100644 --- a/mmu/instructions/modexpData/_lua_modexp_parameter_extraction.tex +++ b/mmu/instructions/modexpData/_lua_modexp_parameter_extraction.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/blake_r_f_input_transfer.lua.tex b/mmu/lua/blake_r_f_input_transfer.lua.tex index c6ffeb39..2d21d563 100644 --- a/mmu/lua/blake_r_f_input_transfer.lua.tex +++ b/mmu/lua/blake_r_f_input_transfer.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/extraction.lua.tex b/mmu/lua/extraction.lua.tex index 132516ed..137cae44 100644 --- a/mmu/lua/extraction.lua.tex +++ b/mmu/lua/extraction.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/interface.lua.tex b/mmu/lua/interface.lua.tex index 78ddd1f9..ca69675f 100644 --- a/mmu/lua/interface.lua.tex +++ b/mmu/lua/interface.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/left_right_padded_extraction.lua.tex b/mmu/lua/left_right_padded_extraction.lua.tex index 41b06dc7..0d19cf99 100644 --- a/mmu/lua/left_right_padded_extraction.lua.tex +++ b/mmu/lua/left_right_padded_extraction.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/modexp_byte_size_parameter_extraction.lua.tex b/mmu/lua/modexp_byte_size_parameter_extraction.lua.tex index fc432ddf..33425ea5 100644 --- a/mmu/lua/modexp_byte_size_parameter_extraction.lua.tex +++ b/mmu/lua/modexp_byte_size_parameter_extraction.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/precompile_ecRecAddMul_padded_data_extraction.lua.tex b/mmu/lua/precompile_ecRecAddMul_padded_data_extraction.lua.tex index 91fbdbd5..b34a0a0e 100644 --- a/mmu/lua/precompile_ecRecAddMul_padded_data_extraction.lua.tex +++ b/mmu/lua/precompile_ecRecAddMul_padded_data_extraction.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/precompile_result_transfer.lua.tex b/mmu/lua/precompile_result_transfer.lua.tex index a50b049b..1eb23f7e 100644 --- a/mmu/lua/precompile_result_transfer.lua.tex +++ b/mmu/lua/precompile_result_transfer.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/return_invalid_code_prefix_testing.lua.tex b/mmu/lua/return_invalid_code_prefix_testing.lua.tex index 4ddb1bfe..a8b23574 100644 --- a/mmu/lua/return_invalid_code_prefix_testing.lua.tex +++ b/mmu/lua/return_invalid_code_prefix_testing.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/isolate_chunk.lua.tex b/mmu/lua/specialized/isolate_chunk.lua.tex index 6d8b37df..01ca249f 100644 --- a/mmu/lua/specialized/isolate_chunk.lua.tex +++ b/mmu/lua/specialized/isolate_chunk.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/isolate_prefix.lua.tex b/mmu/lua/specialized/isolate_prefix.lua.tex index b1cf90b5..8012dcdc 100644 --- a/mmu/lua/specialized/isolate_prefix.lua.tex +++ b/mmu/lua/specialized/isolate_prefix.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/isolate_suffix.lua.tex b/mmu/lua/specialized/isolate_suffix.lua.tex index dd68bde9..f7bd15a3 100644 --- a/mmu/lua/specialized/isolate_suffix.lua.tex +++ b/mmu/lua/specialized/isolate_suffix.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/plateau.lua.tex b/mmu/lua/specialized/plateau.lua.tex index 5e382de1..66acc1d0 100644 --- a/mmu/lua/specialized/plateau.lua.tex +++ b/mmu/lua/specialized/plateau.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/power_generic.lua.tex b/mmu/lua/specialized/power_generic.lua.tex index b34354fa..7c43826a 100644 --- a/mmu/lua/specialized/power_generic.lua.tex +++ b/mmu/lua/specialized/power_generic.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/power_plateau.lua.tex b/mmu/lua/specialized/power_plateau.lua.tex index a5dd2daa..d156179b 100644 --- a/mmu/lua/specialized/power_plateau.lua.tex +++ b/mmu/lua/specialized/power_plateau.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/specialized/power_test b/mmu/lua/specialized/power_test index 4ee0e5fa..bf05ebf1 100644 --- a/mmu/lua/specialized/power_test +++ b/mmu/lua/specialized/power_test @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/[1_Full_to_2].lua.tex b/mmu/lua/surgical_patterns/[1_Full_to_2].lua.tex index 193238f8..6b0c05e4 100644 --- a/mmu/lua/surgical_patterns/[1_Full_to_2].lua.tex +++ b/mmu/lua/surgical_patterns/[1_Full_to_2].lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/[1_Partial_to_1].lua.tex b/mmu/lua/surgical_patterns/[1_Partial_to_1].lua.tex index b90e8b67..479de756 100644 --- a/mmu/lua/surgical_patterns/[1_Partial_to_1].lua.tex +++ b/mmu/lua/surgical_patterns/[1_Partial_to_1].lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/[1_Partial_to_2].lua.tex b/mmu/lua/surgical_patterns/[1_Partial_to_2].lua.tex index 2ba40e01..8ec470b9 100644 --- a/mmu/lua/surgical_patterns/[1_Partial_to_2].lua.tex +++ b/mmu/lua/surgical_patterns/[1_Partial_to_2].lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/[1_to_1_Padded].lua.tex b/mmu/lua/surgical_patterns/[1_to_1_Padded].lua.tex index 69213b43..82a281a6 100644 --- a/mmu/lua/surgical_patterns/[1_to_1_Padded].lua.tex +++ b/mmu/lua/surgical_patterns/[1_to_1_Padded].lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/[2_to_1_Padded].lua.tex b/mmu/lua/surgical_patterns/[2_to_1_Padded].lua.tex index 7982a815..35bbd937 100644 --- a/mmu/lua/surgical_patterns/[2_to_1_Padded].lua.tex +++ b/mmu/lua/surgical_patterns/[2_to_1_Padded].lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/byteSwap.lua.tex b/mmu/lua/surgical_patterns/byteSwap.lua.tex index 514af126..0273b2be 100644 --- a/mmu/lua/surgical_patterns/byteSwap.lua.tex +++ b/mmu/lua/surgical_patterns/byteSwap.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/surgical_patterns/excision.lua.tex b/mmu/lua/surgical_patterns/excision.lua.tex index 1f9bb17e..f47fda0b 100644 --- a/mmu/lua/surgical_patterns/excision.lua.tex +++ b/mmu/lua/surgical_patterns/excision.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/lua/type3.lua.tex b/mmu/lua/type3.lua.tex index 5432ffdd..7df4a7ba 100644 --- a/mmu/lua/type3.lua.tex +++ b/mmu/lua/type3.lua.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/mmu/utilities/row_types_diagram.tex b/mmu/utilities/row_types_diagram.tex index 6e43f3c7..18cad30a 100644 --- a/mmu/utilities/row_types_diagram.tex +++ b/mmu/utilities/row_types_diagram.tex @@ -9,7 +9,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/oob/opcodes/lua/layout.lua.tex b/oob/opcodes/lua/layout.lua.tex index b3e82be5..9347312d 100644 --- a/oob/opcodes/lua/layout.lua.tex +++ b/oob/opcodes/lua/layout.lua.tex @@ -10,7 +10,7 @@ \usepackage{../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/oob/precompiles/lua/layout.lua.tex b/oob/precompiles/lua/layout.lua.tex index d8a52f46..660d0b58 100644 --- a/oob/precompiles/lua/layout.lua.tex +++ b/oob/precompiles/lua/layout.lua.tex @@ -11,7 +11,7 @@ \usepackage{../../../pkg/draculatheme} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/prc/blkmdx/lua/blake.lua.tex b/prc/blkmdx/lua/blake.lua.tex index 857cb6b5..49d0d11b 100644 --- a/prc/blkmdx/lua/blake.lua.tex +++ b/prc/blkmdx/lua/blake.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/prc/blkmdx/lua/modexp.lua.tex b/prc/blkmdx/lua/modexp.lua.tex index 3bd0e600..8349476d 100644 --- a/prc/blkmdx/lua/modexp.lua.tex +++ b/prc/blkmdx/lua/modexp.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/prc/shakira/lua/layout.lua.tex b/prc/shakira/lua/layout.lua.tex index 088048b9..ef949ca5 100644 --- a/prc/shakira/lua/layout.lua.tex +++ b/prc/shakira/lua/layout.lua.tex @@ -10,7 +10,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/trm/precompiles.tex b/trm/precompiles.tex deleted file mode 100644 index 211105b5..00000000 --- a/trm/precompiles.tex +++ /dev/null @@ -1,37 +0,0 @@ -The present section constrains the $\isPrecompile$ column. -\begin{enumerate} - \item $\isPrecompile$ and $\bit{1}$ are binary; - \item \If $\ct_{i} = \llargeMO$ \Then - \begin{enumerate} - \item \If $\trmAddrHi_{i} + \big(\rawAddrLo_{i} - \byteCol{LO}_{i}\big) \neq 0$ \Then $\isPrecompile_{i} = 0$ - \item \If $\trmAddrHi_{i} + \big(\rawAddrLo_{i} - \byteCol{LO}_{i}\big) = 0$ \Then - \begin{enumerate} - \item \If $\byteCol{LO}_{i} = 0$ \Then $\isPrecompile_{i} = 0$ - \item\label{trm: justifying isPrecompile through a comparion} \If $\byteCol{LO}_{i} \neq 0$ \Then - \[ - \underbrace{\Big( 9 - \byteCol{LO}_{i} \Big) - \cdot - \Big( 2 \cdot \isPrecompile_{i} - 1 \Big) - + - \Big( \isPrecompile_{i} - 1 \Big)}_{\displaystyle (\star) } - = - \sum_{k = 0}^7 - 2^k \cdot \bit{1}_{i - k} - \] - \end{enumerate} - \end{enumerate} -\end{enumerate} -In other words if the (trimmed) address is anything but a byte in the least significant position we set $\isPrecompile{} = 0$. If the (trimmed) address is a single byte but is $=0$ we set $\isPrecompile{} = 0$ again. In the remaining case (the trimmed address is both a single byte and nonzero) the implementer must set the \isPrecompile{} bit manually. This bit is to be $=1$ \emph{if and only if} the (trimmed) address is in the range $\{1, 2,\dots, 9\}$. The \zkEvm{} verifies this claim in the equation \ref{trm: justifying isPrecompile through a comparion} which performs a comparison with $9$. The purpose of the \bit{1}'s column is to contain the bit decomposition of the adjusted, nonnegative difference $(\star)$. The above achieves the desired result that $\isPrecompile = 1 \iff \trmAddrHi = 0$ and $\rawAddrLo_{i} \in \{1, 2, \dots, 9 \}$. - -\saNote{} Given that $\ct_{i} = \llargeMO$, the quantity ``$\col{Q} := \trmAddrHi_{i} + \big(\rawAddrLo_{i} - \byteCol{LO}_{i}\big)$'' is known to be the sum of two ``small nonnegative integers'': $\trmAddrHi_{i}$ is constructed to be a $4$ byte integer and $\rawAddrLo_{i}$ has been verified to be a $\llarge$ integer by means of a byte decomposition, the last byte therein being $\byteCol{LO}_{i}$. Thus both terms in the sum are $\geq$ and ``small''. It therefore makes sense to use the distinction -\[ - \col{Q} \neq 0 - \text{ vs. } - \col{Q} = 0 -\] -in lieu of the following conditions respectively: -\[ - \Big[\big[\trmAddrHi \neq 0\big] ~ \Or \big[\rawAddrLo \geq 256\big]\Big] - \text{ vs. } - \Big[\big[\trmAddrHi = 0\big] \et \big[\rawAddrLo\text{ is a single byte}\big]\Big]. -\] diff --git a/txn_data/lua/computations.lua.tex b/txn_data/lua/computations.lua.tex index 379060d9..648eea33 100644 --- a/txn_data/lua/computations.lua.tex +++ b/txn_data/lua/computations.lua.tex @@ -12,7 +12,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] diff --git a/txn_data/lua/layout.lua.tex b/txn_data/lua/layout.lua.tex index bd9bea03..6d144f41 100644 --- a/txn_data/lua/layout.lua.tex +++ b/txn_data/lua/layout.lua.tex @@ -11,7 +11,7 @@ } )} -\setmonofont{JetBrains Mono NF Regular}[ +\setmonofont{JetBrains Mono NL Regular}[ RawFeature={fallback=emojifallback} ] From 5b7624c0c798bfa201015d202bf6056199d0296f Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Thu, 13 Mar 2025 18:28:12 +0100 Subject: [PATCH 3/9] thanks copilot Signed-off-by: F Bojarski --- .github/workflows/compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 7cb7db80..ad95acc1 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -11,7 +11,7 @@ jobs: - name: Install JetBrainsMono run: mkdir JetBrainsMono && cd JetBrainsMono - && wget https://github.com/JetBrains/JetBrainsMono/releases/tag/v2.304 + && wget https://github.com/JetBrains/JetBrainsMono/releases/download/v2.304/JetBrainsMono-2.304.zip && unzip JetBrainsMono.zip && sudo mv JetBrainsMono*.ttf /usr/share/fonts/ && cd - From 8412c62471647c225bbdbeddf9867474c83dca56 Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Thu, 13 Mar 2025 18:30:33 +0100 Subject: [PATCH 4/9] wrong branch Signed-off-by: F Bojarski --- trm/precompiles.tex | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 trm/precompiles.tex diff --git a/trm/precompiles.tex b/trm/precompiles.tex new file mode 100644 index 00000000..8bb5dcbc --- /dev/null +++ b/trm/precompiles.tex @@ -0,0 +1,37 @@ +The present section constrains the $\isPrecompile$ column. +\begin{enumerate} + \item $\isPrecompile$ and $\bit{1}$ are binary; + \item \If $\ct_{i} = \llargeMO$ \Then + \begin{enumerate} + \item \If $\trmAddrHi_{i} + \big(\rawAddrLo_{i} - \byteCol{LO}_{i}\big) \neq 0$ \Then $\isPrecompile_{i} = 0$ + \item \If $\trmAddrHi_{i} + \big(\rawAddrLo_{i} - \byteCol{LO}_{i}\big) = 0$ \Then + \begin{enumerate} + \item \If $\byteCol{LO}_{i} = 0$ \Then $\isPrecompile_{i} = 0$ + \item\label{trm: justifying isPrecompile through a comparion} \If $\byteCol{LO}_{i} \neq 0$ \Then + \[ + \underbrace{\Big( 9 - \byteCol{LO}_{i} \Big) + \cdot + \Big( 2 \cdot \isPrecompile_{i} - 1 \Big) + + + \Big( \isPrecompile_{i} - 1 \Big)}_{\displaystyle (\star) } + = + \sum_{k = 0}^7 + 2^k \cdot \bit{1}_{i - k} + \] + \end{enumerate} + \end{enumerate} +\end{enumerate} +In other words if the (trimmed) address is anything but a byte in the least significant position we set $\isPrecompile{} = 0$. If the (trimmed) address is a single byte but is $=0$ we set $\isPrecompile{} = 0$ again. In the remaining case (the trimmed address is both a single byte and nonzero) the implementer must set the \isPrecompile{} bit manually. This bit is to be $=1$ \emph{if and only if} the (trimmed) address is in the range $\{1, 2,\dots, 9\}$. The \zkEvm{} verifies this claim in the equation \ref{trm: justifying isPrecompile through a comparion} which performs a comparison with $9$. The purpose of the \bit{1}'s column is to contain the bit decomposition of the adjusted, nonnegative difference $(\star)$. The above achieves the desired result that $\isPrecompile = 1 \iff \trmAddrHi = 0$ and $\rawAddrLo_{i} \in \{1, 2, \dots, 9 \}$. + +\saNote{} Given that $\ct_{i} = \llargeMO$, the quantity ``$\col{Q} := \trmAddrHi_{i} + \big(\rawAddrLo_{i} - \byteCol{LO}_{i}\big)$'' is known to be the sum of two ``small nonnegative integers'': $\trmAddrHi_{i}$ is constructed to be a $4$ byte integer and $\rawAddrLo_{i}$ has been verified to be a $\llarge$ integer by means of a byte decomposition, the last byte therein being $\byteCol{LO}_{i}$. Thus both terms in the sum are $\geq$ and ``small''. It therefore makes sense to use the distinction +\[ + \col{Q} \neq 0 + \text{ vs. } + \col{Q} = 0 +\] +in lieu of the following conditions respectively: +\[ + \Big[\big[\trmAddrHi \neq 0\big] ~ \Or \big[\rawAddrLo \geq 256\big]\Big] + \text{ vs. } + \Big[\big[\trmAddrHi = 0\big] \et \big[\rawAddrLo\text{ is a single byte}\big]\Big]. +\] \ No newline at end of file From ddad11c4f821df5f62afd91c68ac0883d98ddc52 Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Mon, 17 Mar 2025 20:03:17 +0100 Subject: [PATCH 5/9] delegate everythi,g to wcp Signed-off-by: F Bojarski --- hub/lookups/acc_into_trm.tex | 2 + pkg/trm.sty | 4 +- trm/.DS_Store | Bin 0 -> 6148 bytes trm/_all_trm.tex | 1 + trm/_inputs.tex | 7 ++-- trm/_local.tex | 8 ++++ trm/binary.tex | 3 +- trm/byteDec.tex | 24 ----------- trm/columns.tex | 14 ++----- trm/constancies.tex | 8 ++-- trm/heartbeat.tex | 8 ++-- trm/introduction.tex | 2 +- trm/lookup.tex | 14 +++---- trm/plateau.tex | 8 ---- trm/precompiles.tex | 37 ---------------- trm/setting_wcp_arg.tex | 79 +++++++++++++++++++++++++++++++++++ trm/setting_wcp_flag.tex | 2 - trm/target.tex | 19 ++++----- 18 files changed, 121 insertions(+), 119 deletions(-) create mode 100644 trm/.DS_Store create mode 100644 trm/_local.tex delete mode 100644 trm/byteDec.tex delete mode 100644 trm/plateau.tex delete mode 100644 trm/precompiles.tex create mode 100644 trm/setting_wcp_arg.tex delete mode 100644 trm/setting_wcp_flag.tex diff --git a/hub/lookups/acc_into_trm.tex b/hub/lookups/acc_into_trm.tex index 12c8db65..cd0282aa 100644 --- a/hub/lookups/acc_into_trm.tex +++ b/hub/lookups/acc_into_trm.tex @@ -4,6 +4,7 @@ \item[Source columns:] --- \begin{multicols}{2} \begin{enumerate} + \item 1 \item $\accAddressHi$ \item $\accAddressLo$ \item $\accTrmRawAddrHi$ @@ -13,6 +14,7 @@ \item[Target columns:] --- \begin{multicols}{2} \begin{enumerate} + \item $\done$ \item $\trmAddrHi$ \item $\rawAddrLo$ \item $\rawAddrHi$ diff --git a/pkg/trm.sty b/pkg/trm.sty index fc17ceec..197a8b6c 100644 --- a/pkg/trm.sty +++ b/pkg/trm.sty @@ -1,9 +1,7 @@ -\newcommand{\iAddrHi} {\imported{\addr\high}} -\newcommand{\iAddrLo} {\imported{\addr\low}} \newcommand{\trmAddrHi} {\trmMod\col{\_}\addr\col{\_HI}} \newcommand{\rawAddrHi} {\col{RAW\_ADDR\_HI}} \newcommand{\rawAddrLo} {\col{RAW\_ADDR\_LO}} \newcommand{\isPrecompile} {\col{IS\_PRECOMPILE}} -\newcommand{\plateauBit} {\col{PLATEAU\_BIT}} +\newcommand{\trmLeadHi} {\col{LEADING\_BYTES}} \newcommand{\maxPrecompileAddress} {\red{9}} \ No newline at end of file diff --git a/trm/.DS_Store b/trm/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Thu, 20 Mar 2025 14:36:39 +0100 Subject: [PATCH 6/9] address xcomments Signed-off-by: F Bojarski --- pkg/trm.sty | 1 + trm/_all_trm.tex | 2 ++ trm/_local.tex | 3 ++- trm/binary.tex | 2 +- trm/columns.tex | 12 +++++++----- trm/heartbeat.tex | 22 ++++++++-------------- trm/introduction.tex | 4 ++-- trm/setting_wcp_arg.tex | 24 ++++++++++++------------ trm/target.tex | 2 +- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkg/trm.sty b/pkg/trm.sty index 197a8b6c..aece4879 100644 --- a/pkg/trm.sty +++ b/pkg/trm.sty @@ -3,5 +3,6 @@ \newcommand{\rawAddrLo} {\col{RAW\_ADDR\_LO}} \newcommand{\isPrecompile} {\col{IS\_PRECOMPILE}} \newcommand{\trmLeadHi} {\col{LEADING\_BYTES}} +\newcommand{\first} {\col{FIRST}} \newcommand{\maxPrecompileAddress} {\red{9}} \ No newline at end of file diff --git a/trm/_all_trm.tex b/trm/_all_trm.tex index cfbe3830..c78dc8ce 100644 --- a/trm/_all_trm.tex +++ b/trm/_all_trm.tex @@ -1,6 +1,7 @@ \documentclass{article} \usepackage[dvipsnames]{xcolor} \usepackage{../pkg/common} +\usepackage{xkeyval} % \usepackage{../pkg/dark_theme} \usepackage{../pkg/std} \usepackage{../pkg/flags_stamps_selectors} @@ -17,6 +18,7 @@ \usepackage{../pkg/iomf_done} \usepackage{../pkg/wc3} \usepackage{../pkg/xkeyval_macros/wcp_calls} +\usepackage{../pkg/draculatheme} \title{Address trimming module} \author{Rollup team} diff --git a/trm/_local.tex b/trm/_local.tex index 68ba818c..0cd9d72f 100644 --- a/trm/_local.tex +++ b/trm/_local.tex @@ -1,4 +1,5 @@ -\def\ctMax {\redm{3}} +\def\locCtMaxTrm {\yellowm{3}} +\def\locCtMaxTrmName {\yellowm{{\texttt{ct\_max\_trm}}}} \def\anchorRow {\redm{4}} diff --git a/trm/binary.tex b/trm/binary.tex index 194f5432..874d7123 100644 --- a/trm/binary.tex +++ b/trm/binary.tex @@ -1,8 +1,8 @@ The following columns are binary: \begin{multicols}{2} \begin{enumerate} + \item $\iomf$ \item $\isPrecompile$ \quad (\trash) - \item $\iomf$ \quad (\trash) \item $\done$ \quad (\trash) \end{enumerate} \end{multicols} diff --git a/trm/columns.tex b/trm/columns.tex index 3c558219..9a702b07 100644 --- a/trm/columns.tex +++ b/trm/columns.tex @@ -1,19 +1,21 @@ \begin{enumerate} - \item $\iomf$: - monotonous bit column that lights up for non-padding rows; - \item $\done$: - bit column that lights up precisely at the last row of all counter-loop; + \item $\trmStamp$: + stamp column; starts at $0$ and grows by 1 with every served request; like many other stamp columns its main purpose is to separate the different requests to that module; + \item $\first$: + bit column that lights up precisely at the first row of all counter-loop; \item $\rawAddrHi$ and $\rawAddrLo$: \godGiven{} \ccc{}; contains the high and low part of some stack value which ought to be interpreted as an address; \item $\trmAddrHi$: \godGiven{} \ccc{}; contains the trimmed version of the high part of the address argument; + \item $\trmLeadHi$: + \ccc{}; contains the leading bytes of the high part of the address argument; \item $\isPrecompile$: \godGiven{} \ccbc{}; equals $1$ \emph{if and only if} the trimmed address is in the range $\{1, 2,\dots, \maxPrecompileAddress\}$; \item $\ct$: - counter column: counts continuously from $0$ to $\ctMax$ and resets; + counter column: counts continuously from $0$ to $\locCtMaxTrmName$ ($= \locCtMaxTrm$) and resets; \item $\argOneHi$, $\argOneLo$, $\argTwoHi$, $\argTwoLo$, $\res$, $\INST$: arguments for calls to the \wcpMod{} module; \end{enumerate} diff --git a/trm/heartbeat.tex b/trm/heartbeat.tex index e3618b1e..e5747726 100644 --- a/trm/heartbeat.tex +++ b/trm/heartbeat.tex @@ -1,28 +1,22 @@ The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\ctMax$ unless $\iomf$ is zero, in which case it hovers at $0$. \begin{enumerate} - \item $\iomf_{0} = 0$ - \item $\iomf_{i + 1} \in \{ \iomf_{i}, 1 + \iomf_{i} \}$ - \item \If $\iomf_{i} = 0$ \Then - \[ - \left\{ \begin{array}{lcl} - \done_{i} & \!\!\! = \!\!\! & 0 \\ - \ct_{i+1} & \!\!\! = \!\!\! & 0 \\ - \end{array} \right. - \] - - \item \If $\iomf_{i} \neq 0$ \Then + \item $\trmStamp_{0} = 0$ + \item $\trmStamp_{i + 1} \in \{ \trmStamp_{i}, 1 + \trmStamp_{i} \}$ + \item \If $\trmStamp_{i} = 0$ \Then $\ct_{i+1} = 0 $ + \item $\first_{i} = \trmStamp_{i} - \trmStamp_{i-1}$ + \item \If $\trmStamp_{i} \neq 0$ \Then \begin{enumerate} \item \If $\ct_{i} \neq \ctMax$ \Then \begin{enumerate} - \item $\done_{i} = 0$ + \item $\trmStamp_{i+1} = \trmStamp_{i}$ \item $\ct_{i + 1} = 1 + \ct_{i}$ \end{enumerate} \item \If $\ct_{i} = \ctMax$ \Then \begin{enumerate} - \item $\done_{i} = 1$ + \item $\trmStamp_{i+1} = 1 + \trmStamp_{i}$ \item $\ct_{i + 1} = 0$ \end{enumerate} \end{enumerate} - \item \If $\iomf_{N} = 1$ \Then $\ct_{i} = \ctMax$ + \item \If $\trmStamp_{N} \neq 0$ \Then $\ct_{i} = \ctMax$ \end{enumerate} diff --git a/trm/introduction.tex b/trm/introduction.tex index f9fd888d..9008e20a 100644 --- a/trm/introduction.tex +++ b/trm/introduction.tex @@ -3,8 +3,8 @@ reduce 32 byte strings modulo $2^{160}$ (\emph{b}) identify addresses of precompiles. -(\emph{c}) -proving the smallness of addresses on behalf of \rlpTxnMod{}. +%(\emph{c}) +%proving the smallness of addresses on behalf of \rlpTxnMod{}. TODO reenable with RLP_TXN update Recall that some opcodes take an address stack argument which may require trimming to be interpreted as an address. Furthermore when computing a deployment address associated with an invokation of a \inst{CREATE}-type instruction the \rlpAddrMod{} module is called, too, to trim down the raw \texttt{KECCAK} hash. Also every new address appearing in the \hubMod{} module is automatically trimmed upon first encounter. diff --git a/trm/setting_wcp_arg.tex b/trm/setting_wcp_arg.tex index 17eb8f0e..5b7e1857 100644 --- a/trm/setting_wcp_arg.tex +++ b/trm/setting_wcp_arg.tex @@ -1,5 +1,5 @@ \[ - \boxed{\text{All constraints in this subsection assume } \done_{i} = 1 } + \boxed{\text{All constraints in this subsection assume } \first_{i} = 1 } \] To this end We impose the following constraints \begin{description} @@ -7,18 +7,18 @@ we impose that \[ \wcpCallToLeq { - anchorRow = i - \anchorRow , + anchorRow = i , relOffset = \nRows , argOneHi = \trmAddrHi , argOneLo = \rawAddrLo , - argTwoHi = (1 << 4) - 1 , + argTwoHi = (256 << 4) - 1 , argTwoLo = 0 , } \] we further impose that \[ \resultMustBeTrue { - anchorRow = i - \anchorRow , + anchorRow = i , relOffset = \nRows , } \] @@ -29,18 +29,18 @@ we impose that \[ \wcpCallToLeq { - anchorRow = i - \anchorRow , + anchorRow = i , relOffset = \nRows , argOneHi = 0 , argOneLo = \trmLeadHi , argTwoHi = 0 , - argTwoLo = (1 << 12) - 1 , + argTwoLo = (256 << 12) - 1 , } \] we further impose that \[ \resultMustBeTrue { - anchorRow = i - \anchorRow , + anchorRow = i , relOffset = \nRows , } \] @@ -52,10 +52,10 @@ \def\nRows{\rowOffsetNonZeroAddr}\item[\underline{Processing row $n^\circ(\nRows)$:}] we impose that \[ - \wcpCallToIsZero { - anchorRow = i - \anchorRow , + \wcpCallToIszero { + anchorRow = i , relOffset = \nRows , - argOneHi = \trmLeadHi , + argOneHi = \trmAddrHi , argOneLo = \rawAddrLo , argTwoHi = 0 , argTwoLo = 0 , @@ -67,9 +67,9 @@ we impose that \[ \wcpCallToLt { - anchorRow = i - \anchorRow , + anchorRow = i , relOffset = \nRows , - argOneHi = \trmLeadHi , + argOneHi = \trmAddrHi , argOneLo = \rawAddrLo , argTwoHi = 0 , argTwoLo = \maxPrecompileAddress , diff --git a/trm/target.tex b/trm/target.tex index dd17d970..1abc80ad 100644 --- a/trm/target.tex +++ b/trm/target.tex @@ -3,6 +3,6 @@ \] \begin{enumerate} \item $\isPrecompile_{i} = \res_{i} \cdot (1 - \res_{i-1})$ - \item $\rawAddrHi_{i} = 256^{12} \cdot \trmLeadHi_{i} + \trmAddrHi_{i}$ + \item $\rawAddrHi_{i} = 256^{4} \cdot \trmLeadHi_{i} + \trmAddrHi_{i}$ \end{enumerate} From e78f44e8057a019df5f61a77a7a67c28c987dbf4 Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Thu, 20 Mar 2025 14:45:48 +0100 Subject: [PATCH 7/9] ras Signed-off-by: F Bojarski --- hub/lookups/acc_into_trm.tex | 2 -- trm/constancies.tex | 8 ++++---- trm/heartbeat.tex | 15 +++++++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hub/lookups/acc_into_trm.tex b/hub/lookups/acc_into_trm.tex index cd0282aa..12c8db65 100644 --- a/hub/lookups/acc_into_trm.tex +++ b/hub/lookups/acc_into_trm.tex @@ -4,7 +4,6 @@ \item[Source columns:] --- \begin{multicols}{2} \begin{enumerate} - \item 1 \item $\accAddressHi$ \item $\accAddressLo$ \item $\accTrmRawAddrHi$ @@ -14,7 +13,6 @@ \item[Target columns:] --- \begin{multicols}{2} \begin{enumerate} - \item $\done$ \item $\trmAddrHi$ \item $\rawAddrLo$ \item $\rawAddrHi$ diff --git a/trm/constancies.tex b/trm/constancies.tex index d2ea6488..280a7aa7 100644 --- a/trm/constancies.tex +++ b/trm/constancies.tex @@ -5,9 +5,9 @@ We impose that the following columns be counter constant: \begin{multicols}{2} \begin{enumerate} - \item $\rawAddrHi$ \quad (\trash) - \item $\rawAddrLo$ \quad (\trash) - \item $\trmAddrHi$ \quad (\trash) - \item $\isPrecompile$ \quad (\trash) + \item $\rawAddrHi$ + \item $\rawAddrLo$ + \item $\trmAddrHi$ + \item $\isPrecompile$ \end{enumerate} \end{multicols} diff --git a/trm/heartbeat.tex b/trm/heartbeat.tex index e5747726..95d8714a 100644 --- a/trm/heartbeat.tex +++ b/trm/heartbeat.tex @@ -1,18 +1,25 @@ -The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\ctMax$ unless $\iomf$ is zero, in which case it hovers at $0$. +The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\locCtMaxTrm$ unless $\iomf$ is zero, in which case it hovers at $0$. \begin{enumerate} \item $\trmStamp_{0} = 0$ \item $\trmStamp_{i + 1} \in \{ \trmStamp_{i}, 1 + \trmStamp_{i} \}$ - \item \If $\trmStamp_{i} = 0$ \Then $\ct_{i+1} = 0 $ + \item \If $\trmStamp_{i} = 0$ \Then + \begin{enumerate} + \item $\rawAddrHi_{i} = 0 $ + \item $\rawAddrLo_{i} = 0 $ + \item $\trmAddrHi_{i} = 0 $ + \item $\isPrecompile_{i} = 0 $ + \item $\ct_{i+1} = 0 $ + \end{enumerate} \item $\first_{i} = \trmStamp_{i} - \trmStamp_{i-1}$ \item \If $\trmStamp_{i} \neq 0$ \Then \begin{enumerate} - \item \If $\ct_{i} \neq \ctMax$ \Then + \item \If $\ct_{i} \neq \locCtMaxTrm$ \Then \begin{enumerate} \item $\trmStamp_{i+1} = \trmStamp_{i}$ \item $\ct_{i + 1} = 1 + \ct_{i}$ \end{enumerate} - \item \If $\ct_{i} = \ctMax$ \Then + \item \If $\ct_{i} = \locCtMaxTrm$ \Then \begin{enumerate} \item $\trmStamp_{i+1} = 1 + \trmStamp_{i}$ \item $\ct_{i + 1} = 0$ From e62fcc655f3a2a5cd0bd5847a0c7b3785b747678 Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Thu, 20 Mar 2025 16:27:44 +0100 Subject: [PATCH 8/9] typo Signed-off-by: F Bojarski --- trm/_all_trm.tex | 1 - trm/binary.tex | 3 +-- trm/columns.tex | 2 -- trm/heartbeat.tex | 2 +- trm/setting_wcp_arg.tex | 2 +- trm/target.tex | 7 ++++--- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/trm/_all_trm.tex b/trm/_all_trm.tex index c78dc8ce..fb6680b8 100644 --- a/trm/_all_trm.tex +++ b/trm/_all_trm.tex @@ -15,7 +15,6 @@ \usepackage{../pkg/exponent} \usepackage{../pkg/thm_env} \usepackage{../pkg/offset_processor} -\usepackage{../pkg/iomf_done} \usepackage{../pkg/wc3} \usepackage{../pkg/xkeyval_macros/wcp_calls} \usepackage{../pkg/draculatheme} diff --git a/trm/binary.tex b/trm/binary.tex index 874d7123..89fe3d54 100644 --- a/trm/binary.tex +++ b/trm/binary.tex @@ -1,8 +1,7 @@ The following columns are binary: \begin{multicols}{2} \begin{enumerate} - \item $\iomf$ + \item $\first$ \quad (\trash) \item $\isPrecompile$ \quad (\trash) - \item $\done$ \quad (\trash) \end{enumerate} \end{multicols} diff --git a/trm/columns.tex b/trm/columns.tex index 9a702b07..ca47d819 100644 --- a/trm/columns.tex +++ b/trm/columns.tex @@ -9,8 +9,6 @@ \item $\trmAddrHi$: \godGiven{} \ccc{}; contains the trimmed version of the high part of the address argument; - \item $\trmLeadHi$: - \ccc{}; contains the leading bytes of the high part of the address argument; \item $\isPrecompile$: \godGiven{} \ccbc{}; equals $1$ \emph{if and only if} the trimmed address is in the range $\{1, 2,\dots, \maxPrecompileAddress\}$; diff --git a/trm/heartbeat.tex b/trm/heartbeat.tex index 95d8714a..f750c6d8 100644 --- a/trm/heartbeat.tex +++ b/trm/heartbeat.tex @@ -1,4 +1,4 @@ -The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\locCtMaxTrm$ unless $\iomf$ is zero, in which case it hovers at $0$. +The heartbeat of the address trimming module is very simple: the \ct{} column counts from $0$ to $\locCtMaxTrm$ unless $\trmStamp$ is zero, in which case it hovers at $0$. \begin{enumerate} \item $\trmStamp_{0} = 0$ \item $\trmStamp_{i + 1} \in \{ \trmStamp_{i}, 1 + \trmStamp_{i} \}$ diff --git a/trm/setting_wcp_arg.tex b/trm/setting_wcp_arg.tex index 5b7e1857..e8c1c33a 100644 --- a/trm/setting_wcp_arg.tex +++ b/trm/setting_wcp_arg.tex @@ -66,7 +66,7 @@ \def\nRows{\rowOffsetPrcAddr}\item[\underline{Processing row $n^\circ(\nRows)$:}] we impose that \[ - \wcpCallToLt { + \wcpCallToLeq { anchorRow = i , relOffset = \nRows , argOneHi = \trmAddrHi , diff --git a/trm/target.tex b/trm/target.tex index 1abc80ad..9f22d2c3 100644 --- a/trm/target.tex +++ b/trm/target.tex @@ -1,8 +1,9 @@ \[ - \boxed{\text{All constraints in this subsection assume } \done_{i} = 1 } + \boxed{\text{All constraints in this subsection assume } \first_{i} = 1 } \] \begin{enumerate} - \item $\isPrecompile_{i} = \res_{i} \cdot (1 - \res_{i-1})$ - \item $\rawAddrHi_{i} = 256^{4} \cdot \trmLeadHi_{i} + \trmAddrHi_{i}$ + \item $\isPrecompile_{i} = \res_{i + \rowOffsetPrcAddr} \cdot (1 - \res_{i + \rowOffsetNonZeroAddr})$ + \item $\rawAddrHi_{i} = 256^{4} \cdot \trmLeadHi + \trmAddrHi_{i}$ \end{enumerate} +where $\trmLeadHi$ is a shorthand for $\argOneLo_{i+\rowOffsetAddressTrm}$ From e6cf253324176ba1be096b127ef22218b030197d Mon Sep 17 00:00:00 2001 From: F Bojarski Date: Fri, 21 Mar 2025 14:23:29 +0100 Subject: [PATCH 9/9] fix wcp comp for address Signed-off-by: F Bojarski --- trm/setting_wcp_arg.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trm/setting_wcp_arg.tex b/trm/setting_wcp_arg.tex index e8c1c33a..b8faf7ba 100644 --- a/trm/setting_wcp_arg.tex +++ b/trm/setting_wcp_arg.tex @@ -6,12 +6,12 @@ \def\nRows{\rowOffsetAddress}\item[\underline{Processing row $n^\circ(\nRows)$:}] we impose that \[ - \wcpCallToLeq { + \wcpCallToLt { anchorRow = i , relOffset = \nRows , argOneHi = \trmAddrHi , argOneLo = \rawAddrLo , - argTwoHi = (256 << 4) - 1 , + argTwoHi = (256 << 5) , argTwoLo = 0 , } \]