From 9a12fa45b09a13442bb747bbffe211c00cdbf7f7 Mon Sep 17 00:00:00 2001 From: delehef Date: Thu, 2 Nov 2023 16:02:34 +0100 Subject: [PATCH] chore: update to Corset 9 (#35) --- alu/add/columns.lisp | 6 +- alu/ext/columns.lisp | 116 ++++++------- alu/mod/columns.lisp | 60 +++---- alu/mul/columns.lisp | 48 +++--- bin/columns.lisp | 26 +-- ec_data/columns.lisp | 24 +-- hub/columns.lisp | 66 ++++---- hub/mmio/columns.lisp | 36 ++--- hub/mmu/columns.lisp | 70 ++++---- lookup_tables/tables/instruction_decoder.lisp | 152 +++++++++--------- mxp/columns.lisp | 14 +- mxp/constraints.lisp | 8 +- rlpAddr/columns.lisp | 10 +- rlp_txn/columns.lisp | 22 +-- rlp_txrcpt/columns.lisp | 20 +-- rom/columns.lisp | 10 +- rom/constraints.lisp | 13 +- romLex/columns.lisp | 6 +- shf/columns.lisp | 40 ++--- stp/columns.lisp | 20 +-- trm/columns.lisp | 10 +- trm_sally/columns.lisp | 10 +- txn_data/columns.lisp | 14 +- wcp/columns.lisp | 28 ++-- 24 files changed, 412 insertions(+), 417 deletions(-) diff --git a/alu/add/columns.lisp b/alu/add/columns.lisp index d80c3153..1ec440e1 100644 --- a/alu/add/columns.lisp +++ b/alu/add/columns.lisp @@ -10,9 +10,9 @@ ARG_2_LO RES_HI RES_LO - (BYTE_1 :BYTE) - (BYTE_2 :BYTE) + (BYTE_1 :byte) + (BYTE_2 :byte) ACC_1 ACC_2 - (OVERFLOW :BOOLEAN) + (OVERFLOW :binary) ) diff --git a/alu/ext/columns.lisp b/alu/ext/columns.lisp index 9595ff1f..33926d1e 100644 --- a/alu/ext/columns.lisp +++ b/alu/ext/columns.lisp @@ -2,7 +2,7 @@ (defcolumns STAMP - (OLI :BOOLEAN) + (OLI :binary) CT INST ; @@ -15,71 +15,71 @@ RES_HI RES_LO ; - (CMP :BOOLEAN) - (OF_I :BOOLEAN) - (OF_J :BOOLEAN) - (OF_H :BOOLEAN) - (OF_RES :BOOLEAN) + (CMP :binary) + (OF_I :binary) + (OF_J :binary) + (OF_H :binary) + (OF_RES :binary) ; - (BIT_1 :BOOLEAN) - (BIT_2 :BOOLEAN) - (BIT_3 :BOOLEAN) + (BIT_1 :binary) + (BIT_2 :binary) + (BIT_3 :binary) ; - (BYTE_A_3 :BYTE) ACC_A_3 - (BYTE_A_2 :BYTE) ACC_A_2 - (BYTE_A_1 :BYTE) ACC_A_1 - (BYTE_A_0 :BYTE) ACC_A_0 + (BYTE_A_3 :byte) ACC_A_3 + (BYTE_A_2 :byte) ACC_A_2 + (BYTE_A_1 :byte) ACC_A_1 + (BYTE_A_0 :byte) ACC_A_0 ; - (BYTE_B_3 :BYTE) ACC_B_3 - (BYTE_B_2 :BYTE) ACC_B_2 - (BYTE_B_1 :BYTE) ACC_B_1 - (BYTE_B_0 :BYTE) ACC_B_0 + (BYTE_B_3 :byte) ACC_B_3 + (BYTE_B_2 :byte) ACC_B_2 + (BYTE_B_1 :byte) ACC_B_1 + (BYTE_B_0 :byte) ACC_B_0 ; - (BYTE_C_3 :BYTE) ACC_C_3 - (BYTE_C_2 :BYTE) ACC_C_2 - (BYTE_C_1 :BYTE) ACC_C_1 - (BYTE_C_0 :BYTE) ACC_C_0 + (BYTE_C_3 :byte) ACC_C_3 + (BYTE_C_2 :byte) ACC_C_2 + (BYTE_C_1 :byte) ACC_C_1 + (BYTE_C_0 :byte) ACC_C_0 ; - (BYTE_Q_7 :BYTE) ACC_Q_7 - (BYTE_Q_6 :BYTE) ACC_Q_6 - (BYTE_Q_5 :BYTE) ACC_Q_5 - (BYTE_Q_4 :BYTE) ACC_Q_4 - (BYTE_Q_3 :BYTE) ACC_Q_3 - (BYTE_Q_2 :BYTE) ACC_Q_2 - (BYTE_Q_1 :BYTE) ACC_Q_1 - (BYTE_Q_0 :BYTE) ACC_Q_0 + (BYTE_Q_7 :byte) ACC_Q_7 + (BYTE_Q_6 :byte) ACC_Q_6 + (BYTE_Q_5 :byte) ACC_Q_5 + (BYTE_Q_4 :byte) ACC_Q_4 + (BYTE_Q_3 :byte) ACC_Q_3 + (BYTE_Q_2 :byte) ACC_Q_2 + (BYTE_Q_1 :byte) ACC_Q_1 + (BYTE_Q_0 :byte) ACC_Q_0 ; - (BYTE_R_3 :BYTE) ACC_R_3 - (BYTE_R_2 :BYTE) ACC_R_2 - (BYTE_R_1 :BYTE) ACC_R_1 - (BYTE_R_0 :BYTE) ACC_R_0 + (BYTE_R_3 :byte) ACC_R_3 + (BYTE_R_2 :byte) ACC_R_2 + (BYTE_R_1 :byte) ACC_R_1 + (BYTE_R_0 :byte) ACC_R_0 ; - (BYTE_DELTA_3 :BYTE) ACC_DELTA_3 - (BYTE_DELTA_2 :BYTE) ACC_DELTA_2 - (BYTE_DELTA_1 :BYTE) ACC_DELTA_1 - (BYTE_DELTA_0 :BYTE) ACC_DELTA_0 + (BYTE_DELTA_3 :byte) ACC_DELTA_3 + (BYTE_DELTA_2 :byte) ACC_DELTA_2 + (BYTE_DELTA_1 :byte) ACC_DELTA_1 + (BYTE_DELTA_0 :byte) ACC_DELTA_0 ; - (BYTE_H_5 :BYTE) ACC_H_5 - (BYTE_H_4 :BYTE) ACC_H_4 - (BYTE_H_3 :BYTE) ACC_H_3 - (BYTE_H_2 :BYTE) ACC_H_2 - (BYTE_H_1 :BYTE) ACC_H_1 - (BYTE_H_0 :BYTE) ACC_H_0 + (BYTE_H_5 :byte) ACC_H_5 + (BYTE_H_4 :byte) ACC_H_4 + (BYTE_H_3 :byte) ACC_H_3 + (BYTE_H_2 :byte) ACC_H_2 + (BYTE_H_1 :byte) ACC_H_1 + (BYTE_H_0 :byte) ACC_H_0 ; - (BYTE_I_6 :BYTE) ACC_I_6 - (BYTE_I_5 :BYTE) ACC_I_5 - (BYTE_I_4 :BYTE) ACC_I_4 - (BYTE_I_3 :BYTE) ACC_I_3 - (BYTE_I_2 :BYTE) ACC_I_2 - (BYTE_I_1 :BYTE) ACC_I_1 - (BYTE_I_0 :BYTE) ACC_I_0 + (BYTE_I_6 :byte) ACC_I_6 + (BYTE_I_5 :byte) ACC_I_5 + (BYTE_I_4 :byte) ACC_I_4 + (BYTE_I_3 :byte) ACC_I_3 + (BYTE_I_2 :byte) ACC_I_2 + (BYTE_I_1 :byte) ACC_I_1 + (BYTE_I_0 :byte) ACC_I_0 ; - (BYTE_J_7 :BYTE) ACC_J_7 - (BYTE_J_6 :BYTE) ACC_J_6 - (BYTE_J_5 :BYTE) ACC_J_5 - (BYTE_J_4 :BYTE) ACC_J_4 - (BYTE_J_3 :BYTE) ACC_J_3 - (BYTE_J_2 :BYTE) ACC_J_2 - (BYTE_J_1 :BYTE) ACC_J_1 - (BYTE_J_0 :BYTE) ACC_J_0 + (BYTE_J_7 :byte) ACC_J_7 + (BYTE_J_6 :byte) ACC_J_6 + (BYTE_J_5 :byte) ACC_J_5 + (BYTE_J_4 :byte) ACC_J_4 + (BYTE_J_3 :byte) ACC_J_3 + (BYTE_J_2 :byte) ACC_J_2 + (BYTE_J_1 :byte) ACC_J_1 + (BYTE_J_0 :byte) ACC_J_0 ) \ No newline at end of file diff --git a/alu/mod/columns.lisp b/alu/mod/columns.lisp index 7a59389a..659b46dc 100644 --- a/alu/mod/columns.lisp +++ b/alu/mod/columns.lisp @@ -2,11 +2,11 @@ (defcolumns STAMP - (OLI :BOOLEAN) + (OLI :binary) CT INST - (DEC_SIGNED :BOOLEAN) ;while instruction decoded this provides better If-zero etc stuff - (DEC_OUTPUT :BOOLEAN) ; + (DEC_SIGNED :binary) ;while instruction decoded this provides better If-zero etc stuff + (DEC_OUTPUT :binary) ; ; ARG_1_HI ARG_1_LO @@ -15,38 +15,38 @@ RES_HI RES_LO ; - (BYTE_1_3 :BYTE) ACC_1_3 - (BYTE_1_2 :BYTE) ACC_1_2 - (BYTE_2_3 :BYTE) ACC_2_3 - (BYTE_2_2 :BYTE) ACC_2_2 + (BYTE_1_3 :byte) ACC_1_3 + (BYTE_1_2 :byte) ACC_1_2 + (BYTE_2_3 :byte) ACC_2_3 + (BYTE_2_2 :byte) ACC_2_2 ; - (BYTE_B_3 :BYTE) ACC_B_3 - (BYTE_B_2 :BYTE) ACC_B_2 - (BYTE_B_1 :BYTE) ACC_B_1 - (BYTE_B_0 :BYTE) ACC_B_0 + (BYTE_B_3 :byte) ACC_B_3 + (BYTE_B_2 :byte) ACC_B_2 + (BYTE_B_1 :byte) ACC_B_1 + (BYTE_B_0 :byte) ACC_B_0 ; - (BYTE_Q_3 :BYTE) ACC_Q_3 - (BYTE_Q_2 :BYTE) ACC_Q_2 - (BYTE_Q_1 :BYTE) ACC_Q_1 - (BYTE_Q_0 :BYTE) ACC_Q_0 + (BYTE_Q_3 :byte) ACC_Q_3 + (BYTE_Q_2 :byte) ACC_Q_2 + (BYTE_Q_1 :byte) ACC_Q_1 + (BYTE_Q_0 :byte) ACC_Q_0 ; - (BYTE_R_3 :BYTE) ACC_R_3 - (BYTE_R_2 :BYTE) ACC_R_2 - (BYTE_R_1 :BYTE) ACC_R_1 - (BYTE_R_0 :BYTE) ACC_R_0 + (BYTE_R_3 :byte) ACC_R_3 + (BYTE_R_2 :byte) ACC_R_2 + (BYTE_R_1 :byte) ACC_R_1 + (BYTE_R_0 :byte) ACC_R_0 ; - (BYTE_DELTA_3 :BYTE) ACC_DELTA_3 - (BYTE_DELTA_2 :BYTE) ACC_DELTA_2 - (BYTE_DELTA_1 :BYTE) ACC_DELTA_1 - (BYTE_DELTA_0 :BYTE) ACC_DELTA_0 + (BYTE_DELTA_3 :byte) ACC_DELTA_3 + (BYTE_DELTA_2 :byte) ACC_DELTA_2 + (BYTE_DELTA_1 :byte) ACC_DELTA_1 + (BYTE_DELTA_0 :byte) ACC_DELTA_0 ; - (BYTE_H_2 :BYTE) ACC_H_2 - (BYTE_H_1 :BYTE) ACC_H_1 - (BYTE_H_0 :BYTE) ACC_H_0 + (BYTE_H_2 :byte) ACC_H_2 + (BYTE_H_1 :byte) ACC_H_1 + (BYTE_H_0 :byte) ACC_H_0 ; - (CMP_1 :BOOLEAN) - (CMP_2 :BOOLEAN) + (CMP_1 :binary) + (CMP_2 :binary) ; - (MSB_1 :BOOLEAN) - (MSB_2 :BOOLEAN) + (MSB_1 :binary) + (MSB_2 :binary) ) \ No newline at end of file diff --git a/alu/mul/columns.lisp b/alu/mul/columns.lisp index 44278461..f9fa0e85 100644 --- a/alu/mul/columns.lisp +++ b/alu/mul/columns.lisp @@ -3,10 +3,10 @@ (defcolumns MUL_STAMP COUNTER - (OLI :BOOLEAN) - (TINY_BASE :BOOLEAN) - (TINY_EXPONENT :BOOLEAN) - (RESULT_VANISHES :BOOLEAN) + (OLI :binary) + (TINY_BASE :binary) + (TINY_EXPONENT :binary) + (RESULT_VANISHES :binary) INSTRUCTION ARG_1_HI ARG_1_LO @@ -14,32 +14,32 @@ ARG_2_LO RES_HI RES_LO - (BITS :BOOLEAN) + (BITS :binary) ;========================== - (BYTE_A_3 :BYTE) ACC_A_3 - (BYTE_A_2 :BYTE) ACC_A_2 - (BYTE_A_1 :BYTE) ACC_A_1 - (BYTE_A_0 :BYTE) ACC_A_0 + (BYTE_A_3 :byte) ACC_A_3 + (BYTE_A_2 :byte) ACC_A_2 + (BYTE_A_1 :byte) ACC_A_1 + (BYTE_A_0 :byte) ACC_A_0 ;========================== - (BYTE_B_3 :BYTE) ACC_B_3 - (BYTE_B_2 :BYTE) ACC_B_2 - (BYTE_B_1 :BYTE) ACC_B_1 - (BYTE_B_0 :BYTE) ACC_B_0 + (BYTE_B_3 :byte) ACC_B_3 + (BYTE_B_2 :byte) ACC_B_2 + (BYTE_B_1 :byte) ACC_B_1 + (BYTE_B_0 :byte) ACC_B_0 ;========================== - (BYTE_C_3 :BYTE) ACC_C_3 - (BYTE_C_2 :BYTE) ACC_C_2 - (BYTE_C_1 :BYTE) ACC_C_1 - (BYTE_C_0 :BYTE) ACC_C_0 + (BYTE_C_3 :byte) ACC_C_3 + (BYTE_C_2 :byte) ACC_C_2 + (BYTE_C_1 :byte) ACC_C_1 + (BYTE_C_0 :byte) ACC_C_0 ;========================== - (BYTE_H_3 :BYTE) ACC_H_3 - (BYTE_H_2 :BYTE) ACC_H_2 - (BYTE_H_1 :BYTE) ACC_H_1 - (BYTE_H_0 :BYTE) ACC_H_0 + (BYTE_H_3 :byte) ACC_H_3 + (BYTE_H_2 :byte) ACC_H_2 + (BYTE_H_1 :byte) ACC_H_1 + (BYTE_H_0 :byte) ACC_H_0 ;========================== - (EXPONENT_BIT :BOOLEAN) + (EXPONENT_BIT :binary) EXPONENT_BIT_ACCUMULATOR - (EXPONENT_BIT_SOURCE :BOOLEAN) - (SQUARE_AND_MULTIPLY :BOOLEAN) + (EXPONENT_BIT_SOURCE :binary) + (SQUARE_AND_MULTIPLY :binary) BIT_NUM ) diff --git a/bin/columns.lisp b/bin/columns.lisp index 7aecc4be..c06cf708 100644 --- a/bin/columns.lisp +++ b/bin/columns.lisp @@ -2,7 +2,7 @@ (defcolumns BINARY_STAMP - (ONE_LINE_INSTRUCTION :BOOLEAN) + (ONE_LINE_INSTRUCTION :binary) COUNTER INST ARGUMENT_1_HI @@ -11,19 +11,19 @@ ARGUMENT_2_LO RESULT_HI RESULT_LO - (SMALL :BOOLEAN) - (BITS :BOOLEAN) - (BIT_B_4 :BOOLEAN) - (NEG :BOOLEAN) + (SMALL :binary) + (BITS :binary) + (BIT_B_4 :binary) + (NEG :binary) LOW_4 - (BIT_1 :BOOLEAN) + (BIT_1 :binary) PIVOT - (BYTE_1 :BYTE) - (BYTE_2 :BYTE) - (BYTE_3 :BYTE) - (BYTE_4 :BYTE) - (BYTE_5 :BYTE) - (BYTE_6 :BYTE) + (BYTE_1 :byte) + (BYTE_2 :byte) + (BYTE_3 :byte) + (BYTE_4 :byte) + (BYTE_5 :byte) + (BYTE_6 :byte) ACC_1 ACC_2 ACC_3 @@ -39,7 +39,7 @@ XOR_BYTE_LO NOT_BYTE_HI NOT_BYTE_LO - (IS_DATA :BOOLEAN)) + (IS_DATA :binary)) ;; aliases (defalias diff --git a/ec_data/columns.lisp b/ec_data/columns.lisp index aa7141e8..6b98946a 100644 --- a/ec_data/columns.lisp +++ b/ec_data/columns.lisp @@ -7,20 +7,20 @@ LIMB TYPE - (EC_RECOVER :boolean) - (EC_ADD :boolean) - (EC_MUL :boolean) - (EC_PAIRING :boolean) + (EC_RECOVER :binary) + (EC_ADD :binary) + (EC_MUL :binary) + (EC_PAIRING :binary) TOTAL_PAIRINGS ACC_PAIRINGS - (COMPARISONS :boolean) - (EQUALITIES :boolean) + (COMPARISONS :binary) + (EQUALITIES :binary) - (HURDLE :boolean) - (PRELIMINARY_CHECKS_PASSED :boolean) - (ALL_CHECKS_PASSED :boolean) + (HURDLE :binary) + (PRELIMINARY_CHECKS_PASSED :binary) + (ALL_CHECKS_PASSED :binary) SQUARE CUBE @@ -45,9 +45,9 @@ EXT_RES_LO EXT_RES_HI - (THIS_IS_NOT_ON_G2 :boolean) - (THIS_IS_NOT_ON_G2_ACC :boolean) - (SOMETHING_WASNT_ON_G2 :boolean) + (THIS_IS_NOT_ON_G2 :binary) + (THIS_IS_NOT_ON_G2_ACC :binary) + (SOMETHING_WASNT_ON_G2 :binary) ) ;; aliases diff --git a/hub/columns.lisp b/hub/columns.lisp index 4c7a356f..b6e18615 100644 --- a/hub/columns.lisp +++ b/hub/columns.lisp @@ -20,12 +20,12 @@ INSTRUCTION_ARGUMENT_LO BYTECODE_ADDRESS_HI BYTECODE_ADDRESS_LO - (IS_INITCODE :BOOLEAN) + (IS_INITCODE :binary) PC CONTEXT_NUMBER MAXIMUM_CONTEXT - (CONTEXT_TYPE :BOOLEAN) + (CONTEXT_TYPE :binary) CALLER_CONTEXT RETURNER_CONTEXT @@ -37,12 +37,12 @@ RETURNDATA_OFFSET RETURNDATA_SIZE - (CONTEXT_REVERTS :BOOLEAN) - (CONTEXT_REVERTS_BY_CHOICE :BOOLEAN) - (CONTEXT_REVERTS_BY_FORCE :BOOLEAN) + (CONTEXT_REVERTS :binary) + (CONTEXT_REVERTS_BY_CHOICE :binary) + (CONTEXT_REVERTS_BY_FORCE :binary) CONTEXT_REVERT_STORAGE_STAMP - (CONTEXT_RUNS_OUT_OF_GAS :BOOLEAN) - (CONTEXT_ERROR :BOOLEAN) + (CONTEXT_RUNS_OUT_OF_GAS :binary) + (CONTEXT_ERROR :binary) CALLSTACK_DEPTH VALUE @@ -50,11 +50,11 @@ ;; ===================================================================== ;; INSTRUCTION DECODED FLAGS ;;===================================================================== - (STATICCALL_FLAG :BOOLEAN) - (DELEGATECALL_FLAG :BOOLEAN) - (CODECALL_FLAG :BOOLEAN) - ;;(JUMP_FLAG :BOOLEAN) - ;;(PUSH_FLAG :BOOLEAN) + (STATICCALL_FLAG :binary) + (DELEGATECALL_FLAG :binary) + (CODECALL_FLAG :binary) + ;;(JUMP_FLAG :binary) + ;;(PUSH_FLAG :binary) ;; ===================================================================== ;; STACK STUFF @@ -68,27 +68,27 @@ (VAL_LO :array [1:4]) (VAL_HI :array [1:4]) (ITEM_STACK_STAMP :array [1:4]) - (POP :array [1:4] :boolean) + (POP :array [1:4] :binary) ALPHA DELTA HEIGHT_UNDER HEIGHT_OVER - (STACK_EXCEPTION :BOOLEAN) - (STACK_UNDERFLOW_EXCEPTION :BOOLEAN) - (STACK_OVERFLOW_EXCEPTION :BOOLEAN) + (STACK_EXCEPTION :binary) + (STACK_UNDERFLOW_EXCEPTION :binary) + (STACK_OVERFLOW_EXCEPTION :binary) ;; Imported from the ID STATIC_GAS INST_PARAM - (TWO_LINES_INSTRUCTION :BOOLEAN) + (TWO_LINES_INSTRUCTION :binary) STACK_PATTERN - (COUNTER :BOOLEAN) + (COUNTER :binary) - (FLAG_1 :BOOLEAN) - (FLAG_2 :BOOLEAN) - (FLAG_3 :BOOLEAN) + (FLAG_1 :binary) + (FLAG_2 :binary) + (FLAG_3 :binary) TX_NUM @@ -100,18 +100,18 @@ ;; WCP_STAMP ;; WRM_STAMP - (ARITHMETIC_INST :BOOLEAN) - (BINARY_INST :BOOLEAN) - (RAM_INST :BOOLEAN) - (SHIFT_INST :BOOLEAN) - (STORAGE_INST :BOOLEAN) - (WORD_COMPARISON_INST :BOOLEAN) - ;; (WRM_INST :BOOLEAN) - - (ALU_ADD_INST :BOOLEAN) - (ALU_EXT_INST :BOOLEAN) - (ALU_MOD_INST :BOOLEAN) - (ALU_MUL_INST :BOOLEAN)) + (ARITHMETIC_INST :binary) + (BINARY_INST :binary) + (RAM_INST :binary) + (SHIFT_INST :binary) + (STORAGE_INST :binary) + (WORD_COMPARISON_INST :binary) + ;; (WRM_INST :binary) + + (ALU_ADD_INST :binary) + (ALU_EXT_INST :binary) + (ALU_MOD_INST :binary) + (ALU_MUL_INST :binary)) (definterleaved CN_POW_4 (CONTEXT_NUMBER CONTEXT_NUMBER CONTEXT_NUMBER CONTEXT_NUMBER)) (definterleaved HEIGHT_1234 ([ITEM_HEIGHT 1] [ITEM_HEIGHT 2] [ITEM_HEIGHT 3] [ITEM_HEIGHT 4])) diff --git a/hub/mmio/columns.lisp b/hub/mmio/columns.lisp index 3d2701a0..2627fa46 100644 --- a/hub/mmio/columns.lisp +++ b/hub/mmio/columns.lisp @@ -17,9 +17,9 @@ VAL_B_NEW VAL_C_NEW - (BYTE_A :BYTE) - (BYTE_B :BYTE) - (BYTE_C :BYTE) + (BYTE_A :byte) + (BYTE_B :byte) + (BYTE_C :byte) ACC_A ACC_B @@ -31,7 +31,7 @@ CONTEXT_SOURCE CONTEXT_TARGET - (IS_INIT :BOOLEAN) + (IS_INIT :binary) SOURCE_LIMB_OFFSET TARGET_LIMB_OFFSET @@ -39,36 +39,36 @@ TARGET_BYTE_OFFSET SIZE - (FAST :BOOLEAN) - (ERF :BOOLEAN) + (FAST :binary) + (ERF :binary) STACK_VALUE_HIGH STACK_VALUE_LOW - (STACK_VALUE_LO_BYTE :BYTE) - (STACK_VALUE_HI_BYTE :BYTE) + (STACK_VALUE_LO_BYTE :byte) + (STACK_VALUE_HI_BYTE :byte) ACC_VAL_HI ACC_VAL_LO - (EXO_IS_ROM :BOOLEAN) - (EXO_IS_LOG :BOOLEAN) - (EXO_IS_HASH :BOOLEAN) ;previously EXO_IS_SHA3 - (EXO_IS_TXCD :BOOLEAN) + (EXO_IS_ROM :binary) + (EXO_IS_LOG :binary) + (EXO_IS_HASH :binary) ;previously EXO_IS_SHA3 + (EXO_IS_TXCD :binary) INDEX_X VAL_X - (BYTE_X :BYTE) + (BYTE_X :byte) ACC_X TX_NUM LOG_NUM ;to be replaced with a single NUM column - (BIN_1 :BOOLEAN) - (BIN_2 :BOOLEAN) - (BIN_3 :BOOLEAN) - (BIN_4 :BOOLEAN) - (BIN_5 :BOOLEAN) + (BIN_1 :binary) + (BIN_2 :binary) + (BIN_3 :binary) + (BIN_4 :binary) + (BIN_5 :binary) ACC_1 ACC_2 diff --git a/hub/mmu/columns.lisp b/hub/mmu/columns.lisp index 188f3036..b429ef20 100644 --- a/hub/mmu/columns.lisp +++ b/hub/mmu/columns.lisp @@ -3,7 +3,7 @@ (defcolumns RAM_STAMP MICRO_INSTRUCTION_STAMP - (IS_MICRO_INSTRUCTION :BOOLEAN) + (IS_MICRO_INSTRUCTION :binary) OFF_1_LO OFF_2_HI @@ -21,15 +21,15 @@ CONTEXT_TARGET COUNTER - (OFFSET_OUT_OF_BOUNDS :BOOLEAN) + (OFFSET_OUT_OF_BOUNDS :binary) PRECOMPUTATION TERNARY MICRO_INSTRUCTION - (EXO_IS_ROM :BOOLEAN) - (EXO_IS_LOG :BOOLEAN) - (EXO_IS_HASH :BOOLEAN) - (EXO_IS_TXCD :BOOLEAN) + (EXO_IS_ROM :binary) + (EXO_IS_LOG :binary) + (EXO_IS_HASH :binary) + (EXO_IS_TXCD :binary) SOURCE_LIMB_OFFSET SOURCE_BYTE_OFFSET @@ -37,24 +37,24 @@ TARGET_BYTE_OFFSET SIZE - (NIB_1 :NIBBLE) - (NIB_2 :NIBBLE) - (NIB_3 :NIBBLE) - (NIB_4 :NIBBLE) - (NIB_5 :NIBBLE) - (NIB_6 :NIBBLE) - (NIB_7 :NIBBLE) - (NIB_8 :NIBBLE) - (NIB_9 :NIBBLE) - - (BYTE_1 :BYTE) - (BYTE_2 :BYTE) - (BYTE_3 :BYTE) - (BYTE_4 :BYTE) - (BYTE_5 :BYTE) - (BYTE_6 :BYTE) - (BYTE_7 :BYTE) - (BYTE_8 :BYTE) + (NIB_1 :nibble) + (NIB_2 :nibble) + (NIB_3 :nibble) + (NIB_4 :nibble) + (NIB_5 :nibble) + (NIB_6 :nibble) + (NIB_7 :nibble) + (NIB_8 :nibble) + (NIB_9 :nibble) + + (BYTE_1 :byte) + (BYTE_2 :byte) + (BYTE_3 :byte) + (BYTE_4 :byte) + (BYTE_5 :byte) + (BYTE_6 :byte) + (BYTE_7 :byte) + (BYTE_8 :byte) ACC_1 ACC_2 @@ -65,14 +65,14 @@ ACC_7 ACC_8 - (BIT_1 :BOOLEAN) - (BIT_2 :BOOLEAN) - (BIT_3 :BOOLEAN) - (BIT_4 :BOOLEAN) - (BIT_5 :BOOLEAN) - (BIT_6 :BOOLEAN) - (BIT_7 :BOOLEAN) - (BIT_8 :BOOLEAN) + (BIT_1 :binary) + (BIT_2 :binary) + (BIT_3 :binary) + (BIT_4 :binary) + (BIT_5 :binary) + (BIT_6 :binary) + (BIT_7 :binary) + (BIT_8 :binary) ALIGNED FAST @@ -88,8 +88,8 @@ TOTAL_NUMBER_OF_READS TOTAL_NUMBER_OF_PADDINGS - (TO_RAM :BOOLEAN) - (ERF :BOOLEAN) + (TO_RAM :binary) + (ERF :binary) RETURN_OFFSET RETURN_CAPACITY @@ -99,7 +99,7 @@ INFO - (IS_DATA :BOOLEAN)) + (IS_DATA :binary)) (defalias CSD CALL_STACK_DEPTH diff --git a/lookup_tables/tables/instruction_decoder.lisp b/lookup_tables/tables/instruction_decoder.lisp index 1649e4a7..e1c31d7c 100644 --- a/lookup_tables/tables/instruction_decoder.lisp +++ b/lookup_tables/tables/instruction_decoder.lisp @@ -6,103 +6,103 @@ ;; ;; Family flags ;; - (FAMILY_ADD :boolean) - (FAMILY_MOD :boolean) - (FAMILY_MUL :boolean) - (FAMILY_EXT :boolean) - (FAMILY_WCP :boolean) - (FAMILY_BIN :boolean) - (FAMILY_SHF :boolean) - (FAMILY_KEC :boolean) - (FAMILY_CONTEXT :boolean) - (FAMILY_ACCOUNT :boolean) - (FAMILY_COPY :boolean) - (FAMILY_TRANSACTION :boolean) - (FAMILY_BATCH :boolean) - (FAMILY_STACK_RAM :boolean) - (FAMILY_STORAGE :boolean) - (FAMILY_JUMP :boolean) - (FAMILY_MACHINE_STATE :boolean) - (FAMILY_PUSH_POP :boolean) - (FAMILY_DUP :boolean) - (FAMILY_SWAP :boolean) - (FAMILY_LOG :boolean) - (FAMILY_CREATE :boolean) - (FAMILY_CALL :boolean) - (FAMILY_HALT :boolean) - (FAMILY_INVALID :boolean) + (FAMILY_ADD :binary) + (FAMILY_MOD :binary) + (FAMILY_MUL :binary) + (FAMILY_EXT :binary) + (FAMILY_WCP :binary) + (FAMILY_BIN :binary) + (FAMILY_SHF :binary) + (FAMILY_KEC :binary) + (FAMILY_CONTEXT :binary) + (FAMILY_ACCOUNT :binary) + (FAMILY_COPY :binary) + (FAMILY_TRANSACTION :binary) + (FAMILY_BATCH :binary) + (FAMILY_STACK_RAM :binary) + (FAMILY_STORAGE :binary) + (FAMILY_JUMP :binary) + (FAMILY_MACHINE_STATE :binary) + (FAMILY_PUSH_POP :binary) + (FAMILY_DUP :binary) + (FAMILY_SWAP :binary) + (FAMILY_LOG :binary) + (FAMILY_CREATE :binary) + (FAMILY_CALL :binary) + (FAMILY_HALT :binary) + (FAMILY_INVALID :binary) ;; ;; Stack settings ;; - (PATTERN_ZERO_ZERO :boolean) - (PATTERN_ONE_ZERO :boolean) - (PATTERN_TWO_ZERO :boolean) - (PATTERN_ZERO_ONE :boolean) - (PATTERN_ONE_ONE :boolean) - (PATTERN_TWO_ONE :boolean) - (PATTERN_THREE_ONE :boolean) - (PATTERN_LOAD_STORE :boolean) - (PATTERN_DUP :boolean) - (PATTERN_SWAP :boolean) - (PATTERN_LOG :boolean) - (PATTERN_COPY :boolean) - (PATTERN_CALL :boolean) - (PATTERN_CREATE :boolean) + (PATTERN_ZERO_ZERO :binary) + (PATTERN_ONE_ZERO :binary) + (PATTERN_TWO_ZERO :binary) + (PATTERN_ZERO_ONE :binary) + (PATTERN_ONE_ONE :binary) + (PATTERN_TWO_ONE :binary) + (PATTERN_THREE_ONE :binary) + (PATTERN_LOAD_STORE :binary) + (PATTERN_DUP :binary) + (PATTERN_SWAP :binary) + (PATTERN_LOG :binary) + (PATTERN_COPY :binary) + (PATTERN_CALL :binary) + (PATTERN_CREATE :binary) (ALPHA :byte) (DELTA :byte) (NB_ADDED :byte) (NB_REMOVED :byte) STATIC_GAS - (TWO_LINES_INSTRUCTION :boolean) - (FORBIDDEN_IN_STATIC :boolean) - (ADDRESS_TRIMMING_INSTRUCTION :boolean) - (FLAG1 :boolean) - (FLAG2 :boolean) - (FLAG3 :boolean) - (FLAG4 :boolean) + (TWO_LINES_INSTRUCTION :binary) + (FORBIDDEN_IN_STATIC :binary) + (ADDRESS_TRIMMING_INSTRUCTION :binary) + (FLAG1 :binary) + (FLAG2 :binary) + (FLAG3 :binary) + (FLAG4 :binary) ;; ;; RAM settings ;; - (RAM_ENABLED :boolean) - (RAM_SOURCE_ROM :boolean) - (RAM_SOURCE_TXN_DATA :boolean) - (RAM_SOURCE_RAM :boolean) - (RAM_SOURCE_STACK :boolean) - (RAM_SOURCE_EC_DATA :boolean) - (RAM_SOURCE_EC_INFO :boolean) - (RAM_SOURCE_MODEXP_DATA :boolean) - (RAM_SOURCE_HASH_DATA :boolean) - (RAM_SOURCE_HASH_INFO :boolean) - (RAM_SOURCE_BLAKE_DATA :boolean) - (RAM_SOURCE_LOG_DATA :boolean) - (RAM_TARGET_ROM :boolean) - (RAM_TARGET_TXN_DATA :boolean) - (RAM_TARGET_RAM :boolean) - (RAM_TARGET_STACK :boolean) - (RAM_TARGET_EC_DATA :boolean) - (RAM_TARGET_EC_INFO :boolean) - (RAM_TARGET_MODEXP_DATA :boolean) - (RAM_TARGET_HASH_DATA :boolean) - (RAM_TARGET_HASH_INFO :boolean) - (RAM_TARGET_BLAKE_DATA :boolean) - (RAM_TARGET_LOG_DATA :boolean) + (RAM_ENABLED :binary) + (RAM_SOURCE_ROM :binary) + (RAM_SOURCE_TXN_DATA :binary) + (RAM_SOURCE_RAM :binary) + (RAM_SOURCE_STACK :binary) + (RAM_SOURCE_EC_DATA :binary) + (RAM_SOURCE_EC_INFO :binary) + (RAM_SOURCE_MODEXP_DATA :binary) + (RAM_SOURCE_HASH_DATA :binary) + (RAM_SOURCE_HASH_INFO :binary) + (RAM_SOURCE_BLAKE_DATA :binary) + (RAM_SOURCE_LOG_DATA :binary) + (RAM_TARGET_ROM :binary) + (RAM_TARGET_TXN_DATA :binary) + (RAM_TARGET_RAM :binary) + (RAM_TARGET_STACK :binary) + (RAM_TARGET_EC_DATA :binary) + (RAM_TARGET_EC_INFO :binary) + (RAM_TARGET_MODEXP_DATA :binary) + (RAM_TARGET_HASH_DATA :binary) + (RAM_TARGET_HASH_INFO :binary) + (RAM_TARGET_BLAKE_DATA :binary) + (RAM_TARGET_LOG_DATA :binary) ;; ;; Billing settings ;; BILLING_PER_WORD BILLING_PER_BYTE - (MXP_TYPE_1 :boolean) - (MXP_TYPE_2 :boolean) - (MXP_TYPE_3 :boolean) - (MXP_TYPE_4 :boolean) - (MXP_TYPE_5 :boolean) + (MXP_TYPE_1 :binary) + (MXP_TYPE_2 :binary) + (MXP_TYPE_3 :binary) + (MXP_TYPE_4 :binary) + (MXP_TYPE_5 :binary) ;; ;; ROM columns ;; - (IS_PUSH :boolean) - (IS_JUMPDEST :boolean) + (IS_PUSH :binary) + (IS_JUMPDEST :binary) ) diff --git a/mxp/columns.lisp b/mxp/columns.lisp index 82fa78f0..1d921393 100644 --- a/mxp/columns.lisp +++ b/mxp/columns.lisp @@ -4,14 +4,14 @@ STAMP CN CT - (ROOB :boolean) - (NOOP :boolean) - (MXPX :boolean) + (ROOB :binary) + (NOOP :binary) + (MXPX :binary) (INST :display :opcode) - (MXP_TYPE :boolean :array[5]) + (MXP_TYPE :binary :array[5]) GBYTE GWORD - (DEPLOYS :boolean) + (DEPLOYS :binary) OFFSET_1_LO OFFSET_2_LO OFFSET_1_HI @@ -23,7 +23,7 @@ MAX_OFFSET_1 MAX_OFFSET_2 MAX_OFFSET - (COMP :boolean) + (COMP :binary) (BYTE :byte :array[4]) (BYTE_A :byte) (BYTE_W :byte) @@ -41,4 +41,4 @@ QUAD_COST LIN_COST GAS_MXP - (EXPANDS :boolean)) + (EXPANDS :binary)) diff --git a/mxp/constraints.lisp b/mxp/constraints.lisp index 770eee78..505d9ee7 100644 --- a/mxp/constraints.lisp +++ b/mxp/constraints.lisp @@ -1,6 +1,6 @@ (module mxp) -(defconst +(defconst G_MEM 3 ;; 'G_memory' in Ethereum yellow paper SHORTCYCLE 3 LONGCYCLE 16 @@ -309,7 +309,7 @@ (+ (* GBYTE SIZE_1_LO) (* GWORD ACC_W))))) (defconstraint setting-gas-mxp (:guard (* (standing-hypothesis) (offsets-are-in-bounds))) - (if! (eq! INST RETURN) + (if (eq! INST RETURN) (= GAS_MXP (+ QUAD_COST (* DEPLOYS LIN_COST))) (= GAS_MXP (+ QUAD_COST LIN_COST)))) @@ -319,7 +319,7 @@ ;; 2.12 Consistency Constraints ;; ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defpermutation +(defpermutation (CN_perm STAMP_perm C_MEM_perm @@ -343,5 +343,3 @@ (= (next C_MEM_perm) C_MEM_NEW_perm))) (begin (vanishes! (next WORDS_perm)) (vanishes! (next C_MEM_perm)))))) - - diff --git a/rlpAddr/columns.lisp b/rlpAddr/columns.lisp index be00c57a..7c3a06f9 100644 --- a/rlpAddr/columns.lisp +++ b/rlpAddr/columns.lisp @@ -3,8 +3,8 @@ (defcolumns ;; INPUTS RECIPE - (RECIPE_1 :bool) - (RECIPE_2 :bool) + (RECIPE_1 :binary) + (RECIPE_2 :binary) ADDR_HI ;; hi part (4B) of the creator address ADDR_LO ;; lo part (16B) " DEP_ADDR_HI ;; hi part of the deploed addr @@ -16,7 +16,7 @@ KEC_LO ;; OUTPUTS LIMB ;; bytes of the output - (LC :bool) + (LC :binary) nBYTES ;; the number of bytes to read INDEX ;; Register columns @@ -26,9 +26,9 @@ ACC ACC_BYTESIZE POWER - (BIT1 :bool) + (BIT1 :binary) (BIT_ACC :byte) - (TINY_NON_ZERO_NONCE :bool)) + (TINY_NON_ZERO_NONCE :binary)) ;; aliases (defalias diff --git a/rlp_txn/columns.lisp b/rlp_txn/columns.lisp index 2a61efdd..88fab27a 100644 --- a/rlp_txn/columns.lisp +++ b/rlp_txn/columns.lisp @@ -4,37 +4,37 @@ ABS_TX_NUM LIMB nBYTES - (LIMB_CONSTRUCTED :boolean) - (LT :boolean) - (LX :boolean) + (LIMB_CONSTRUCTED :binary) + (LT :binary) + (LX :binary) INDEX_LT INDEX_LX ABS_TX_NUM_INFINY DATA_HI DATA_LO CODE_FRAGMENT_INDEX - (REQUIRES_EVM_EXECUTION :boolean) - (PHASE :boolean :array [0:14]) - (PHASE_END :boolean) + (REQUIRES_EVM_EXECUTION :binary) + (PHASE :binary :array [0:14]) + (PHASE_END :binary) TYPE COUNTER - (DONE :boolean) + (DONE :binary) nSTEP (INPUT :display :bytes :array [2]) (BYTE :byte :array [2]) (ACC :display :bytes :array [2]) ACC_BYTESIZE - (BIT :boolean) + (BIT :binary) BIT_ACC POWER RLP_LT_BYTESIZE RLP_LX_BYTESIZE - (LC_CORRECTION :boolean) - (IS_PREFIX :boolean) + (LC_CORRECTION :binary) + (IS_PREFIX :binary) PHASE_SIZE INDEX_DATA DATAGASCOST - (DEPTH :boolean :array [2]) + (DEPTH :binary :array [2]) ADDR_HI ADDR_LO ACCESS_TUPLE_BYTESIZE diff --git a/rlp_txrcpt/columns.lisp b/rlp_txrcpt/columns.lisp index 5e835e8f..79746163 100644 --- a/rlp_txrcpt/columns.lisp +++ b/rlp_txrcpt/columns.lisp @@ -7,28 +7,28 @@ ABS_LOG_NUM_MAX (LIMB :display :bytes) (nBYTES :byte) - (LIMB_CONSTRUCTED :boolean) + (LIMB_CONSTRUCTED :binary) INDEX INDEX_LOCAL - (PHASE :boolean :array [5]) - (PHASE_END :boolean) + (PHASE :binary :array [5]) + (PHASE_END :binary) COUNTER nSTEP - (DONE :boolean) + (DONE :binary) TXRCPT_SIZE (INPUT :display :bytes :array [4]) (BYTE :byte :array [4]) (ACC :display :bytes :array [4]) ACC_SIZE - (BIT :boolean) + (BIT :binary) (BIT_ACC :byte) POWER - (IS_PREFIX :boolean) - (LC_CORRECTION :boolean) + (IS_PREFIX :binary) + (LC_CORRECTION :binary) PHASE_SIZE - (DEPTH_1 :boolean) - (IS_TOPIC :boolean) - (IS_DATA :boolean) + (DEPTH_1 :binary) + (IS_TOPIC :binary) + (IS_DATA :binary) LOG_ENTRY_SIZE LOCAL_SIZE) diff --git a/rom/columns.lisp b/rom/columns.lisp index 3c1b6176..d787da01 100644 --- a/rom/columns.lisp +++ b/rom/columns.lisp @@ -4,7 +4,7 @@ CODE_FRAGMENT_INDEX CODE_FRAGMENT_INDEX_INFTY CODE_SIZE - (CODESIZE_REACHED :boolean) + (CODESIZE_REACHED :binary) PROGRAMME_COUNTER LIMB nBYTES @@ -14,16 +14,16 @@ COUNTER_MAX (PADDED_BYTECODE_BYTE :byte) ACC - (IS_PUSH :boolean) + (IS_PUSH :binary) PUSH_PARAMETER COUNTER_PUSH - (IS_PUSH_DATA :boolean) + (IS_PUSH_DATA :binary) PUSH_VALUE_HIGH PUSH_VALUE_LOW PUSH_VALUE_ACC - (PUSH_FUNNEL_BIT :boolean) + (PUSH_FUNNEL_BIT :binary) (OPCODE :byte) - (VALID_JUMP_DESTINATION :boolean)) + (VALID_JUMP_DESTINATION :binary)) (defalias PC PROGRAMME_COUNTER diff --git a/rom/constraints.lisp b/rom/constraints.lisp index 51b41f08..7dca918c 100644 --- a/rom/constraints.lisp +++ b/rom/constraints.lisp @@ -1,6 +1,6 @@ (module rom) -(defconst +(defconst PUSH_1 0x60 JUMPDEST 0x5b LLARGE 16 @@ -9,10 +9,10 @@ INVALID_OPCODE 0xfe) (defpurefun (if-not-eq A B then) - (if-not-zero (- A B) - then)) + (if (neq A B) + then)) -;; Binarity +;; Binarity (defconstraint binarities () (begin (is-binary CODESIZE_REACHED) (is-binary IS_PUSH_DATA) @@ -27,8 +27,7 @@ (remained-constant! X))) (defun (cfi-incrementing X) - (if-not-eq CFI - (+ (prev CFI) 1) + (if-not-eq CFI (+ (prev CFI) 1) (or! (remained-constant! X) (did-inc! X 1)))) (defpurefun (counter-constant X ct ctmax) @@ -202,5 +201,3 @@ (vanishes! PUSH_VALUE_HIGH)) (eq! PUSH_VALUE_ACC PUSH_VALUE_LOW) (vanishes! (next IS_PUSH_DATA))))))) - - diff --git a/romLex/columns.lisp b/romLex/columns.lisp index 2387355d..21693553 100644 --- a/romLex/columns.lisp +++ b/romLex/columns.lisp @@ -7,9 +7,9 @@ ADDR_HI ADDR_LO DEP_NUMBER - (DEP_STATUS :boolean) - (COMMIT_TO_STATE :boolean) - (READ_FROM_STATE :boolean)) + (DEP_STATUS :binary) + (COMMIT_TO_STATE :binary) + (READ_FROM_STATE :binary)) (defalias CFI CODE_FRAGMENT_INDEX) diff --git a/shf/columns.lisp b/shf/columns.lisp index c798c4c5..77967418 100644 --- a/shf/columns.lisp +++ b/shf/columns.lisp @@ -3,7 +3,7 @@ (defcolumns SHIFT_STAMP COUNTER - (ONE_LINE_INSTRUCTION :BOOLEAN) + (ONE_LINE_INSTRUCTION :binary) ARG_1_HI ARG_1_LO ARG_2_HI @@ -11,10 +11,10 @@ RES_HI RES_LO INST - (SHIFT_DIRECTION :BOOLEAN) - (BITS :BOOLEAN) - (NEG :BOOLEAN) - (KNOWN :BOOLEAN) + (SHIFT_DIRECTION :binary) + (BITS :binary) + (NEG :binary) + (KNOWN :binary) LEFT_ALIGNED_SUFFIX_HIGH ;decoded RIGHT_ALIGNED_PREFIX_HIGH ;decoded LEFT_ALIGNED_SUFFIX_LOW ;decoded @@ -22,20 +22,20 @@ ONES ;decoded LOW_3 MICRO_SHIFT_PARAMETER - (BIT_1 :BOOLEAN) - (BIT_2 :BOOLEAN) - (BIT_3 :BOOLEAN) - (BIT_4 :BOOLEAN) - (BIT_B_3 :BOOLEAN) - (BIT_B_4 :BOOLEAN) - (BIT_B_5 :BOOLEAN) - (BIT_B_6 :BOOLEAN) - (BIT_B_7 :BOOLEAN) - (BYTE_1 :BYTE) - (BYTE_2 :BYTE) - (BYTE_3 :BYTE) - (BYTE_4 :BYTE) - (BYTE_5 :BYTE) + (BIT_1 :binary) + (BIT_2 :binary) + (BIT_3 :binary) + (BIT_4 :binary) + (BIT_B_3 :binary) + (BIT_B_4 :binary) + (BIT_B_5 :binary) + (BIT_B_6 :binary) + (BIT_B_7 :binary) + (BYTE_1 :byte) + (BYTE_2 :byte) + (BYTE_3 :byte) + (BYTE_4 :byte) + (BYTE_5 :byte) ACC_1 ACC_2 ACC_3 @@ -51,7 +51,7 @@ SHB_6_LO SHB_7_HI SHB_7_LO - (IS_DATA :BOOLEAN) ;turns on exactly when stamp is non zero + (IS_DATA :binary) ;turns on exactly when stamp is non zero ) diff --git a/stp/columns.lisp b/stp/columns.lisp index 7a21a26e..3d4b8200 100644 --- a/stp/columns.lisp +++ b/stp/columns.lisp @@ -4,8 +4,8 @@ STAMP CT CT_MAX - (INSTRUCTION_TYPE :BOOLEAN) - (CALL_CAN_TRANSFER_VALUE :BOOLEAN) + (INSTRUCTION_TYPE :binary) + (CALL_CAN_TRANSFER_VALUE :binary) ;; GAS_ACTUAL GAS_MXP @@ -17,19 +17,19 @@ VAL_HI VAL_LO ;; - (TO_EXISTS :BOOLEAN) - (TO_WARM :BOOLEAN) - (OUT_OF_GAS_EXCEPTION :BOOLEAN) + (TO_EXISTS :binary) + (TO_WARM :binary) + (OUT_OF_GAS_EXCEPTION :binary) ;; - (ABORT :BOOLEAN) + (ABORT :binary) CALL_STACK_DEPTH FROM_BALANCE TO_NONCE - (TO_HAS_CODE :BOOLEAN) + (TO_HAS_CODE :binary) ;; - (WCP_FLAG :BOOLEAN) - (MOD_FLAG :BOOLEAN) - (EXOGENOUS_MODULE_INSTRUCTION :BYTE) + (WCP_FLAG :binary) + (MOD_FLAG :binary) + (EXOGENOUS_MODULE_INSTRUCTION :byte) ARG_1_HI ARG_1_LO ARG_2_LO diff --git a/trm/columns.lisp b/trm/columns.lisp index 063cfa25..bebbd048 100644 --- a/trm/columns.lisp +++ b/trm/columns.lisp @@ -5,15 +5,15 @@ ADDR_HI ADDR_LO TRM_ADDR_HI - (IS_PREC :BOOLEAN) + (IS_PREC :binary) ;; CT - (BYTE_HI :BYTE) - (BYTE_LO :BYTE) + (BYTE_HI :byte) + (BYTE_LO :byte) ACC_HI ACC_LO ACC_T ;; - (PBIT :BOOLEAN) - (ONES :BOOLEAN) + (PBIT :binary) + (ONES :binary) ) diff --git a/trm_sally/columns.lisp b/trm_sally/columns.lisp index 8e43984e..693b445e 100644 --- a/trm_sally/columns.lisp +++ b/trm_sally/columns.lisp @@ -5,15 +5,15 @@ ADDR_HI ADDR_LO TRM_ADDR_HI - (IS_PREC :BOOLEAN) + (IS_PREC :binary) ;; CT - (BYTE_HI :BYTE) - (BYTE_LO :BYTE) + (BYTE_HI :byte) + (BYTE_LO :byte) ACC_HI ACC_LO ACC_T ;; - (PBIT :BOOLEAN) - (ONES :BOOLEAN) + (PBIT :binary) + (ONES :binary) ) diff --git a/txn_data/columns.lisp b/txn_data/columns.lisp index f25873ee..d438188e 100644 --- a/txn_data/columns.lisp +++ b/txn_data/columns.lisp @@ -15,7 +15,7 @@ VALUE TO_HI TO_LO - (IS_DEP :boolean) + (IS_DEP :binary) GAS_LIMIT INITIAL_GAS GAS_PRICE @@ -24,15 +24,15 @@ COINBASE_LO CALL_DATA_SIZE INIT_CODE_SIZE - (TYPE0 :boolean) - (TYPE1 :boolean) - (TYPE2 :boolean) - (REQUIRES_EVM_EXECUTION :boolean) + (TYPE0 :binary) + (TYPE1 :binary) + (TYPE2 :binary) + (REQUIRES_EVM_EXECUTION :binary) LEFTOVER_GAS REFUND_COUNTER REFUND_AMOUNT CUMULATIVE_CONSUMED_GAS - (STATUS_CODE :boolean) + (STATUS_CODE :binary) PHASE_RLP_TXN PHASE_RLP_TXNRCPT CODE_FRAGMENT_INDEX @@ -41,7 +41,7 @@ OUTGOING_RLP_TXNRCPT WCP_ARG_ONE_LO WCP_ARG_TWO_LO - (WCP_RES_LO :boolean) + (WCP_RES_LO :binary) WCP_INST) (defalias diff --git a/wcp/columns.lisp b/wcp/columns.lisp index c9b64e77..ab541995 100644 --- a/wcp/columns.lisp +++ b/wcp/columns.lisp @@ -2,7 +2,7 @@ (defcolumns WORD_COMPARISON_STAMP - (ONE_LINE_INSTRUCTION :BOOLEAN) + (ONE_LINE_INSTRUCTION :binary) COUNTER INST ARGUMENT_1_HI @@ -11,25 +11,25 @@ ARGUMENT_2_LO RESULT_HI RESULT_LO - (BITS :BOOLEAN) - (NEG_1 :BOOLEAN) - (NEG_2 :BOOLEAN) - (BYTE_1 :BYTE) - (BYTE_2 :BYTE) - (BYTE_3 :BYTE) - (BYTE_4 :BYTE) - (BYTE_5 :BYTE) - (BYTE_6 :BYTE) + (BITS :binary) + (NEG_1 :binary) + (NEG_2 :binary) + (BYTE_1 :byte) + (BYTE_2 :byte) + (BYTE_3 :byte) + (BYTE_4 :byte) + (BYTE_5 :byte) + (BYTE_6 :byte) ACC_1 ACC_2 ACC_3 ACC_4 ACC_5 ACC_6 - (BIT_1 :BOOLEAN) - (BIT_2 :BOOLEAN) - (BIT_3 :BOOLEAN) - (BIT_4 :BOOLEAN)) + (BIT_1 :binary) + (BIT_2 :binary) + (BIT_3 :binary) + (BIT_4 :binary)) ;; aliases (defalias