Skip to content

Commit

Permalink
Merge branch 'master' into EC-precompile-MMU-instruction-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
OlivierBBB authored Dec 13, 2024
2 parents a1fb337 + dd809c6 commit d2b6087
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Before contributing, ensure you're familiar with:

- Our [Linea contribution guide](https://github.com/Consensys/linea-monorepo/blob/main/docs/contribute.md)
- Our [Linea code of conduct](https://github.com/Consensys/linea-monorepo/blob/main/docs/code-of-conduct.md)
- The [Besu contribution guide](https://github.com/Consensys/linea-monorepo/blob/main/https://wiki.hyperledger.org/display/BESU/Coding+Conventions), for Besu:Linea related contributions
- The [Besu contribution guide](https://wiki.hyperledger.org/display/BESU/Coding+Conventions), for Besu:Linea related contributions
- Our [Security policy](https://github.com/Consensys/linea-monorepo/blob/main/docs/security.md)


Expand All @@ -61,4 +61,4 @@ Before contributing, ensure you're familiar with:
- [Linea blog](https://linea.mirror.xyz)
- [Support](https://support.linea.build)
- [Discord](https://discord.gg/linea)
- [Twitter](https://twitter.com/LineaBuild)
- [X](https://x.com/LineaBuild)
2 changes: 1 addition & 1 deletion hub/constraints/generalities/context.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
(defconstraint generalities---context-numbers---imposing-CN_NEW-is-CALLER_CN---for-exceptions ()
(if-not-zero XAHOY (eq! CN_NEW CALLER_CN)))

(defconstraint generalities---context-numbers---imposing-CN_NEW-is-CALLER_CN---for-halting-instrutions ()
(defconstraint generalities---context-numbers---imposing-CN_NEW-is-CALLER_CN---for-halting-instructions ()
(if-not-zero PEEK_AT_STACK
(if-not-zero stack/HALT_FLAG
(eq! CN_NEW CALLER_CN))))
2 changes: 1 addition & 1 deletion mmu/instructions/right_padded_word_extraction.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
0
(right-padded-word-extraction---second-limb-byte-size))))

(defconstraint right-padded-word-extraction---setting-micro-instrution-constant-values (:guard (* MACRO IS_RIGHT_PADDED_WORD_EXTRACTION))
(defconstraint right-padded-word-extraction---setting-micro-instruction-constant-values (:guard (* MACRO IS_RIGHT_PADDED_WORD_EXTRACTION))
(begin
(eq! (shift micro/CN_S NB_PP_ROWS_RIGHT_PADDED_WORD_EXTRACTION_PO) macro/SRC_ID)
(vanishes! (shift micro/EXO_SUM NB_PP_ROWS_RIGHT_PADDED_WORD_EXTRACTION_PO))))
Expand Down

0 comments on commit d2b6087

Please sign in to comment.