Skip to content

Commit 312ebeb

Browse files
DavePearceDavePearce
authored
use defclookup in place of deflookup (#682)
1 parent 5ae826a commit 312ebeb

File tree

144 files changed

+2603
-2305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+2603
-2305
lines changed

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Install Go Corset
1717
shell: bash
18-
run: go install github.com/consensys/go-corset/cmd/[email protected].7
18+
run: go install github.com/consensys/go-corset/cmd/[email protected].13
1919

2020
- name: Build all forks
2121
run: make -B all

‎bin/lookups/bin_into_binreftable.lisp‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(defun (selector-bin-to-binreftable)
22
(+ bin.IS_AND bin.IS_OR bin.IS_XOR bin.IS_NOT))
33

4-
(deflookup
4+
(defclookup
55
bin-into-binreftable-high
66
;reference columns
77
(
@@ -10,29 +10,33 @@
1010
binreftable.INPUT_BYTE_1
1111
binreftable.INPUT_BYTE_2
1212
)
13+
;source selector
14+
(selector-bin-to-binreftable)
1315
;source columns
1416
(
15-
(* bin.INST (selector-bin-to-binreftable))
16-
(* bin.XXX_BYTE_HI (selector-bin-to-binreftable))
17-
(* bin.BYTE_1 (selector-bin-to-binreftable))
18-
(* bin.BYTE_3 (selector-bin-to-binreftable))
17+
bin.INST
18+
bin.XXX_BYTE_HI
19+
bin.BYTE_1
20+
bin.BYTE_3
1921
))
2022

21-
(deflookup
23+
(defclookup
2224
bin-into-binreftable-low
2325
;reference columns
2426
(
2527
binreftable.INST
2628
binreftable.RESULT_BYTE
2729
binreftable.INPUT_BYTE_1
2830
binreftable.INPUT_BYTE_2
29-
)
31+
)
32+
;source selector
33+
(selector-bin-to-binreftable)
3034
;source columns
3135
(
32-
(* bin.INST (selector-bin-to-binreftable))
33-
(* bin.XXX_BYTE_LO (selector-bin-to-binreftable))
34-
(* bin.BYTE_2 (selector-bin-to-binreftable))
35-
(* bin.BYTE_4 (selector-bin-to-binreftable))
36+
bin.INST
37+
bin.XXX_BYTE_LO
38+
bin.BYTE_2
39+
bin.BYTE_4
3640
))
3741

3842

‎blake2fmodexpdata/lookups/blakemodexp_into_wcp.lisp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
(force-bin (* (~ blake2fmodexpdata.STAMP)
33
(- blake2fmodexpdata.STAMP (prev blake2fmodexpdata.STAMP)))))
44

5-
(deflookup
5+
(defclookup
66
blake2fmodexpdata-into-wcp
7-
; target colums (in WCP)
7+
;; target colums (in WCP)
88
(
99
wcp.ARG_1_HI
1010
wcp.ARG_1_LO
@@ -13,14 +13,16 @@
1313
wcp.RES
1414
wcp.INST
1515
)
16-
; source columns
16+
;; source selector
17+
(blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag)
18+
;; source columns
1719
(
1820
0
19-
(* (blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag) (prev blake2fmodexpdata.ID))
21+
(prev blake2fmodexpdata.ID)
2022
0
21-
(* (blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag) blake2fmodexpdata.ID)
22-
(* (blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag) 1)
23-
(* (blake2fmodexpdata-into-wcp-oob-into-wcp-activation-flag) EVM_INST_LT)
23+
blake2fmodexpdata.ID
24+
1
25+
EVM_INST_LT
2426
))
2527

2628

‎blockdata/cancun/lookups/blockdata_into_euc.lisp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(defun (blockdata-into-euc-selector) blockdata.EUC_FLAG)
22

3-
(deflookup
3+
(defclookup
44
blockdata-into-euc
55
;; target columns
66
(
@@ -9,11 +9,13 @@
99
euc.DIVISOR
1010
euc.QUOTIENT
1111
)
12+
;; source selector
13+
(blockdata-into-euc-selector)
1214
;; source columns
1315
(
14-
(* 1 (blockdata-into-euc-selector))
15-
(* blockdata.ARG_1_LO (blockdata-into-euc-selector))
16-
(* blockdata.ARG_2_LO (blockdata-into-euc-selector))
17-
(* blockdata.RES (blockdata-into-euc-selector))
16+
1
17+
blockdata.ARG_1_LO
18+
blockdata.ARG_2_LO
19+
blockdata.RES
1820
))
1921

‎blockdata/cancun/lookups/blockdata_into_wcp.lisp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(defun (blockdata-into-wcp-selector)
22
blockdata.WCP_FLAG)
33

4-
(deflookup
4+
(defclookup
55
blockdata-into-wcp
66
;; target columns
77
(
@@ -11,14 +11,16 @@
1111
wcp.ARGUMENT_2_LO
1212
wcp.RESULT
1313
wcp.INST
14-
)
14+
)
15+
;; source selector
16+
(blockdata-into-wcp-selector)
1517
;; source columns
1618
(
17-
(* blockdata.ARG_1_HI (blockdata-into-wcp-selector))
18-
(* blockdata.ARG_1_LO (blockdata-into-wcp-selector))
19-
(* blockdata.ARG_2_HI (blockdata-into-wcp-selector))
20-
(* blockdata.ARG_2_LO (blockdata-into-wcp-selector))
21-
(* blockdata.RES (blockdata-into-wcp-selector))
22-
(* blockdata.EXO_INST (blockdata-into-wcp-selector))
19+
blockdata.ARG_1_HI
20+
blockdata.ARG_1_LO
21+
blockdata.ARG_2_HI
22+
blockdata.ARG_2_LO
23+
blockdata.RES
24+
blockdata.EXO_INST
2325
))
2426

‎blockdata/london/lookups/blockdata_into_euc.lisp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(defun (blockdata-into-euc-selector) blockdata.EUC_FLAG)
22

3-
(deflookup
3+
(defclookup
44
blockdata-into-euc
55
;; target columns
66
(
@@ -9,11 +9,13 @@
99
euc.DIVISOR
1010
euc.QUOTIENT
1111
)
12+
;; source selector
13+
(blockdata-into-euc-selector)
1214
;; source columns
1315
(
14-
(* 1 (blockdata-into-euc-selector))
15-
(* blockdata.ARG_1_LO (blockdata-into-euc-selector))
16-
(* blockdata.ARG_2_LO (blockdata-into-euc-selector))
17-
(* blockdata.RES (blockdata-into-euc-selector))
16+
1
17+
blockdata.ARG_1_LO
18+
blockdata.ARG_2_LO
19+
blockdata.RES
1820
))
1921

‎blockdata/london/lookups/blockdata_into_wcp.lisp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(defun (blockdata-into-wcp-selector)
22
blockdata.WCP_FLAG)
33

4-
(deflookup
4+
(defclookup
55
blockdata-into-wcp
66
;; target columns
77
(
@@ -12,13 +12,15 @@
1212
wcp.RESULT
1313
wcp.INST
1414
)
15+
;; source selector
16+
(blockdata-into-wcp-selector)
1517
;; source columns
1618
(
17-
(* blockdata.ARG_1_HI (blockdata-into-wcp-selector))
18-
(* blockdata.ARG_1_LO (blockdata-into-wcp-selector))
19-
(* blockdata.ARG_2_HI (blockdata-into-wcp-selector))
20-
(* blockdata.ARG_2_LO (blockdata-into-wcp-selector))
21-
(* blockdata.RES (blockdata-into-wcp-selector))
22-
(* blockdata.EXO_INST (blockdata-into-wcp-selector))
19+
blockdata.ARG_1_HI
20+
blockdata.ARG_1_LO
21+
blockdata.ARG_2_HI
22+
blockdata.ARG_2_LO
23+
blockdata.RES
24+
blockdata.EXO_INST
2325
))
2426

‎blockdata/paris/lookups/blockdata_into_euc.lisp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(defun (blockdata-into-euc-selector) blockdata.EUC_FLAG)
22

3-
(deflookup
3+
(defclookup
44
blockdata-into-euc
55
;; target columns
66
(
@@ -9,11 +9,13 @@
99
euc.DIVISOR
1010
euc.QUOTIENT
1111
)
12+
;; source selector
13+
(blockdata-into-euc-selector)
1214
;; source columns
1315
(
14-
(* 1 (blockdata-into-euc-selector))
15-
(* blockdata.ARG_1_LO (blockdata-into-euc-selector))
16-
(* blockdata.ARG_2_LO (blockdata-into-euc-selector))
17-
(* blockdata.RES (blockdata-into-euc-selector))
16+
1
17+
blockdata.ARG_1_LO
18+
blockdata.ARG_2_LO
19+
blockdata.RES
1820
))
1921

‎blockdata/paris/lookups/blockdata_into_wcp.lisp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(defun (blockdata-into-wcp-selector)
22
blockdata.WCP_FLAG)
33

4-
(deflookup
4+
(defclookup
55
blockdata-into-wcp
66
;; target columns
77
(
@@ -12,13 +12,15 @@
1212
wcp.RESULT
1313
wcp.INST
1414
)
15+
;; source selector
16+
(blockdata-into-wcp-selector)
1517
;; source columns
1618
(
17-
(* blockdata.ARG_1_HI (blockdata-into-wcp-selector))
18-
(* blockdata.ARG_1_LO (blockdata-into-wcp-selector))
19-
(* blockdata.ARG_2_HI (blockdata-into-wcp-selector))
20-
(* blockdata.ARG_2_LO (blockdata-into-wcp-selector))
21-
(* blockdata.RES (blockdata-into-wcp-selector))
22-
(* blockdata.EXO_INST (blockdata-into-wcp-selector))
19+
blockdata.ARG_1_HI
20+
blockdata.ARG_1_LO
21+
blockdata.ARG_2_HI
22+
blockdata.ARG_2_LO
23+
blockdata.RES
24+
blockdata.EXO_INST
2325
))
2426

‎blockhash/lookups/blockhash_into_blockdata.lisp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
(defun (blockhash-into-blockdata-selector) blockhash.MACRO) ;; ""
22

3-
(deflookup
3+
(defclookup
44
blockhash-into-blockdata
5-
; target columns
5+
;; target columns
66
(
77
blockdata.REL_BLOCK
88
blockdata.DATA_LO
99
blockdata.INST
10-
)
11-
; source columns
10+
)
11+
;; source selector
12+
(blockhash-into-blockdata-selector)
13+
;; source columns
1214
(
13-
(* (blockhash-into-blockdata-selector) blockhash.macro/REL_BLOCK)
14-
(* (blockhash-into-blockdata-selector) blockhash.macro/ABS_BLOCK)
15-
(* (blockhash-into-blockdata-selector) EVM_INST_NUMBER)
15+
blockhash.macro/REL_BLOCK
16+
blockhash.macro/ABS_BLOCK
17+
EVM_INST_NUMBER
1618
)
1719
)

0 commit comments

Comments
 (0)