MXP redesign

Makefile

@@ -47,9 +47,11 @@ LOG_INFO := loginfo
 
 MMU :=  mmu
 
-MMIO := mmio 
+MMIO := mmio
 
-MXP := mxp
+MXP_LONDON := mxp/london
+
+MXP_CANCUN := mxp/cancun
 
 OOB_LONDON := oob/london
 
@@ -123,27 +125,31 @@ ZKEVM_MODULES_COMMON := ${CONSTANTS} \
 ZKEVM_MODULES_LONDON := ${ZKEVM_MODULES_COMMON} \
 		 ${BLOCKDATA_LONDON} \
 		 ${HUB_LONDON} \
+		 ${MXP_LONDON} \
 		 ${OOB_LONDON} \
 		 ${INST_DECODER_LONDON} \
 		 ${TXN_DATA_LONDON}
 
 ZKEVM_MODULES_PARIS := ${ZKEVM_MODULES_COMMON} \
 		 ${BLOCKDATA_PARIS} \
 		 ${HUB_LONDON} \
+		 ${MXP_LONDON} \
 		 ${OOB_LONDON} \
 		 ${INST_DECODER_LONDON} \
 		 ${TXN_DATA_LONDON}
 
 ZKEVM_MODULES_SHANGHAI := ${ZKEVM_MODULES_COMMON} \
  		 ${BLOCKDATA_PARIS} \
 		 ${HUB_SHANGHAI} \
+		 ${MXP_LONDON} \
 		 ${OOB_SHANGHAI} \
 		 ${INST_DECODER_LONDON} \
 		 ${TXN_DATA_SHANGHAI}
 
 ZKEVM_MODULES_CANCUN := ${ZKEVM_MODULES_COMMON} \
  		 ${BLOCKDATA_CANCUN} \
 		 ${HUB_CANCUN} \
+		 ${MXP_CANCUN} \
 		 ${OOB_SHANGHAI} \
 		 ${INST_DECODER_CANCUN} \
 		 ${TXN_DATA_CANCUN}

constants/constants.lisp

@@ -92,6 +92,7 @@
   ;; Transient Operations                                 ;; appear in Cancun (EIP-1153)
   EVM_INST_TLOAD                            0x5C
   EVM_INST_TSTORE                           0x5D
+  EVM_INST_MCOPY                            0x5E
   ;; Push Operations
   EVM_INST_PUSH0                            0x5F          ;; post Shanghai
   EVM_INST_PUSH1                            0x60
@@ -508,6 +509,4 @@
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;            ;;
   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   WCP_INST_GEQ                              0x0E
-  WCP_INST_LEQ                              0x0F)
-
-
+  WCP_INST_LEQ                              0x0F)

hub/cancun/columns/miscellaneous.lisp

@@ -47,7 +47,6 @@
 		 ( MXP_SIZE_2_LO                :i128 )
 		 ( MXP_WORDS                    :i128 )
 		 ( MXP_GAS_MXP                  :i128 )
-		 ( MXP_MTNTOP                   :binary@prove )
 		 ( MXP_SIZE_1_NONZERO_NO_MXPX   :binary@prove )
 		 ( MXP_SIZE_2_NONZERO_NO_MXPX   :binary@prove )
 

hub/cancun/columns/stack.lisp

@@ -22,6 +22,7 @@
    ( CALL_FLAG               :binary )
    ( CON_FLAG                :binary )
    ( COPY_FLAG               :binary )
+   ( MCOPY_FLAG              :binary )
    ( CREATE_FLAG             :binary )
    ( DUP_FLAG                :binary )
    ( EXT_FLAG                :binary )

hub/cancun/constraints/instruction-handling/call/generalities/universal.lisp

