trace: reimplement the DTRACE function so it doesn't use a vector

At the same time, rename the trace flags to debug flags since they
have broader usage than simply tracing.  This means that
--trace-flags is now --debug-flags and --trace-help is now --debug-help

33 files changed, 42 insertions, 0 deletions

diff --git a/src/dev/alpha/backdoor.cc b/src/dev/alpha/backdoor.cc
index 960832f8c..31ab62866 100644
--- a/src/dev/alpha/backdoor.cc
+++ b/src/dev/alpha/backdoor.cc
@@ -44,6 +44,7 @@
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "debug/AlphaBackdoor.hh"
 #include "dev/alpha/backdoor.hh"
 #include "dev/platform.hh"
 #include "dev/simple_disk.hh"
diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc
index fd76fd93e..74f769c86 100644
--- a/src/dev/alpha/tsunami_cchip.cc
+++ b/src/dev/alpha/tsunami_cchip.cc
@@ -42,6 +42,8 @@
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
 #include "cpu/thread_context.hh"
+#include "debug/IPI.hh"
+#include "debug/Tsunami.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunamireg.h"
diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index 37456ada2..0c1937a32 100644
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -43,6 +43,7 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "debug/Tsunami.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunami_io.hh"
diff --git a/src/dev/alpha/tsunami_pchip.cc b/src/dev/alpha/tsunami_pchip.cc
index e293f6333..f8c9104e2 100644
--- a/src/dev/alpha/tsunami_pchip.cc
+++ b/src/dev/alpha/tsunami_pchip.cc
@@ -39,6 +39,7 @@
 
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "debug/Tsunami.hh"
 #include "dev/alpha/tsunami.hh"
 #include "dev/alpha/tsunami_pchip.hh"
 #include "dev/alpha/tsunamireg.h"
diff --git a/src/dev/copy_engine.cc b/src/dev/copy_engine.cc
index feb0342de..361d4db1b 100644
--- a/src/dev/copy_engine.cc
+++ b/src/dev/copy_engine.cc
@@ -36,6 +36,7 @@
 
 #include "base/cp_annotate.hh"
 #include "base/trace.hh"
+#include "debug/DMACopyEngine.hh"
 #include "dev/copy_engine.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/disk_image.cc b/src/dev/disk_image.cc
index 6a06e74f6..4c770fbcd 100644
--- a/src/dev/disk_image.cc
+++ b/src/dev/disk_image.cc
@@ -44,6 +44,8 @@
 #include "base/callback.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
+#include "debug/DiskImageRead.hh"
+#include "debug/DiskImageWrite.hh"
 #include "dev/disk_image.hh"
 #include "sim/byteswap.hh"
 #include "sim/sim_exit.hh"
diff --git a/src/dev/etherbus.cc b/src/dev/etherbus.cc
index b072e16f8..c9e9c93ba 100644
--- a/src/dev/etherbus.cc
+++ b/src/dev/etherbus.cc
@@ -38,6 +38,8 @@
 #include <vector>
 
 #include "base/trace.hh"
+#include "debug/Ethernet.hh"
+#include "debug/EthernetData.hh"
 #include "dev/etherbus.hh"
 #include "dev/etherdump.hh"
 #include "dev/etherint.hh"
diff --git a/src/dev/etherlink.cc b/src/dev/etherlink.cc
index dcecfd933..289b74543 100644
--- a/src/dev/etherlink.cc
+++ b/src/dev/etherlink.cc
@@ -40,6 +40,8 @@
 
 #include "base/random.hh"
 #include "base/trace.hh"
+#include "debug/Ethernet.hh"
+#include "debug/EthernetData.hh"
 #include "dev/etherdump.hh"
 #include "dev/etherint.hh"
 #include "dev/etherlink.hh"
diff --git a/src/dev/ethertap.cc b/src/dev/ethertap.cc
index 401ea8a83..2a85aa524 100644
--- a/src/dev/ethertap.cc
+++ b/src/dev/ethertap.cc
@@ -45,6 +45,8 @@
 #include "base/pollevent.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "debug/Ethernet.hh"
+#include "debug/EthernetData.hh"
 #include "dev/etherdump.hh"
 #include "dev/etherint.hh"
 #include "dev/etherpkt.hh"
diff --git a/src/dev/i8254xGBe.cc b/src/dev/i8254xGBe.cc
index 78a897815..db03f5778 100644
--- a/src/dev/i8254xGBe.cc
+++ b/src/dev/i8254xGBe.cc
@@ -44,6 +44,7 @@
 
 #include "base/inet.hh"
 #include "base/trace.hh"
+#include "debug/EthernetAll.hh"
 #include "dev/i8254xGBe.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/i8254xGBe.hh b/src/dev/i8254xGBe.hh
