Changeset 1312 for src/LTL/semantics.ma

Timestamp:

Oct 6, 2011, 10:35:29 PM (9 years ago)

Author:

sacerdot

Message:

Type of frame operations (pop_frame/save_frame) generalized to take in account
the RTL semantics. LTL and LIN semantics fixed. Fixing of ERTL/RTL still to
be done.

File:

• src/LTL/semantics.ma (modified) (3 diffs)

src/LTL/semantics.ma

@@ -2 +2 @@
 include "LTL/LTL.ma". (* CSC: syntax.ma in RTLabs *)
 
-definition ltl_init_locals : unit → hw_register_env → hw_register_env ≝ λ_.λe.e.
-definition ltl_pop_frame: unit → res unit ≝ λ_. OK … it.
-definition ltl_save_frame: unit → hw_register_env → unit ≝ λ_.λ_. it.
-
 definition ltl_more_sem_params: more_sem_params ltl_params_ :=
  mk_more_sem_params ltl_params_
-  unit hw_register_env graph_succ_p ltl_pop_frame ltl_save_frame
+  unit hw_register_env graph_succ_p
    hwreg_store hwreg_retrieve (λ_.hwreg_store RegisterA) (λe.λ_.hwreg_retrieve e RegisterA)
     (λ_.hwreg_store RegisterB) (λe.λ_.hwreg_retrieve e RegisterB)
@@ -24 +20 @@
 definition ltl_sem_params: sem_params ≝ mk_sem_params … ltl_more_sem_params.
 
+definition ltl_init_locals : unit → hw_register_env → hw_register_env ≝ λ_.λe.e.
+definition ltl_pop_frame: state … ltl_sem_params → res (state … ltl_sem_params) ≝ λst. OK … st.
+definition ltl_save_frame: state … ltl_sem_params → state … ltl_sem_params ≝ λst.st.
+
+definition ltl_more_sem_params1 : more_sem_params1 … ltl_params1 ≝
+ mk_more_sem_params1 ? ltl_params1 ltl_more_sem_params
+  ltl_init_locals ltl_pop_frame ltl_save_frame.
+
 (*CSC: XXXXX, for is_final only *)
 axiom ltl_fetch_result: state ltl_sem_params → nat → res val.
@@ -37 +41 @@
 definition ltl_more_sem_params2: ∀globals. more_sem_params2 … (ltl_params globals) ≝
  λglobals.
-  mk_more_sem_params2 … ltl_more_sem_params ltl_init_locals
+  mk_more_sem_params2 … ltl_more_sem_params1
    (graph_fetch_statement …) ltl_fetch_result ltl_fetch_external_args ltl_set_result
     (ltl_exec_extended …).