@@ -82,17 +82,17 @@
 
 (defconstraint    call-instruction---setting-MXP-instruction-parameters    (:guard    (call-instruction---standard-precondition))
                   (if-not-zero    (shift    misc/MXP_FLAG    CALL_misc_row___row_offset)
-                                  (set-MXP-instruction-type-5    CALL_misc_row___row_offset                ;; row offset kappa
-                                                                 (call-instruction---STACK-instruction)    ;; instruction
-                                                                 (call-instruction---STACK-cdo-hi)         ;; call data offset high
-                                                                 (call-instruction---STACK-cdo-lo)         ;; call data offset low
-                                                                 (call-instruction---STACK-cds-hi)         ;; call data size high
-                                                                 (call-instruction---STACK-cds-lo)         ;; call data size low
-                                                                 (call-instruction---STACK-r@o-hi)         ;; return at offset high
-                                                                 (call-instruction---STACK-r@o-lo)         ;; return at offset low
-                                                                 (call-instruction---STACK-r@c-hi)         ;; return at capacity high
-                                                                 (call-instruction---STACK-r@c-lo)         ;; return at capacity low
-                                                                 )
+                                  (set-MXP-instruction---for-CALL-type    CALL_misc_row___row_offset                ;; row offset kappa
+                                                                          (call-instruction---STACK-instruction)    ;; instruction
+                                                                          (call-instruction---STACK-cdo-hi)         ;; call data offset high
+                                                                          (call-instruction---STACK-cdo-lo)         ;; call data offset low
+                                                                          (call-instruction---STACK-cds-hi)         ;; call data size high
+                                                                          (call-instruction---STACK-cds-lo)         ;; call data size low
+                                                                          (call-instruction---STACK-r@o-hi)         ;; return at offset high
+                                                                          (call-instruction---STACK-r@o-lo)         ;; return at offset low
+                                                                          (call-instruction---STACK-r@c-hi)         ;; return at capacity high
+                                                                          (call-instruction---STACK-r@c-lo)         ;; return at capacity low
+                                                                          )
                                   ))
 
 (defconstraint    call-instruction---justifying-mxpx                       (:guard    (call-instruction---standard-precondition))

hub/cancun/constraints/instruction-handling/copy/generalities.lisp

@@ -157,7 +157,7 @@
 
 (defun (copy-instruction---trigger_OOB)    (copy-instruction---is-RETURNDATACOPY))
 (defun (copy-instruction---trigger_MXP)    (- 1 stack/RDCX))
-(defun (copy-instruction---trigger_MMU)    (* (- 1 XAHOY) (shift misc/MXP_MTNTOP ROFF_COPY_INST_MISCELLANEOUS_ROW)))
+(defun (copy-instruction---trigger_MMU)    (* (- 1 XAHOY) (shift misc/MXP_SIZE_1_NONZERO_NO_MXPX ROFF_COPY_INST_MISCELLANEOUS_ROW)))
 
 (defconstraint    copy-instruction---misc-row---setting-OOB-instruction (:guard (copy-instruction---standard-precondition))
                   (if-not-zero (shift misc/OOB_FLAG ROFF_COPY_INST_MISCELLANEOUS_ROW)
@@ -178,13 +178,13 @@
 
 (defconstraint    copy-instruction---misc-row---setting-MXP-instruction (:guard (copy-instruction---standard-precondition))
                   (if-not-zero (shift misc/MXP_FLAG ROFF_COPY_INST_MISCELLANEOUS_ROW)
-                               (set-MXP-instruction-type-4 ROFF_COPY_INST_MISCELLANEOUS_ROW ;; row offset kappa
-                                                           stack/INSTRUCTION                      ;; instruction
-                                                           0                                      ;; deploys (bit modifying the behaviour of RETURN pricing)
-                                                           (copy-instruction---target-offset-hi)  ;; offset high
-                                                           (copy-instruction---target-offset-lo)  ;; offset low
-                                                           (copy-instruction---size-hi)           ;; size high
-                                                           (copy-instruction---size-lo))))        ;; size low
+                               (set-MXP-instruction---single-mxp-offset-instructions   ROFF_COPY_INST_MISCELLANEOUS_ROW ;; row offset kappa
+                                                                                       stack/INSTRUCTION                      ;; instruction
+                                                                                       0                                      ;; deploys (bit modifying the behaviour of RETURN pricing)
+                                                                                       (copy-instruction---target-offset-hi)  ;; offset high
+                                                                                       (copy-instruction---target-offset-lo)  ;; offset low
+                                                                                       (copy-instruction---size-hi)           ;; size high
+                                                                                       (copy-instruction---size-lo))))        ;; size low
 
 (defconstraint    copy-instruction---misc-row---setting-MXPX (:guard (copy-instruction---standard-precondition))
                   (if-zero    (shift    misc/MXP_FLAG    ROFF_COPY_INST_MISCELLANEOUS_ROW)

hub/cancun/constraints/instruction-handling/create/constraints/generalities.lisp

@@ -47,14 +47,14 @@
 
 (defconstraint    create-instruction---setting-the-MXP-instruction                          (:guard    (create-instruction---generic-precondition))
                   (if-not-zero    (shift    misc/MXP_FLAG    CREATE_miscellaneous_row___row_offset)
-                                  (set-MXP-instruction-type-4    CREATE_miscellaneous_row___row_offset       ;; row offset kappa
-                                                                 (create-instruction---instruction)          ;; instruction
-                                                                 0                                           ;; bit modifying the behaviour of RETURN pricing
-                                                                 (create-instruction---STACK-offset-hi)      ;; offset high
-                                                                 (create-instruction---STACK-offset-lo)      ;; offset low
-                                                                 (create-instruction---STACK-size-hi)        ;; size high
-                                                                 (create-instruction---STACK-size-lo))       ;; size low
-                                  ))
+                                  (set-MXP-instruction---single-mxp-offset-instructions   CREATE_miscellaneous_row___row_offset       ;; row offset kappa
+                                                                                          (create-instruction---instruction)          ;; instruction
+                                                                                          0                                           ;; bit modifying the behaviour of RETURN pricing
+                                                                                          (create-instruction---STACK-offset-hi)      ;; offset high
+                                                                                          (create-instruction---STACK-offset-lo)      ;; offset low
+                                                                                          (create-instruction---STACK-size-hi)        ;; size high
+                                                                                          (create-instruction---STACK-size-lo))       ;; size low
+                                                                                          ))
 
 (defconstraint    create-instruction---setting-the-memory-expansion-exception               (:guard    (create-instruction---generic-precondition))
                   (if-zero    (shift    misc/MXP_FLAG    CREATE_miscellaneous_row___row_offset)
@@ -136,7 +136,7 @@
                   (:guard    (create-instruction---generic-precondition))
                   (if-not-zero    (scenario-shorthand---CREATE---not-rebuffed)
                                   (eq!    (scenario-shorthand---CREATE---not-rebuffed-nonempty-init-code)
-                                          (create-instruction---MXP-mtntop))))
+                                          (create-instruction---MXP-s1nznomxpx))))
 
 (defconstraint    create-instruction---setting-the-CREATE-scenario---not-rebuffed-nonempty-init-code
                   (:guard    (create-instruction---generic-precondition))
@@ -202,4 +202,4 @@
                     (if-not-zero    (scenario-shorthand---CREATE---failure-condition)                (eq!   GAS_NEXT  (-  GAS_ACTUAL  (create-instruction---full-gas-cost))))
                     (if-not-zero    (scenario-shorthand---CREATE---not-rebuffed-empty-init-code)     (eq!   GAS_NEXT  (-  GAS_ACTUAL  (create-instruction---upfront-gas-cost))))
                     (if-not-zero    (scenario-shorthand---CREATE---not-rebuffed-nonempty-init-code)  (eq!   GAS_NEXT  (-  GAS_ACTUAL  (create-instruction---full-gas-cost))))
-                    ))
+                  ))

