Changeset 888 for src/RTLabs

Timestamp:

Jun 6, 2011, 4:28:07 PM (9 years ago)

Author:

campbell

Message:

Use simplified conditionals in RTLabs, following the prototype.

Location:

src/RTLabs

Files:

• semantics.ma (modified) (1 diff)
• syntax.ma (modified) (1 diff)

src/RTLabs/semantics.ma

@@ -140 +140 @@
       ret ? 〈E0, Callstate fd vs (retdst f) fs (free m (sp f))〉
 
-  | St_condcst cst ltrue lfalse ⇒
-      ! v ← opt_to_res … (msg FailedConstant) (eval_constant (find_symbol … ge) (sp f) cst);
+  | St_cond src ltrue lfalse ⇒
+      ! v ← reg_retrieve (locals f) src;
       ! b ← eval_bool_of_val v;
-      ret ? 〈E0, build_state f fs m (if b then ltrue else lfalse)〉
-  | St_cond1 op src ltrue lfalse ⇒
-      ! v ← reg_retrieve (locals f) src;
-      ! v' ← opt_to_res … (msg FailedOp) (eval_unop op v);
-      ! b ← eval_bool_of_val v';
-      ret ? 〈E0, build_state f fs m (if b then ltrue else lfalse)〉
-  | St_cond2 op src1 src2 ltrue lfalse ⇒
-      ! v1 ← reg_retrieve (locals f) src1;
-      ! v2 ← reg_retrieve (locals f) src2;
-      ! v' ← opt_to_res … (msg FailedOp) (eval_binop op v1 v2);
-      ! b ← eval_bool_of_val v';
       ret ? 〈E0, build_state f fs m (if b then ltrue else lfalse)〉
 

src/RTLabs/syntax.ma

@@ -24 +24 @@
 | St_tailcall_id : ident → list register → statement
 | St_tailcall_ptr : register → list register → statement
-(* Um, what? *)
-| St_condcst : constant → label → label → statement
-| St_cond1 : unary_operation → register → label → label → statement
-| St_cond2 : binary_operation → register → register → label → label → statement
+| St_cond : register → label → label → statement
 | St_jumptable : register → list label → statement
 | St_return : statement