From b19b9defebf96ba8599f481d4c617d43c21642ef Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Fri, 10 Apr 2020 18:09:34 +0200
Subject: use proper local labels

---
 aarch64/TargetPrinter.ml                | 2 +-
 backend/Profilingaux.ml                 | 5 +++--
 runtime/c/write_profiling_table.c       | 2 +-
 test/monniaux/minisat/Makefile.profiled | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/aarch64/TargetPrinter.ml b/aarch64/TargetPrinter.ml
index 0eaf3923..9d605336 100644
--- a/aarch64/TargetPrinter.ml
+++ b/aarch64/TargetPrinter.ml
@@ -230,7 +230,7 @@ module Target : TARGET =
     let next_profiling_label =
       let atomic_incr_counter = ref 0 in
       fun () ->
-      let r = sprintf ".compcert_atomic_incr%d" !atomic_incr_counter in
+      let r = sprintf ".Lcompcert_atomic_incr%d" !atomic_incr_counter in
       incr atomic_incr_counter; r;;
                 
     let print_profiling_logger oc id kind =
diff --git a/backend/Profilingaux.ml b/backend/Profilingaux.ml
index a1d41ceb..0ba739c2 100644
--- a/backend/Profilingaux.ml
+++ b/backend/Profilingaux.ml
@@ -48,13 +48,14 @@ let load_profiling_info (filename : string) : unit =
       let id : identifier = really_input_string ic 16 in
       let counter0 = input_counter ic in
       let counter1 = input_counter ic in
-      (* Printf.fprintf stderr "%a : %Ld %Ld\n" pp_id id counter0 counter1; *)
+      (* Printf.fprintf stderr "%a : %Ld %Ld\n" pp_id id counter0 counter1 *)
       add_profiling_counts id counter0 counter1
     done
   with End_of_file -> close_in ic;;
 
 let condition_oracle (id : identifier) : bool option =
   let (count0, count1) = get_counts id in
-  (* Printf.fprintf stderr "%a : %Ld %Ld\n" pp_id id count0 count1; *)
+  (if count0 <> 0L || count1 <> 0L then
+  Printf.fprintf stderr "%a : %Ld %Ld\n" pp_id id count0 count1);
   if count0 = count1 then None
   else Some(count1 > count0);;
diff --git a/runtime/c/write_profiling_table.c b/runtime/c/write_profiling_table.c
index 3c7303e4..60bae3d7 100644
--- a/runtime/c/write_profiling_table.c
+++ b/runtime/c/write_profiling_table.c
@@ -46,5 +46,5 @@ void _compcert_write_profiling_table(unsigned int nr_items,
     perror("write CompCert profiling data");
     return;
   }
-  //fprintf(stderr, "no error\n");
+  fprintf(stderr, "write CompCert profiling data: no error\n");
 }
diff --git a/test/monniaux/minisat/Makefile.profiled b/test/monniaux/minisat/Makefile.profiled
index 2c078f28..64e7cb80 100644
--- a/test/monniaux/minisat/Makefile.profiled
+++ b/test/monniaux/minisat/Makefile.profiled
@@ -41,7 +41,7 @@ minisat.ccomp.trace-linearize.exe: $(CFILES)
 
 $(PROFILING_DAT): minisat.ccomp.profile-arcs.exe
 	-rm -f $(PROFILING_DAT)
-	$(EXECUTE) $< $(EXAMPLE)
+	$(EXECUTE) $< $(EXAMPLE) || true
 
 minisat.ccomp.profiled.exe: $(CFILES) $(PROFILING_DAT)
 	$(CCOMP) $(CCOMPFLAGS) -fprofile-use= $(PROFILING_DAT) -ftracelinearize $(CFILES) -o $@ $(LIBS)
-- 
cgit