OCaml 5.0 support

dune-project

@@ -11,7 +11,7 @@
 (package
  (name jit)
  (depends
-   (ocaml (and (>= 4.14.0) (< 5.0)))
+   (ocaml (and (>= 5.0) (< 5.1)))
    cmdliner
    compiler-libs-either-toplevel)
  (synopsis "Just In Time compiler for OCaml native toplevel"))

jit.opam

@@ -8,7 +8,7 @@ homepage: "https://github.com/NathanReb/ocaml-jit"
 bug-reports: "https://github.com/NathanReb/ocaml-jit/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "4.14.0" & < "5.0"}
+  "ocaml" {>= "5.0" & < "5.1"}
   "cmdliner"
   "compiler-libs-either-toplevel"
   "odoc" {with-doc}

lib/jit/dune

@@ -9,4 +9,5 @@
  (modes native)
  (foreign_stubs
   (language c)
-  (names jit_stubs)))
+  (names jit_stubs)
+  (flags :standard -DNATIVE_CODE)))

lib/jit/jit_jit.ml

@@ -113,23 +113,13 @@ let entry_points ~phrase_name symbols =
   let find_symbol name = Symbols.find symbols (symbol_name name) in
   let frametable = find_symbol "frametable" in
   let gc_roots = find_symbol "gc_roots" in
-  let data_begin = find_symbol "data_begin" in
-  let data_end = find_symbol "data_end" in
   let code_begin = find_symbol "code_begin" in
   let code_end = find_symbol "code_end" in
   let entry_name = symbol_name "entry" in
   match Symbols.find symbols entry_name with
   | Some entry ->
       let open Jit_unit.Entry_points in
-      {
-        frametable;
-        gc_roots;
-        data_begin;
-        data_end;
-        code_begin;
-        code_end;
-        entry;
-      }
+      { frametable; gc_roots; code_begin; code_end; entry }
   | None ->
       failwithf "Toplevel phrase entry point symbol %s is not defined"
         entry_name

lib/jit/jit_stubs.c

@@ -17,17 +17,13 @@
 #define CAML_INTERNALS
 
 #include "caml/mlvalues.h"
-#include "caml/memory.h"
-#include "caml/stack.h"
+#include "caml/frame_descriptors.h"
+#include "caml/globroots.h"
 #include "caml/callback.h"
 #include "caml/alloc.h"
 #include "caml/osdeps.h"
 #include "caml/codefrag.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/mman.h>
 #include <unistd.h>
 
 CAMLprim value jit_get_page_size(value unit) {
@@ -139,29 +135,23 @@ static void *addr_from_caml_option(value option)
 CAMLprim value jit_run(value symbols_addresses) {
   CAMLparam1 (symbols_addresses);
   CAMLlocal1 (result);
-  void *sym,*sym2;
 
-  intnat entrypoint;
+  intnat entry;
 
-  sym = addr_from_caml_option(Field(symbols_addresses, 0));
-  if (NULL != sym) caml_register_frametable(sym);
+  void* frame_table = addr_from_caml_option(Field(symbols_addresses, 0));
+  if (NULL != frame_table) caml_register_frametable(frame_table);
 
-  sym = addr_from_caml_option(Field(symbols_addresses, 1));
-  if (NULL != sym) caml_register_dyn_global(sym);
+  void* gc_roots = addr_from_caml_option(Field(symbols_addresses, 1));
+  if (NULL != gc_roots) caml_register_dyn_global(gc_roots);
 
-  sym = addr_from_caml_option(Field(symbols_addresses, 2));
-  sym2 = addr_from_caml_option(Field(symbols_addresses, 3));
-  if (NULL != sym && NULL != sym2)
-    caml_page_table_add(In_static_data, sym, sym2);
-
-  sym = addr_from_caml_option(Field(symbols_addresses, 4));
-  sym2 = addr_from_caml_option(Field(symbols_addresses, 5));
-  if (NULL != sym && NULL != sym2)
-    caml_register_code_fragment((char *) sym, (char *) sym2,
+  void* code_begin = addr_from_caml_option(Field(symbols_addresses, 2));
+  void* code_end = addr_from_caml_option(Field(symbols_addresses, 3));
+  if (NULL != code_begin && NULL != code_end && code_begin != code_end)
+    caml_register_code_fragment((char *) code_begin, (char *) code_end,
                                 DIGEST_LATER, NULL);
 
-  entrypoint = Nativeint_val(Field(symbols_addresses, 6));
-  result = caml_callback((value)(&entrypoint), 0);
+  entry = Nativeint_val(Field(symbols_addresses, 4));
+  result = caml_callback((value)(&entry), 0);
 
   CAMLreturn (result);
 }

lib/jit/jit_unit.ml

@@ -18,8 +18,6 @@ module Entry_points = struct
   type t = {
     frametable : Address.t option;
     gc_roots : Address.t option;
-    data_begin : Address.t option;
-    data_end : Address.t option;
     code_begin : Address.t option;
     code_end : Address.t option;
     entry : Address.t;

lib/jit/jit_unit.mli

@@ -18,8 +18,6 @@ module Entry_points : sig
   type t = {
     frametable : Address.t option;
     gc_roots : Address.t option;
-    data_begin : Address.t option;
-    data_end : Address.t option;
     code_begin : Address.t option;
     code_end : Address.t option;
     entry : Address.t;

lib/jit/x86_ast_helpers.ml

@@ -234,6 +234,10 @@ type asm_line = X86_ast.asm_line =
   | Cfi_adjust_cfa_offset of int
   | Cfi_endproc
   | Cfi_startproc
+  | Cfi_remember_state
+  | Cfi_restore_state
+  | Cfi_def_cfa_register of string
+  | Cfi_def_cfa_offset of int
   | File of int * string (* (file_num, file_name) *)
   | Indirect_symbol of string
   | Loc of int * int * int (* (file_num, line, col) *)

lib/jit/x86_emitter.ml

@@ -1403,6 +1403,10 @@ let assemble_line b loc ins =
     | Cfi_startproc -> ()
     | Cfi_endproc -> ()
     | Cfi_adjust_cfa_offset _ -> ()
+    | Cfi_remember_state -> ()
+    | Cfi_restore_state -> ()
+    | Cfi_def_cfa_register _ -> ()
+    | Cfi_def_cfa_offset _ -> ()
     | File _ -> ()
     | Loc _ -> ()
     | Private_extern _ -> assert false