use directives in place of emitaux

Author: spiessimon

backend/arm64/emit.ml

@@ -538,6 +538,12 @@ type local_realloc_call =
 
 let local_realloc_sites = ref ([] : local_realloc_call list)
 
+let file_emitter ~file_num ~file_name =
+  D.file ~file_num:(Some file_num) ~file_name
+
+let emit_debug_info ?discriminator dbg =
+  Emitaux.emit_debug_info_gen ?discriminator dbg file_emitter D.loc
+
 let emit_local_realloc lr =
   D.define_label lr.lr_lbl;
   emit_debug_info lr.lr_dbg;
@@ -685,7 +691,7 @@ let emit_stack_adjustment n =
   let ml = m land 0xFFF and mh = m land 0xFFF_000 in
   if mh <> 0 then DSL.ins instr [| DSL.sp; DSL.sp; DSL.imm mh |];
   if ml <> 0 then DSL.ins instr [| DSL.sp; DSL.sp; DSL.imm ml |];
-  if n <> 0 then cfi_adjust_cfa_offset (-n)
+  if n <> 0 then D.cfi_adjust_cfa_offset ~bytes:(-n)
 
 (* Deallocate the stack frame and reload the return address before a return or
    tail call *)
@@ -697,7 +703,7 @@ let output_epilogue f =
   if n > 0 then emit_stack_adjustment n;
   f ();
   (* reset CFA back because function body may continue *)
-  if n > 0 then cfi_adjust_cfa_offset n
+  if n > 0 then D.cfi_adjust_cfa_offset ~bytes:n
 
 (* Output add-immediate / sub-immediate / cmp-immediate instructions *)
 
@@ -1390,7 +1396,7 @@ let emit_instr i =
     if n > 0 then emit_stack_adjustment (-n);
     if !contains_calls
     then (
-      cfi_offset ~reg:30 (* return address *) ~offset:(-8);
+      D.cfi_offset ~reg:30 (* return address *) ~offset:(-8);
       DSL.ins I.STR [| DSL.reg_x_30; DSL.emit_mem_sp_offset (n - 8) |])
   | Lop (Intop_atomic _) ->
     (* Never generated; builtins are not yet translated to atomics *)
@@ -1489,8 +1495,8 @@ let emit_instr i =
       if Config.runtime5
       then (
         DSL.ins I.MOV [| DSL.reg_x_29; DSL.sp |];
-        cfi_remember_state ();
-        cfi_def_cfa_register ~reg:29;
+        D.cfi_remember_state ();
+        D.cfi_def_cfa_register ~reg:(Int.to_string 29);
         let offset = Domainstate.(idx_of_field Domain_c_stack) * 8 in
         DSL.ins I.LDR
           [| DSL.emit_reg reg_tmp1;
@@ -1499,7 +1505,7 @@ let emit_instr i =
         DSL.ins I.MOV [| DSL.sp; DSL.emit_reg reg_tmp1 |]);
       DSL.ins I.BL [| DSL.emit_symbol (S.create func) |];
       if Config.runtime5 then DSL.ins I.MOV [| DSL.sp; DSL.reg_x_29 |];
-      cfi_restore_state ())
+      D.cfi_restore_state ())
   | Lop (Stackoffset n) ->
     assert (n mod 16 = 0);
     emit_stack_adjustment (-n);
@@ -1959,7 +1965,7 @@ let emit_instr i =
 *)
   | Lentertrap -> ()
   | Ladjust_stack_offset { delta_bytes } ->
-    cfi_adjust_cfa_offset delta_bytes;
+    D.cfi_adjust_cfa_offset ~bytes:delta_bytes;
     stack_offset := !stack_offset + delta_bytes
   | Lpushtrap { lbl_handler } ->
     let lbl_handler = label_to_asm_label ~section:Text lbl_handler in
@@ -1970,14 +1976,14 @@ let emit_instr i =
          DSL.emit_reg reg_tmp1;
          DSL.mem_pre ~base:Arm64_ast.Reg.sp ~offset:(-16)
       |];
-    cfi_adjust_cfa_offset 16;
+    D.cfi_adjust_cfa_offset ~bytes:16;
     DSL.ins I.MOV [| DSL.emit_reg reg_trap_ptr; DSL.sp |]
   | Lpoptrap ->
     DSL.ins I.LDR
       [| DSL.emit_reg reg_trap_ptr;
          DSL.mem_post ~base:Arm64_ast.Reg.sp ~offset:16
       |];
