aboutsummaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/Asmexpandaux.ml4
-rw-r--r--backend/PrintAsm.ml8
2 files changed, 6 insertions, 6 deletions
diff --git a/backend/Asmexpandaux.ml b/backend/Asmexpandaux.ml
index 7b8cc8c2..3d1dd754 100644
--- a/backend/Asmexpandaux.ml
+++ b/backend/Asmexpandaux.ml
@@ -94,8 +94,7 @@ let expand_debug id sp preg simple l =
lbl
| Some lbl -> lbl in
let rec aux lbl scopes = function
- | [] -> let lbl = get_lbl lbl in
- Debug.function_end id lbl
+ | [] -> ()
| (Pbuiltin(EF_debug (kind,txt,_x),args,_) as i)::rest ->
let kind = (P.to_int kind) in
begin
@@ -133,6 +132,7 @@ let expand_debug id sp preg simple l =
| _ ->
aux None scopes rest
end
+ | (Plabel lbl)::rest -> simple (Plabel lbl); aux (Some lbl) scopes rest
| i::rest -> simple i; aux None scopes rest in
(* We need to move all closing debug annotations before the last real statement *)
let rec move_debug acc bcc = function
diff --git a/backend/PrintAsm.ml b/backend/PrintAsm.ml
index e7c945e3..6c1eda57 100644
--- a/backend/PrintAsm.ml
+++ b/backend/PrintAsm.ml
@@ -24,10 +24,10 @@ open TargetPrinter
module Printer(Target:TARGET) =
struct
- let get_fun_addr name =
+ let get_fun_addr name txt =
let s = Target.new_label ()
and e = Target.new_label () in
- Debug.add_fun_addr name (e,s);
+ Debug.add_fun_addr name txt (e,s);
s,e
let print_debug_label oc l =
@@ -51,7 +51,7 @@ module Printer(Target:TARGET) =
fprintf oc " .globl %a\n" Target.symbol name;
Target.print_optional_fun_info oc;
let s,e = if !Clflags.option_g && Configuration.advanced_debug then
- get_fun_addr name
+ get_fun_addr name text
else
-1,-1 in
print_debug_label oc s;
@@ -112,8 +112,8 @@ module Printer(Target:TARGET) =
struct
let label = Target.label
let section = Target.section
- let name_of_section = Target.name_of_section
let symbol = Target.symbol
+ let comment = Target.comment
end
module DebugPrinter = DwarfPrinter (DwarfTarget)