Changed print_fun/var_info to be functions instead of booleans.

5 files changed, 16 insertions, 18 deletions

diff --git a/arm/TargetPrinter.ml b/arm/TargetPrinter.ml
index 079d78ff..7eb01084 100644
--- a/arm/TargetPrinter.ml
+++ b/arm/TargetPrinter.ml
@@ -1058,9 +1058,9 @@ module Target (Opt: PRINTER_OPTIONS) : TARGET =
       if !Clflags.option_mthumb then
         fprintf oc "	.thumb_func\n"
 
-    let print_fun_info = true
+    let print_fun_info = print_fun_info
 
-    let print_var_info = true
+    let print_var_info = print_var_info
 
     let print_comm_symb oc sz name align =
       if C2C.atom_is_static name then
diff --git a/backend/PrintAsm.ml b/backend/PrintAsm.ml
index 532de044..fb03d96b 100644
--- a/backend/PrintAsm.ml
+++ b/backend/PrintAsm.ml
@@ -44,8 +44,7 @@ module Printer(Target:TARGET) =
       Target.cfi_startproc oc;
       Target.print_instructions oc fn;
       Target.cfi_endproc oc;
-      if Target.print_fun_info then
-        print_fun_info oc name;
+      Target.print_fun_info oc name;
       Target.emit_constants oc lit;
       Target.print_jumptable oc jmptbl
         
@@ -78,8 +77,7 @@ module Printer(Target:TARGET) =
               fprintf oc "	.global	%a\n" symbol name;
             fprintf oc "%a:\n" symbol name;
             print_init_data oc name v.gvar_init;
-            if Target.print_var_info then
-              print_var_info oc name;
+            Target.print_var_info oc name;
           end else
             let sz =
               match v.gvar_init with [Init_space sz] -> sz | _ -> assert false in
diff --git a/backend/PrintAsmaux.ml b/backend/PrintAsmaux.ml
index 3f619d84..f3d95f87 100644
--- a/backend/PrintAsmaux.ml
+++ b/backend/PrintAsmaux.ml
@@ -26,8 +26,8 @@ module type TARGET =
       val print_epilogue: out_channel -> unit
       val print_align: out_channel -> int -> unit
       val print_comm_symb:  out_channel -> Z.t -> P.t -> int -> unit
-      val print_var_info: bool
-      val print_fun_info: bool
+      val print_var_info: out_channel -> P.t -> unit
+      val print_fun_info: out_channel -> P.t -> unit
       val print_init: out_channel -> init_data -> unit
       val reset_constants: unit -> unit
       val get_section_names: P.t -> section_name * section_name * section_name
diff --git a/ia32/TargetPrinter.ml b/ia32/TargetPrinter.ml
index 0a14bf24..6de53025 100644
--- a/ia32/TargetPrinter.ml
+++ b/ia32/TargetPrinter.ml
@@ -67,8 +67,8 @@ module type SYSTEM =
       val stack_alignment: int
       val print_align: out_channel -> int -> unit
       val print_mov_ra: out_channel -> ireg -> ident -> unit
-      val print_fun_info: bool
-      val print_var_info: bool
+      val print_fun_info:  out_channel -> P.t -> unit
+      val print_var_info: out_channel -> P.t -> unit
       val print_epilogue: out_channel -> unit
       val print_comm_decl: out_channel -> P.t -> Z.t -> int -> unit
       val print_lcomm_decl: out_channel -> P.t -> Z.t -> int -> unit
@@ -107,9 +107,9 @@ module Cygwin_System : SYSTEM =
     let print_mov_ra oc rd id =   
       fprintf oc "	movl	$%a, %a\n" symbol id ireg rd
 
-    let print_fun_info = false
+    let print_fun_info _ _  = ()
         
-    let print_var_info = false
+    let print_var_info _ _ = ()
 
     let print_epilogue _ = ()
 
@@ -154,9 +154,9 @@ module ELF_System : SYSTEM =
     let print_mov_ra  oc rd id = 
          fprintf oc "	movl	$%a, %a\n" symbol id ireg rd
 
-    let print_fun_info = true
+    let print_fun_info = print_fun_info
       
-    let print_var_info = true
+    let print_var_info = print_var_info
       
     let print_epilogue _ = ()
 
@@ -213,9 +213,9 @@ module MacOS_System : SYSTEM =
       indirect_symbols := StringSet.add id !indirect_symbols;
       fprintf oc "	movl	L%a$non_lazy_ptr, %a\n" raw_symbol id ireg rd
 
-    let print_fun_info = false
+    let print_fun_info _ _ = ()
  
-    let print_var_info = false
+    let print_var_info _ _ = ()
     
     let print_epilogue oc = 
       fprintf oc "	.section __IMPORT,__pointers,non_lazy_symbol_pointers\n";
diff --git a/powerpc/TargetPrinter.ml b/powerpc/TargetPrinter.ml
index 4968e2d2..e9c64ffc 100644
--- a/powerpc/TargetPrinter.ml
+++ b/powerpc/TargetPrinter.ml
@@ -683,7 +683,7 @@ module Target (System : SYSTEM):TARGET =
 
     let comment = comment
 
-    let print_fun_info = true
+    let print_fun_info = print_fun_info
 
     let emit_constants oc lit =
       if !float64_literals <> [] || !float32_literals <> [] then begin
@@ -703,7 +703,7 @@ module Target (System : SYSTEM):TARGET =
             
     let reset_constants = reset_constants
  
-    let print_var_info = true
+    let print_var_info = print_var_info
 
     let print_comm_symb oc sz name align = 
       fprintf oc "	%s	%a, %s, %d\n"