Merge pull request #102 from 0xPolygonHermez/fix-sp-negative-offset

fix problem with negative offset
0xPolygonHermez · Dec 14, 2022 · e72191a · e72191a
2 parents 270960e + 5980581
commit e72191a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/src/sm/sm_main/sm_main_exec.js b/src/sm/sm_main/sm_main_exec.js
@@ -467,6 +467,7 @@ module.exports = async function execute(pols, input, rom, config = {}, metadata
                 addrRel += fe2n(Fr, ctx.RR, ctx);
             }
             if (l.offset) addrRel += l.offset;
+            if (l.isStack == 1) addrRel += Number(ctx.SP);
             if (!skipAddrRelControl) {
                 if (addrRel >= 0x20000 || (!l.isMem && addrRel >= 0x10000)) throw new Error(`Address too big ${sourceRef}`);
                 if (addrRel <0 ) throw new Error(`Address can not be negative ${sourceRef}`);
@@ -481,7 +482,6 @@ module.exports = async function execute(pols, input, rom, config = {}, metadata
         }
         if (l.isStack==1) {
             addr += 0x10000;
-            addr += Number(ctx.SP);
             pols.isStack[i] = 1n;
         } else {
             pols.isStack[i] = 0n;

diff --git a/test/fix/sp_negative_offset/sp_negative_offset.js b/test/fix/sp_negative_offset/sp_negative_offset.js
@@ -0,0 +1,19 @@
+const chai = require("chai");
+const assert = chai.assert;
+const fs = require("fs");
+const path = require("path");
+
+const {verifyZkasm} = require("../../verify_zkasm");
+
+describe("Test Fix Negative Offset SP", async function () {
+    this.timeout(10000000000);
+
+    it("Test Fix Negative Offset SP", async () => {
+        await verifyZkasm(__dirname + "/sp_negative_offset.zkasm", true,
+                { defines: {N: 2 ** 16},
+                  namespaces: ['Global', 'Main', 'Rom'],
+                  verbose: true,
+                  color: true,
+                  disableUnusedError: true});
+    });
+});
diff --git a/test/fix/sp_negative_offset/sp_negative_offset.zkasm b/test/fix/sp_negative_offset/sp_negative_offset.zkasm
@@ -0,0 +1,18 @@
+start:
+
+        STEP => A
+        0 :ASSERT
+
+
+        128514851843584385348488432423523454n => A   :MSTORE(SP++)
+        $ => B :MLOAD(SP-1)
+        B :ASSERT
+
+end:
+       0 => A,B,C,D,E,CTX, SP, PC, GAS, MAXMEM, SR, RCX, HASHPOS
+
+finalWait:
+        ${beforeLast()}  : JMPN(finalWait)
+
+                         : JMP(start)
+opINVALID: