cleanup

Author: spiessimon

backend/arm64/emit.ml

@@ -372,8 +372,6 @@ end = struct
   let ins name ops = print_ins name ops |> Emitaux.emit_string
 
   let labeled_ins lbl name ops =
-    (* CR sspies: labelled instructions have to be in the text section, right?
-       Perhaps we should add an assert here. *)
     D.define_label lbl;
     print_ins name ops |> Emitaux.emit_string
 
@@ -510,8 +508,6 @@ let record_frame_label live dbg =
     live;
   record_frame_descr ~label:lbl ~frame_size:(frame_size ())
     ~live_offset:!live_offset dbg;
-  (* CR sspies: Are we defining this in the text or data section? My guess would
-     be text. *)
   label_to_asm_label ~section:Text lbl
 
 let record_frame live dbg =
@@ -1997,7 +1993,6 @@ let emit_instr i =
         |];
       DSL.ins I.BR [| DSL.emit_reg reg_tmp1 |])
   | Lstackcheck { max_frame_size_bytes } ->
-    (* CR sspies: Are both of these in the text section? *)
     let overflow = L.create Text and ret = L.create Text in
     let threshold_offset =
       (Domainstate.stack_ctx_words * 8) + Stack_check.stack_threshold_size
@@ -2064,7 +2059,7 @@ let fundecl fundecl =
   D.align ~bytes:8;
   D.global fun_sym;
   D.type_symbol ~ty:Function fun_sym;
-  D.define_function_symbol fun_sym;
+  D.define_symbol_label ~section:Text fun_sym;
   emit_debug_info fundecl.fun_dbg;
   cfi_startproc ();
   let num_call_gc = num_call_gc_points fundecl.fun_body in
@@ -2102,16 +2097,15 @@ let emit_item (d : Cmm.data_item) =
          evaluate to random other GOT entries. For the moment force all symbols
          to be global. *)
       D.global sym;
-    (* CR sspies: Are these data or function symbols? From context, I guessed
-       data symbols. *)
-    D.define_data_symbol sym
-  (* [Cint8] mirrors x86 with new directives *)
+    D.define_symbol_label ~section:Data sym
+  (* [Cint8] mirrors mshinwell/ocaml#gdb-names-gpr x86 emitter *)
   | Cint8 n -> D.int8 (Numbers.Int8.of_int_exn n)
-  (* [Cint16] mirrors x86 with new directives *)
+  (* [Cint16] mirrors mshinwell/ocaml#gdb-names-gpr x86 emitter *)
   | Cint16 n -> D.int16 (Numbers.Int16.of_int_exn n)
-  (* [Cint32] mirrors x86 with new directives *)
+  (* [Cint32] mirrors mshinwell/ocaml#gdb-names-gpr x86 emitter *)
   | Cint32 n -> D.int32 (Nativeint.to_int32 n)
-  (* [Cint] mirrors x86 with new directives *)
+  (* CR mshinwell: Add [Targetint.of_nativeint] *)
+  (* [Cint] mirrors mshinwell/ocaml#gdb-names-gpr x86 emitter *)
   | Cint n -> D.targetint (Targetint.of_int64 (Int64.of_nativeint n))
   | Csingle f -> D.float32 f
   | Cdouble f -> D.float64 f
@@ -2155,12 +2149,12 @@ let begin_assembly _unix =
   let data_begin_sym = S.create data_begin in
   D.data ();
   D.global data_begin_sym;
-  D.define_data_symbol data_begin_sym;
+  D.define_symbol_label ~section:Data data_begin_sym;
   let code_begin = Cmm_helpers.make_symbol "code_begin" in
   let code_begin_sym = S.create code_begin in
   emit_named_text_section code_begin;
   D.global code_begin_sym;
-  D.define_function_symbol code_begin_sym;
+  D.define_symbol_label ~section:Text code_begin_sym;
   (* we need to pad here to avoid collision for the unwind test between the
      code_begin symbol and the first function. (See also #4690) Alignment is
      needed to avoid linker warnings for shared_startup__code_{begin,end} (e.g.
@@ -2177,22 +2171,21 @@ let end_assembly () =
   let code_end_sym = S.create code_end in
   emit_named_text_section code_end;
   D.global code_end_sym;
-  D.define_function_symbol code_end_sym;
+  D.define_symbol_label ~section:Text code_end_sym;
   let data_end = Cmm_helpers.make_symbol "data_end" in
   let data_end_sym = S.create data_end in
   D.data ();
   D.int64 0L;
   (* PR#6329 *)
   D.global data_end_sym;
-  D.define_data_symbol data_end_sym;
+  D.define_symbol_label ~section:Data data_end_sym;
   D.int64 0L;
   D.align ~bytes:8;
   (* #7887 *)
   let frametable = Cmm_helpers.make_symbol "frametable" in
   let frametable_sym = S.create frametable in
-  (* Unlike the name `lbl` suggests, we emit the label as a symbol here. *)
   D.global frametable_sym;
-  D.define_data_symbol frametable_sym;
+  D.define_symbol_label ~section:Data frametable_sym;
   emit_frames
     { efa_code_label =
         (fun lbl ->
@@ -2204,15 +2197,17 @@ let end_assembly () =
           let lbl = label_to_asm_label ~section:Data lbl in
           D.type_label ~ty:Object lbl;
           D.label lbl);
-      (* [efa_8] is not part of x86 with new directives *)
+      (* [efa_8] is not part of mshinwell/ocaml#gdb-names-gpr *)
       efa_8 = (fun n -> D.uint8 (Numbers.Uint8.of_nonnegative_int_exn n));
-      (* [efa_16] mirrors x86 with new directives *)
+      (* [efa_16] is [D.uint16 (Numbers.Uint16.of_int_exn n)] in
+         mshinwell/ocaml#gdb-names-gpr x86 emitter *)
       efa_16 = (fun n -> D.uint16 (Numbers.Uint16.of_nonnegative_int_exn n));
+      (* [efa_16] is [D.uint32 (Numbers.Uint32.of_int32 n)] in
+         mshinwell/ocaml#gdb-names-gpr x86 emitter *)
       (* CR sspies: for some reason, we can get negative numbers here *)
       efa_32 = (fun n -> D.int32 n);
-      (* CR sspies: Is a word supposed to mean 64-bit here, or an actual word
-         (i.e., processor size)? *)
-      (* [efa_word] mirrors x86 with new directives *)
+      (* [efa_word] is [D.targetint (Targetint.of_int_exn n)] in
+         mshinwell/ocaml#gdb-names-gpr x86 emitter *)
       efa_word = (fun n -> D.targetint (Targetint.of_int_exn n));
       efa_align = (fun n -> D.align ~bytes:n);
       efa_label_rel =

backend/asm_targets/asm_directives_new.ml

@@ -751,6 +751,12 @@ let define_function_symbol symbol =
   | GAS_like, false -> type_ (Asm_symbol.encode symbol) ~type_:Function
   | GAS_like, true | MacOS, _ | MASM, _ -> ()
 
+let define_symbol_label ~section symbol =
+  let typ : Directive.thing_after_label =
+    match section with Asm_section.Text -> Code | _ -> Machine_width_data
+  in
+  emit (New_label (Asm_symbol.encode symbol, typ))
+
 let type_symbol symbol ~ty =
   match TS.assembler (), TS.windows () with
   | GAS_like, false -> type_ (Asm_symbol.encode symbol) ~type_:ty

backend/asm_targets/asm_directives_new.mli

@@ -172,6 +172,9 @@ val define_data_symbol : Asm_symbol.t -> unit
     will be raised if the current section is not a text section. *)
 val define_function_symbol : Asm_symbol.t -> unit
 
+(** Define a symbol as a label at the current position. No type information is emitted. *)
+val define_symbol_label : section:Asm_section.t -> Asm_symbol.t -> unit
+
 (** Mark a symbol as global. *)
 val global : Asm_symbol.t -> unit