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>

57 files changed, 58 insertions, 58 deletions

diff --git a/src/arch/alpha/isa.cc b/src/arch/alpha/isa.cc
index fd2dda67c..32d1aff65 100644
--- a/src/arch/alpha/isa.cc
+++ b/src/arch/alpha/isa.cc
@@ -32,7 +32,7 @@
 
 #include <cassert>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "params/AlphaISA.hh"
 #include "sim/serialize.hh"
diff --git a/src/arch/alpha/locked_mem.hh b/src/arch/alpha/locked_mem.hh
index ba577e8cb..36a6a0333 100644
--- a/src/arch/alpha/locked_mem.hh
+++ b/src/arch/alpha/locked_mem.hh
@@ -58,7 +58,7 @@
  */
 
 #include "arch/alpha/registers.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
diff --git a/src/arch/alpha/mt.hh b/src/arch/alpha/mt.hh
index cce27303a..640825b89 100644
--- a/src/arch/alpha/mt.hh
+++ b/src/arch/alpha/mt.hh
@@ -42,7 +42,7 @@
 
 #include "arch/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 
 namespace AlphaISA
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 2a5c9f616..58fe0bdbe 100644
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -34,7 +34,7 @@
 #include "arch/alpha/isa_traits.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Loader.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/alpha/pseudo_inst.hh b/src/arch/alpha/pseudo_inst.hh
index 8147f7abe..9f8b508c2 100644
--- a/src/arch/alpha/pseudo_inst.hh
+++ b/src/arch/alpha/pseudo_inst.hh
@@ -32,7 +32,7 @@
 #define __ARCH_ALPHA_PSEUDO_INST_HH__
 
 #include "arch/generic/pseudo_inst.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/alpha/utility.hh b/src/arch/alpha/utility.hh
index 45e47b5e8..bf585fdab 100644
--- a/src/arch/alpha/utility.hh
+++ b/src/arch/alpha/utility.hh
@@ -35,7 +35,7 @@
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "arch/alpha/ev5.hh"
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index 8f860970d..3191ceb88 100644
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -50,7 +50,7 @@
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/pagetable.hh"
 #include "arch/arm/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/faults.hh"
 #include "sim/full_system.hh"
 
