set pc = 0 after ecall/halt in ceno_emul

scroll-tech · Sep 25, 2024 · 0713aba · 0713aba
1 parent 66d635c
commit 0713aba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ceno_emul/src/vm_state.rs b/ceno_emul/src/vm_state.rs
@@ -95,6 +95,7 @@ impl EmuContext for VMState {
         let function = self.load_register(self.platform.reg_ecall())?;
         let argument = self.load_register(self.platform.reg_arg0())?;
         if function == self.platform.ecall_halt() && argument == self.platform.code_success() {
+            self.set_pc(ByteAddr(0));
             self.succeeded = true;
             Ok(true)
         } else {

diff --git a/ceno_zkvm/src/instructions/riscv/ecall/halt.rs b/ceno_zkvm/src/instructions/riscv/ecall/halt.rs
@@ -74,7 +74,7 @@ impl<E: ExtensionField> Instruction<E> for HaltInstruction<E> {
             step.rs1().unwrap().value,
             (ECALL_HALT[0] + (ECALL_HALT[1] << 16)) as u32
         );
-        assert_eq!(step.pc().after.0, 0);
+        assert_eq!(step.pc().after.0, 0, "pc after ecall/halt {:x}", step.pc().after.0);
 
         set_val!(
             instance,