Skip to content

Commit 78ad636

Browse files
OlivierBBBOlivierBBB
authored
Automatic vanishing constraints of misc/XXX_? columns when misc/XXX is inactive (#821)
1 parent c483d9e commit 78ad636

File tree

6 files changed

+134
-2
lines changed

6 files changed

+134
-2
lines changed

‎hub/osaka/columns/miscellaneous.lisp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
;; EXP columns (DONE)
1616
( EXP_INST :i16 )
17-
( EXP_DATA :array [5] :i128 )
17+
( EXP_DATA :array [5] :i128 ) ;;""
1818

1919
;; MMU columns (DONE)
2020
( MMU_INST :i16 :display :hex)
@@ -52,7 +52,7 @@
5252

5353
;; OOB columns
5454
(OOB_INST :i16 )
55-
(OOB_DATA :array[1:10] :i128 )
55+
(OOB_DATA :array[1:10] :i128 ) ;;""
5656

5757
;; STP columns
5858
( STP_INSTRUCTION :byte )

‎hub/osaka/constraints/miscellaneous-rows/automatic-vanishing/exp.lisp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
(module hub)
2+
3+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4+
;; ;;
5+
;; X Miscellaneous-rows ;;
6+
;; X.Y Automatic vanishing constraints ;;
7+
;; X.Y.Z EXP sub-perspective ;;
8+
;; ;;
9+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10+
11+
12+
(defconstraint misc-rows---automatic-vanishing-of-columns-in-inactive-sub-perspectives---EXP-sub-perspective
13+
(:guard PEEK_AT_MISCELLANEOUS)
14+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
15+
(if-zero misc/EXP_FLAG
16+
(begin
17+
(vanishes! misc/EXP_INST )
18+
(for k [5] (vanishes! [ misc/EXP_DATA k ] )) ;; ""
19+
)))

‎hub/osaka/constraints/miscellaneous-rows/automatic-vanishing/mmu.lisp‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
(module hub)
2+
3+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4+
;; ;;
5+
;; X Miscellaneous-rows ;;
6+
;; X.Y Automatic vanishing constraints ;;
7+
;; X.Y.Z MMU sub-perspective ;;
8+
;; ;;
9+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10+
11+
12+
(defconstraint misc-rows---automatic-vanishing-of-columns-in-inactive-sub-perspectives---MMU-sub-perspective
13+
(:guard PEEK_AT_MISCELLANEOUS)
14+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
15+
(if-zero misc/MMU_FLAG
16+
(begin
17+
(vanishes! misc/MMU_INST )
18+
(vanishes! misc/MMU_SRC_ID )
19+
(vanishes! misc/MMU_TGT_ID )
20+
(vanishes! misc/MMU_AUX_ID )
21+
(vanishes! misc/MMU_SRC_OFFSET_LO )
22+
(vanishes! misc/MMU_SRC_OFFSET_HI )
23+
(vanishes! misc/MMU_TGT_OFFSET_LO )
24+
(vanishes! misc/MMU_SIZE )
25+
(vanishes! misc/MMU_REF_OFFSET )
26+
(vanishes! misc/MMU_REF_SIZE )
27+
(vanishes! misc/MMU_SUCCESS_BIT )
28+
(vanishes! misc/MMU_LIMB_1 )
29+
(vanishes! misc/MMU_LIMB_2 )
30+
(vanishes! misc/MMU_PHASE )
31+
(vanishes! misc/MMU_EXO_SUM )
32+
)))

‎hub/osaka/constraints/miscellaneous-rows/automatic-vanishing/mxp.lisp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
(module hub)
2+
3+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4+
;; ;;
5+
;; X Miscellaneous-rows ;;
6+
;; X.Y Automatic vanishing constraints ;;
7+
;; X.Y.Z MXP sub-perspective ;;
8+
;; ;;
9+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10+
11+
12+
(defconstraint misc-rows---automatic-vanishing-of-columns-in-inactive-sub-perspectives---MXP-sub-perspective
13+
(:guard PEEK_AT_MISCELLANEOUS)
14+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
15+
(if-zero misc/MXP_FLAG
16+
(begin
17+
(vanishes! misc/MXP_INST )
18+
(vanishes! misc/MXP_MXPX )
19+
(vanishes! misc/MXP_DEPLOYS )
20+
(vanishes! misc/MXP_OFFSET_1_HI )
21+
(vanishes! misc/MXP_OFFSET_1_LO )
22+
(vanishes! misc/MXP_OFFSET_2_HI )
23+
(vanishes! misc/MXP_OFFSET_2_LO )
24+
(vanishes! misc/MXP_SIZE_1_HI )
25+
(vanishes! misc/MXP_SIZE_1_LO )
26+
(vanishes! misc/MXP_SIZE_2_HI )
27+
(vanishes! misc/MXP_SIZE_2_LO )
28+
(vanishes! misc/MXP_WORDS )
29+
(vanishes! misc/MXP_GAS_MXP )
30+
(vanishes! misc/MXP_SIZE_1_NONZERO_NO_MXPX )
31+
(vanishes! misc/MXP_SIZE_2_NONZERO_NO_MXPX )
32+
)))
33+

‎hub/osaka/constraints/miscellaneous-rows/automatic-vanishing/oob.lisp‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
(module hub)
2+
3+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4+
;; ;;
5+
;; X Miscellaneous-rows ;;
6+
;; X.Y Automatic vanishing constraints ;;
7+
;; X.Y.Z OOB sub-perspective ;;
8+
;; ;;
9+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10+
11+
12+
(defconstraint misc-rows---automatic-vanishing-of-columns-in-inactive-sub-perspectives---OOB-sub-perspective
13+
(:guard PEEK_AT_MISCELLANEOUS)
14+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
15+
(if-zero misc/OOB_FLAG
16+
(begin
17+
(vanishes! misc/OOB_INST )
18+
(for k [1:10] (vanishes! [ misc/OOB_DATA k ] )) ;; ""
19+
)))

‎hub/osaka/constraints/miscellaneous-rows/automatic-vanishing/stp.lisp‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
(module hub)
2+
3+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
4+
;; ;;
5+
;; X Miscellaneous-rows ;;
6+
;; X.Y Automatic vanishing constraints ;;
7+
;; X.Y.Z STP sub-perspective ;;
8+
;; ;;
9+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10+
11+
12+
(defconstraint misc-rows---automatic-vanishing-of-columns-in-inactive-sub-perspectives---STP-sub-perspective
13+
(:guard PEEK_AT_MISCELLANEOUS)
14+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
15+
(if-zero misc/STP_FLAG
16+
(begin
17+
(vanishes! misc/STP_INSTRUCTION )
18+
(vanishes! misc/STP_GAS_HI )
19+
(vanishes! misc/STP_GAS_LO )
20+
(vanishes! misc/STP_VALUE_HI )
21+
(vanishes! misc/STP_VALUE_LO )
22+
(vanishes! misc/STP_EXISTS )
23+
(vanishes! misc/STP_WARMTH )
24+
(vanishes! misc/STP_OOGX )
25+
(vanishes! misc/STP_GAS_MXP )
26+
(vanishes! misc/STP_GAS_UPFRONT_GAS_COST )
27+
(vanishes! misc/STP_GAS_PAID_OUT_OF_POCKET )
28+
(vanishes! misc/STP_GAS_STIPEND )
29+
)))

0 commit comments

Comments
 (0)