Delete unused logic for GetCurContextE and ContextKindE

Wasm-DSL · Apr 8, 2024 · 849f01e · 849f01e
1 parent af9a5ae
commit 849f01e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/spectec/src/backend-interpreter/ds.ml b/spectec/src/backend-interpreter/ds.ml
@@ -264,9 +264,10 @@ module WasmContext = struct
     | Some (v, _, _) -> v
     | None -> failwith "Wasm context stack underflow"
 
-  let get_current_context () =
-    let ctx, _, _ = get_context () in
-    ctx
+  let get_top_context () =
+    let ctx, vs, _ = get_context () in
+    if List.length vs = 0 then Some ctx 
+    else None
 
   let get_current_frame () =
     let match_frame = function
@@ -280,11 +281,6 @@ module WasmContext = struct
       | _ -> false
     in get_value_with_condition match_label
 
-  let get_top_context () =
-    let ctx, vs, _ = get_context () in
-    if List.length vs = 0 then Some ctx 
-    else None
-
   let get_module_instance () =
     match get_current_frame () with
     | FrameV (_, mm) -> mm

diff --git a/spectec/src/backend-interpreter/ds.mli b/spectec/src/backend-interpreter/ds.mli
@@ -68,10 +68,9 @@ module WasmContext : sig
   val string_of_context : t -> string
   val string_of_context_stack : unit -> string
 
-  val get_current_context : unit -> value
+  val get_top_context : unit -> value option
   val get_current_frame : unit -> value
   val get_current_label : unit -> value
-  val get_top_context : unit -> value option
   val get_module_instance : unit -> value
 
   val get_value_stack : unit -> value list

diff --git a/spectec/src/backend-interpreter/interpreter.ml b/spectec/src/backend-interpreter/interpreter.ml
@@ -218,7 +218,6 @@ and eval_expr env expr =
     let v2 = eval_expr env e2 in
     LabelV (v1, v2)
   | GetCurLabelE -> WasmContext.get_current_label ()
-  | GetCurContextE -> WasmContext.get_current_context ()
   | ContE e ->
     (match eval_expr env e with
     | LabelV (_, vs) -> vs
@@ -249,11 +248,6 @@ and eval_expr env expr =
     | l, _ -> listV_of_list l)
   | InfixE (e1, _, e2) -> TupV [ eval_expr env e1; eval_expr env e2 ]
   (* condition *)
-  | ContextKindE ((kind, _), e) ->
-    (match kind, eval_expr env e with
-    | Il.Atom.Atom "FRAME_", FrameV _ -> boolV true
-    | Il.Atom.Atom "LABEL_", LabelV _ -> boolV true
-    | _ -> boolV false)
   | TopFrameE ->
     let ctx = WasmContext.get_top_context () in
     (match ctx with