Skip to content

Commit f6d2790

Browse files
OlivierBBBOlivierBBB
committed
ras: formatting
1 parent 4d0de63 commit f6d2790

File tree

2 files changed

+84
-67
lines changed

2 files changed

+84
-67
lines changed

‎oob/osaka/precompiles/common/common_constraints.lisp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
(defun (prc---cdx-filter) (+ (flag-sum-london-common-precompiles)
2424
(flag-sum-cancun-precompiles)
2525
(flag-sum-prague-precompiles)
26-
(* (p256-verify-valid-cds) (flag-sum-osaka-precompiles))))
26+
(* (flag-sum-osaka-precompiles)
27+
(p256-verify-valid-cds)
28+
)))
2729
;; ""
2830

2931
(defconstraint prc---common-constraints---check-cds-is-zero

‎oob/osaka/shorthands.lisp‎

Lines changed: 81 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
(module oob)
22

33

4-
(defun (flag-sum-inst) (+ IS_JUMP IS_JUMPI
5-
IS_RDC
6-
IS_CDL
7-
IS_XCALL
8-
IS_CALL
9-
IS_XCREATE
10-
IS_CREATE
11-
IS_SSTORE
12-
IS_DEPLOYMENT))
13-
14-
(defun (flag-sum-prc-common) (+ (flag-sum-london-common-precompiles)
15-
(flag-sum-cancun-precompiles)
16-
(flag-sum-prague-precompiles)
17-
(flag-sum-osaka-precompiles)))
18-
19-
(defun (flag-sum-london-common-precompiles) (+ IS_ECRECOVER
20-
IS_SHA2
21-
IS_RIPEMD
22-
IS_IDENTITY
23-
IS_ECADD
24-
IS_ECMUL
25-
IS_ECPAIRING))
26-
27-
(defun (flag-sum-cancun-precompiles) IS_POINT_EVALUATION)
28-
29-
(defun (flag-sum-prague-precompiles) (+ (flag-sum-prague-precompiles-fixed-size)
30-
(flag-sum-prague-precompiles-variable-size)))
4+
(defun (flag-sum-inst) (+ IS_JUMP IS_JUMPI
5+
IS_RDC
6+
IS_CDL
7+
IS_XCALL
8+
IS_CALL
9+
IS_XCREATE
10+
IS_CREATE
11+
IS_SSTORE
12+
IS_DEPLOYMENT
13+
))
14+
15+
(defun (flag-sum-prc-common) (+ (flag-sum-london-common-precompiles)
16+
(flag-sum-cancun-precompiles)
17+
(flag-sum-prague-precompiles)
18+
(flag-sum-osaka-precompiles)
19+
))
20+
21+
(defun (flag-sum-london-common-precompiles) (+ IS_ECRECOVER
22+
IS_SHA2
23+
IS_RIPEMD
24+
IS_IDENTITY
25+
IS_ECADD
26+
IS_ECMUL
27+
IS_ECPAIRING
28+
))
29+
30+
(defun (flag-sum-cancun-precompiles) (+ IS_POINT_EVALUATION ))
31+
32+
(defun (flag-sum-prague-precompiles) (+ (flag-sum-prague-precompiles-fixed-size)
33+
(flag-sum-prague-precompiles-variable-size)
34+
))
3135

3236
(defun (flag-sum-prague-precompiles-fixed-size) (+ IS_BLS_G1_ADD
3337
IS_BLS_G2_ADD
@@ -40,7 +44,7 @@
4044
IS_BLS_PAIRING_CHECK
4145
))
4246

43-
(defun (flag-sum-osaka-precompiles) IS_P256_VERIFY)
47+
(defun (flag-sum-osaka-precompiles) (+ IS_P256_VERIFY ))
4448

4549
(defun (flag-sum-prc-blake) (+ IS_BLAKE2F_CDS
4650
IS_BLAKE2F_PARAMS))
@@ -49,33 +53,37 @@
4953
IS_MODEXP_XBS
5054
IS_MODEXP_LEAD
5155
IS_MODEXP_PRICING
52-
IS_MODEXP_EXTRACT))
56+
IS_MODEXP_EXTRACT
57+
))
5358

5459
(defun (flag-sum-prc) (+ (flag-sum-prc-common)
5560
(flag-sum-prc-blake)
56-
(flag-sum-prc-modexp)))
61+
(flag-sum-prc-modexp)
62+
))
5763

