summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-11-30 17:36:53 -0800
committerGabe Black <gabeblack@google.com>2017-12-04 23:10:55 +0000
commit1088f0c4ac3999fc3c363cc51daef4cfb360a2bd (patch)
tree64b3cc0b13bd6ba6aa375163765d36b385d32663 /src/cpu
parent86f18f26fc7223cc8a63a792d2be1267f573f97c (diff)
downloadgem5-1088f0c4ac3999fc3c363cc51daef4cfb360a2bd.tar.xz
misc: Rename misc.(hh|cc) to logging.(hh|cc)
These files aren't a collection of miscellaneous stuff, they're the definition of the Logger interface, and a few utility macros for calling into that interface (panic, warn, etc.). Change-Id: I84267ac3f45896a83c0ef027f8f19c5e9a5667d1 Reviewed-on: https://gem5-review.googlesource.com/6226 Reviewed-by: Brandon Potter <Brandon.Potter@amd.com> Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/base.cc2
-rw-r--r--src/cpu/func_unit.cc2
-rw-r--r--src/cpu/intr_control.hh2
-rw-r--r--src/cpu/kvm/device.cc2
-rw-r--r--src/cpu/kvm/perfevent.cc2
-rw-r--r--src/cpu/kvm/timer.cc2
-rw-r--r--src/cpu/minor/buffers.hh4
-rw-r--r--src/cpu/o3/free_list.hh2
-rw-r--r--src/cpu/o3/store_set.cc2
-rw-r--r--src/cpu/pc_event.hh2
-rw-r--r--src/cpu/pred/2bit_local.cc2
-rw-r--r--src/cpu/pred/btb.hh2
-rw-r--r--src/cpu/pred/ltage.cc2
-rw-r--r--src/cpu/pred/sat_counter.hh2
-rw-r--r--src/cpu/simple/base.cc2
-rw-r--r--src/cpu/static_inst.hh2
-rw-r--r--src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc2
-rw-r--r--src/cpu/testers/rubytest/RubyTester.cc2
-rw-r--r--src/cpu/thread_context.cc2
19 files changed, 20 insertions, 20 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index a41a0c3e3..2c3ca0809 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -54,7 +54,7 @@
#include "arch/tlb.hh"
#include "base/cprintf.hh"
#include "base/loader/symtab.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/output.hh"
#include "base/trace.hh"
#include "cpu/checker/cpu.hh"
diff --git a/src/cpu/func_unit.cc b/src/cpu/func_unit.cc
index d5d564050..a7fd4bb3b 100644
--- a/src/cpu/func_unit.cc
+++ b/src/cpu/func_unit.cc
@@ -32,7 +32,7 @@
#include <sstream>
-#include "base/misc.hh"
+#include "base/logging.hh"
using namespace std;
diff --git a/src/cpu/intr_control.hh b/src/cpu/intr_control.hh
index f8ded6f39..b2a6277b1 100644
--- a/src/cpu/intr_control.hh
+++ b/src/cpu/intr_control.hh
@@ -34,7 +34,7 @@
#include <vector>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "params/IntrControl.hh"
#include "sim/sim_object.hh"
#include "sim/system.hh"
diff --git a/src/cpu/kvm/device.cc b/src/cpu/kvm/device.cc
index 973bbaa64..3980b50da 100644
--- a/src/cpu/kvm/device.cc
+++ b/src/cpu/kvm/device.cc
@@ -46,7 +46,7 @@
#include <cassert>
#include <cerrno>
-#include "base/misc.hh"
+#include "base/logging.hh"
KvmDevice::KvmDevice(int _fd)
: fd(_fd)
diff --git a/src/cpu/kvm/perfevent.cc b/src/cpu/kvm/perfevent.cc
index 5738b8eca..5023b301e 100644
--- a/src/cpu/kvm/perfevent.cc
+++ b/src/cpu/kvm/perfevent.cc
@@ -50,7 +50,7 @@
#include <csignal>
#include <cstring>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "perfevent.hh"
PerfKvmCounterConfig::PerfKvmCounterConfig(uint32_t type, uint64_t config)
diff --git a/src/cpu/kvm/timer.cc b/src/cpu/kvm/timer.cc
index 03b31bd3f..8d3e69f42 100644
--- a/src/cpu/kvm/timer.cc
+++ b/src/cpu/kvm/timer.cc
@@ -46,7 +46,7 @@
#include <csignal>
#include <ctime>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/KvmTimer.hh"
diff --git a/src/cpu/minor/buffers.hh b/src/cpu/minor/buffers.hh
index 924d7d2af..864b29e0c 100644
--- a/src/cpu/minor/buffers.hh
+++ b/src/cpu/minor/buffers.hh
@@ -50,9 +50,9 @@
#include <queue>
#include <sstream>
-#include "base/misc.hh"
-#include "cpu/minor/trace.hh"
+#include "base/logging.hh"
#include "cpu/activity.hh"
+#include "cpu/minor/trace.hh"
#include "cpu/timebuf.hh"
namespace Minor
diff --git a/src/cpu/o3/free_list.hh b/src/cpu/o3/free_list.hh
index f4c26a697..3ad08ee98 100644
--- a/src/cpu/o3/free_list.hh
+++ b/src/cpu/o3/free_list.hh
@@ -48,7 +48,7 @@
#include <queue>
#include <vector>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "cpu/o3/comm.hh"
#include "cpu/o3/regfile.hh"
diff --git a/src/cpu/o3/store_set.cc b/src/cpu/o3/store_set.cc
index 9c21fbff3..6fa75186f 100644
--- a/src/cpu/o3/store_set.cc
+++ b/src/cpu/o3/store_set.cc
@@ -31,7 +31,7 @@
#include "cpu/o3/store_set.hh"
#include "base/intmath.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/StoreSet.hh"
diff --git a/src/cpu/pc_event.hh b/src/cpu/pc_event.hh
index 11fce2ca0..7b57e97a7 100644
--- a/src/cpu/pc_event.hh
+++ b/src/cpu/pc_event.hh
@@ -34,7 +34,7 @@
#include <vector>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
class ThreadContext;
diff --git a/src/cpu/pred/2bit_local.cc b/src/cpu/pred/2bit_local.cc
index adbb07583..cd97f2bdf 100644
--- a/src/cpu/pred/2bit_local.cc
+++ b/src/cpu/pred/2bit_local.cc
@@ -31,7 +31,7 @@
#include "cpu/pred/2bit_local.hh"
#include "base/intmath.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/Fetch.hh"
diff --git a/src/cpu/pred/btb.hh b/src/cpu/pred/btb.hh
index 209bbdb49..0a15cc0e4 100644
--- a/src/cpu/pred/btb.hh
+++ b/src/cpu/pred/btb.hh
@@ -32,7 +32,7 @@
#define __CPU_PRED_BTB_HH__
#include "arch/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
#include "config/the_isa.hh"
diff --git a/src/cpu/pred/ltage.cc b/src/cpu/pred/ltage.cc
index 84fc9a404..251fb2e7f 100644
--- a/src/cpu/pred/ltage.cc
+++ b/src/cpu/pred/ltage.cc
@@ -41,7 +41,7 @@
#include "cpu/pred/ltage.hh"
#include "base/intmath.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/random.hh"
#include "base/trace.hh"
#include "debug/Fetch.hh"
diff --git a/src/cpu/pred/sat_counter.hh b/src/cpu/pred/sat_counter.hh
index 4721a3f9f..92d5d628c 100644
--- a/src/cpu/pred/sat_counter.hh
+++ b/src/cpu/pred/sat_counter.hh
@@ -31,7 +31,7 @@
#ifndef __CPU_PRED_SAT_COUNTER_HH__
#define __CPU_PRED_SAT_COUNTER_HH__
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/types.hh"
/**
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 62900ec78..5c8eba6ef 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -52,7 +52,7 @@
#include "base/cprintf.hh"
#include "base/inifile.hh"
#include "base/loader/symtab.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/pollevent.hh"
#include "base/trace.hh"
#include "base/types.hh"
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 883c532ac..a58df00c7 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -37,7 +37,7 @@
#include "arch/registers.hh"
#include "arch/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/refcnt.hh"
#include "base/types.hh"
#include "config/the_isa.hh"
diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
index 1345fe93e..f7513d382 100644
--- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
+++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
@@ -36,7 +36,7 @@
#include <string>
#include <vector>
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/random.hh"
#include "base/statistics.hh"
#include "debug/GarnetSyntheticTraffic.hh"
diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc
index 712d15dff..d9ca030c7 100644
--- a/src/cpu/testers/rubytest/RubyTester.cc
+++ b/src/cpu/testers/rubytest/RubyTester.cc
@@ -41,7 +41,7 @@
#include "cpu/testers/rubytest/RubyTester.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "cpu/testers/rubytest/Check.hh"
#include "debug/RubyTest.hh"
diff --git a/src/cpu/thread_context.cc b/src/cpu/thread_context.cc
index 0d288de6f..bf25cd65f 100644
--- a/src/cpu/thread_context.cc
+++ b/src/cpu/thread_context.cc
@@ -44,7 +44,7 @@
#include "cpu/thread_context.hh"
#include "arch/kernel_stats.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "cpu/base.hh"