change MEM_ALIGN_WR8 to MEM_ALIGN_WR

0xPolygonHermez · Mar 24, 2024 · c0412f7 · c0412f7
1 parent a7f9a51
commit c0412f7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/docs/opcode-cost-zk-counters.md b/docs/opcode-cost-zk-counters.md
@@ -170,15 +170,15 @@ counters = SLOAD
 ### CODECOPY
 L = bytes to copy.  
 if is createContract -> counters = CALLDATACOPY  
-else -> counters = LT + L*(LT + MEM_ALIGN_WR8)  
+else -> counters = LT + L*(LT + MEM_ALIGN_WR)  
 
 ### EXTCODESIZE
 counters = SLOAD  
 
 ### EXTCODECOPY
 L = bytes to copy.  
 if is createContract -> counters = CALLDATACOPY  
-else -> counters = LT + L*(LT + MEM_ALIGN_WR8)
+else -> counters = LT + L*(LT + MEM_ALIGN_WR)
 
 ### RETURNDATACOPY
 L = Length to copy.  
@@ -250,7 +250,7 @@ counters = 2*EQ + LT*2 + computeGasSendCall + copySP
 | ARITH          | 1         | 0          | 0             | 0            | 0              | 0              | false      |
 | SLOAD          | 0         | 0          | 0             | 0            | 0              | 11              | [true](#SLOAD)      |
 | SSTORE         | 0         | 0          | 0             | 0            | 0              | 11              | [true](#SSTORE)      |
-| MEM_ALIGN_WR8  | 0         | 0          | 1             | 0            | 0              | 0              | false      |
+| MEM_ALIGN_WR  | 0         | 0          | 1             | 0            | 0              | 0              | false      |
 
 
 ## Dynamic regs

diff --git a/main/constants.zkasm b/main/constants.zkasm
@@ -142,3 +142,8 @@ CONST %CHANGE_L2_BLOCK_TX_TYPE = 0x0b
 CONST %DELTA_TIMESTAMP_NUM_BYTES = 4
 CONST %INDEX_L1INFOTREE_NUM_BYTES = 4
 CONST %TX_TYPE_NUM_BYTES = 1
+
+; CONSTANTS MEM_ALIGN
+CONST %MEM_ALIGN_LEN = 2**7
+CONST %MEM_ALIGN_LEFT_ALIGNMENT = 2**13
+CONST %MEM_ALIGN_LITTLE_ENDIAN = 2**14
diff --git a/main/opcodes/calldata-returndata-code.zkasm b/main/opcodes/calldata-returndata-code.zkasm
@@ -306,8 +306,10 @@ opCODECOPYloop:
     $ => A          :MLOAD(MEM:E)
     A               :MSTORE(previousValue), CALL(opCODECOPYLoadBytes); in:[codecopyBytecodeLength, codecopyHashId] out: [B: readByte]
     $ => A          :MLOAD(previousValue)
-    ${memAlignWR8_W0(A,B,C)} => D  ; no trust calculate W0
-    B               :MEM_ALIGN_WR8 ; only use LSB of B, rest of bytes could be non zero
+    C + 1 * %MEM_ALIGN_LEN => C
+    ${memAlignWR_W0(A,B,C)} => D  ; no trust calculate W0
+    B => E          ; B amb E must be same value
+    B               :MEM_ALIGN_WR ; only use LSB of B, rest of bytes could be non zero
     $ => E          :MLOAD(memInteger)
     D               :MSTORE(MEM:E) ; write W0
     ; update vars loop

diff --git a/main/opcodes/storage-memory.zkasm b/main/opcodes/storage-memory.zkasm
@@ -95,13 +95,17 @@ opMSTORE8:
     ; store lastMemLength for memory expansion gas cost. In case of MSTORE8, always 1 byte
     1               :MSTORE(lastMemLength), CALL(saveMem); in: [lastMemOffset, lastMemLength]
     B => A          :CALL(offsetUtil); in: [A: offset] out: [E: offset/32, C: offset%32]
-    $ => B          :MLOAD(SP); [value => B]
+    $ => RCX        :MLOAD(SP); [value => B]
     ; read from memory position E
     $ => A          :MLOAD(MEM:E)
-    ${memAlignWR8_W0(A,B,C)} => D  ; no trust calculate W0
-    B               :MEM_ALIGN_WR8 ; only use LSB of B, rest of bytes could be non zero.
-    ; write at memory position E
-    D               :MSTORE(MEM:E), JMP(readCode)
+
+    ; C contains offset, setting len = 1 byte
+    C + 1 * %MEM_ALIGN_LEN => C
+
+    ; no trust calculate W0 but if verification fails, proof no generated
+    ; B,E no change because only one byte, but B must be equal to E
+    ${memAlignWR_W0(A,B,C)} => D,B,E  :MSTORE(MEM:E)
+    RCX             :MEM_ALIGN_WR, JMP(readCode) ; only use LSB of B, rest of bytes could be non zero.
 
 /**
  * @link [https://www.evm.codes/#59?fork=berlin]

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "url": "https://github.com/0xPolygonHermez/zkevm-rom.git"
   },
   "dependencies": {
-    "@0xpolygonhermez/zkasmcom": "https://github.com/0xPolygonHermez/zkasmcom.git#develop-feijoa",
+    "@0xpolygonhermez/zkasmcom": "https://github.com/0xPolygonHermez/zkasmcom.git#feature/remove-mem-align-wr8",
     "yargs": "^17.5.1"
   },
   "devDependencies": {