index 738b1cf43..1e50be165 100644
--- a/src/dev/i8254xGBe.hh
+++ b/src/dev/i8254xGBe.hh
@@ -40,6 +40,8 @@
 
 #include "base/cp_annotate.hh"
 #include "base/inet.hh"
+#include "debug/EthernetDesc.hh"
+#include "debug/EthernetIntr.hh"
 #include "dev/etherdevice.hh"
 #include "dev/etherint.hh"
 #include "dev/etherpkt.hh"
diff --git a/src/dev/ide_ctrl.cc b/src/dev/ide_ctrl.cc
index 8e9b673ac..a370c7f36 100644
--- a/src/dev/ide_ctrl.cc
+++ b/src/dev/ide_ctrl.cc
@@ -34,6 +34,7 @@
 
 #include "base/trace.hh"
 #include "cpu/intr_control.hh"
+#include "debug/IdeCtrl.hh"
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_disk.hh"
 #include "mem/packet.hh"
diff --git a/src/dev/ide_disk.cc b/src/dev/ide_disk.cc
index c6c020e5c..a67318b68 100644
--- a/src/dev/ide_disk.cc
+++ b/src/dev/ide_disk.cc
@@ -43,6 +43,7 @@
 #include "base/cprintf.hh" // csprintf
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "debug/IdeDisk.hh"
 #include "dev/disk_image.hh"
 #include "dev/ide_ctrl.hh"
 #include "dev/ide_disk.hh"
diff --git a/src/dev/intel_8254_timer.cc b/src/dev/intel_8254_timer.cc
index cad59bbdb..4aa3fec14 100644
--- a/src/dev/intel_8254_timer.cc
+++ b/src/dev/intel_8254_timer.cc
@@ -31,6 +31,7 @@
  */
 
 #include "base/misc.hh"
+#include "debug/Intel8254Timer.hh"
 #include "dev/intel_8254_timer.hh"
 
 using namespace std;
diff --git a/src/dev/intel_8254_timer.hh b/src/dev/intel_8254_timer.hh
index bdfdf36cc..72b9b9c72 100644
--- a/src/dev/intel_8254_timer.hh
+++ b/src/dev/intel_8254_timer.hh
@@ -38,6 +38,7 @@
 
 #include "base/bitunion.hh"
 #include "base/types.hh"
+#include "debug/Intel8254Timer.hh"
 #include "sim/eventq.hh"
 #include "sim/serialize.hh"
 
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index b9c47adc6..bfdf3d486 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -31,6 +31,8 @@
 
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
+#include "debug/BusAddrRanges.hh"
+#include "debug/DMA.hh"
 #include "dev/io_device.hh"
 #include "sim/system.hh"
 
diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc
index af3ca3b0f..21b723bdc 100644
--- a/src/dev/isa_fake.cc
+++ b/src/dev/isa_fake.cc
@@ -33,6 +33,7 @@
  */
 
 #include "base/trace.hh"
+#include "debug/IsaFake.hh"
 #include "dev/isa_fake.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/mc146818.cc b/src/dev/mc146818.cc
index c29bb94b4..9397a599b 100644
--- a/src/dev/mc146818.cc
+++ b/src/dev/mc146818.cc
@@ -38,6 +38,7 @@
 #include "base/bitfield.hh"
 #include "base/time.hh"
 #include "base/trace.hh"
+#include "debug/MC146818.hh"
 #include "dev/mc146818.hh"
 #include "dev/rtcreg.h"
 
diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc
index f1b95e113..a7bc6d0ab 100644
--- a/src/dev/ns_gige.cc
+++ b/src/dev/ns_gige.cc
@@ -41,6 +41,7 @@
 #include "base/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
+#include "debug/EthernetAll.hh"
 #include "dev/etherlink.hh"
 #include "dev/ns_gige.hh"
 #include "dev/pciconfigall.hh"
diff --git a/src/dev/pciconfigall.cc b/src/dev/pciconfigall.cc
index 74396be5d..55b439857 100644
--- a/src/dev/pciconfigall.cc
+++ b/src/dev/pciconfigall.cc
@@ -34,6 +34,7 @@
  */
 
 #include "base/trace.hh"
+#include "debug/PciConfigAll.hh"
 #include "dev/pciconfigall.hh"
 #include "dev/pcireg.h"
 #include "dev/platform.hh"
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc
index db68a3799..a22612d18 100644
--- a/src/dev/pcidev.cc
+++ b/src/dev/pcidev.cc
@@ -43,6 +43,7 @@
 #include "base/misc.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
+#include "debug/PCIDEV.hh"
 #include "dev/alpha/tsunamireg.h"
 #include "dev/pciconfigall.hh"
 #include "dev/pcidev.hh"
diff --git a/src/dev/simple_disk.cc b/src/dev/simple_disk.cc
index eb603c6c7..4bf24b1cd 100644
--- a/src/dev/simple_disk.cc
+++ b/src/dev/simple_disk.cc
@@ -42,6 +42,8 @@
 
 #include "base/misc.hh"
 #include "base/trace.hh"
