[sim/ppc] Fix printf_filtered reference

[deliverable/binutils-gdb.git] / sim / ppc / debug.h

diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h
index e1cb053b7ff3670143f1e12370b1cc64001f96f7..6f19624179e2047c804dab0d2257d2484037f651 100644 (file)
--- a/sim/ppc/debug.h
+++ b/sim/ppc/debug.h
@@ -1,10 +1,10 @@
 /*  This file is part of the program psim.
 
-    Copyright (C) 1994-1995, Andrew Cagney <cagney@highland.com.au>
+    Copyright (C) 1994-1997, Andrew Cagney <cagney@highland.com.au>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
  
     */
 
@@ -31,33 +30,51 @@ typedef enum {
   trace_gdb,
   trace_os_emul,
   /**/
+  trace_events,
   trace_device_tree,
   trace_devices,
-  trace_pass_device,
+  trace_binary_device,
+  trace_com_device,
   trace_console_device,
-  trace_icu_device,
+  trace_core_device,
+  trace_disk_device,
+  trace_eeprom_device,
+  trace_file_device,
+  trace_glue_device,
   trace_halt_device,
-  trace_register_device,
-  trace_vm_device,
-  trace_memory_device,
   trace_htab_device,
-  trace_pte_device,
-  trace_binary_device,
-  trace_file_device,
-  trace_core_device,
+  trace_icu_device,
+  trace_ide_device,
+  trace_memory_device,
+  trace_opic_device,
+  trace_pal_device,
+  trace_pass_device,
+  trace_phb_device,
+  trace_sem_device,
+  trace_shm_device,
   trace_stack_device,
+  trace_register_device,
+  trace_vm_device,
+  /**/
+  trace_disklabel_package,
   /**/
   trace_semantics,
   trace_idecode,
   trace_alu,
   trace_load_store,
+  trace_model,
   /**/
   trace_vm,
   trace_core,
+  trace_interrupts,
   trace_psim,
   trace_device_init,
   trace_cpu,
   trace_breakpoint,
+  trace_opts,
+  trace_print_info,
+  trace_print_device_tree,
+  trace_dump_device_tree,
   nr_trace_options
 } trace_options;
 
@@ -65,55 +82,92 @@ typedef enum {
 
 extern int ppc_trace[nr_trace_options];
 
-#if WITH_TRACE
+/* simple */
 #define TRACE(OBJECT, ARGS) \
 do { \
-  if (ppc_trace[OBJECT]) { \
-    printf_filtered("%s:%d:%s: ", filter_filename(__FILE__), __LINE__, #OBJECT); \
-    printf_filtered ARGS; \
+  if (WITH_TRACE) { \
+    if (ppc_trace[OBJECT]) { \
+      sim_io_printf_filtered("%s:%d: ", filter_filename(__FILE__), __LINE__); \
+      sim_io_printf_filtered ARGS; \
+    } \
   } \
 } while (0)
+
 /* issue */
 #define ITRACE(OBJECT, ARGS) \
 do { \
-  if (ppc_trace[OBJECT]) { \
-    printf_filtered("%s:%d:0x%x", my_prefix, cpu_nr(processor) + 1, cia); \
-    printf_filtered ARGS; \
+  if (WITH_TRACE) { \
+    if (ppc_trace[OBJECT]) { \
+      sim_io_printf_filtered("%s:%d:0x%08lx:%s ", itable[MY_INDEX].file, itable[MY_INDEX].line_nr, (long)cia, itable[MY_INDEX].name); \
+      sim_io_printf_filtered ARGS; \
+    } \
   } \
 } while (0)
+
 /* device */
 #define DTRACE(OBJECT, ARGS) \
 do { \
-  if (ppc_trace[trace_devices] || ppc_trace[trace_##OBJECT##_device]) { \
-    printf_filtered("%s:%d:%s: ", filter_filename(__FILE__), __LINE__, #OBJECT); \
-    printf_filtered ARGS; \
+  if (WITH_TRACE) { \
+    int trace_device = device_trace(me); \
+    if (ppc_trace[trace_devices] \
+       || ppc_trace[trace_##OBJECT##_device] \
+       || trace_device) { \
+      sim_io_printf_filtered("%s:%d:%s:%s%s ",                                 \
+                            filter_filename(__FILE__), __LINE__, #OBJECT, \
+                            trace_device ? device_path(me) : "",       \
+                            trace_device ? ":" : "");                  \
+      sim_io_printf_filtered ARGS; \
+    } \
+  } \
+} while (0)
+
+/* device instance */
+#define DITRACE(OBJECT, ARGS) \
+do { \
+  if (WITH_TRACE) { \
+    device *me = device_instance_device(instance); \
+    int trace_device = device_trace(me); \
+    if (ppc_trace[trace_devices] \
+       || ppc_trace[trace_##OBJECT##_device] \
+       || trace_device) { \
+      sim_io_printf_filtered("%s:%d:%s:%s%s ", \
+                            filter_filename(__FILE__), __LINE__, #OBJECT, \
+                            trace_device ? device_path(me) : "",       \
+                            trace_device ? ":" : "");                  \
+      sim_io_printf_filtered ARGS; \
+    } \
   } \
 } while (0)
-#else
-#define TRACE(OBJECT, ARGS)
-#define ITRACE(OBJECT, ARGS)
-#define DTRACE(OBJECT, ARGS)
-#endif
 
-#if WITH_ASSERT
+/* package */
+#define PTRACE(OBJECT, ARGS) \
+do { \
+  if (WITH_TRACE) { \
+    if (ppc_trace[trace_##OBJECT##_package]) { \
+      sim_io_printf_filtered("%s:%d:%s: ", filter_filename(__FILE__), __LINE__, #OBJECT); \
+      sim_io_printf_filtered ARGS; \
+    } \
+  } \
+} while (0)
+
+
 #define ASSERT(EXPRESSION) \
 do { \
-  if (!(EXPRESSION)) { \
-    error("%s:%d: assertion failed - %s\n", \
-         filter_filename(__FILE__), __LINE__, #EXPRESSION); \
+  if (WITH_ASSERT) { \
+    if (!(EXPRESSION)) { \
+      error("%s:%d: assertion failed - %s\n", \
+           filter_filename(__FILE__), __LINE__, #EXPRESSION); \
+    } \
   } \
 } while (0)
-#else
-#define ASSERT(EXPRESSION)
-#endif
 
 /* Parse OPTION updating the trace array */
 extern void
-trace_option(const char *option);
+trace_option(const char *option, int setting);
 
 /* Output the list of trace options */
-extern void
-trace_usage(void);
+extern void trace_usage
+(int verbose);
 
 
 #endif /* _DEBUG_H_ */