enable continuations and mem on main, reduce intermediates stage 3

Cargo.toml

@@ -14,7 +14,7 @@ members = [
     "state-machines/mem",
     "state-machines/rom",
     "witness-computation",
-    "ziskos/entrypoint", 
+    "ziskos/entrypoint",
 ]
 
 resolver = "2"
@@ -26,19 +26,19 @@ opt-level = 3
 opt-level = 3
 
 [workspace.dependencies]
-#proofman-common = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
-#proofman-macros = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
-#proofman-util = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
-#proofman = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
-#pil-std-lib = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
-#stark = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
+proofman-common = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
+proofman-macros = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
+proofman-util = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
+proofman = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
+pil-std-lib = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
+stark = { git = "https://github.com/0xPolygonHermez/pil2-proofman.git", branch ="develop" }
 #Local development
-proofman-common = { path = "../pil2-proofman/common" }
-proofman-macros = { path = "../pil2-proofman/macros" }
-proofman-util = { path = "../pil2-proofman/util" }
-proofman = { path = "../pil2-proofman/proofman" }
-pil-std-lib = { path = "../pil2-proofman/pil2-components/lib/std/rs" }
-stark = { path = "../pil2-proofman/provers/stark" }
+#proofman-common = { path = "../pil2-proofman/common" }
+#proofman-macros = { path = "../pil2-proofman/macros" }
+#proofman-util = { path = "../pil2-proofman/util" }
+#proofman = { path = "../pil2-proofman/proofman" }
+#pil-std-lib = { path = "../pil2-proofman/pil2-components/lib/std/rs" }
+#stark = { path = "../pil2-proofman/provers/stark" }
 
 p3-field = { git = "https://github.com/Plonky3/Plonky3.git", rev = "c3d754ef77b9fce585b46b972af751fe6e7a9803" }
 log = "0.4"

book/getting_started/quickstart_dev.md

@@ -20,8 +20,6 @@ git clone -b develop https://github.com/0xPolygonHermez/pil2-compiler.git
 git clone -b develop https://github.com/0xPolygonHermez/zisk.git
 git clone -b develop https://github.com/0xPolygonHermez/pil2-proofman.git
 git clone -b develop  https://github.com/0xPolygonHermez/pil2-stark-js.git
-
-git clone --recursive -b develop  https://github.com/0xPolygonHermez/pil2-stark.git
 git clone -b feature/setup https://github.com/0xPolygonHermez/pil2-proofman-js
 ```
 
@@ -116,7 +114,7 @@ node ../pil2-compiler/src/pil.js pil/zisk.pil -I pil,../pil2-components/lib/std_
 
 ### Compile the PIl2 Stark C++ Library (run only once):
 ```bash
-(cd ../pil2-stark && git submodule init && git submodule update && make clean && make -j starks_lib && make -j bctree)
+(cd ../pil2-proofman/pil2-stark && git submodule init && git submodule update && make clean && make -j starks_lib && make -j bctree)
 ```
 
 ### Generate PIL-Helpers Rust Code
@@ -140,7 +138,7 @@ cargo build --release
 
 > If you get a library not found error, set the path manually:
 > ```bash
-> export RUSTFLAGS="-L native=/home/{path to your pil2-stark folder}/lib"
+> export RUSTFLAGS="-L native={path to your pil2-stark folder}/pil2-stark/lib"
 > ```
 
 ## Generate & Verify Proofs

core/src/inst_context.rs

@@ -29,6 +29,10 @@ impl InstContext {
             end: false,
         }
     }
+    pub fn to_text(&self) -> String {
+        let s = format! {"a={:x} b={:x} c={:x} flag={} sp={} pc={} step={} end={}", self.a, self.b, self.c, self.flag, self.sp, self.pc, self.step, self.end};
+        s
+    }
 }
 
 impl Default for InstContext {

core/src/mem.rs

@@ -151,7 +151,10 @@ impl Mem {
 
         // Check that the address and width fall into this section address range
         if (addr < section.start) || ((addr + width) > section.end) {
-            panic!("Mem::write_silent() invalid addr={}", addr);
+            panic!(
+                "Mem::write_silent() invalid addr={}={:x} write section start={:x} end={:x}",
+                addr, addr, section.start, section.end
+            );
         }
 
         // Calculate the write position

core/src/zisk_definitions.rs

@@ -14,21 +14,22 @@ pub const STORE_IND: u64 = 2;
 
 /* Memory map:
 
-  |--------------- ROM_ENTRY (0x1000)
-  | (rom entry, calls program, ~BIOS)
-  |---------------
+  |--------------- ROM_ENTRY first instr   (    0x1000)
+  | calls program at ROM_ADDR, then returns
+  | kind of a BIOS
+  |--------------- ROM_EXIT last instr     (0x10000000)
         ...
-  |--------------- ROM_ADDR (0x80000000)
+  |--------------- ROM_ADDR                (0x80000000)
   | (rom program)
-  |--------------- INPUT_ADDR
+  |--------------- INPUT_ADDR              (0x90000000)
   | (input data)
-  |--------------- SYS_ADDR (= RAM_ADDR)
+  |--------------- SYS_ADDR (= RAM_ADDR)   (0xa0000000)
   | (sys = 32 registers)
-  |--------------- OUTPUT_ADDR
+  |--------------- OUTPUT_ADDR             (0xa0010000)
   | (output data)
-  |--------------- AVAILABLE_MEM_ADDR
+  |--------------- AVAILABLE_MEM_ADDR      (0xa0020000)
   | (program memory)
-  |---------------
+  |---------------                         (0xb0000000)
 
 */
 pub const ROM_ADDR: u64 = 0x80000000;
@@ -44,6 +45,7 @@ pub const OUTPUT_MAX_SIZE: u64 = 0x10000; // 64K
 pub const AVAILABLE_MEM_ADDR: u64 = OUTPUT_ADDR + OUTPUT_MAX_SIZE;
 pub const AVAILABLE_MEM_SIZE: u64 = RAM_SIZE - OUTPUT_MAX_SIZE - SYS_SIZE;
 pub const ROM_ENTRY: u64 = 0x1000;
+pub const ROM_EXIT: u64 = 0x10000000;
 pub const ARCH_ID_ZISK: u64 = 0xFFFEEEE;
 pub const UART_ADDR: u64 = SYS_ADDR + 512;