Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to Corset 9 #35

Merged
merged 1 commit into from
Nov 2, 2023
Merged

chore: update to Corset 9 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions alu/add/columns.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
116 changes: 58 additions & 58 deletions alu/ext/columns.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

(defcolumns
STAMP
(OLI :BOOLEAN)
(OLI :binary)
CT
INST
;
Expand All @@ -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
)
60 changes: 30 additions & 30 deletions alu/mod/columns.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
)
48 changes: 24 additions & 24 deletions alu/mul/columns.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,43 @@
(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
ARG_2_HI
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
)

Expand Down
26 changes: 13 additions & 13 deletions bin/columns.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

(defcolumns
BINARY_STAMP
(ONE_LINE_INSTRUCTION :BOOLEAN)
(ONE_LINE_INSTRUCTION :binary)
COUNTER
INST
ARGUMENT_1_HI
Expand All @@ -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
Expand All @@ -39,7 +39,7 @@
XOR_BYTE_LO
NOT_BYTE_HI
NOT_BYTE_LO
(IS_DATA :BOOLEAN))
(IS_DATA :binary))

;; aliases
(defalias
Expand Down
24 changes: 12 additions & 12 deletions ec_data/columns.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading