architecture specific symbol types

Author: spiessimon

backend/amd64/emit.ml

@@ -110,7 +110,7 @@ let to_x86_directive (dir : ND.Directive.t) : X86_ast.asm_line list =
     comment_lines comment @ [X86_ast.Sleb128 (to_x86_constant constant)]
   | Space { bytes } -> [Space bytes]
   | Type (n, st) ->
-    let typ = match st with Function -> "STT_FUNC" | Object -> "STT_OBJECT" in
+    let typ = ND.symbol_type_to_string st in
     [Type (n, typ)]
   | Uleb128 { constant; comment } ->
     comment_lines comment @ [X86_ast.Uleb128 (to_x86_constant constant)]

backend/asm_targets/asm_directives_new.ml

@@ -65,6 +65,16 @@ type symbol_type =
   | Function
   | Object
 
+(* CR sspies: We should use the "STT" forms when they are supported as they are
+   unambiguous across platforms (cf.
+   https://sourceware.org/binutils/docs/as/Type.html). *)
+let symbol_type_to_string sym =
+  match TS.architecture () with
+  | AArch64 -> ( match sym with Function -> "%function" | Object -> "%object")
+  | X86_64 -> (
+    match sym with Function -> "@function" | Object -> "STT_OBJECT")
+  | _ -> Misc.fatal_error "Symbol types not implemented for this architecture."
+
 let bprintf = Printf.bprintf
 
 module Directive = struct
@@ -349,12 +359,7 @@ module Directive = struct
       let comment = gas_comment_opt comment in
       bprintf buf "\t.sleb128\t%a%s" Constant.print constant comment
     | Type (s, typ) ->
-      (* We use the "STT" forms when they are supported as they are unambiguous
-         across platforms (cf. https://sourceware.org/binutils/docs/as/Type.html
-         ). *)
-      let typ =
-        match typ with Function -> "STT_FUNC" | Object -> "STT_OBJECT"
-      in
+      let typ = symbol_type_to_string typ in
       bprintf buf "\t.type %s %s" s typ
     | Uleb128 { constant; comment } ->
       let comment = gas_comment_opt comment in

backend/asm_targets/asm_directives_new.mli

@@ -210,6 +210,9 @@ type symbol_type =
   | Function
   | Object
 
+(** The string representation, architecture dependent at the moment. *)
+val symbol_type_to_string : symbol_type -> string
+
 val type_symbol : Asm_symbol.t -> ty:symbol_type -> unit
 
 val type_label : Asm_label.t -> ty:symbol_type -> unit