merge from gcc

[external/binutils.git] / sim / ppc / debug.c

diff --git a/sim/ppc/debug.c b/sim/ppc/debug.c
index b23644c..79dd47b 100644 (file)
--- a/sim/ppc/debug.c
+++ b/sim/ppc/debug.c
@@ -1,6 +1,6 @@
 /*  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
@@ -22,11 +22,17 @@
 #ifndef _DEBUG_C_
 #define _DEBUG_C_
 
+#include "config.h"
 #include "basics.h"
+
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 
 int ppc_trace[nr_trace_options];
-int print_info;
 
 typedef struct _trace_option_descriptor {
   trace_options option;
@@ -36,45 +42,63 @@ typedef struct _trace_option_descriptor {
 
 static trace_option_descriptor trace_description[] = {
   { trace_gdb, "gdb", "calls made by gdb to the sim_calls.c file" },
-  { trace_os_emul, "os-emul", "VEA mode sytem calls - like strace/spy" },
+  { trace_os_emul, "os-emul", "VEA mode sytem calls - like strace" },
+  { trace_events, "events", "event queue handling" },
   /* decode/issue */
   { trace_semantics, "semantics", "Instruction execution (issue)" },
-  { trace_idecode, "idecode", "instruction decode (when miss in cache)" },
+  { trace_idecode, "idecode", "instruction decode (when miss in icache)" },
   { trace_alu, "alu", "results of integer ALU" },
-  { trace_load_store, "load-store", "transfers to from data registers" },
+  { trace_vm, "vm", "OEA address translation" },
+  { trace_load_store, "load-store", "transfers between registers and memory" },
+  { trace_model, "model", "model specific information" },
+  { trace_interrupts, "interrupts", "interrupt handling" },
   /* devices */
   { trace_device_tree, "device-tree",  },
   { trace_devices, "devices" },
-  { trace_pass_device, "pass-device" },
+  { trace_binary_device, "binary-device" },
+  { trace_com_device, "com-device" },
   { trace_console_device, "console-device" },
-  { trace_icu_device, "icu-device" },
+  { trace_core_device, "core-device" },
+  { trace_disk_device, "disk-device" },
+  { trace_eeprom_device, "eeprom-device" },
+  { trace_file_device, "file-device" },
+  { trace_glue_device, "glue-device" },
   { trace_halt_device, "halt-device" },
-  { trace_register_device, "register-device" },
-  { trace_vm_device, "vm-device" },
-  { trace_memory_device, "memory-device" },
   { trace_htab_device, "htab-device" },
-  { trace_pte_device, "pte-device" },
-  { trace_binary_device, "binary-device" },
-  { trace_file_device, "file-device" },
-  { trace_core_device, "core-device" },
+  { trace_icu_device, "icu-device" },
+  { trace_ide_device, "ide-device" },
+  { trace_memory_device, "memory-device" },
+  { trace_opic_device, "opic-device" },
+  { trace_pal_device, "pal-device" },
+  { trace_pass_device, "pass-device" },
+  { trace_phb_device, "phb-device" },
+  { trace_register_device, "register-device", "Device initializing registers" },
+  { trace_sem_device, "sem-device" },
+  { trace_shm_device, "shm-device" },
   { trace_stack_device, "stack-device" },
+  { trace_vm_device, "vm-device" },
+  /* packages */
+  { trace_disklabel_package, "disklabel-package" },
   /* misc */
+  { trace_print_info, "print-info", "Print performance analysis information" },
+  { trace_opts, "options", "Print options simulator was compiled with" },
+  /*{ trace_tbd, "tbd", "Trace any missing features" },*/
+  { trace_print_device_tree, "print-device-tree", "Output the contents of the device tree" },
+  { trace_dump_device_tree, "dump-device-tree", "Output the contents of the device tree then exit" },
   /* sentinal */
   { nr_trace_options, NULL },
 };
 
 extern void
-trace_option(const char *option)
+trace_option(const char *option,
+            int setting)
 {
-  int setting = 1;
-  if (option[0] == '!') {
-    setting = 0; /* clear it */
-    option += 1;
-  }
   if (strcmp(option, "all") == 0) {
     trace_options i;
     for (i = 0; i < nr_trace_options; i++)
-      ppc_trace[i] = setting;
+      if (i != trace_dump_device_tree) {
+       ppc_trace[i] = setting;
+      }
   }
   else {
     int i = 0;
@@ -96,19 +120,39 @@ trace_option(const char *option)
 
 
 extern void
-trace_usage(void)
+trace_usage(int verbose)
 {
-  const char *format = "\t%-18s%s\n";
-  int i;
-  printf_filtered("Possible <trace-option>s are:\n");
-  printf_filtered(format, "!<trace-option>", "Disable the specified option");
-  printf_filtered(format, "all", "enable all the trace options");
-  for (i = 0; trace_description[i].option < nr_trace_options; i++)
-    printf_filtered(format,
-                   trace_description[i].name,
-                   (trace_description[i].description
-                    ? trace_description[i].description
-                    : ""));
+  if (verbose) {
+    printf_filtered("\n");
+    printf_filtered("The following are possible <trace> options:\n");
+    printf_filtered("\n");
+  }
+  if (verbose == 1) {
+    int pos;
+    int i;
+    printf_filtered("  all");
+    pos = strlen("all") + 2;
+    for (i = 0; trace_description[i].option < nr_trace_options; i++) {
+      pos += strlen(trace_description[i].name) + 2;
+      if (pos > 75) {
+       pos = strlen(trace_description[i].name) + 2;
+       printf_filtered("\n");
+      }
+      printf_filtered("  %s", trace_description[i].name);
+    }
+    printf_filtered("\n");
+  }
+  if (verbose > 1) {
+    const char *format = "\t%-18s%s\n";
+    int i;
+    printf_filtered(format, "all", "enable all the trace options");
+    for (i = 0; trace_description[i].option < nr_trace_options; i++)
+      printf_filtered(format,
+                     trace_description[i].name,
+                     (trace_description[i].description
+                      ? trace_description[i].description
+                      : ""));
+  }
 }
 
 #endif /* _DEBUG_C_ */