hub/cancun/constraints/instruction-handling/create/shorthands.lisp

@@ -46,7 +46,7 @@
 (defun    (create-instruction---OOB-failure-condition)        (shift   [misc/OOB_DATA 8]                 CREATE_miscellaneous_row___row_offset))
 (defun    (create-instruction---MXP-mxpx)                     (shift   misc/MXP_MXPX                     CREATE_miscellaneous_row___row_offset))
 (defun    (create-instruction---MXP-gas)                      (shift   misc/MXP_GAS_MXP                  CREATE_miscellaneous_row___row_offset))
-(defun    (create-instruction---MXP-mtntop)                   (shift   misc/MXP_MTNTOP                   CREATE_miscellaneous_row___row_offset))
+(defun    (create-instruction---MXP-s1nznomxpx)               (shift   misc/MXP_SIZE_1_NONZERO_NO_MXPX   CREATE_miscellaneous_row___row_offset))
 (defun    (create-instruction---STP-gas-paid-out-of-pocket)   (shift   misc/STP_GAS_PAID_OUT_OF_POCKET   CREATE_miscellaneous_row___row_offset))
 (defun    (create-instruction---STP-oogx)                     (shift   misc/STP_OOGX                     CREATE_miscellaneous_row___row_offset))
 (defun    (create-instruction---compute-createe-address)      (shift   account/RLPADDR_FLAG              CREATE_first_creator_account_row___row_offset))

hub/cancun/constraints/instruction-handling/create/triggers.lisp

@@ -33,7 +33,7 @@
 
 (defun    (create-instruction---trigger_HASHINFO)   (*    (create-instruction---is-CREATE2)
                                                           (+    (*    (scenario-shorthand---CREATE---failure-condition)
-                                                                      (create-instruction---MXP-mtntop))
+                                                                      (create-instruction---MXP-s1nznomxpx))
                                                                 (scenario-shorthand---CREATE---not-rebuffed-nonempty-init-code))))
 
 (defun    (create-instruction---trigger_RLPADDR)    (scenario-shorthand---CREATE---compute-deployment-address))
@@ -42,7 +42,7 @@
 
 ;; auxiliary shorthands required for (create-instruction---trigger_MMU)
 (defun    (create-instruction---hash-init-code)                   (*    (scenario-shorthand---CREATE---failure-condition)
-                                                                        (create-instruction---MXP-mtntop)
+                                                                        (create-instruction---MXP-s1nznomxpx)
                                                                         (create-instruction---is-CREATE2)))
 
 (defun    (create-instruction---hash-init-code-and-send-to-ROM)   (*    (scenario-shorthand---CREATE---not-rebuffed-nonempty-init-code)