diff --git a/src/arch/arm/isa_device.cc b/src/arch/arm/isa_device.cc
index 813d163e0..110104fe4 100644
--- a/src/arch/arm/isa_device.cc
+++ b/src/arch/arm/isa_device.cc
@@ -39,7 +39,7 @@
 
 #include "arch/arm/isa_device.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 namespace ArmISA
 {
diff --git a/src/arch/arm/miscregs.cc b/src/arch/arm/miscregs.cc
index d08f75142..826e56726 100644
--- a/src/arch/arm/miscregs.cc
+++ b/src/arch/arm/miscregs.cc
@@ -44,7 +44,7 @@
 #include <tuple>
 
 #include "arch/arm/isa.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "sim/full_system.hh"
 
diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc
index eb8abfb4d..dcc9145d3 100644
--- a/src/arch/arm/process.cc
+++ b/src/arch/arm/process.cc
@@ -47,7 +47,7 @@
 #include "arch/arm/types.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Stack.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/arm/pseudo_inst.hh b/src/arch/arm/pseudo_inst.hh
index 8da25ef87..50c725dcf 100644
--- a/src/arch/arm/pseudo_inst.hh
+++ b/src/arch/arm/pseudo_inst.hh
@@ -32,7 +32,7 @@
 #define __ARCH_ARM_PSEUDO_INST_HH__
 
 #include "arch/generic/pseudo_inst.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index 30725811a..eb9a9e801 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -45,7 +45,7 @@
 
 #include "arch/generic/types.hh"
 #include "base/bitunion.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "debug/Decoder.hh"
 
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index 3a5a468dd..640ba70d2 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -48,7 +48,7 @@
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "cpu/static_inst.hh"
diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh
index aeb2261a7..5c5aa01ea 100644
--- a/src/arch/generic/debugfaults.hh
+++ b/src/arch/generic/debugfaults.hh
@@ -42,7 +42,7 @@
 
 #include <string>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/faults.hh"
 
 namespace GenericISA
diff --git a/src/arch/generic/pseudo_inst.cc b/src/arch/generic/pseudo_inst.cc
index 46667c158..1c83d344f 100644
--- a/src/arch/generic/pseudo_inst.cc
+++ b/src/arch/generic/pseudo_inst.cc
@@ -30,7 +30,7 @@
 
 #include "arch/generic/pseudo_inst.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/generic/tlb.hh b/src/arch/generic/tlb.hh
index 995fbfff4..aef52a120 100644
--- a/src/arch/generic/tlb.hh
+++ b/src/arch/generic/tlb.hh
@@ -43,7 +43,7 @@
 #ifndef __ARCH_GENERIC_TLB_HH__
 #define __ARCH_GENERIC_TLB_HH__
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "mem/request.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/arch/generic/vec_reg.hh b/src/arch/generic/vec_reg.hh
index 7a993ea73..b68a5886d 100644
--- a/src/arch/generic/vec_reg.hh
+++ b/src/arch/generic/vec_reg.hh
@@ -152,7 +152,7 @@
 #include <vector>
 
 #include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 template <size_t Sz>
 class VecRegContainer;
diff --git a/src/arch/hsail/gpu_isa.hh b/src/arch/hsail/gpu_isa.hh
index 831ad6ed5..425522a48 100644
--- a/src/arch/hsail/gpu_isa.hh
+++ b/src/arch/hsail/gpu_isa.hh
@@ -39,7 +39,7 @@
 #include <cstdint>
 
 #include "arch/hsail/gpu_types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "gpu-compute/misc.hh"
 
 namespace HsailISA
diff --git a/src/arch/mips/decoder.hh b/src/arch/mips/decoder.hh
index 59e040658..4a2fc46a5 100644
--- a/src/arch/mips/decoder.hh
+++ b/src/arch/mips/decoder.hh
@@ -33,7 +33,7 @@
 
 #include "arch/generic/decode_cache.hh"
 #include "arch/mips/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "cpu/static_inst.hh"
 
diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc
index c999955e4..e13cf0870 100755
--- a/src/arch/mips/dsp.cc
+++ b/src/arch/mips/dsp.cc
@@ -32,7 +32,7 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst.hh"
 #include "sim/serialize.hh"
 
diff --git a/src/arch/mips/dsp.hh b/src/arch/mips/dsp.hh
index 0e9424f38..a929984e4 100755
--- a/src/arch/mips/dsp.hh
+++ b/src/arch/mips/dsp.hh
@@ -33,7 +33,7 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 
 class ThreadContext;
diff --git a/src/arch/mips/interrupts.hh b/src/arch/mips/interrupts.hh
index 2205510d2..ce9e0e4a3 100755
--- a/src/arch/mips/interrupts.hh
+++ b/src/arch/mips/interrupts.hh
@@ -35,7 +35,7 @@
 
 #include "arch/mips/faults.hh"
 #include "base/compiler.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "params/MipsInterrupts.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_object.hh"
diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 61c689955..5c1e60aa1 100644
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -50,7 +50,7 @@
  */
 
 #include "arch/registers.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/LLSC.hh"
 #include "mem/packet.hh"
diff --git a/src/arch/mips/mt.hh b/src/arch/mips/mt.hh
index 7b28b0493..67aeb6477 100755
--- a/src/arch/mips/mt.hh
+++ b/src/arch/mips/mt.hh
@@ -45,7 +45,7 @@
 #include "arch/mips/pra_constants.hh"
 #include "arch/mips/registers.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 
 namespace MipsISA
diff --git a/src/arch/mips/pagetable.hh b/src/arch/mips/pagetable.hh
index cb129fba7..a963cf6d2 100755
--- a/src/arch/mips/pagetable.hh
+++ b/src/arch/mips/pagetable.hh
@@ -34,7 +34,7 @@
 #ifndef __ARCH_MIPS_PAGETABLE_H__
 #define __ARCH_MIPS_PAGETABLE_H__
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "sim/serialize.hh"
 
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 60e343578..4d0d5e309 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -35,7 +35,7 @@
 #include "arch/mips/isa_traits.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Loader.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/mips/pseudo_inst.hh b/src/arch/mips/pseudo_inst.hh
index 1aae21abb..3741ebc71 100644
--- a/src/arch/mips/pseudo_inst.hh
+++ b/src/arch/mips/pseudo_inst.hh
@@ -32,7 +32,7 @@
 #define __ARCH_MIPS_PSEUDO_INST_HH__
 
 #include "arch/generic/pseudo_inst.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/mips/registers.hh b/src/arch/mips/registers.hh
index f5dd325cd..b44283d35 100644
--- a/src/arch/mips/registers.hh
+++ b/src/arch/mips/registers.hh
@@ -34,7 +34,7 @@
 
 #include "arch/generic/vec_reg.hh"
 #include "arch/mips/generated/max_inst_regs.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 
 class ThreadContext;
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index c56321612..2a9a8d83c 100644
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -36,7 +36,7 @@
 #include "arch/mips/registers.hh"
 #include "arch/mips/vtophys.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "mem/fs_translating_port_proxy.hh"
diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index 242dddbf7..57c0897f1 100644
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -35,7 +35,7 @@
 #define __ARCH_MIPS_UTILITY_HH__
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/arch/power/interrupts.hh b/src/arch/power/interrupts.hh
index e41b4aa95..f89959863 100644
--- a/src/arch/power/interrupts.hh
+++ b/src/arch/power/interrupts.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_POWER_INTERRUPT_HH__
 #define __ARCH_POWER_INTERRUPT_HH__
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "params/PowerInterrupts.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/arch/power/isa.hh b/src/arch/power/isa.hh
index edac96d59..9769f8fd1 100644
--- a/src/arch/power/isa.hh
+++ b/src/arch/power/isa.hh
@@ -35,7 +35,7 @@
 
 #include "arch/power/registers.hh"
 #include "arch/power/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/reg_class.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/arch/power/process.cc b/src/arch/power/process.cc
index 4b2efb0a6..4a34decf3 100644
--- a/src/arch/power/process.cc
+++ b/src/arch/power/process.cc
@@ -36,7 +36,7 @@
 #include "arch/power/types.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Stack.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/power/pseudo_inst.hh b/src/arch/power/pseudo_inst.hh
index 295b33320..e1ecda238 100644
--- a/src/arch/power/pseudo_inst.hh
+++ b/src/arch/power/pseudo_inst.hh
@@ -32,7 +32,7 @@
 #define __ARCH_POWER_PSEUDO_INST_HH__
 
 #include "arch/generic/pseudo_inst.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/power/utility.cc b/src/arch/power/utility.cc
index c8076a697..c8ff99988 100644
--- a/src/arch/power/utility.cc
+++ b/src/arch/power/utility.cc
@@ -34,7 +34,7 @@
 
 #include "arch/power/utility.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 namespace PowerISA {
 
diff --git a/src/arch/riscv/decoder.hh b/src/arch/riscv/decoder.hh
index c1d68bf06..91fe7873e 100644
--- a/src/arch/riscv/decoder.hh
+++ b/src/arch/riscv/decoder.hh
@@ -36,7 +36,7 @@
 #include "arch/generic/decode_cache.hh"
 #include "arch/riscv/isa_traits.hh"
 #include "arch/riscv/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "cpu/static_inst.hh"
 #include "debug/Decode.hh"
diff --git a/src/arch/riscv/interrupts.hh b/src/arch/riscv/interrupts.hh
index 36eb52909..cfb9a5b7e 100644
--- a/src/arch/riscv/interrupts.hh
+++ b/src/arch/riscv/interrupts.hh
@@ -31,7 +31,7 @@
 #ifndef __ARCH_RISCV_INTERRUPT_HH__
 #define __ARCH_RISCV_INTERRUPT_HH__
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "params/RiscvInterrupts.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/arch/riscv/isa.hh b/src/arch/riscv/isa.hh
index 18dc1ba4c..4f8b4dc7a 100644
--- a/src/arch/riscv/isa.hh
+++ b/src/arch/riscv/isa.hh
@@ -43,7 +43,7 @@
 
 #include "arch/riscv/registers.hh"
 #include "arch/riscv/types.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/reg_class.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/arch/riscv/locked_mem.hh b/src/arch/riscv/locked_mem.hh
index f334385b1..61fbe0de1 100644
--- a/src/arch/riscv/locked_mem.hh
+++ b/src/arch/riscv/locked_mem.hh
@@ -51,7 +51,7 @@
 #include <stack>
 
 #include "arch/registers.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/LLSC.hh"
 #include "mem/packet.hh"
diff --git a/src/arch/riscv/pagetable.hh b/src/arch/riscv/pagetable.hh
index 72573cad6..249d03264 100644
--- a/src/arch/riscv/pagetable.hh
+++ b/src/arch/riscv/pagetable.hh
@@ -34,7 +34,7 @@
 #ifndef __ARCH_RISCV_PAGETABLE_H__
 #define __ARCH_RISCV_PAGETABLE_H__
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "sim/serialize.hh"
 
diff --git a/src/arch/riscv/process.cc b/src/arch/riscv/process.cc
index eeea5ee48..54afc854c 100644
--- a/src/arch/riscv/process.cc
+++ b/src/arch/riscv/process.cc
@@ -43,7 +43,7 @@
 #include "arch/riscv/isa_traits.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Stack.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/riscv/pseudo_inst.hh b/src/arch/riscv/pseudo_inst.hh
index 646e978f8..49cceb86b 100644
--- a/src/arch/riscv/pseudo_inst.hh
+++ b/src/arch/riscv/pseudo_inst.hh
@@ -32,7 +32,7 @@
 #define __ARCH_RISCV_PSEUDO_INST_HH__
 
 #include "arch/generic/pseudo_inst.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa
index e78295a0d..ff48b0aec 100644
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -53,7 +53,7 @@ output header {{
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "base/condcodes.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"  // some constructors use MemReq flags
diff --git a/src/arch/sparc/mt.hh b/src/arch/sparc/mt.hh
index 7fb054902..faf60910f 100644
--- a/src/arch/sparc/mt.hh
+++ b/src/arch/sparc/mt.hh
@@ -42,7 +42,7 @@
 
 #include "arch/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 
 namespace SparcISA
diff --git a/src/arch/sparc/pagetable.hh b/src/arch/sparc/pagetable.hh
index 20df5a653..43a61259e 100644
--- a/src/arch/sparc/pagetable.hh
+++ b/src/arch/sparc/pagetable.hh
@@ -35,7 +35,7 @@
 
 #include "arch/sparc/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class Checkpoint;
 
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index d8384b470..da7032f08 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -38,7 +38,7 @@
 #include "arch/sparc/types.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Stack.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/sparc/pseudo_inst.hh b/src/arch/sparc/pseudo_inst.hh
index 5d54391b2..5f9e576cc 100644
--- a/src/arch/sparc/pseudo_inst.hh
+++ b/src/arch/sparc/pseudo_inst.hh
@@ -32,7 +32,7 @@
 #define __ARCH_SPARC_PSEUDO_INST_HH__
 
 #include "arch/generic/pseudo_inst.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/sparc/tlb.hh b/src/arch/sparc/tlb.hh
index 65b6aff72..12d5ef738 100644
--- a/src/arch/sparc/tlb.hh
+++ b/src/arch/sparc/tlb.hh
@@ -34,7 +34,7 @@
 #include "arch/generic/tlb.hh"
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/tlb_map.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "mem/request.hh"
 #include "params/SparcTLB.hh"
 
diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh
index 63a9bb712..ae5799699 100644
--- a/src/arch/sparc/utility.hh
+++ b/src/arch/sparc/utility.hh
@@ -35,7 +35,7 @@
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/tlb.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "sim/full_system.hh"
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index 8d0a9be7d..07d2f1333 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -40,7 +40,7 @@
 #include "arch/x86/bios/intelmp.hh"
 
 #include "arch/x86/isa_traits.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "mem/port_proxy.hh"
 #include "sim/byteswap.hh"
diff --git a/src/arch/x86/decoder.cc b/src/arch/x86/decoder.cc
index 9c4997d6f..835d5e25d 100644
--- a/src/arch/x86/decoder.cc
+++ b/src/arch/x86/decoder.cc
@@ -31,7 +31,7 @@
 #include "arch/x86/decoder.hh"
 
 #include "arch/x86/regs/misc.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "debug/Decoder.hh"
diff --git a/src/arch/x86/decoder.hh b/src/arch/x86/decoder.hh
index 93e5955c8..a60aa469a 100644
--- a/src/arch/x86/decoder.hh
+++ b/src/arch/x86/decoder.hh
@@ -38,7 +38,7 @@
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/types.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "cpu/decode_cache.hh"
diff --git a/src/arch/x86/emulenv.cc b/src/arch/x86/emulenv.cc
index 8abfb6398..0e2795da1 100644
--- a/src/arch/x86/emulenv.cc
+++ b/src/arch/x86/emulenv.cc
@@ -41,7 +41,7 @@
 
 #include <cassert>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace X86ISA;
 
diff --git a/src/arch/x86/faults.hh b/src/arch/x86/faults.hh
index 6eabd53fa..4a7e93398 100644
--- a/src/arch/x86/faults.hh
+++ b/src/arch/x86/faults.hh
@@ -44,7 +44,7 @@
 
 #include "arch/x86/tlb.hh"
 #include "base/bitunion.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/faults.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 0d0c0de3e..1fad1ec1a 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -66,7 +66,7 @@ output header {{
 #include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
 #include "arch/x86/utility.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst.hh"
 #include "mem/packet.hh"
 #include "sim/faults.hh"
@@ -84,7 +84,7 @@ output decoder {{
 #include "arch/x86/tlb.hh"
 #include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
 #include "sim/full_system.hh"
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index d7a057151..1ad1315da 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -54,7 +54,7 @@
 #include "arch/x86/types.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Stack.hh"
diff --git a/src/arch/x86/regs/int.hh b/src/arch/x86/regs/int.hh
index 60aa6d0cc..449281da3 100644
--- a/src/arch/x86/regs/int.hh
+++ b/src/arch/x86/regs/int.hh
@@ -42,7 +42,7 @@
 
 #include "arch/x86/x86_traits.hh"
 #include "base/bitunion.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/core.hh"
 
 namespace X86ISA