Update

Author: osa1

src/lib/lib.ml

@@ -264,6 +264,37 @@ struct
     then (take n xs, drop n xs)
     else (xs, [])
 
+  let rec init xs =
+    match xs with
+    | [] -> failwith "init"
+    | [_] -> []
+    | x :: xs -> x :: init xs
+
+  let remove idx0 xs0 =
+    if idx0 < 0 then
+      failwith "remove -- negative index"
+    else
+      let rec go idx xs =
+        match (idx, xs) with
+        | (0, _ :: xs) -> xs
+        | (n, x :: xs) -> x :: go (n - 1) xs
+        | (_, []) -> failwith "remove -- index out of bounds"
+      in
+      go idx0 xs0
+
+  let insert idx0 a xs0 =
+    Printf.printf "insert at %d, list length = %d\n" idx0 (List.length xs0);
+    if idx0 < 0 then
+      failwith "insert -- negative index"
+    else
+      let rec go idx xs =
+        match (idx, xs) with
+        | (0, xs) -> a :: xs
+        | (n, x :: xs) -> x :: go (n - 1) xs
+        | (n, []) -> [a] (* failwith "insert -- index out of bounds" TODO *)
+      in
+      go idx0 xs0
+
   let hd_opt = function
     | x :: _ -> Some x
     | _ -> None

src/lib/lib.mli

@@ -18,6 +18,9 @@ sig
   val take : int -> 'a list -> 'a list (* raises Failure *)
   val drop : int -> 'a list -> 'a list (* raises Failure *)
   val split_at : int -> 'a list -> ('a list * 'a list)
+  val init : 'a list -> 'a list (* raises Failure *)
+  val remove : int -> 'a list -> 'a list (* raises Failure *)
+  val insert : int -> 'a -> 'a list -> 'a list (* raises Failure *)
 
   val hd_opt : 'a list -> 'a option
   val last : 'a list -> 'a (* raises Failure *)

src/linking/linkModule.ml

@@ -586,7 +586,7 @@ let rec find_fun_export (name : name) (exports : export list) : var option =
     else
       find_fun_export name exports
 
-let rec find_idx p lst : int option =
+let find_idx p lst : int option =
   let rec go idx = function
     | [] -> None
     | x :: xs -> if p x then Some idx else go (idx + 1) xs
@@ -830,24 +830,54 @@ let link (em1 : extended_module) libname (em2 : extended_module) =
      for the imported functions *)
   let dm2 =
     Hashtbl.fold (fun import_idx (global_idx, func_idx) dm2 ->
-      (* - Find the function in the table (add it if it's not in the table)
-         - Remove the import
-         - Add a global at `global_idx` as i32 of the table index *)
+
+      Printf.printf "import_idx=%d, global_idx=%d, func_idx=%d\n"
+        (Int32.to_int import_idx)
+        (Int32.to_int global_idx)
+        (Int32.to_int func_idx);
+
+      (* Find the function in the table (add it if it's not in the table) *)
       let (tbl_idx, dm2) = match find_table_idx func_idx dm2.elems with
       | Some tbl_idx -> (tbl_idx, dm2)
       | None ->
-        (* Function not in elem section, add it *)
+        (* Function not in elem section, add it to the last elem section in the
+           RTS module. *)
         let last_elem_section = (List.nth dm2.elems (List.length dm2.elems - 1)).it in
+        (* 'offset' field of the elem section gives us the index of the first
+           element in the section. *)
         let offset = get_i32_const last_elem_section.offset in
+        (* Elements in the section *)
         let var_list: var list = last_elem_section.init in
-
+        (* Table index of the function we're adding to the section *)
         let tbl_idx = Int32.(add offset (of_int (List.length var_list))) in
-        (* TODO: Append last elem section with the function index *)
-        let dm2 = { dm2 with elems = List.append (Lib.List.take (List.length var_list - 1) dm2.elems) [last_elem_section @@ no_region] } in
+        (* Append the function to the last elem section *)
+        let last_elem_section =
+          { last_elem_section with
+            init = List.append last_elem_section.init [func_idx @@ no_region] }
+        in
+        (* Update the module *)
+        let final_elem_section =
+          List.append (Lib.List.init dm2.elems) [last_elem_section @@ no_region]
+        in
+        let dm2 = { dm2 with elems = final_elem_section } in
 
         (tbl_idx, dm2)
       in
-      (* TODO *)
+
+      (* Turn import into global (remove import, add global) *)
+      let global =
+        { gtype = Wasm.Types.GlobalType (Wasm.Types.I32Type, Wasm.Types.Mutable);
+          value = [Const (Wasm.Values.I32 tbl_idx @@ no_region) @@ no_region] @@ no_region }
+      in
+      let dm2 =
+        { dm2 with
+          (* FIXME: Lots of other imports removed already so the index here is
+             not right. Maybe remove this with others above? *)
+          (* imports = Lib.List.remove (Int32.to_int import_idx) dm2.imports; *)
+          globals = Lib.List.insert (Int32.to_int global_idx) (global @@ no_region) dm2.globals;
+        }
+      in
+
       dm2
     ) got_func_imports dm2
   in