5864
(defun (flag-sum) (+ (flag-sum-inst)
59-
(flag-sum-prc)))
60-
61-
(defun (wght-sum-inst) (+ (* OOB_INST_JUMP IS_JUMP)
62-
(* OOB_INST_JUMPI IS_JUMPI)
63-
(* OOB_INST_RDC IS_RDC)
64-
(* OOB_INST_CDL IS_CDL)
65-
(* OOB_INST_XCALL IS_XCALL)
66-
(* OOB_INST_CALL IS_CALL)
67-
(* OOB_INST_XCREATE IS_XCREATE)
68-
(* OOB_INST_CREATE IS_CREATE)
69-
(* OOB_INST_SSTORE IS_SSTORE)
70-
(* OOB_INST_DEPLOYMENT IS_DEPLOYMENT)))
71-
72-
(defun (wght-sum-prc-common) (+ (* OOB_INST_ECRECOVER IS_ECRECOVER)
73-
(* OOB_INST_SHA2 IS_SHA2)
74-
(* OOB_INST_RIPEMD IS_RIPEMD)
75-
(* OOB_INST_IDENTITY IS_IDENTITY)
76-
(* OOB_INST_ECADD IS_ECADD)
77-
(* OOB_INST_ECMUL IS_ECMUL)
78-
(* OOB_INST_ECPAIRING IS_ECPAIRING)
65+
(flag-sum-prc)
66+
))
67+
68+
(defun (wght-sum-inst) (+ (* OOB_INST_JUMP IS_JUMP )
69+
(* OOB_INST_JUMPI IS_JUMPI )
70+
(* OOB_INST_RDC IS_RDC )
71+
(* OOB_INST_CDL IS_CDL )
72+
(* OOB_INST_XCALL IS_XCALL )
73+
(* OOB_INST_CALL IS_CALL )
74+
(* OOB_INST_XCREATE IS_XCREATE )
75+
(* OOB_INST_CREATE IS_CREATE )
76+
(* OOB_INST_SSTORE IS_SSTORE )
77+
(* OOB_INST_DEPLOYMENT IS_DEPLOYMENT )
78+
))
79+
80+
(defun (wght-sum-prc-common) (+ (* OOB_INST_ECRECOVER IS_ECRECOVER )
81+
(* OOB_INST_SHA2 IS_SHA2 )
82+
(* OOB_INST_RIPEMD IS_RIPEMD )
83+
(* OOB_INST_IDENTITY IS_IDENTITY )
84+
(* OOB_INST_ECADD IS_ECADD )
85+
(* OOB_INST_ECMUL IS_ECMUL )
86+
(* OOB_INST_ECPAIRING IS_ECPAIRING )
7987
(wght-sum-prc-bls)
8088
(wght-sum-prc-osaka-precompiles)
8189
))
@@ -91,9 +99,9 @@
9199
(* OOB_INST_MODEXP_EXTRACT IS_MODEXP_EXTRACT )
92100
))
93101

94-
(defun (wght-sum-prc-cancun-precompiles) (+ (* OOB_INST_POINT_EVALUATION IS_POINT_EVALUATION ) ))
102+
(defun (wght-sum-prc-cancun-precompiles) (+ (* OOB_INST_POINT_EVALUATION IS_POINT_EVALUATION ) ))
95103

96-
(defun (wght-sum-prc-prague-precompiles) (+ (* OOB_INST_BLS_G1_ADD IS_BLS_G1_ADD )
104+
(defun (wght-sum-prc-prague-precompiles) (+ (* OOB_INST_BLS_G1_ADD IS_BLS_G1_ADD )
97105
(* OOB_INST_BLS_G1_MSM IS_BLS_G1_MSM )
98106
(* OOB_INST_BLS_G2_ADD IS_BLS_G2_ADD )
99107
(* OOB_INST_BLS_G2_MSM IS_BLS_G2_MSM )
@@ -102,17 +110,20 @@
102110
(* OOB_INST_BLS_MAP_FP2_TO_G2 IS_BLS_MAP_FP2_TO_G2 )
103111
))
104112

105-
(defun (wght-sum-prc-osaka-precompiles) (+ (* OOB_INST_P256_VERIFY IS_P256_VERIFY)))
113+
(defun (wght-sum-prc-osaka-precompiles) (+ (* OOB_INST_P256_VERIFY IS_P256_VERIFY)))
106114

107115
(defun (wght-sum-prc-bls) (+ (wght-sum-prc-cancun-precompiles)
108-
(wght-sum-prc-prague-precompiles)))
116+
(wght-sum-prc-prague-precompiles)
117+
))
109118

110119
(defun (wght-sum-prc) (+ (wght-sum-prc-common)
111120
(wght-sum-prc-blake)
112-
(wght-sum-prc-modexp)))
121+
(wght-sum-prc-modexp)
122+
))
113123

114124
(defun (wght-sum) (+ (wght-sum-inst)
115-
(wght-sum-prc)))
125+
(wght-sum-prc)
126+
))
116127

117128
(defun (ct-max-sum-inst) (+ (* CT_MAX_JUMP IS_JUMP )
118129
(* CT_MAX_JUMPI IS_JUMPI )
@@ -167,20 +178,24 @@
167178

168179
(defun (ct-max-sum-prc) (+ (ct-max-sum-prc-common)
169180
(ct-max-sum-prc-blake)
170-
(ct-max-sum-prc-modexp)))
181+
(ct-max-sum-prc-modexp)
182+
))
171183

172184
(defun (ct-max-sum) (+ (ct-max-sum-inst)
173-
(ct-max-sum-prc)))
185+
(ct-max-sum-prc)
186+
))
174187

175-
(defun (lookup-sum k) (+ (shift ADD_FLAG k)
176-
(shift MOD_FLAG k)
177-
(shift WCP_FLAG k)
178-
(shift BLS_REF_TABLE_FLAG k)))
188+
(defun (lookup-sum k) (+ (shift ADD_FLAG k)
189+
(shift MOD_FLAG k)
190+
(shift WCP_FLAG k)
191+
(shift BLS_REF_TABLE_FLAG k)
192+
))
179193

180-
(defun (wght-lookup-sum k) (+ (* 1 (shift ADD_FLAG k))
181-
(* 2 (shift MOD_FLAG k))
182-
(* 3 (shift WCP_FLAG k))
183-
(* 4 (shift BLS_REF_TABLE_FLAG k))))
194+
(defun (wght-lookup-sum k) (+ (* 1 (shift ADD_FLAG k) )
195+
(* 2 (shift MOD_FLAG k) )
196+
(* 3 (shift WCP_FLAG k) )
197+
(* 4 (shift BLS_REF_TABLE_FLAG k) )
198+
))
184199

185200
(defun (assumption---fresh-new-stamp) (- STAMP (prev STAMP)))
186201

0 commit comments

Comments
 (0)