Removing unnecessary code

0xPolygonHermez · Dec 11, 2024 · e610706 · e610706
1 parent 5470bf1
commit e610706
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 70 deletions.
diff --git a/pil/constants.pil b/pil/constants.pil
diff --git a/pil/zisk.pil b/pil/zisk.pil
@@ -1,5 +1,3 @@
-
-require "constants.pil"
 require "rom/pil/rom.pil"
 require "main/pil/main.pil"
 require "binary/pil/binary.pil"

diff --git a/state-machines/binary/pil/binary.pil b/state-machines/binary/pil/binary.pil
@@ -59,9 +59,7 @@ require "std_lookup.pil"
       0      XOR                0x22     0x22
 */
 
-const int BINARY_ID = 20;
-
-airtemplate Binary(const int N = 2**21, const int operation_bus_id = BINARY_ID) {
+airtemplate Binary(const int N = 2**21, const int operation_bus_id) {
     // Default values
     const int bits = 64;
     const int bytes = bits / 8;

diff --git a/state-machines/binary/pil/binary_extension.pil b/state-machines/binary/pil/binary_extension.pil
@@ -1,4 +1,3 @@
-require "std_permutation.pil"
 require "std_lookup.pil"
 require "std_range_check.pil"
 
@@ -66,9 +65,7 @@ x    in2[x]    out[x][0]     out[x][1]
 Result:        0xFFFF8abc    0xFFFFFFFF
 */
 
-const int BINARY_EXTENSION_ID = 21;
-
-airtemplate BinaryExtension(const int N = 2**18, const int operation_bus_id = BINARY_EXTENSION_ID) {
+airtemplate BinaryExtension(const int N = 2**18, const int operation_bus_id) {
     const int bits = 64;
     const int bytes = bits / 8;
 

diff --git a/state-machines/binary/pil/binary_extension_table.pil b/state-machines/binary/pil/binary_extension_table.pil
@@ -1,5 +1,5 @@
+require "std_constants.pil"
 require "std_lookup.pil"
-require "constants.pil"
 
 // Operations Table:
 //                                                                Running Total

diff --git a/state-machines/binary/pil/binary_table.pil b/state-machines/binary/pil/binary_table.pil
@@ -1,4 +1,5 @@
-require "constants.pil";
+require "std_constants.pil";
+require "std_lookup.pil"
 
 // PIL Binary Operations Table used by Binary
 //                                                                                                     Running Total
@@ -65,7 +66,7 @@ airtemplate BinaryTable(const int N = 2**22, const int disable_fixed = 0) {
                     0x02:P2_18, 0x03:P2_18,                         // ADD,SUB
                     0x06:P2_17, 0x07:P2_17,                         // LEU,LE
                     0x20:P2_17, 0x21:P2_17, 0x22:P2_17,             // AND,OR,XOR
-                    0x23:P2_11]...;                                 // EXT_32
+                    EXT_32_OP:P2_11]...;                            // EXT_32
 
     // NOTE: MINU/MINU_W, MIN/MIN_W, MAXU/MAXU_W, MAX/MAX_W has double size because
     //       the result_is_a is 0 in the first half and 1 in the second half.

diff --git a/state-machines/main/pil/main.pil b/state-machines/main/pil/main.pil
@@ -1,4 +1,5 @@
 require "std_lookup.pil"
+require "std_permutation.pil"
 require "std_common.pil"
 
 const int BOOT_ADDR = 0x1000;