diff options
author | Yann Herklotz <git@yannherklotz.com> | 2021-10-18 17:05:46 +0100 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2021-10-18 17:05:46 +0100 |
commit | fbfa988072ce2eba808b9a6631af5f8e86cd9df0 (patch) | |
tree | 5146e558d5c9c6e9a399225eed0784b8dc12558f /src/hls/RTLBlock.v | |
parent | 603768a49eac2005729dd03e723ff6c5a6b292f7 (diff) | |
parent | fe06668f0de56635efe55310d7a64289a37c1d90 (diff) | |
download | vericert-fbfa988072ce2eba808b9a6631af5f8e86cd9df0.tar.gz vericert-fbfa988072ce2eba808b9a6631af5f8e86cd9df0.zip |
Merge branch 'master' into dev/michalisdev/michalis
Diffstat (limited to 'src/hls/RTLBlock.v')
-rw-r--r-- | src/hls/RTLBlock.v | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/hls/RTLBlock.v b/src/hls/RTLBlock.v index 6a3487a..bf5c37a 100644 --- a/src/hls/RTLBlock.v +++ b/src/hls/RTLBlock.v @@ -58,11 +58,11 @@ Section RELSEM. Inductive step: state -> trace -> state -> Prop := | exec_bblock: - forall s f sp pc rs rs' m m' t s' bb, + forall s f sp pc rs rs' m m' t s' bb pr pr', f.(fn_code)!pc = Some bb -> - step_instr_list sp (InstrState rs m) bb.(bb_body) (InstrState rs' m') -> - step_cf_instr ge (State s f sp pc rs' m') bb.(bb_exit) t s' -> - step (State s f sp pc rs m) t s' + step_instr_list sp (mk_instr_state rs pr m) bb.(bb_body) (mk_instr_state rs' pr' m') -> + step_cf_instr ge (State s f sp pc rs' pr' m') bb.(bb_exit) t s' -> + step (State s f sp pc rs pr m) t s' | exec_function_internal: forall s f args m m' stk, Mem.alloc m 0 f.(fn_stacksize) = (m', stk) -> @@ -72,6 +72,7 @@ Section RELSEM. (Vptr stk Ptrofs.zero) f.(fn_entrypoint) (init_regs args f.(fn_params)) + (PMap.init false) m') | exec_function_external: forall s ef args res t m m', @@ -79,9 +80,9 @@ Section RELSEM. step (Callstate s (External ef) args m) t (Returnstate s res m') | exec_return: - forall res f sp pc rs s vres m, - step (Returnstate (Stackframe res f sp pc rs :: s) vres m) - E0 (State s f sp pc (rs#res <- vres) m). + forall res f sp pc rs s vres m pr, + step (Returnstate (Stackframe res f sp pc rs pr :: s) vres m) + E0 (State s f sp pc (rs#res <- vres) pr m). End RELSEM. |