+#include "debug/SimpleDisk.hh"
+#include "debug/SimpleDiskData.hh"
 #include "dev/disk_image.hh"
 #include "dev/simple_disk.hh"
 #include "mem/port.hh"
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc
index 9141b629c..1c7e1694a 100644
--- a/src/dev/sinic.cc
+++ b/src/dev/sinic.cc
@@ -39,6 +39,7 @@
 #include "config/the_isa.hh"
 #include "cpu/intr_control.hh"
 #include "cpu/thread_context.hh"
+#include "debug/EthernetAll.hh"
 #include "dev/etherlink.hh"
 #include "dev/sinic.hh"
 #include "mem/packet.hh"
diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index 9bf8eca15..748a08c81 100644
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -42,6 +42,7 @@
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/intr_control.hh"
+#include "debug/Iob.hh"
 #include "dev/sparc/iob.hh"
 #include "dev/platform.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc
index f9a91eded..b86905387 100644
--- a/src/dev/sparc/mm_disk.cc
+++ b/src/dev/sparc/mm_disk.cc
@@ -36,6 +36,7 @@
 #include <cstring>
 
 #include "base/trace.hh"
+#include "debug/IdeDisk.hh"
 #include "dev/sparc/mm_disk.hh"
 #include "dev/platform.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/terminal.cc b/src/dev/terminal.cc
index 637061082..bae4c9194 100644
--- a/src/dev/terminal.cc
+++ b/src/dev/terminal.cc
@@ -50,6 +50,8 @@
 #include "base/output.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "debug/Terminal.hh"
+#include "debug/TerminalVerbose.hh"
 #include "dev/platform.hh"
 #include "dev/terminal.hh"
 #include "dev/uart.hh"
diff --git a/src/dev/uart8250.cc b/src/dev/uart8250.cc
index f33a428f7..877e9fb47 100644
--- a/src/dev/uart8250.cc
+++ b/src/dev/uart8250.cc
@@ -39,6 +39,7 @@
 #include "base/str.hh"        // for to_number
 #include "base/trace.hh"
 #include "config/the_isa.hh"
+#include "debug/Uart.hh"
 #include "dev/platform.hh"
 #include "dev/terminal.hh"
 #include "dev/uart8250.hh"
diff --git a/src/dev/x86/cmos.cc b/src/dev/x86/cmos.cc
index aa92521dc..d7107deb7 100644
--- a/src/dev/x86/cmos.cc
+++ b/src/dev/x86/cmos.cc
@@ -28,6 +28,7 @@
  * Authors: Gabe Black
  */
 
+#include "debug/CMOS.hh"
 #include "dev/x86/cmos.hh"
 #include "dev/x86/intdev.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8042.cc b/src/dev/x86/i8042.cc
index fb1412615..a0786c95c 100644
--- a/src/dev/x86/i8042.cc
+++ b/src/dev/x86/i8042.cc
@@ -29,6 +29,7 @@
  */
 
 #include "base/bitunion.hh"
+#include "debug/I8042.hh"
 #include "dev/x86/i8042.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc
index 90c6a0900..584090a9e 100644
--- a/src/dev/x86/i82094aa.cc
+++ b/src/dev/x86/i82094aa.cc
@@ -30,6 +30,7 @@
 
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
+#include "debug/I82094AA.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8259.hh"
 #include "mem/packet.hh"
diff --git a/src/dev/x86/i8254.cc b/src/dev/x86/i8254.cc
index dd1ff7c5e..f6af34a65 100644
--- a/src/dev/x86/i8254.cc
+++ b/src/dev/x86/i8254.cc
@@ -28,6 +28,7 @@
  * Authors: Gabe Black
  */
 
+#include "debug/I8254.hh"
 #include "dev/x86/i8254.hh"
 #include "dev/x86/intdev.hh"
 #include "mem/packet.hh"
diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc
index 651196b47..4e8c10181 100644
--- a/src/dev/x86/i8259.cc
+++ b/src/dev/x86/i8259.cc
@@ -29,6 +29,7 @@
  */
 
 #include "base/bitfield.hh"
+#include "debug/I8259.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8259.hh"
 #include "mem/packet.hh"
diff --git a/src/dev/x86/speaker.cc b/src/dev/x86/speaker.cc
index b0f4dcd8b..70f52dd1a 100644
--- a/src/dev/x86/speaker.cc
+++ b/src/dev/x86/speaker.cc
@@ -30,6 +30,7 @@
 
 #include "base/bitunion.hh"
 #include "base/trace.hh"
+#include "debug/PcSpeaker.hh"
 #include "dev/x86/i8254.hh"
 #include "dev/x86/speaker.hh"
 #include "mem/packet.hh"