EXTCODECOPY requires the CFI as its MMU_SRC_ID only for address…

…es not currently under deployment (#554)
Consensys · Dec 16, 2024 · a5c956e · a5c956e
1 parent d3fa8d9
commit a5c956e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/hub/constraints/instruction-handling/copy/generalities.lisp b/hub/constraints/instruction-handling/copy/generalities.lisp
@@ -216,7 +216,7 @@
 (defun (copy-instruction---source-id)         (+   (* (copy-instruction---is-CALLDATACOPY)      (copy-instruction---call-data-context))
                                                    (* (copy-instruction---is-RETURNDATACOPY)    (copy-instruction---return-data-context))
                                                    (* (copy-instruction---is-CODECOPY)          (copy-instruction---bytecode-address-code-fragment-index))
-                                                   (* (copy-instruction---is-EXTCODECOPY)       (copy-instruction---foreign-address-code-fragment-index))))
+                                                   (* (copy-instruction---is-EXTCODECOPY)       (copy-instruction---foreign-address-code-fragment-index)  (copy-instruction---foreign-address-has-code))))
 
 (defun (copy-instruction---reference-offset)  (+   (* (copy-instruction---is-CALLDATACOPY)      (copy-instruction---call-data-offset))
                                                    (* (copy-instruction---is-RETURNDATACOPY)    (copy-instruction---return-data-offset))))
@@ -226,4 +226,5 @@
                                                    (* (copy-instruction---is-CODECOPY)          (copy-instruction---bytecode-address-code-size))
                                                    (* (copy-instruction---is-EXTCODECOPY)       (copy-instruction---foreign-address-code-size) (copy-instruction---foreign-address-has-code))))
 
-(defun (copy-instruction---exo-sum)           (*   (+ (copy-instruction---is-CODECOPY) (copy-instruction---is-EXTCODECOPY)) EXO_SUM_WEIGHT_ROM))
+(defun (copy-instruction---exo-sum)           (+   (* (copy-instruction---is-CODECOPY)          EXO_SUM_WEIGHT_ROM)
+                                                   (* (copy-instruction---is-EXTCODECOPY)       EXO_SUM_WEIGHT_ROM)))