-    cfi_adjust_cfa_offset (-16);
+    D.cfi_adjust_cfa_offset ~bytes:(-16);
     stack_offset := !stack_offset - 16
   | Lraise k -> (
     match k with
@@ -2067,7 +2073,7 @@ let fundecl fundecl =
   D.type_symbol ~ty:Function fun_sym;
   D.define_symbol_label ~section:Text fun_sym;
   emit_debug_info fundecl.fun_dbg;
-  cfi_startproc ();
+  D.cfi_startproc ();
   let num_call_gc = num_call_gc_points fundecl.fun_body in
   let max_out_of_line_code_offset = max_out_of_line_code_offset ~num_call_gc in
   BR.relax fundecl.fun_body ~max_out_of_line_code_offset;
@@ -2081,7 +2087,7 @@ let fundecl fundecl =
   | Some fun_end_label ->
     let fun_end_label = label_to_asm_label ~section:Text fun_end_label in
     D.define_label fun_end_label);
-  cfi_endproc ();
+  D.cfi_endproc ();
   (* The type symbol and the size are system specific. They are not output on
      macOS. The asm directives take care of correctly handling this distinction.
      For the size, they automatically emit the size [. - symbol], meaning "this

backend/asm_targets/asm_directives_new.ml

@@ -166,6 +166,9 @@ module Directive = struct
           offset : int
         }
     | Cfi_startproc
+    | Cfi_remember_state
+    | Cfi_restore_state
+    | Cfi_def_cfa_register of string
     | Comment of comment
     | Const of
         { constant : Constant_with_width.t;
@@ -333,6 +336,9 @@ module Directive = struct
     | Cfi_offset { reg; offset } ->
       bprintf buf "\t.cfi_offset %d, %d" reg offset
     | Cfi_startproc -> bprintf buf "\t.cfi_startproc"
+    | Cfi_remember_state -> bprintf buf "\t.cfi_remember_state"
+    | Cfi_restore_state -> bprintf buf "\t.cfi_restore_state"
+    | Cfi_def_cfa_register reg -> bprintf buf "\t.cfi_def_cfa_register %%%s" reg
     | File { file_num = None; filename } ->
       bprintf buf "\t.file\t\"%s\"" filename
     | File { file_num = Some file_num; filename } ->
@@ -422,6 +428,9 @@ module Directive = struct
     | Cfi_endproc -> unsupported "Cfi_endproc"
     | Cfi_offset _ -> unsupported "Cfi_offset"
     | Cfi_startproc -> unsupported "Cfi_startproc"
+    | Cfi_remember_state -> unsupported "Cfi_remember_state"
+    | Cfi_restore_state -> unsupported "Cfi_restore_state"
+    | Cfi_def_cfa_register _ -> unsupported "Cfi_def_cfa_register"
     | File _ -> unsupported "File"
     | Indirect_symbol _ -> unsupported "Indirect_symbol"
     | Loc _ -> unsupported "Loc"
@@ -512,6 +521,14 @@ let cfi_offset ~reg ~offset =
 
 let cfi_startproc () = if should_generate_cfi () then emit Cfi_startproc
 
+let cfi_remember_state () =
+  if should_generate_cfi () then emit Cfi_remember_state
+
+let cfi_restore_state () = if should_generate_cfi () then emit Cfi_restore_state
+
+let cfi_def_cfa_register ~reg =
+  if should_generate_cfi () then emit (Cfi_def_cfa_register reg)
+
 let comment text = if emit_comments () then emit (Comment text)
 
 let loc ~file_num ~line ~col ?discriminator () =

backend/asm_targets/asm_directives_new.mli

@@ -145,6 +145,15 @@ val cfi_startproc : unit -> unit
 (** Mark the end of a function, for CFI purposes. *)
 val cfi_endproc : unit -> unit
 
+(** Remember the current state for CFI purposes. *)
+val cfi_remember_state : unit -> unit
+
+(** Restore the state for CFI purposes. *)
+val cfi_restore_state : unit -> unit
+
+(** Define a CFA register, for CFI purposes. *)
+val cfi_def_cfa_register : reg:string -> unit
+
 (** Mark that the call stack is not to be executable at runtime.  Not
     supported on all platforms. *)
 val mark_stack_non_executable : unit -> unit
@@ -367,6 +376,9 @@ module Directive : sig
           offset : int
         }
     | Cfi_startproc
+    | Cfi_remember_state
+    | Cfi_restore_state
+    | Cfi_def_cfa_register of string
     | Comment of comment
     | Const of
         { constant : Constant_with_width.t;