diff options
| author | Gabe Black <gabeblack@google.com> | 2017-11-30 17:36:53 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2017-12-04 23:10:55 +0000 |
| commit | 1088f0c4ac3999fc3c363cc51daef4cfb360a2bd (patch) | |
| tree | 64b3cc0b13bd6ba6aa375163765d36b385d32663 | |
| parent | 86f18f26fc7223cc8a63a792d2be1267f573f97c (diff) | |
| download | gem5-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>
180 files changed, 190 insertions, 189 deletions
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc index 7749d37d6..3d48e9386 100644 --- a/ext/sst/gem5.cc +++ b/ext/sst/gem5.cc @@ -57,7 +57,7 @@ #include <sim/init_signals.hh> #include <sim/system.hh> #include <sim/sim_object.hh> -#include <base/misc.hh> +#include <base/logging.hh> #include <base/debug.hh> #ifdef fatal // gem5 sets this 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 diff --git a/src/base/SConscript b/src/base/SConscript index 13c1ffff5..75759fd37 100644 --- a/src/base/SConscript +++ b/src/base/SConscript @@ -51,8 +51,8 @@ Source('hostinfo.cc') Source('inet.cc') Source('inifile.cc') Source('intmath.cc') +Source('logging.cc') Source('match.cc') -Source('misc.cc') Source('output.cc') Source('pollevent.cc') Source('random.cc') diff --git a/src/base/addr_range.hh b/src/base/addr_range.hh index ac1cbd05a..b243d68aa 100644 --- a/src/base/addr_range.hh +++ b/src/base/addr_range.hh @@ -50,7 +50,7 @@ #include "base/bitfield.hh" #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" /** diff --git a/src/base/bigint.hh b/src/base/bigint.hh index 2fa441a73..a078fdd65 100644 --- a/src/base/bigint.hh +++ b/src/base/bigint.hh @@ -30,7 +30,7 @@ #include <iostream> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #ifndef __BASE_BIGINT_HH__ diff --git a/src/base/bmpwriter.cc b/src/base/bmpwriter.cc index f650074ab..02245c09d 100644 --- a/src/base/bmpwriter.cc +++ b/src/base/bmpwriter.cc @@ -44,7 +44,7 @@ #include <cassert> -#include "base/misc.hh" +#include "base/logging.hh" const char* BmpWriter::_imgExtension = "bmp"; diff --git a/src/base/circlebuf.hh b/src/base/circlebuf.hh index bf6f9e263..2c93daafc 100644 --- a/src/base/circlebuf.hh +++ b/src/base/circlebuf.hh @@ -44,7 +44,7 @@ #include <cassert> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/serialize.hh" /** diff --git a/src/base/debug.cc b/src/base/debug.cc index 6be9cdff5..448268585 100644 --- a/src/base/debug.cc +++ b/src/base/debug.cc @@ -37,7 +37,7 @@ #include <csignal> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc index 43999a5e5..7ece35dd8 100644 --- a/src/base/hostinfo.cc +++ b/src/base/hostinfo.cc @@ -47,7 +47,7 @@ #include <cstring> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "base/types.hh" diff --git a/src/base/imgwriter.cc b/src/base/imgwriter.cc index ba9b58c02..40de3d7cc 100644 --- a/src/base/imgwriter.cc +++ b/src/base/imgwriter.cc @@ -38,13 +38,14 @@ */ #include "base/imgwriter.hh" -#include "base/bmpwriter.hh" -#include "base/misc.hh" +#include "base/bmpwriter.hh" +#include "base/logging.hh" #include "config/use_png.hh" #if USE_PNG #include "base/pngwriter.hh" + #endif std::unique_ptr<ImgWriter> diff --git a/src/base/intmath.hh b/src/base/intmath.hh index eded26d4a..0b22ba0db 100644 --- a/src/base/intmath.hh +++ b/src/base/intmath.hh @@ -33,7 +33,7 @@ #include <cassert> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" // Returns the prime number one less than n. diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc index 4e94ecd1e..caeab5f8f 100644 --- a/src/base/loader/ecoff_object.cc +++ b/src/base/loader/ecoff_object.cc @@ -33,7 +33,7 @@ #include <string> #include "base/loader/symtab.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "base/types.hh" #include "debug/Loader.hh" diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc index fe43a7f01..60c79f803 100644 --- a/src/base/loader/elf_object.cc +++ b/src/base/loader/elf_object.cc @@ -54,7 +54,7 @@ #include "base/bitfield.hh" #include "base/loader/symtab.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/Loader.hh" #include "gelf.h" diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh index 80ffa91f6..c2cdafe47 100644 --- a/src/base/loader/object_file.hh +++ b/src/base/loader/object_file.hh @@ -35,7 +35,7 @@ #include <limits> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" class PortProxy; diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc index ea7332114..5c81c13e1 100644 --- a/src/base/loader/symtab.cc +++ b/src/base/loader/symtab.cc @@ -35,7 +35,7 @@ #include <string> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "base/types.hh" #include "sim/serialize.hh" diff --git a/src/base/misc.cc b/src/base/logging.cc index be97368f3..cec9c8360 100644 --- a/src/base/misc.cc +++ b/src/base/logging.cc @@ -41,7 +41,7 @@ * Andreas Sandberg */ -#include "base/misc.hh" +#include "base/logging.hh" #include <array> diff --git a/src/base/misc.hh b/src/base/logging.hh index 7b0d46274..b0a9b0c1b 100644 --- a/src/base/misc.hh +++ b/src/base/logging.hh @@ -42,8 +42,8 @@ * Andreas Sandberg */ -#ifndef __BASE_MISC_HH__ -#define __BASE_MISC_HH__ +#ifndef __BASE_LOGGING_HH__ +#define __BASE_LOGGING_HH__ #include <cassert> #include <cstdlib> @@ -236,8 +236,8 @@ class Logger } while (0) /** - * The chatty assert macro will function like a normal assert, but will allow the - * specification of additional, helpful material to aid debugging why the + * The chatty assert macro will function like a normal assert, but will allow + * the specification of additional, helpful material to aid debugging why the * assertion actually failed. Like the normal assertion, the chatty_assert * will not be active in fast builds. * @@ -253,4 +253,4 @@ class Logger panic("assert(" # cond ") failed: %s", csprintf(__VA_ARGS__)); \ } while (0) #endif // NDEBUG -#endif // __BASE_MISC_HH__ +#endif // __BASE_LOGGING_HH__ diff --git a/src/base/output.cc b/src/base/output.cc index dc85c2a54..48581c3fe 100644 --- a/src/base/output.cc +++ b/src/base/output.cc @@ -58,7 +58,7 @@ #include <cstdlib> #include <fstream> -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; diff --git a/src/base/pngwriter.cc b/src/base/pngwriter.cc index 3b49d479d..3251ac885 100644 --- a/src/base/pngwriter.cc +++ b/src/base/pngwriter.cc @@ -51,7 +51,7 @@ extern "C" #include <cstdio> #include <cstdlib> -#include "base/misc.hh" +#include "base/logging.hh" const char* PngWriter::_imgExtension = "png"; diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc index 79814e077..2101f8d71 100644 --- a/src/base/pollevent.cc +++ b/src/base/pollevent.cc @@ -45,7 +45,7 @@ #include <csignal> #include <cstring> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "sim/async.hh" #include "sim/core.hh" diff --git a/src/base/random.cc b/src/base/random.cc index 0121581d6..1c6b1cb4a 100644 --- a/src/base/random.cc +++ b/src/base/random.cc @@ -46,7 +46,7 @@ #include <sstream> -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/serialize.hh" Random::Random() diff --git a/src/base/socket.cc b/src/base/socket.cc index a09b51fb2..ece4a6ac4 100644 --- a/src/base/socket.cc +++ b/src/base/socket.cc @@ -38,7 +38,7 @@ #include <cerrno> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "sim/byteswap.hh" diff --git a/src/base/statistics.cc b/src/base/statistics.cc index 96747f0a9..123351b80 100644 --- a/src/base/statistics.cc +++ b/src/base/statistics.cc @@ -40,7 +40,7 @@ #include "base/cprintf.hh" #include "base/debug.hh" #include "base/hostinfo.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "base/time.hh" #include "base/trace.hh" diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc index 9403ed3ff..10e94a770 100644 --- a/src/base/stats/text.cc +++ b/src/base/stats/text.cc @@ -52,7 +52,7 @@ #include <string> #include "base/cast.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/stats/info.hh" #include "base/str.hh" diff --git a/src/base/time.cc b/src/base/time.cc index 5509bccaf..6e9d7ccfb 100644 --- a/src/base/time.cc +++ b/src/base/time.cc @@ -35,7 +35,7 @@ #include <iostream> #include <sstream> -#include "base/misc.hh" +#include "base/logging.hh" #include "config/use_posix_clock.hh" #include "sim/core.hh" #include "sim/serialize.hh" diff --git a/src/base/trace.cc b/src/base/trace.cc index dfd99686a..06f9eeb21 100644 --- a/src/base/trace.cc +++ b/src/base/trace.cc @@ -42,7 +42,7 @@ #include <string> #include "base/debug.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/output.hh" #include "base/str.hh" diff --git a/src/base/trie.hh b/src/base/trie.hh index 1d110b4e1..e256377c1 100644 --- a/src/base/trie.hh +++ b/src/base/trie.hh @@ -34,7 +34,7 @@ #include <cassert> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" // Key has to be an integral type. diff --git a/src/base/vnc/vncinput.cc b/src/base/vnc/vncinput.cc index b9d1d2546..da3c913b2 100644 --- a/src/base/vnc/vncinput.cc +++ b/src/base/vnc/vncinput.cc @@ -46,7 +46,7 @@ #include <sys/types.h> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/output.hh" #include "base/trace.hh" diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc index 00ff5602f..97515ac16 100644 --- a/src/base/vnc/vncserver.cc +++ b/src/base/vnc/vncserver.cc @@ -64,7 +64,7 @@ #include <cstdio> #include "base/atomicio.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/output.hh" #include "base/socket.hh" #include "base/trace.hh" 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" diff --git a/src/dev/intel_8254_timer.cc b/src/dev/intel_8254_timer.cc index 3831f21b8..5a0174d77 100644 --- a/src/dev/intel_8254_timer.cc +++ b/src/dev/intel_8254_timer.cc @@ -32,7 +32,7 @@ #include "dev/intel_8254_timer.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "debug/Intel8254Timer.hh" using namespace std; diff --git a/src/dev/mc146818.hh b/src/dev/mc146818.hh index 8eb301c45..741dca336 100644 --- a/src/dev/mc146818.hh +++ b/src/dev/mc146818.hh @@ -34,7 +34,7 @@ #define __DEV_MC146818_HH__ #include "base/bitunion.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/eventq_impl.hh" /** Real-Time Clock (MC146818) */ diff --git a/src/dev/net/dist_iface.hh b/src/dev/net/dist_iface.hh index c02c39530..c87a4c0bd 100644 --- a/src/dev/net/dist_iface.hh +++ b/src/dev/net/dist_iface.hh @@ -83,7 +83,7 @@ #include <thread> #include <utility> -#include "base/misc.hh" +#include "base/logging.hh" #include "dev/net/dist_packet.hh" #include "dev/net/etherpkt.hh" #include "sim/core.hh" diff --git a/src/dev/net/etherbus.cc b/src/dev/net/etherbus.cc index 243e27b18..7e086bfb0 100644 --- a/src/dev/net/etherbus.cc +++ b/src/dev/net/etherbus.cc @@ -38,7 +38,7 @@ #include <string> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/Ethernet.hh" #include "debug/EthernetData.hh" diff --git a/src/dev/net/etherdump.cc b/src/dev/net/etherdump.cc index 1fe462764..64444d578 100644 --- a/src/dev/net/etherdump.cc +++ b/src/dev/net/etherdump.cc @@ -38,7 +38,7 @@ #include <algorithm> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/output.hh" #include "sim/core.hh" diff --git a/src/dev/net/etherint.cc b/src/dev/net/etherint.cc index b5990c7a0..0c5e6b817 100644 --- a/src/dev/net/etherint.cc +++ b/src/dev/net/etherint.cc @@ -30,7 +30,7 @@ #include "dev/net/etherint.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/sim_object.hh" void diff --git a/src/dev/net/etherpkt.cc b/src/dev/net/etherpkt.cc index 22c0156d0..9b020197c 100644 --- a/src/dev/net/etherpkt.cc +++ b/src/dev/net/etherpkt.cc @@ -33,7 +33,7 @@ #include <iostream> #include "base/inet.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/serialize.hh" using namespace std; diff --git a/src/dev/net/ethertap.cc b/src/dev/net/ethertap.cc index 59314e540..4b5b9bdb0 100644 --- a/src/dev/net/ethertap.cc +++ b/src/dev/net/ethertap.cc @@ -59,7 +59,7 @@ #include <deque> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/pollevent.hh" #include "base/socket.hh" #include "base/trace.hh" diff --git a/src/dev/net/pktfifo.cc b/src/dev/net/pktfifo.cc index 17aa54a78..f7bfcac59 100644 --- a/src/dev/net/pktfifo.cc +++ b/src/dev/net/pktfifo.cc @@ -30,7 +30,7 @@ #include "dev/net/pktfifo.hh" -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; diff --git a/src/dev/net/pktfifo.hh b/src/dev/net/pktfifo.hh index 456c4433b..397d86b11 100644 --- a/src/dev/net/pktfifo.hh +++ b/src/dev/net/pktfifo.hh @@ -35,7 +35,7 @@ #include <list> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "dev/net/etherpkt.hh" #include "sim/serialize.hh" diff --git a/src/dev/pci/device.cc b/src/dev/pci/device.cc index 192d824d8..4d9d29b1d 100644 --- a/src/dev/pci/device.cc +++ b/src/dev/pci/device.cc @@ -54,7 +54,7 @@ #include "base/inifile.hh" #include "base/intmath.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "base/trace.hh" #include "debug/PciDevice.hh" diff --git a/src/dev/platform.cc b/src/dev/platform.cc index 63df9bc0d..fae1b13a1 100644 --- a/src/dev/platform.cc +++ b/src/dev/platform.cc @@ -31,7 +31,7 @@ #include "dev/platform.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "config/the_isa.hh" #include "sim/sim_exit.hh" diff --git a/src/dev/ps2.cc b/src/dev/ps2.cc index 2c13e5caf..0d6052706 100644 --- a/src/dev/ps2.cc +++ b/src/dev/ps2.cc @@ -41,7 +41,7 @@ #include <list> -#include "base/misc.hh" +#include "base/logging.hh" #include "x11keysym/keysym.h" namespace Ps2 { diff --git a/src/dev/serial/serial.cc b/src/dev/serial/serial.cc index 873366860..8a3d80126 100644 --- a/src/dev/serial/serial.cc +++ b/src/dev/serial/serial.cc @@ -39,7 +39,7 @@ #include "dev/serial/serial.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "params/SerialDevice.hh" #include "params/SerialNullDevice.hh" diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc index 7230698d3..5e8e52e95 100644 --- a/src/dev/serial/terminal.cc +++ b/src/dev/serial/terminal.cc @@ -55,7 +55,7 @@ #include <string> #include "base/atomicio.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/output.hh" #include "base/socket.hh" #include "base/trace.hh" diff --git a/src/dev/storage/disk_image.cc b/src/dev/storage/disk_image.cc index e7fda40a2..0e338e9c4 100644 --- a/src/dev/storage/disk_image.cc +++ b/src/dev/storage/disk_image.cc @@ -44,7 +44,7 @@ #include <string> #include "base/callback.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/DiskImageRead.hh" #include "debug/DiskImageWrite.hh" diff --git a/src/dev/storage/simple_disk.cc b/src/dev/storage/simple_disk.cc index 49c001a00..bc52e7ec5 100644 --- a/src/dev/storage/simple_disk.cc +++ b/src/dev/storage/simple_disk.cc @@ -42,7 +42,7 @@ #include <cstring> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/SimpleDisk.hh" #include "debug/SimpleDiskData.hh" diff --git a/src/gpu-compute/brig_object.cc b/src/gpu-compute/brig_object.cc index 21b7d4433..6211598d4 100644 --- a/src/gpu-compute/brig_object.cc +++ b/src/gpu-compute/brig_object.cc @@ -45,7 +45,7 @@ #include <cstdlib> #include "arch/hsail/Brig.h" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/BRIG.hh" #include "debug/HSAILObject.hh" diff --git a/src/gpu-compute/gpu_tlb.hh b/src/gpu-compute/gpu_tlb.hh index ee4375259..73b5f2f61 100644 --- a/src/gpu-compute/gpu_tlb.hh +++ b/src/gpu-compute/gpu_tlb.hh @@ -47,7 +47,7 @@ #include "arch/x86/pagetable_walker.hh" #include "arch/x86/regs/segment.hh" #include "base/callback.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/statistics.hh" #include "gpu-compute/compute_unit.hh" #include "mem/mem_object.hh" diff --git a/src/gpu-compute/hsa_object.cc b/src/gpu-compute/hsa_object.cc index e74a45454..ac734a437 100644 --- a/src/gpu-compute/hsa_object.cc +++ b/src/gpu-compute/hsa_object.cc @@ -38,7 +38,7 @@ #include <cassert> #include <fstream> -#include "base/misc.hh" +#include "base/logging.hh" HsaObject::HsaObject(const std::string &fname) : readonlyData(nullptr), filename(fname) diff --git a/src/gpu-compute/misc.hh b/src/gpu-compute/misc.hh index 5ade89789..5ee8fb87b 100644 --- a/src/gpu-compute/misc.hh +++ b/src/gpu-compute/misc.hh @@ -40,7 +40,7 @@ #include <limits> #include <memory> -#include "base/misc.hh" +#include "base/logging.hh" class GPUDynInst; diff --git a/src/gpu-compute/of_scheduling_policy.hh b/src/gpu-compute/of_scheduling_policy.hh index 684e51a3a..94b5fdcd7 100644 --- a/src/gpu-compute/of_scheduling_policy.hh +++ b/src/gpu-compute/of_scheduling_policy.hh @@ -39,7 +39,7 @@ #include <cstddef> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" class Wavefront; diff --git a/src/gpu-compute/rr_scheduling_policy.hh b/src/gpu-compute/rr_scheduling_policy.hh index 780f294aa..3e83748da 100644 --- a/src/gpu-compute/rr_scheduling_policy.hh +++ b/src/gpu-compute/rr_scheduling_policy.hh @@ -42,7 +42,7 @@ #include <utility> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" class Wavefront; diff --git a/src/gpu-compute/simple_pool_manager.cc b/src/gpu-compute/simple_pool_manager.cc index 0e35ab9cc..dfa1ec013 100644 --- a/src/gpu-compute/simple_pool_manager.cc +++ b/src/gpu-compute/simple_pool_manager.cc @@ -35,7 +35,7 @@ #include "gpu-compute/simple_pool_manager.hh" -#include "base/misc.hh" +#include "base/logging.hh" // return the min number of elements that the manager can reserve given // a request for "size" elements diff --git a/src/gpu-compute/tlb_coalescer.hh b/src/gpu-compute/tlb_coalescer.hh index b03e77150..feb5b7807 100644 --- a/src/gpu-compute/tlb_coalescer.hh +++ b/src/gpu-compute/tlb_coalescer.hh @@ -46,7 +46,7 @@ #include "arch/isa_traits.hh" #include "arch/x86/pagetable.hh" #include "arch/x86/regs/segment.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/statistics.hh" #include "gpu-compute/gpu_tlb.hh" #include "mem/mem_object.hh" diff --git a/src/gpu-compute/vector_register_file.cc b/src/gpu-compute/vector_register_file.cc index 3c3b400bb..9e3bca7e7 100644 --- a/src/gpu-compute/vector_register_file.cc +++ b/src/gpu-compute/vector_register_file.cc @@ -37,7 +37,7 @@ #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "gpu-compute/compute_unit.hh" #include "gpu-compute/gpu_dyn_inst.hh" #include "gpu-compute/shader.hh" diff --git a/src/gpu-compute/wavefront.hh b/src/gpu-compute/wavefront.hh index 659132941..eae6890db 100644 --- a/src/gpu-compute/wavefront.hh +++ b/src/gpu-compute/wavefront.hh @@ -43,7 +43,7 @@ #include <vector> #include "arch/gpu_isa.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "config/the_gpu_isa.hh" #include "gpu-compute/condition_register_state.hh" diff --git a/src/kern/operatingsystem.cc b/src/kern/operatingsystem.cc index 553ceaf66..afeca4fca 100644 --- a/src/kern/operatingsystem.cc +++ b/src/kern/operatingsystem.cc @@ -31,7 +31,7 @@ #include "kern/operatingsystem.hh" -#include "base/misc.hh" +#include "base/logging.hh" int OperatingSystem::openSpecialFile(std::string path, Process *process, diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh index 431c2f84a..b006d4b64 100644 --- a/src/mem/cache/base.hh +++ b/src/mem/cache/base.hh @@ -55,7 +55,7 @@ #include <string> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/statistics.hh" #include "base/trace.hh" #include "base/types.hh" diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc index 169ef0d1d..2a3dddc19 100644 --- a/src/mem/cache/cache.cc +++ b/src/mem/cache/cache.cc @@ -53,7 +53,7 @@ #include "mem/cache/cache.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "debug/Cache.hh" #include "debug/CachePort.hh" diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh index 9d135c652..a39a9c740 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -54,7 +54,7 @@ #include <unordered_set> -#include "base/misc.hh" // fatal, panic, and warn +#include "base/logging.hh" // fatal, panic, and warn #include "enums/Clusivity.hh" #include "mem/cache/base.hh" #include "mem/cache/blk.hh" diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc index 25f73d79a..fa21f5cfc 100644 --- a/src/mem/cache/mshr.cc +++ b/src/mem/cache/mshr.cc @@ -54,7 +54,7 @@ #include <string> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "debug/Cache.hh" #include "mem/cache/cache.hh" diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc index 91b1b5679..895f7953b 100644 --- a/src/mem/cache/tags/fa_lru.cc +++ b/src/mem/cache/tags/fa_lru.cc @@ -51,7 +51,7 @@ #include <sstream> #include "base/intmath.hh" -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; diff --git a/src/mem/cache/write_queue_entry.cc b/src/mem/cache/write_queue_entry.cc index 283c4a862..7a778ea72 100644 --- a/src/mem/cache/write_queue_entry.cc +++ b/src/mem/cache/write_queue_entry.cc @@ -55,7 +55,7 @@ #include <string> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "debug/Cache.hh" #include "mem/cache/cache.hh" diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc index ef0620822..ede409503 100644 --- a/src/mem/coherent_xbar.cc +++ b/src/mem/coherent_xbar.cc @@ -49,7 +49,7 @@ #include "mem/coherent_xbar.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/AddrRanges.hh" #include "debug/CoherentXBar.hh" diff --git a/src/mem/dramsim2_wrapper.cc b/src/mem/dramsim2_wrapper.cc index 841ae4391..5b35e7123 100644 --- a/src/mem/dramsim2_wrapper.cc +++ b/src/mem/dramsim2_wrapper.cc @@ -54,7 +54,7 @@ #include "DRAMSim2/MultiChannelMemorySystem.h" #include "base/compiler.hh" -#include "base/misc.hh" +#include "base/logging.hh" /** * DRAMSim2 requires SHOW_SIM_OUTPUT to be defined (declared extern in diff --git a/src/mem/mem_checker.hh b/src/mem/mem_checker.hh index 7de4c17b7..eacfda04d 100644 --- a/src/mem/mem_checker.hh +++ b/src/mem/mem_checker.hh @@ -47,7 +47,7 @@ #include <unordered_map> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "base/types.hh" #include "debug/MemChecker.hh" diff --git a/src/mem/noncoherent_xbar.cc b/src/mem/noncoherent_xbar.cc index eeaa4fb0b..94649eaff 100644 --- a/src/mem/noncoherent_xbar.cc +++ b/src/mem/noncoherent_xbar.cc @@ -49,7 +49,7 @@ #include "mem/noncoherent_xbar.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/NoncoherentXBar.hh" #include "debug/XBar.hh" diff --git a/src/mem/packet.cc b/src/mem/packet.cc index 371058b25..e05783ca9 100644 --- a/src/mem/packet.cc +++ b/src/mem/packet.cc @@ -54,7 +54,7 @@ #include <iostream> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" using namespace std; diff --git a/src/mem/packet.hh b/src/mem/packet.hh index 74a2de135..0920f223b 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -59,7 +59,7 @@ #include "base/cast.hh" #include "base/compiler.hh" #include "base/flags.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/printable.hh" #include "base/types.hh" #include "mem/request.hh" diff --git a/src/mem/request.hh b/src/mem/request.hh index d9f58d21d..aff13075b 100644 --- a/src/mem/request.hh +++ b/src/mem/request.hh @@ -56,7 +56,7 @@ #include <climits> #include "base/flags.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "cpu/inst_seq.hh" #include "sim/core.hh" diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh index 3ab6979d4..cb01c9613 100644 --- a/src/mem/ruby/common/Set.hh +++ b/src/mem/ruby/common/Set.hh @@ -36,7 +36,7 @@ #include <cassert> #include <iostream> -#include "base/misc.hh" +#include "base/logging.hh" #include "mem/ruby/common/TypeDefines.hh" // Change for systems with more than 64 controllers of a particular type. diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc index 67bc7f72d..f4eca3b1e 100644 --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -31,7 +31,7 @@ #include <cassert> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/random.hh" #include "base/stl_helpers.hh" #include "debug/RubyQueue.hh" diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc index 1761218b0..57834f2e2 100644 --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -40,7 +40,7 @@ #include "mem/ruby/network/Network.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "mem/ruby/common/MachineID.hh" #include "mem/ruby/network/BasicLink.hh" #include "mem/ruby/system/RubySystem.hh" diff --git a/src/mem/ruby/network/fault_model/FaultModel.cc b/src/mem/ruby/network/fault_model/FaultModel.cc index 7be5bcd49..befcfa265 100644 --- a/src/mem/ruby/network/fault_model/FaultModel.cc +++ b/src/mem/ruby/network/fault_model/FaultModel.cc @@ -45,7 +45,7 @@ // GEM5 includes #include "FaultModel.hh" -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; diff --git a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh index cbd068c04..f0e950030 100644 --- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh +++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh @@ -35,7 +35,7 @@ #include <iostream> -#include "base/misc.hh" +#include "base/logging.hh" #include "mem/protocol/AccessPermission.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/slicc_interface/AbstractEntry.hh" diff --git a/src/mem/ruby/structures/AbstractReplacementPolicy.cc b/src/mem/ruby/structures/AbstractReplacementPolicy.cc index 05304dc84..01eb6e517 100644 --- a/src/mem/ruby/structures/AbstractReplacementPolicy.cc +++ b/src/mem/ruby/structures/AbstractReplacementPolicy.cc @@ -30,7 +30,7 @@ #include "mem/ruby/structures/AbstractReplacementPolicy.hh" -#include "base/misc.hh" +#include "base/logging.hh" AbstractReplacementPolicy::AbstractReplacementPolicy(const Params * p) : SimObject(p) diff --git a/src/mem/ruby/system/GPUCoalescer.cc b/src/mem/ruby/system/GPUCoalescer.cc index a615c40fd..d874b84e5 100644 --- a/src/mem/ruby/system/GPUCoalescer.cc +++ b/src/mem/ruby/system/GPUCoalescer.cc @@ -33,7 +33,7 @@ * Author: Sooraj Puthoor */ -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "config/the_isa.hh" diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 541b52138..4037fb8f1 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -29,7 +29,7 @@ #include "mem/ruby/system/Sequencer.hh" #include "arch/x86/ldstflags.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "cpu/testers/rubytest/RubyTester.hh" #include "debug/MemoryAccess.hh" diff --git a/src/mem/ruby/system/VIPERCoalescer.cc b/src/mem/ruby/system/VIPERCoalescer.cc index 6956469d5..04484bc97 100644 --- a/src/mem/ruby/system/VIPERCoalescer.cc +++ b/src/mem/ruby/system/VIPERCoalescer.cc @@ -33,7 +33,7 @@ * Author: Sooraj Puthoor */ -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" #include "config/the_isa.hh" diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index 817ddb481..3f4e43a8b 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -1051,7 +1051,7 @@ $c_ident::functionalWriteBuffers(PacketPtr& pkt) #include <cassert> #include <typeinfo> -#include "base/misc.hh" +#include "base/logging.hh" ''') for f in self.debug_flags: @@ -1168,7 +1168,7 @@ ${ident}_Controller::wakeup() #include <cassert> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/ProtocolTrace.hh" #include "debug/RubyGenerated.hh" diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py index e62758305..4f4f0585d 100644 --- a/src/mem/slicc/symbols/Type.py +++ b/src/mem/slicc/symbols/Type.py @@ -460,7 +460,7 @@ out << "${{dm.ident}} = " << printAddress(m_${{dm.ident}}) << " ";''') if self.isMachineType: code('#include <functional>') - code('#include "base/misc.hh"') + code('#include "base/logging.hh"') code('#include "mem/ruby/common/Address.hh"') code('#include "mem/ruby/common/TypeDefines.hh"') code('struct MachineID;') @@ -561,7 +561,7 @@ std::ostream& operator<<(std::ostream& out, const ${{self.c_ident}}& obj); #include <iostream> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "mem/protocol/${{self.c_ident}}.hh" using namespace std; diff --git a/src/mem/snoop_filter.cc b/src/mem/snoop_filter.cc index e8f449504..b372cfe21 100755 --- a/src/mem/snoop_filter.cc +++ b/src/mem/snoop_filter.cc @@ -44,7 +44,7 @@ #include "mem/snoop_filter.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/SnoopFilter.hh" #include "sim/system.hh" diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc index b7826fd25..db0bf180e 100644 --- a/src/mem/xbar.cc +++ b/src/mem/xbar.cc @@ -49,7 +49,7 @@ #include "mem/xbar.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/AddrRanges.hh" #include "debug/Drain.hh" diff --git a/src/proto/protoio.cc b/src/proto/protoio.cc index a666726fe..d2ce4595d 100644 --- a/src/proto/protoio.cc +++ b/src/proto/protoio.cc @@ -39,7 +39,7 @@ #include "proto/protoio.hh" -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; using namespace google::protobuf; diff --git a/src/python/pybind11/core.cc b/src/python/pybind11/core.cc index 159b19f9d..41eeed200 100644 --- a/src/python/pybind11/core.cc +++ b/src/python/pybind11/core.cc @@ -52,7 +52,7 @@ #include "base/addr_range.hh" #include "base/inet.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/random.hh" #include "base/socket.hh" #include "base/types.hh" diff --git a/src/python/pybind11/event.cc b/src/python/pybind11/event.cc index 88ee6996a..d2d78fe72 100644 --- a/src/python/pybind11/event.cc +++ b/src/python/pybind11/event.cc @@ -46,7 +46,7 @@ #include "pybind11/pybind11.h" #include "pybind11/stl.h" -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/eventq.hh" #include "sim/sim_events.hh" #include "sim/sim_exit.hh" diff --git a/src/sim/clocked_object.cc b/src/sim/clocked_object.cc index 56389119a..6982966aa 100644 --- a/src/sim/clocked_object.cc +++ b/src/sim/clocked_object.cc @@ -40,7 +40,7 @@ #include "sim/clocked_object.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/power/power_model.hh" ClockedObject::ClockedObject(const ClockedObjectParams *p) : diff --git a/src/sim/drain.cc b/src/sim/drain.cc index e920ee7ae..4d46306c3 100644 --- a/src/sim/drain.cc +++ b/src/sim/drain.cc @@ -41,7 +41,7 @@ #include <algorithm> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/Drain.hh" #include "sim/sim_exit.hh" diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc index 5ccd50bcd..0befb396b 100644 --- a/src/sim/dvfs_handler.cc +++ b/src/sim/dvfs_handler.cc @@ -44,7 +44,7 @@ #include <set> #include <utility> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/DVFS.hh" #include "params/DVFSHandler.hh" diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc index 3e27bcf1c..80de1808f 100644 --- a/src/sim/eventq.cc +++ b/src/sim/eventq.cc @@ -38,7 +38,7 @@ #include <unordered_map> #include <vector> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "cpu/smt.hh" #include "debug/Checkpoint.hh" diff --git a/src/sim/faults.cc b/src/sim/faults.cc index b0fa6fedb..06060802f 100644 --- a/src/sim/faults.cc +++ b/src/sim/faults.cc @@ -32,7 +32,7 @@ #include "sim/faults.hh" #include "arch/isa_traits.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/Fault.hh" diff --git a/src/sim/fd_array.cc b/src/sim/fd_array.cc index 9b6cbb573..15cfe11ef 100644 --- a/src/sim/fd_array.cc +++ b/src/sim/fd_array.cc @@ -42,7 +42,7 @@ #include <memory> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" #include "params/Process.hh" #include "sim/fd_entry.hh" diff --git a/src/sim/init.cc b/src/sim/init.cc index 70578197f..50612895b 100644 --- a/src/sim/init.cc +++ b/src/sim/init.cc @@ -53,7 +53,7 @@ #include <string> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/types.hh" #include "config/have_protobuf.hh" #include "python/pybind11/pybind.hh" diff --git a/src/sim/init_signals.cc b/src/sim/init_signals.cc index c7960c516..501f4eb9d 100644 --- a/src/sim/init_signals.cc +++ b/src/sim/init_signals.cc @@ -57,7 +57,7 @@ #include "base/atomicio.hh" #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "sim/async.hh" #include "sim/backtrace.hh" #include "sim/core.hh" diff --git a/src/sim/mathexpr.cc b/src/sim/mathexpr.cc index 85c130ad0..10d6cb727 100644 --- a/src/sim/mathexpr.cc +++ b/src/sim/mathexpr.cc @@ -44,7 +44,7 @@ #include <regex> #include <string> -#include "base/misc.hh" +#include "base/logging.hh" MathExpr::MathExpr(std::string expr) : ops( diff --git a/src/sim/microcode_rom.cc b/src/sim/microcode_rom.cc index d050919e7..853c22bb2 100644 --- a/src/sim/microcode_rom.cc +++ b/src/sim/microcode_rom.cc @@ -30,7 +30,7 @@ #include "sim/microcode_rom.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "cpu/static_inst_fwd.hh" StaticInstPtr diff --git a/src/sim/root.cc b/src/sim/root.cc index 41adf1cf0..41dad77b4 100644 --- a/src/sim/root.cc +++ b/src/sim/root.cc @@ -31,7 +31,7 @@ * Gabe Black */ -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "debug/TimeSync.hh" diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc index f49092d4d..a03a396b3 100644 --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -60,7 +60,7 @@ #include "arch/generic/vec_reg.hh" #include "base/framebuffer.hh" #include "base/inifile.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/output.hh" #include "base/str.hh" #include "base/trace.hh" diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc index 516019a7c..ab92ae55a 100644 --- a/src/sim/sim_object.cc +++ b/src/sim/sim_object.cc @@ -32,8 +32,8 @@ #include "sim/sim_object.hh" +#include "base/logging.hh" #include "base/match.hh" -#include "base/misc.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "sim/probe/probe.hh" diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc index d3c27fa08..d4e2f383c 100644 --- a/src/sim/simulate.cc +++ b/src/sim/simulate.cc @@ -36,7 +36,7 @@ #include <mutex> #include <thread> -#include "base/misc.hh" +#include "base/logging.hh" #include "base/pollevent.hh" #include "base/types.hh" #include "sim/async.hh" diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh index 1b4580bbf..a24028f08 100644 --- a/src/sim/syscall_emul.hh +++ b/src/sim/syscall_emul.hh @@ -96,7 +96,7 @@ #include "arch/utility.hh" #include "base/intmath.hh" #include "base/loader/object_file.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "base/types.hh" #include "config/the_isa.hh" diff --git a/src/unittest/cprintftest.cc b/src/unittest/cprintftest.cc index 091d292bc..1cf60c232 100644 --- a/src/unittest/cprintftest.cc +++ b/src/unittest/cprintftest.cc @@ -34,7 +34,7 @@ #include <string> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" using namespace std; diff --git a/src/unittest/nmtest.cc b/src/unittest/nmtest.cc index fdd865f2d..7f9dd3593 100644 --- a/src/unittest/nmtest.cc +++ b/src/unittest/nmtest.cc @@ -34,7 +34,7 @@ #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/str.hh" using namespace std; diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc index e3722204b..daf0b8649 100644 --- a/src/unittest/stattest.cc +++ b/src/unittest/stattest.cc @@ -35,7 +35,7 @@ #include <string> #include "base/cprintf.hh" -#include "base/misc.hh" +#include "base/logging.hh" #include "base/statistics.hh" #include "base/types.hh" #include "sim/core.hh" diff --git a/util/systemc/sc_module.cc b/util/systemc/sc_module.cc index 3f890009d..dafa80ee9 100644 --- a/util/systemc/sc_module.cc +++ b/util/systemc/sc_module.cc @@ -57,7 +57,7 @@ * most one Gem5Module instantiated in any simulation. */ -#include "base/misc.hh" +#include "base/logging.hh" #include "base/pollevent.hh" #include "base/trace.hh" #include "debug/Event.hh" |