misc: Rename misc.(hh|cc) to logging.(hh|cc)
authorGabe Black <gabeblack@google.com>
Fri, 1 Dec 2017 01:36:53 +0000 (17:36 -0800)
committerGabe Black <gabeblack@google.com>
Mon, 4 Dec 2017 23:10:55 +0000 (23:10 +0000)
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>

182 files changed:
ext/sst/gem5.cc
src/arch/alpha/isa.cc
src/arch/alpha/locked_mem.hh
src/arch/alpha/mt.hh
src/arch/alpha/process.cc
src/arch/alpha/pseudo_inst.hh
src/arch/alpha/utility.hh
src/arch/arm/faults.hh
src/arch/arm/isa_device.cc
src/arch/arm/miscregs.cc
src/arch/arm/process.cc
src/arch/arm/pseudo_inst.hh
src/arch/arm/types.hh
src/arch/arm/utility.hh
src/arch/generic/debugfaults.hh
src/arch/generic/pseudo_inst.cc
src/arch/generic/tlb.hh
src/arch/generic/vec_reg.hh
src/arch/hsail/gpu_isa.hh
src/arch/mips/decoder.hh
src/arch/mips/dsp.cc
src/arch/mips/dsp.hh
src/arch/mips/interrupts.hh
src/arch/mips/locked_mem.hh
src/arch/mips/mt.hh
src/arch/mips/pagetable.hh
src/arch/mips/process.cc
src/arch/mips/pseudo_inst.hh
src/arch/mips/registers.hh
src/arch/mips/utility.cc
src/arch/mips/utility.hh
src/arch/power/interrupts.hh
src/arch/power/isa.hh
src/arch/power/process.cc
src/arch/power/pseudo_inst.hh
src/arch/power/utility.cc
src/arch/riscv/decoder.hh
src/arch/riscv/interrupts.hh
src/arch/riscv/isa.hh
src/arch/riscv/locked_mem.hh
src/arch/riscv/pagetable.hh
src/arch/riscv/process.cc
src/arch/riscv/pseudo_inst.hh
src/arch/sparc/isa/includes.isa
src/arch/sparc/mt.hh
src/arch/sparc/pagetable.hh
src/arch/sparc/process.cc
src/arch/sparc/pseudo_inst.hh
src/arch/sparc/tlb.hh
src/arch/sparc/utility.hh
src/arch/x86/bios/intelmp.cc
src/arch/x86/decoder.cc
src/arch/x86/decoder.hh
src/arch/x86/emulenv.cc
src/arch/x86/faults.hh
src/arch/x86/isa/includes.isa
src/arch/x86/process.cc
src/arch/x86/regs/int.hh
src/base/SConscript
src/base/addr_range.hh
src/base/bigint.hh
src/base/bmpwriter.cc
src/base/circlebuf.hh
src/base/debug.cc
src/base/hostinfo.cc
src/base/imgwriter.cc
src/base/intmath.hh
src/base/loader/ecoff_object.cc
src/base/loader/elf_object.cc
src/base/loader/object_file.hh
src/base/loader/symtab.cc
src/base/logging.cc [new file with mode: 0644]
src/base/logging.hh [new file with mode: 0644]
src/base/misc.cc [deleted file]
src/base/misc.hh [deleted file]
src/base/output.cc
src/base/pngwriter.cc
src/base/pollevent.cc
src/base/random.cc
src/base/socket.cc
src/base/statistics.cc
src/base/stats/text.cc
src/base/time.cc
src/base/trace.cc
src/base/trie.hh
src/base/vnc/vncinput.cc
src/base/vnc/vncserver.cc
src/cpu/base.cc
src/cpu/func_unit.cc
src/cpu/intr_control.hh
src/cpu/kvm/device.cc
src/cpu/kvm/perfevent.cc
src/cpu/kvm/timer.cc
src/cpu/minor/buffers.hh
src/cpu/o3/free_list.hh
src/cpu/o3/store_set.cc
src/cpu/pc_event.hh
src/cpu/pred/2bit_local.cc
src/cpu/pred/btb.hh
src/cpu/pred/ltage.cc
src/cpu/pred/sat_counter.hh
src/cpu/simple/base.cc
src/cpu/static_inst.hh
src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
src/cpu/testers/rubytest/RubyTester.cc
src/cpu/thread_context.cc
src/dev/intel_8254_timer.cc
src/dev/mc146818.hh
src/dev/net/dist_iface.hh
src/dev/net/etherbus.cc
src/dev/net/etherdump.cc
src/dev/net/etherint.cc
src/dev/net/etherpkt.cc
src/dev/net/ethertap.cc
src/dev/net/pktfifo.cc
src/dev/net/pktfifo.hh
src/dev/pci/device.cc
src/dev/platform.cc
src/dev/ps2.cc
src/dev/serial/serial.cc
src/dev/serial/terminal.cc
src/dev/storage/disk_image.cc
src/dev/storage/simple_disk.cc
src/gpu-compute/brig_object.cc
src/gpu-compute/gpu_tlb.hh
src/gpu-compute/hsa_object.cc
src/gpu-compute/misc.hh
src/gpu-compute/of_scheduling_policy.hh
src/gpu-compute/rr_scheduling_policy.hh
src/gpu-compute/simple_pool_manager.cc
src/gpu-compute/tlb_coalescer.hh
src/gpu-compute/vector_register_file.cc
src/gpu-compute/wavefront.hh
src/kern/operatingsystem.cc
src/mem/cache/base.hh
src/mem/cache/cache.cc
src/mem/cache/cache.hh
src/mem/cache/mshr.cc
src/mem/cache/tags/fa_lru.cc
src/mem/cache/write_queue_entry.cc
src/mem/coherent_xbar.cc
src/mem/dramsim2_wrapper.cc
src/mem/mem_checker.hh
src/mem/noncoherent_xbar.cc
src/mem/packet.cc
src/mem/packet.hh
src/mem/request.hh
src/mem/ruby/common/Set.hh
src/mem/ruby/network/MessageBuffer.cc
src/mem/ruby/network/Network.cc
src/mem/ruby/network/fault_model/FaultModel.cc
src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
src/mem/ruby/structures/AbstractReplacementPolicy.cc
src/mem/ruby/system/GPUCoalescer.cc
src/mem/ruby/system/Sequencer.cc
src/mem/ruby/system/VIPERCoalescer.cc
src/mem/slicc/symbols/StateMachine.py
src/mem/slicc/symbols/Type.py
src/mem/snoop_filter.cc
src/mem/xbar.cc
src/proto/protoio.cc
src/python/pybind11/core.cc
src/python/pybind11/event.cc
src/sim/clocked_object.cc
src/sim/drain.cc
src/sim/dvfs_handler.cc
src/sim/eventq.cc
src/sim/faults.cc
src/sim/fd_array.cc
src/sim/init.cc
src/sim/init_signals.cc
src/sim/mathexpr.cc
src/sim/microcode_rom.cc
src/sim/root.cc
src/sim/serialize.cc
src/sim/sim_object.cc
src/sim/simulate.cc
src/sim/syscall_emul.hh
src/unittest/cprintftest.cc
src/unittest/nmtest.cc
src/unittest/stattest.cc
util/systemc/sc_module.cc

index 7749d37d6cb2da8392843fd0abdff85af57e4349..3d48e938603ec3beb0d5e2368ed4984056f8f2e4 100644 (file)
@@ -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
index fd2dda67ccb8168c76ad5c00121fe85be28418c6..32d1aff6515f213811a3a6a9189cf488175a650d 100644 (file)
@@ -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"
index ba577e8cbf94aec7ec4ebfe167e1989fbd609ec6..36a6a0333e17fd53011bdda1e6257d15b73ba98e 100644 (file)
@@ -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"
 
index cce27303ab7c732720a48f63d7b71a596977b6a7..640825b89e459b254d96dc38dd25069646ad06b8 100644 (file)
@@ -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
index 2a5c9f6162acb75cb209fde168f363f261f98c91..58fe0bdbeee5972a57f3c7ee8d183995290662cb 100644 (file)
@@ -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"
index 8147f7abef2cbab8ccd999346a87df854aefa15b..9f8b508c29d1e04fe5990623314c939f55c9f616 100644 (file)
@@ -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;
 
index 45e47b5e8b5775768cec5dffc4facb75938c705b..bf585fdab485e1e1a151053f59e15a83dc4f7d2a 100644 (file)
@@ -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"
index 8f860970d427b95144969e409e21e3085241294d..3191ceb88570243c609a53f4203b9d0796fd15c6 100644 (file)
@@ -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"
 
index 813d163e0325eb01e3e07381d9c1891add19fd70..110104fe4d8db7d563288993547b7f26f64f3e55 100644 (file)
@@ -39,7 +39,7 @@
 
 #include "arch/arm/isa_device.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 namespace ArmISA
 {
index d08f75142171dff27bbc1c7ec251e0b94ff0e02e..826e567264243d4003ffeda32c37d26e52f118de 100644 (file)
@@ -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"
 
index eb8abfb4d0fa12e347198d8024c7bba11331843d..dcc9145d3e09ae6ff05d525e8dc9f404f45e75fa 100644 (file)
@@ -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"
index 8da25ef872798d24c03c3799b843f81aaebf1d11..50c725dcf90f06e858d4d0d3ae6296a3d1d5e202 100644 (file)
@@ -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;
 
index 30725811abbbdf4504fe13ac764434c2762fa50a..eb9a9e801c0db95e34d4b5d19e6a7e2f7794c274 100644 (file)
@@ -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"
 
index 3a5a468ddac04647ad368194b7b3ec8bc2b0665a..640ba70d2388926f7ea0b77fc423c833ff51525b 100644 (file)
@@ -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"
index aeb2261a7a8b79d695bfde81f0c58a20334bbe99..5c5aa01ea3b386b98c3b6407aef8ae29bf7ee602 100644 (file)
@@ -42,7 +42,7 @@
 
 #include <string>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/faults.hh"
 
 namespace GenericISA
index 46667c15876f03151f1a57582533087496ff849f..1c83d344fcd38bf283030b72194f5d9ddfaabe62 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "arch/generic/pseudo_inst.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class ThreadContext;
 
index 995fbfff4406f458fc23d4e08216682010f5cb2d..aef52a120bba6868787548d6b3d33ff405e5adba 100644 (file)
@@ -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"
 
index 7a993ea73869ecdac036f75996558f4fc113abd2..b68a5886da07cad6ef3a437dc6488ef73d0fb00b 100644 (file)
 #include <vector>
 
 #include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 template <size_t Sz>
 class VecRegContainer;
index 831ad6ed5382f53c246bc0076e628f21ca975373..425522a48c1162842033e86158edb3b146acce82 100644 (file)
@@ -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
index 59e0406582632099a469d149fc26ffc0dded85e7..4a2fc46a5f14ed3deefe7254e734e9cad03f855c 100644 (file)
@@ -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"
 
index c999955e40f75f6725f038474a3e968a7b857489..e13cf087068c9615920aed40f287943a443b1410 100755 (executable)
@@ -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"
 
index 0e9424f38008bb3b1a5a258ee9146005d7326e4a..a929984e4c3ffc5fbcce3038eb95ab3407ecffe3 100755 (executable)
@@ -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;
index 2205510d23e5a70400080e7859ba5dcb04a77b18..ce9e0e4a3dc874a644e3734466276fcc992ce061 100755 (executable)
@@ -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"
index 61c689955889347571508c1a10e6d0f146a36c77..5c1e60aa13530d44ba1da0edf71cdf08b060d9cb 100644 (file)
@@ -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"
index 7b28b0493e46302de36ab1028d9135f9766ccaf9..67aeb6477cf245cd921f79d4147fe71af57b894c 100755 (executable)
@@ -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
index cb129fba782cdf33d91e0789df84ce0d5d95a840..a963cf6d29644cf29990a6aabdb98abaf816c831 100755 (executable)
@@ -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"
 
index 60e343578ac6f19c027c7d4b2b3c19c7eadecbba..4d0d5e309cdeba1c244dc2dcd3b7a857ea958780 100644 (file)
@@ -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"
index 1aae21abb833345e3425065c03f5852bb99a8268..3741ebc7169260ccc1c806527c877f027aafb227 100644 (file)
@@ -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;
 
index f5dd325cd17e7b25e5e255dd8e6860f72442f6a3..b44283d35dc985e34e78438c7fb9ca0f76de2f34 100644 (file)
@@ -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;
index c56321612d7df94ae462453d30a6b5be8aaf20d3..2a9a8d83c13b06e64daba54be24149f81785afaa 100644 (file)
@@ -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"
index 242dddbf74c7721b45094e0bfbef6eefd6657b9e..57c0897f1a76e0a48c6ee02a4bc895a24c99bbb1 100644 (file)
@@ -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"
index e41b4aa95a36418c90d1c8fc5b83f9ca15d5f149..f8995986373d1ef36edbb104f86eb6d571514eeb 100644 (file)
@@ -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"
 
index edac96d597b1366b51c02ee3657238e0aa789808..9769f8fd1af7e10d01e89678c024fc9d92ba5335 100644 (file)
@@ -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"
 
index 4b2efb0a6c0b58ff201ff7008b58865e1f65aee1..4a34decf3f551e7c1f593a7e203894d37dabb264 100644 (file)
@@ -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"
index 295b33320f4310c3994ab3b7ffeb5fab8fea88b0..e1ecda23870c0ee03b1a91707cc060bb7b780cc9 100644 (file)
@@ -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;
 
index c8076a697d81b5843c976c99c572faf79a1a3088..c8ff999887d332725c96887ced2efa494697b435 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "arch/power/utility.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 namespace PowerISA {
 
index c1d68bf06032f561ca39b7f508560db54c5aa0bc..91fe7873e24af7d545fa106fe4bb7a92b9062106 100644 (file)
@@ -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"
index 36eb5290929dfb66c24b8ce57ec75a769dc6fe8f..cfb9a5b7e78ae0005e73db41977a4b7dc55e99c1 100644 (file)
@@ -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"
 
index 18dc1ba4c8e6182e564057c020d88fde8778e5a3..4f8b4dc7ae6e432c21429ca98001988463753fe6 100644 (file)
@@ -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"
 
index f334385b1e5c577c895fa9aa8220d77f77644e06..61fbe0de13c8fe4e66d1f42644f83a7645dbd232 100644 (file)
@@ -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"
index 72573cad63610f9d2723065930c943e605994f5d..249d032644d1a222074c53fcdb5354e042fa2d9e 100644 (file)
@@ -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"
 
index eeea5ee480460b495379c91f0fd93d51054c3eee..54afc854cd4dfb69c973e6b147cb5af4051a960f 100644 (file)
@@ -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"
index 646e978f86a7a1e0b864492c49e0f64226b786c2..49cceb86bf4d90145d5edf53b02f7e0734e5098b 100644 (file)
@@ -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;
 
index e78295a0d30c96d85baa6f61c1c4e5ad307ab7af..ff48b0aec3fccc77971183874fc8de9c1de208ef 100644 (file)
@@ -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
index 7fb0549023ea7d1d19035a4d494bd0071b8b3395..faf60910fa77c308201e1d8bced2750220068768 100644 (file)
@@ -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
index 20df5a65382e1b7b8ef99ec3380dc67583c09e01..43a61259e25bbc07edd48137ed1560c2f96321ed 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "arch/sparc/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class Checkpoint;
 
index d8384b470a6591dce210c8ee808e4483389c8862..da7032f081116603535613f67fe49754ba6c9f2b 100644 (file)
@@ -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"
index 5d54391b2f93aedad92bf332ce5ba822d336a45a..5f9e576cc4c166b07d1e136ced242ad30303aba7 100644 (file)
@@ -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;
 
index 65b6aff72a82af31da36ed0b7b709b2df38a779e..12d5ef738c1948f201816a353cc886cfd1c033fe 100644 (file)
@@ -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"
 
index 63a9bb7129062fc1237229e46cc417867e6f6c98..ae579969950243c03939a538e15a619f72ae9b09 100644 (file)
@@ -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"
index 8d0a9be7da375c1eaa99005a54c7e1c7aacad05d..07d2f133373910edf0fc063c2bd5f315b0c25052 100644 (file)
@@ -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"
index 9c4997d6f02146cdf444b844a69d45546ac160f9..835d5e25d2443138d65b61ffee40b053f4065846 100644 (file)
@@ -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"
index 93e5955c80ad258a635b9f1569bf01cec777464a..a60aa469ab121d03a64622f1f1685fd2dc44d8aa 100644 (file)
@@ -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"
index 8abfb6398e544ec0c4619421a585013a82c74244..0e2795da1ad6f877e708bcbfddc50b756f0fd3de 100644 (file)
@@ -41,7 +41,7 @@
 
 #include <cassert>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace X86ISA;
 
index 6eabd53fa652f6e16e02bd6cfd25ee12d965cf23..4a7e93398c4f99d4e100c1833fe5fd1fe506c679 100644 (file)
@@ -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
index 0d0c0de3e88cf069b16390a439455d5781884908..1fad1ec1ac63968241e714de987cf6eae20c4424 100644 (file)
@@ -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"
index d7a0571518f4838c8ad6beac93fe44af1cea9475..1ad1315da4b7b8bc37c67a287b89ed7659256285 100644 (file)
@@ -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"
index 60aa6d0cc5027115c6b8c648100558f0ec6ff050..449281da3325f02544dfb6f4c36fefddad3d3544 100644 (file)
@@ -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
index 13c1ffff59a9024030c47bf509c0b70c09137f2b..75759fd371708d073c81dbf2d5660ec0834b3c2a 100644 (file)
@@ -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')
index ac1cbd05ac04726c7d1e81b45764f938d392ffe8..b243d68aa6b43856dcd2a42e013faa088b85bd20 100644 (file)
@@ -50,7 +50,7 @@
 
 #include "base/bitfield.hh"
 #include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 
 /**
index 2fa441a73df7c7e3f846e1384de4bbd73a4c30a6..a078fdd656e5b46238211774d13df10b4a607bc3 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <iostream>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 
 #ifndef __BASE_BIGINT_HH__
index f650074ab3e3ffd0bb9e468655eaabd28e34e87a..02245c09df9fbcbdfc6cacab284abf9ddec9afba 100644 (file)
@@ -44,7 +44,7 @@
 
 #include <cassert>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 const char* BmpWriter::_imgExtension = "bmp";
 
index bf6f9e263d04aeeceabe8ae5b7f7c19d0f8b7777..2c93daafcf0a86529243a27772fcfdf592a44b22 100644 (file)
@@ -44,7 +44,7 @@
 #include <cassert>
 #include <vector>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/serialize.hh"
 
 /**
index 6be9cdff5c5884f30b3d26ca78756e4fd37f2315..4482685859e56495bcec31daf8d58408d0921f9e 100644 (file)
@@ -37,7 +37,7 @@
 #include <csignal>
 
 #include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index 43999a5e5c9466cc918bb3c7f9ae0797cdd33620..7ece35dd87f7e884debc2c5de59308ccb07158ff 100644 (file)
@@ -47,7 +47,7 @@
 #include <cstring>
 #include <string>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/str.hh"
 #include "base/types.hh"
 
index ba9b58c027c7a593ecf9db45a61e8cb7e26fa023..40de3d7ccc388e31825c8de8af431f9a599bc114 100644 (file)
  */
 
 #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>
index eded26d4a4c291255886fd70ff3bde2c7bad090b..0b22ba0dbdd7bc66ac1eae1d5b752e6d73351363 100644 (file)
@@ -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.
index 4e94ecd1e7598532f9d859e2db09ef3846fb7ffe..caeab5f8f3cb3948a29ae2e87930d59c2b449b17 100644 (file)
@@ -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"
index fe43a7f01a658db7cc616be4582d2a8385fc2da8..60c79f8039cc54b7246a82ba42daf19f4115d3ab 100644 (file)
@@ -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"
index 80ffa91f6d6ea92b2fa6d6ec9621d1d43e18b99f..c2cdafe47d73bb37b20ff5e3bfc95e6df03aa097 100644 (file)
@@ -35,7 +35,7 @@
 #include <limits>
 #include <string>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 
 class PortProxy;
index ea73321143e4eb3893b75eac68e677897780f3c7..5c81c13e142de93f832b07e7d54545a0b03b1642 100644 (file)
@@ -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/logging.cc b/src/base/logging.cc
new file mode 100644 (file)
index 0000000..cec9c83
--- /dev/null
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2014, 2017 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
+ * Copyright (c) 2002-2005 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ *          Andreas Sandberg
+ */
+
+#include "base/logging.hh"
+
+#include <array>
+
+#include "base/hostinfo.hh"
+#include "base/output.hh"
+#include "base/trace.hh"
+#include "base/types.hh"
+#include "sim/core.hh"
+
+void
+Logger::setLevel(LogLevel ll)
+{
+    for (int i = 0; i < NUM_LOG_LEVELS; ++i)
+        get(LogLevel(i)).enabled = (i <= ll);
+}
+
+static void
+newline_if_needed(std::ostream &stream, const char *format)
+{
+    const size_t format_len(strlen(format));
+
+    switch (format_len ? format[format_len - 1] : '\0') {
+      case '\n':
+      case '\r':
+        break;
+      default:
+        stream << std::endl;
+    }
+}
+
+Logger::Logger(std::ostream &_stream, const char *_prefix)
+    : enabled(true), verbose(false), stream(_stream), prefix(_prefix)
+{
+}
+
+void
+Logger::printEpilogue(const char *func, const char *file, int line,
+                        const char *format)
+{
+    newline_if_needed(stream, format);
+
+    if (verbose) {
+        ccprintf(stream, " @ tick %d\n[%s:%s, line %d]\n",
+                 curTick(), func, file, line);
+    }
+}
+
+class ExitLogger : public Logger
+{
+  public:
+    using Logger::Logger;
+
+    void printEpilogue(const char *func, const char *file, int line,
+                       const char *format) override;
+};
+
+void
+ExitLogger::printEpilogue(const char *func, const char *file, int line,
+                            const char *format)
+{
+    Logger::printEpilogue(func, file, line, format);
+
+    ccprintf(stream, "Memory Usage: %ld KBytes\n", memUsage());
+}
+
+Logger &
+Logger::get(LogLevel ll)
+{
+    static std::array<Logger *, NUM_LOG_LEVELS> loggers{{
+        new ExitLogger(std::cerr, "panic"),
+        new ExitLogger(std::cerr, "fatal"),
+        new Logger(std::cerr, "warn"),
+        new Logger(std::cerr, "info"),
+        new Logger(std::cerr, "hack"),
+    }};
+
+    return *loggers[ll];
+}
diff --git a/src/base/logging.hh b/src/base/logging.hh
new file mode 100644 (file)
index 0000000..b0a9b0c
--- /dev/null
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2014, 2017 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
+ * Copyright (c) 2002-2005 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ *          Dave Greene
+ *          Andreas Sandberg
+ */
+
+#ifndef __BASE_LOGGING_HH__
+#define __BASE_LOGGING_HH__
+
+#include <cassert>
+#include <cstdlib>
+#include <iostream>
+#include <utility>
+
+#include "base/compiler.hh"
+#include "base/cprintf.hh"
+
+#if defined(__SUNPRO_CC)
+#define __FUNCTION__ "how to fix me?"
+#endif
+
+class Logger
+{
+  public:
+    enum LogLevel {
+        PANIC = 0,
+        FATAL,
+        WARN,
+        INFO,
+        HACK,
+        NUM_LOG_LEVELS,
+    };
+
+    /**
+     * Set the active log level.
+     *
+     * All levels that are lower or equal to the selected log level
+     * will be activated.
+     *
+     * @param ll Maximum log level to print
+     */
+    static void setLevel(LogLevel ll);
+
+    /**
+     * Get a Logger corresponding to a specific log level
+     *
+     * @param ll Log level to access
+     * @return Reference to the requested logger
+     */
+    static Logger &get(LogLevel ll);
+
+  public:
+    Logger(std::ostream &stream, const char *prefix);
+    virtual ~Logger() {};
+
+    template<typename ...Args> void
+    print(const char *func, const char *file, int line,
+          const char *format, const Args &...args)
+    {
+        if (!enabled)
+            return;
+
+        if (prefix)
+            stream << prefix << ": ";
+        ccprintf(stream, format, args...);
+
+        printEpilogue(func, file, line, format);
+    }
+
+    template<typename ...Args> void
+    print(const char *func, const char *file, int line,
+          const std::string &format, const Args &...args)
+    {
+        print(func, file, line, format.c_str(), args...);
+    }
+
+  protected:
+    virtual void printEpilogue(const char *func, const char *file, int line,
+                               const char *format);
+
+  public:
+    bool enabled;
+    bool verbose;
+
+  protected:
+    std::ostream &stream;
+    const char *prefix;
+};
+
+#define exit_message(logger, code, ...)                                 \
+    do {                                                                \
+        logger.print(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__);    \
+        if (code < 0)                                                   \
+            ::abort();                                                  \
+        else                                                            \
+            ::exit(code);                                               \
+    } while (0)
+
+//
+// This implements a cprintf based panic() function.  panic() should
+// be called when something happens that should never ever happen
+// regardless of what the user does (i.e., an acutal m5 bug).  panic()
+// calls abort which can dump core or enter the debugger.
+//
+//
+#define panic(...) exit_message(::Logger::get(::Logger::PANIC), -1, \
+                                __VA_ARGS__)
+
+//
+// This implements a cprintf based fatal() function.  fatal() should
+// be called when the simulation cannot continue due to some condition
+// that is the user's fault (bad configuration, invalid arguments,
+// etc.) and not a simulator bug.  fatal() calls  abort() like
+// panic() does.
+//
+#define fatal(...) exit_message(::Logger::get(::Logger::FATAL), 1, \
+                                __VA_ARGS__)
+
+/**
+ * Conditional panic macro that checks the supplied condition and only panics
+ * if the condition is true and allows the programmer to specify diagnostic
+ * printout.  Useful to replace if + panic, or if + print + assert, etc.
+ *
+ * @param cond Condition that is checked; if true -> panic
+ * @param ...  Printf-based format string with arguments, extends printout.
+ */
+#define panic_if(cond, ...)                                  \
+    do {                                                     \
+        if ((cond)) {                                        \
+            panic("panic condition " # cond " occurred: %s", \
+                  csprintf(__VA_ARGS__));                    \
+        }                                                    \
+    } while (0)
+
+
+/**
+ * Conditional fatal macro that checks the supplied condition and only causes a
+ * fatal error if the condition is true and allows the programmer to specify
+ * diagnostic printout.  Useful to replace if + fatal, or if + print + assert,
+ * etc.
+ *
+ * @param cond Condition that is checked; if true -> fatal
+ * @param ...  Printf-based format string with arguments, extends printout.
+ */
+#define fatal_if(cond, ...)                                     \
+    do {                                                        \
+        if ((cond)) {                                           \
+            fatal("fatal condition " # cond " occurred: %s",    \
+                  csprintf(__VA_ARGS__));                       \
+        }                                                       \
+    } while (0)
+
+
+#define base_message(logger, ...)                                       \
+    logger.print(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+
+// Only print the message the first time this expression is
+// encountered.  i.e.  This doesn't check the string itself and
+// prevent duplicate strings, this prevents the statement from
+// happening more than once. So, even if the arguments change and that
+// would have resulted in a different message thoes messages would be
+// supressed.
+#define base_message_once(...) do {                     \
+        static bool once = false;                       \
+        if (!once) {                                    \
+            base_message(__VA_ARGS__);                  \
+            once = true;                                \
+        }                                               \
+    } while (0)
+
+
+#define warn(...) \
+    base_message(::Logger::get(::Logger::WARN), __VA_ARGS__)
+#define inform(...) \
+    base_message(::Logger::get(::Logger::INFO), __VA_ARGS__)
+#define hack(...) \
+    base_message(::Logger::get(::Logger::HACK), __VA_ARGS__)
+
+#define warn_once(...) \
+    base_message_once(::Logger::get(::Logger::WARN), __VA_ARGS__)
+#define inform_once(...) \
+    base_message_once(::Logger::get(::Logger::INFO), __VA_ARGS__)
+#define hack_once(...) \
+    base_message_once(::Logger::get(::Logger::HACK), __VA_ARGS__)
+
+/**
+ * Conditional warning macro that checks the supplied condition and
+ * only prints a warning if the condition is true. Useful to replace
+ * if + warn.
+ *
+ * @param cond Condition that is checked; if true -> warn
+ * @param ...  Printf-based format string with arguments, extends printout.
+ */
+#define warn_if(cond, ...) \
+    do { \
+        if ((cond)) \
+            warn(__VA_ARGS__); \
+    } 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
+ * assertion actually failed.  Like the normal assertion, the chatty_assert
+ * will not be active in fast builds.
+ *
+ * @param cond Condition that is checked; if false -> assert
+ * @param ...  Printf-based format string with arguments, extends printout.
+ */
+#ifdef NDEBUG
+#define chatty_assert(cond, ...)
+#else //!NDEBUG
+#define chatty_assert(cond, ...)                                        \
+    do {                                                                \
+        if (!(cond))                                                    \
+            panic("assert(" # cond ") failed: %s", csprintf(__VA_ARGS__)); \
+    } while (0)
+#endif // NDEBUG
+#endif // __BASE_LOGGING_HH__
diff --git a/src/base/misc.cc b/src/base/misc.cc
deleted file mode 100644 (file)
index be97368..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2014, 2017 ARM Limited
- * All rights reserved
- *
- * The license below extends only to copyright in the software and shall
- * not be construed as granting a license to any other intellectual
- * property including but not limited to intellectual property relating
- * to a hardware implementation of the functionality of the software
- * licensed hereunder.  You may use the software subject to the license
- * terms below provided that you ensure that this notice is replicated
- * unmodified and in its entirety in all distributions of the software,
- * modified or unmodified, in source code or in binary form.
- *
- * Copyright (c) 2002-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Nathan Binkert
- *          Andreas Sandberg
- */
-
-#include "base/misc.hh"
-
-#include <array>
-
-#include "base/hostinfo.hh"
-#include "base/output.hh"
-#include "base/trace.hh"
-#include "base/types.hh"
-#include "sim/core.hh"
-
-void
-Logger::setLevel(LogLevel ll)
-{
-    for (int i = 0; i < NUM_LOG_LEVELS; ++i)
-        get(LogLevel(i)).enabled = (i <= ll);
-}
-
-static void
-newline_if_needed(std::ostream &stream, const char *format)
-{
-    const size_t format_len(strlen(format));
-
-    switch (format_len ? format[format_len - 1] : '\0') {
-      case '\n':
-      case '\r':
-        break;
-      default:
-        stream << std::endl;
-    }
-}
-
-Logger::Logger(std::ostream &_stream, const char *_prefix)
-    : enabled(true), verbose(false), stream(_stream), prefix(_prefix)
-{
-}
-
-void
-Logger::printEpilogue(const char *func, const char *file, int line,
-                        const char *format)
-{
-    newline_if_needed(stream, format);
-
-    if (verbose) {
-        ccprintf(stream, " @ tick %d\n[%s:%s, line %d]\n",
-                 curTick(), func, file, line);
-    }
-}
-
-class ExitLogger : public Logger
-{
-  public:
-    using Logger::Logger;
-
-    void printEpilogue(const char *func, const char *file, int line,
-                       const char *format) override;
-};
-
-void
-ExitLogger::printEpilogue(const char *func, const char *file, int line,
-                            const char *format)
-{
-    Logger::printEpilogue(func, file, line, format);
-
-    ccprintf(stream, "Memory Usage: %ld KBytes\n", memUsage());
-}
-
-Logger &
-Logger::get(LogLevel ll)
-{
-    static std::array<Logger *, NUM_LOG_LEVELS> loggers{{
-        new ExitLogger(std::cerr, "panic"),
-        new ExitLogger(std::cerr, "fatal"),
-        new Logger(std::cerr, "warn"),
-        new Logger(std::cerr, "info"),
-        new Logger(std::cerr, "hack"),
-    }};
-
-    return *loggers[ll];
-}
diff --git a/src/base/misc.hh b/src/base/misc.hh
deleted file mode 100644 (file)
index 7b0d462..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2014, 2017 ARM Limited
- * All rights reserved
- *
- * The license below extends only to copyright in the software and shall
- * not be construed as granting a license to any other intellectual
- * property including but not limited to intellectual property relating
- * to a hardware implementation of the functionality of the software
- * licensed hereunder.  You may use the software subject to the license
- * terms below provided that you ensure that this notice is replicated
- * unmodified and in its entirety in all distributions of the software,
- * modified or unmodified, in source code or in binary form.
- *
- * Copyright (c) 2002-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Nathan Binkert
- *          Dave Greene
- *          Andreas Sandberg
- */
-
-#ifndef __BASE_MISC_HH__
-#define __BASE_MISC_HH__
-
-#include <cassert>
-#include <cstdlib>
-#include <iostream>
-#include <utility>
-
-#include "base/compiler.hh"
-#include "base/cprintf.hh"
-
-#if defined(__SUNPRO_CC)
-#define __FUNCTION__ "how to fix me?"
-#endif
-
-class Logger
-{
-  public:
-    enum LogLevel {
-        PANIC = 0,
-        FATAL,
-        WARN,
-        INFO,
-        HACK,
-        NUM_LOG_LEVELS,
-    };
-
-    /**
-     * Set the active log level.
-     *
-     * All levels that are lower or equal to the selected log level
-     * will be activated.
-     *
-     * @param ll Maximum log level to print
-     */
-    static void setLevel(LogLevel ll);
-
-    /**
-     * Get a Logger corresponding to a specific log level
-     *
-     * @param ll Log level to access
-     * @return Reference to the requested logger
-     */
-    static Logger &get(LogLevel ll);
-
-  public:
-    Logger(std::ostream &stream, const char *prefix);
-    virtual ~Logger() {};
-
-    template<typename ...Args> void
-    print(const char *func, const char *file, int line,
-          const char *format, const Args &...args)
-    {
-        if (!enabled)
-            return;
-
-        if (prefix)
-            stream << prefix << ": ";
-        ccprintf(stream, format, args...);
-
-        printEpilogue(func, file, line, format);
-    }
-
-    template<typename ...Args> void
-    print(const char *func, const char *file, int line,
-          const std::string &format, const Args &...args)
-    {
-        print(func, file, line, format.c_str(), args...);
-    }
-
-  protected:
-    virtual void printEpilogue(const char *func, const char *file, int line,
-                               const char *format);
-
-  public:
-    bool enabled;
-    bool verbose;
-
-  protected:
-    std::ostream &stream;
-    const char *prefix;
-};
-
-#define exit_message(logger, code, ...)                                 \
-    do {                                                                \
-        logger.print(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__);    \
-        if (code < 0)                                                   \
-            ::abort();                                                  \
-        else                                                            \
-            ::exit(code);                                               \
-    } while (0)
-
-//
-// This implements a cprintf based panic() function.  panic() should
-// be called when something happens that should never ever happen
-// regardless of what the user does (i.e., an acutal m5 bug).  panic()
-// calls abort which can dump core or enter the debugger.
-//
-//
-#define panic(...) exit_message(::Logger::get(::Logger::PANIC), -1, \
-                                __VA_ARGS__)
-
-//
-// This implements a cprintf based fatal() function.  fatal() should
-// be called when the simulation cannot continue due to some condition
-// that is the user's fault (bad configuration, invalid arguments,
-// etc.) and not a simulator bug.  fatal() calls  abort() like
-// panic() does.
-//
-#define fatal(...) exit_message(::Logger::get(::Logger::FATAL), 1, \
-                                __VA_ARGS__)
-
-/**
- * Conditional panic macro that checks the supplied condition and only panics
- * if the condition is true and allows the programmer to specify diagnostic
- * printout.  Useful to replace if + panic, or if + print + assert, etc.
- *
- * @param cond Condition that is checked; if true -> panic
- * @param ...  Printf-based format string with arguments, extends printout.
- */
-#define panic_if(cond, ...)                                  \
-    do {                                                     \
-        if ((cond)) {                                        \
-            panic("panic condition " # cond " occurred: %s", \
-                  csprintf(__VA_ARGS__));                    \
-        }                                                    \
-    } while (0)
-
-
-/**
- * Conditional fatal macro that checks the supplied condition and only causes a
- * fatal error if the condition is true and allows the programmer to specify
- * diagnostic printout.  Useful to replace if + fatal, or if + print + assert,
- * etc.
- *
- * @param cond Condition that is checked; if true -> fatal
- * @param ...  Printf-based format string with arguments, extends printout.
- */
-#define fatal_if(cond, ...)                                     \
-    do {                                                        \
-        if ((cond)) {                                           \
-            fatal("fatal condition " # cond " occurred: %s",    \
-                  csprintf(__VA_ARGS__));                       \
-        }                                                       \
-    } while (0)
-
-
-#define base_message(logger, ...)                                       \
-    logger.print(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-
-// Only print the message the first time this expression is
-// encountered.  i.e.  This doesn't check the string itself and
-// prevent duplicate strings, this prevents the statement from
-// happening more than once. So, even if the arguments change and that
-// would have resulted in a different message thoes messages would be
-// supressed.
-#define base_message_once(...) do {                     \
-        static bool once = false;                       \
-        if (!once) {                                    \
-            base_message(__VA_ARGS__);                  \
-            once = true;                                \
-        }                                               \
-    } while (0)
-
-
-#define warn(...) \
-    base_message(::Logger::get(::Logger::WARN), __VA_ARGS__)
-#define inform(...) \
-    base_message(::Logger::get(::Logger::INFO), __VA_ARGS__)
-#define hack(...) \
-    base_message(::Logger::get(::Logger::HACK), __VA_ARGS__)
-
-#define warn_once(...) \
-    base_message_once(::Logger::get(::Logger::WARN), __VA_ARGS__)
-#define inform_once(...) \
-    base_message_once(::Logger::get(::Logger::INFO), __VA_ARGS__)
-#define hack_once(...) \
-    base_message_once(::Logger::get(::Logger::HACK), __VA_ARGS__)
-
-/**
- * Conditional warning macro that checks the supplied condition and
- * only prints a warning if the condition is true. Useful to replace
- * if + warn.
- *
- * @param cond Condition that is checked; if true -> warn
- * @param ...  Printf-based format string with arguments, extends printout.
- */
-#define warn_if(cond, ...) \
-    do { \
-        if ((cond)) \
-            warn(__VA_ARGS__); \
-    } 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
- * assertion actually failed.  Like the normal assertion, the chatty_assert
- * will not be active in fast builds.
- *
- * @param cond Condition that is checked; if false -> assert
- * @param ...  Printf-based format string with arguments, extends printout.
- */
-#ifdef NDEBUG
-#define chatty_assert(cond, ...)
-#else //!NDEBUG
-#define chatty_assert(cond, ...)                                        \
-    do {                                                                \
-        if (!(cond))                                                    \
-            panic("assert(" # cond ") failed: %s", csprintf(__VA_ARGS__)); \
-    } while (0)
-#endif // NDEBUG
-#endif // __BASE_MISC_HH__
index dc85c2a5454f78041e2a95f91011305353302bd4..48581c3fee6a3b3c013aa1303236cb8b08489d6e 100644 (file)
@@ -58,7 +58,7 @@
 #include <cstdlib>
 #include <fstream>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index 3b49d479dd536cea53a49d8c6cbc0d5b18dadf52..3251ac8859dfe21debc6932c074b063f1583ad98 100644 (file)
@@ -51,7 +51,7 @@ extern "C"
 #include <cstdio>
 #include <cstdlib>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 const char* PngWriter::_imgExtension = "png";
 
index 79814e077dfb87768dfb4dc37832e5d436f57aaf..2101f8d718542526078c97c75e0c8081d651c1b5 100644 (file)
@@ -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"
index 0121581d6c8a54c1a13b25f248bc055447f15492..1c6b1cb4ad0ac7bebb83c83b6d98a7428e3a3fae 100644 (file)
@@ -46,7 +46,7 @@
 
 #include <sstream>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/serialize.hh"
 
 Random::Random()
index a09b51fb274124e5c919188e87f569285a1737e4..ece4a6ac4c02ef8b18ca53e2c9919aafc0bf9041 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <cerrno>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 #include "sim/byteswap.hh"
 
index 96747f0a9214a9d3eb9d4682df53e6bed7f51788..123351b8017fc195c152f09042ad29d3ce7bde71 100644 (file)
@@ -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"
index 9403ed3ff48e94820c99a0ba75295ab243b9fddc..10e94a7702f7a09bda251097f765e0844ea05472 100644 (file)
@@ -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"
 
index 5509bccaf25912f33d50068baa714cf1e01b5230..6e9d7ccfb4d8adf447075ed5e93b758a5ed0d106 100644 (file)
@@ -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"
index dfd99686a0961cbc66d313ad21ac3675fa26e28d..06f9eeb2157d36fc7623b8f7ff58b26dff2f46ad 100644 (file)
@@ -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"
 
index 1d110b4e11c9ac03a8eace47dc45df928236e1a8..e256377c15c6ec4c74fa45edbc4c11717ee41539 100644 (file)
@@ -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.
index b9d1d2546ba08daefac45878ebede71fe1ad2dd5..da3c913b2bfd0609aeb77cfe97dad513615f6c63 100644 (file)
@@ -46,7 +46,7 @@
 
 #include <sys/types.h>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/output.hh"
 
 #include "base/trace.hh"
index 00ff5602fed51d730bf9c11df6417a45df5ed2e4..97515ac16847d40c464d1ede83b101b273ba8d34 100644 (file)
@@ -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"
index a41a0c3e30380933e39e9a0c833355c2fa472320..2c3ca0809ec91c94c680d2e5742ae28b9837b929 100644 (file)
@@ -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"
index d5d56405015f9288e002f9c42c8cf2528462ef0b..a7fd4bb3b439529c1c599adbd403e67a293b03fa 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <sstream>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index f8ded6f39dae50c5a8bd5fba875519d4cdc5f886..b2a6277b144bedb4ef2f2676b3e8028426911a3d 100644 (file)
@@ -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"
index 973bbaa6461e770b0984378e94a6cc4edb997e9b..3980b50daf3c936b7124dc4b4b5ef11ed331e8cd 100644 (file)
@@ -46,7 +46,7 @@
 #include <cassert>
 #include <cerrno>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 KvmDevice::KvmDevice(int _fd)
     : fd(_fd)
index 5738b8ecaec89ed0542a1c35bc7e5470d05eea2f..5023b301e6bef9134750cc93d5d697a59abc41e9 100644 (file)
@@ -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)
index 03b31bd3fb4f7ec9a4fa1d6e950d36d3a42396ef..8d3e69f423dbf09a6922c554ac9de8602bad74c7 100644 (file)
@@ -46,7 +46,7 @@
 #include <csignal>
 #include <ctime>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/KvmTimer.hh"
 
index 924d7d2af456d4c213e2a78f605f78de099bc47b..864b29e0cef161bb13cbfe56c8c959320c1b91d7 100644 (file)
@@ -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
index f4c26a6973c82196cbf73e5dc43eada18cfe4774..3ad08ee98846713b4817f85243a16592e5a17768 100644 (file)
@@ -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"
index 9c21fbff37839dca06cbd852fe51c06e968fde4c..6fa75186f20e4acb0a2306d2901e6728abd47054 100644 (file)
@@ -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"
 
index 11fce2ca04b49f638d7e86a45cc4fe1c6936edf4..7b57e97a7c58b7e3996304af21c1add8bee44757 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <vector>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/types.hh"
 
 class ThreadContext;
index adbb07583b6fb1b8eee08643d67ede07677c8034..cd97f2bdf587b7fdb7016999c45a2dcdce4a0397 100644 (file)
@@ -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"
 
index 209bbdb49a9963294a57ffa13103c53476bf1a59..0a15cc0e4f2cd4b632350399405a3d590de9856f 100644 (file)
@@ -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"
 
index 84fc9a404e862b27cf98f0dd682ae4a1b023ad35..251fb2e7fa822dd5530c9844fd9d87a2aa8fb108 100644 (file)
@@ -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"
index 4721a3f9f2f09bab63a9c284d87572f32631ddf2..92d5d628c096de761382e50624facd5fe5f45e3a 100644 (file)
@@ -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"
 
 /**
index 62900ec7840611313a476290201af4b29ee14208..5c8eba6ef25de14131d4f2e2c7152a0f824e90dd 100644 (file)
@@ -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"
index 883c532ac19cf1a3bd5d5c7f8117a2888f71af0d..a58df00c7da214eec6f8b07b0f405d17f3cf048e 100644 (file)
@@ -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"
index 1345fe93e34a028cea0dad8371df316be1f9d464..f7513d3828ca62acb3b2bd193e13bf4d22d1493f 100644 (file)
@@ -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"
index 712d15dfff3a96c48e2461d2d068dd1e23434ef8..d9ca030c7030722b99ffb563ac1d5ac898b3b205 100644 (file)
@@ -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"
index 0d288de6fa1eb26a7a9a5a3006c627500453c9ee..bf25cd65f21b19426080758a27de8196a420d166 100644 (file)
@@ -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"
index 3831f21b80394caddef343dc3f7b9a681d7b64b0..5a0174d77311f79b5b7cd8bfc3d0e0a9458a260a 100644 (file)
@@ -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;
index 8eb301c457424a04943a9d23891d08b39fc1ecf6..741dca33696f621c66d0a1f5a87411b96ce248b5 100644 (file)
@@ -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) */
index c02c39530a66755fe147a570c2b72b4e0ffcee6f..c87a4c0bd634ff8966d41a6887316c6dc3027ed2 100644 (file)
@@ -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"
index 243e27b18267fadf98fad24b0e4e299c6e4c0ed2..7e086bfb0be41ed9dceff3c3adb197f6ba25e002 100644 (file)
@@ -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"
index 1fe4627648ab1f5341c3b9e709977938a2f9b054..64444d578472c0c5232274eff4b1ae4ae676142a 100644 (file)
@@ -38,7 +38,7 @@
 #include <algorithm>
 #include <string>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/output.hh"
 #include "sim/core.hh"
 
index b5990c7a0111980408a75109c6dd87759dc8422a..0c5e6b81797aaed2416059ca4ad7b5b78037d12e 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "dev/net/etherint.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "sim/sim_object.hh"
 
 void
index 22c0156d04be5cfdc1bed0353502408dc4fec047..9b020197cbdc695262460eca054dfdff5424104e 100644 (file)
@@ -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;
index 59314e540b0b84025713c087c6368270c6c62f0a..4b5b9bdb0043ee6f12d352de8e748fadcbcdce3a 100644 (file)
@@ -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"
index 17aa54a787eead97b529bf44e28b064ebe6a4065..f7bfcac59f35efde36bb4b64ca1b85f9e062502f 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "dev/net/pktfifo.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index 456c4433b02796278847e236731f56e1accd357b..397d86b11a45f8bc48f0176ae5dab32467478b08 100644 (file)
@@ -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"
 
index 192d824d886f91df6aa35efdc50b169dc2432f2b..4d9d29b1d9e638f4b90a3b80e680801c0e445e44 100644 (file)
@@ -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"
index 63df9bc0d71228825b6256efbc82ac161473e33f..fae1b13a1169278ec098cc403471f7796d62721d 100644 (file)
@@ -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"
 
index 2c13e5caf3f3459850031c1fdd2e5c49130ceb03..0d605270676fdf1553b0e485a25001b02968e54b 100644 (file)
@@ -41,7 +41,7 @@
 
 #include <list>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "x11keysym/keysym.h"
 
 namespace Ps2 {
index 873366860ab4e45627c5f7015914a39e74847e78..8a3d8012614b200e1cffed0daf8ac67939e7b384 100644 (file)
@@ -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"
 
index 7230698d33729441a954ec66ef7f971bf03e5f5a..5e8e52e9523919c14c7543844bd2b2f53f55c9dd 100644 (file)
@@ -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"
index e7fda40a29503489735ae1eab2539e889acfceca..0e338e9c40c66d18f84776d34364580a90fb810a 100644 (file)
@@ -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"
index 49c001a0077ee684ad8f3d94ad45e65e6a8bb9a6..bc52e7ec53ec22ad91c1e608baea3ed464b61e05 100644 (file)
@@ -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"
index 21b7d44332a16d8e011d2125d0bcd449d712a577..6211598d4167754cb5b38ebc52ea090febd14922 100644 (file)
@@ -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"
index ee4375259c378fb58b17742d5c3ec7618ae8f23d..73b5f2f61f8334dcb5e53ae7d061fc3d8aaa62a9 100644 (file)
@@ -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"
index e74a45454f446a6395eea0ea41dc5c7c95ce7521..ac734a4375ff281287928ed6defa5f3d3da1724b 100644 (file)
@@ -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)
index 5ade897891f2a1173250208d317a37a3c6b5ac27..5ee8fb87b51ae78f916313aec039bdbfe175bd74 100644 (file)
@@ -40,7 +40,7 @@
 #include <limits>
 #include <memory>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class GPUDynInst;
 
index 684e51a3a8fae426d4654ea0da51d72069804b43..94b5fdcd7ed198f7e510545038f6ba38a57917bc 100644 (file)
@@ -39,7 +39,7 @@
 #include <cstddef>
 #include <vector>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class Wavefront;
 
index 780f294aa3fb14c7a2782e9891bd9e8204965383..3e83748da483848de138e8201728b677e8dce5d3 100644 (file)
@@ -42,7 +42,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 class Wavefront;
 
index 0e35ab9cc3c17dd1bf1d9e66bc2c8ce928fb76a5..dfa1ec013594cdb8fdb25c831e0f71dc0c1a0b49 100644 (file)
@@ -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
index b03e771500632acbf4155b4f8d4dc2a6a571abb1..feb5b7807ea567d942c1ecc9f58f6f39aba129e6 100644 (file)
@@ -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"
index 3c3b400bbe94ba635a46eeadc320a0d1f4c20ee7..9e3bca7e791824b487bb5b4c5196a9d237c3d7c3 100644 (file)
@@ -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"
index 659132941c75888eda5af3d63e30f83984e81423..eae6890db5925cee6fb8b54a03dd763e0d48b011 100644 (file)
@@ -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"
index 553ceaf6626a9ddc5efbca93617497bcd17e7bb4..afeca4fcadebf8309222df2188edfa04c9cf1b58 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "kern/operatingsystem.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 int
 OperatingSystem::openSpecialFile(std::string path, Process *process,
index 431c2f84a03630839c39b961b38f2682c43a4cc3..b006d4b64e85179da777048152ff26521746c558 100644 (file)
@@ -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"
index 169ef0d1d4ad52efc03d8bcb1baa61aef72ebdc3..2a3dddc196e2155431081cba4f5e4cc42cb721b1 100644 (file)
@@ -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"
index 9d135c652a52c04d7609049e55bdb87275c52118..a39a9c7402d8f5bb95c3e397711d2aeb5feeca4b 100644 (file)
@@ -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"
index 25f73d79a9c65b9fa1b87fb550dfff24c17a87c1..fa21f5cfc2b18fe8bc9de21840ec74f7eccd797a 100644 (file)
@@ -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"
index 91b1b567939abc384159105534e0af76488af662..895f7953b8a8ced5f197a92ea3fb563a30cc2a8d 100644 (file)
@@ -51,7 +51,7 @@
 #include <sstream>
 
 #include "base/intmath.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index 283c4a8620ab27a5763668ecdd02a0d025519110..7a778ea722d005102f9660aa9ab9e1d92b792777 100644 (file)
@@ -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"
index ef0620822be0cf8edcd0224643fdf3b3413265ab..ede40950379389d6ecd09730824e80c7a56e7cd8 100644 (file)
@@ -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"
index 841ae43912563d7718f51e59813d8b47015ae041..5b35e7123c49e6a7169638971862e8f695d5dc28 100644 (file)
@@ -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
index 7de4c17b72cc8aa66f1631145e76320ab4ae0e3b..eacfda04dbeb426c414de6c9a9deb6b7b1f549c2 100644 (file)
@@ -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"
index eeaa4fb0bda82e07eb488965c52c3c7ad170ec10..94649eaffeacbb328583947914d1a6406bce9156 100644 (file)
@@ -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"
index 371058b25f4b2d3b6eadc7ff8a7ec73a8f3a01b6..e05783ca9cd5edb5b0feb049fb709cce6ea75b77 100644 (file)
@@ -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;
index 74a2de1353cbaeedebfcd3b7bacfd257e2f8eae6..0920f223b6908a7593466db351d31deb33563f73 100644 (file)
@@ -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"
index d9f58d21d71257e25d481defbade9aa3706bb458..aff13075b9e07cc0421f3fd74adaaf5f9bd02b01 100644 (file)
@@ -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"
index 3ab6979d42eea3e7a04c4440dcb631ae9d7b5e9a..cb01c9613b8a8e2c78b89b1936a895b4f4669e01 100644 (file)
@@ -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.
index 67bc7f72d4a5d9e2c27364daaf95279a4d4e593d..f4eca3b1ef604581de1d72cfd477bc8bbb077b0c 100644 (file)
@@ -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"
index 1761218b0663bfcdbf48dd357050e1ef3d7d44bb..57834f2e2a589b38fcafecb85510b41f8390ac55 100644 (file)
@@ -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"
index 7be5bcd4997b57f0c5fb6f8f84f50ac7d289a3e8..befcfa26596813042c53f30a532bfb347f2e0ed6 100644 (file)
@@ -45,7 +45,7 @@
 
 // GEM5 includes
 #include "FaultModel.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index cbd068c0448a623871240e00fcb1935376825949..f0e9500309dcfb3b94a7f64e960f01705ad61384 100644 (file)
@@ -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"
index 05304dc84b1757c53c25ea0606098e44e46b1c42..01eb6e5175890eb02c1a78127fe210d980e2b4ee 100644 (file)
@@ -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)
index a615c40fd1927029b2934b953dca6d46cfbe9eae..d874b84e54981970b64a8b75a3b15bd5eb1e3e2f 100644 (file)
@@ -33,7 +33,7 @@
  * Author: Sooraj Puthoor
  */
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/str.hh"
 #include "config/the_isa.hh"
 
index 541b52138622e1ae9d615c0d10652263d3cacf8e..4037fb8f1a0a7375ca5a4bbd22e314537b39635b 100644 (file)
@@ -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"
index 6956469d5966ede7328c24cfe4449cea8e73c390..04484bc974c785b98fca1d173b71850f511d265e 100644 (file)
@@ -33,7 +33,7 @@
  * Author: Sooraj Puthoor
  */
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "base/str.hh"
 #include "config/the_isa.hh"
 
index 817ddb4812a722242e70d93de439d57261f0e2e3..3f4e43a8be7e4eaa1acea0980e641c52dbb9b422 100644 (file)
@@ -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"
index e627583050bd94b26c2e232e16d42cf43d7276c6..4f4f0585dc4445bc38771dbaa43c8bc9ce5e0cbb 100644 (file)
@@ -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;
index e8f449504de11d4c48489d3487b4f7f90bbecf35..b372cfe2142691aec6b8ac45ac48628a357ff252 100755 (executable)
@@ -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"
index b7826fd25bc5935843472f6a6861e25a965ec315..db0bf180e7794acf392b84e9128b7afb5d4943b8 100644 (file)
@@ -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"
index a666726fe2f587c4227443f1811b4fd0f676ecc9..d2ce4595dce25c68109c113c95bb698969f667aa 100644 (file)
@@ -39,7 +39,7 @@
 
 #include "proto/protoio.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 using namespace google::protobuf;
index 159b19f9d415d34c822bdaeec62408d08b52cf0d..41eeed20038441900213ce7c19f174150df6028c 100644 (file)
@@ -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"
index 88ee6996aab9ff4507e34ec9e8b79a70661bb622..d2d78fe722f4ea365546e328715b0eeaa16ca092 100644 (file)
@@ -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"
index 56389119ac1a13dc04686b967aef53dfbbbd08df..6982966aa85d80b4cfbf0bfd8b292d5d9ddd21b8 100644 (file)
@@ -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) :
index e920ee7ae0a32a557a42449b364158cbb2bef1ad..4d46306c3f350a75ed46f381e8fdacd4fe6a981c 100644 (file)
@@ -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"
index 5ccd50bcdfd98c72d6f4de64b998e0d0d66e96d3..0befb396b9a77ffd389dac1cd4e5b8c84b3f6f73 100644 (file)
@@ -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"
index 3e27bcf1cc925750d7c52768a4991d341a86c41f..80de1808fbef5eb1994c07c3cc3f24d78f110f2e 100644 (file)
@@ -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"
index b0fa6fedb11f4f90ea26dc51637666f303b759e3..06060802f32d4e2efae3767f8c06d0618b5f4803 100644 (file)
@@ -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"
index 9b6cbb5734c0145286c274639d3f80f0dd530d77..15cfe11efb85ee8a079eb5cebf1f64937cf3d2f0 100644 (file)
@@ -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"
 
index 70578197fb324c21b561e3f97dd5357a30d9a19f..50612895b360cffcb0007bbc35b76dda0c612f0b 100644 (file)
@@ -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"
index c7960c51614b73658edb2c4c3912c4c295e8197a..501f4eb9d133e345797fc26d33f33a132c145a73 100644 (file)
@@ -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"
index 85c130ad06499101e06bfadb6d228fd40954e52c..10d6cb727f0fa72c3724252602883a7aba78ea37 100644 (file)
@@ -44,7 +44,7 @@
 #include <regex>
 #include <string>
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 MathExpr::MathExpr(std::string expr)
  : ops(
index d050919e74b28273a26d09906b3d90680b4e69cb..853c22bb2d6a7cd2b2c1cb58525ed14fa9df06ae 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "sim/microcode_rom.hh"
 
-#include "base/misc.hh"
+#include "base/logging.hh"
 #include "cpu/static_inst_fwd.hh"
 
 StaticInstPtr
index 41adf1cf027b287bdba1138411d8fc8742637590..41dad77b4e93306921f5e261cbc2b9f2307a4f4c 100644 (file)
@@ -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"
index f49092d4d5f9ffef606336437ac11a4214119253..a03a396b33e413895a4ae2a78d61347f37b6b15f 100644 (file)
@@ -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"
index 516019a7c88811f23d0cfafb94baf1e36161b761..ab92ae55a368ad609ebf5db400836f9a1edd4f1a 100644 (file)
@@ -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"
index d3c27fa08c5708eeafafd96d190a247176fbc432..d4e2f383c981e889e51a5f93e7ece2777ce7aefd 100644 (file)
@@ -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"
index 1b4580bbf2b0f9d744be22870381412ed6101a0a..a24028f081356466c70fa8751cbd2fa233c5e77c 100644 (file)
@@ -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"
index 091d292bc6f3f94c57ce4a48a3dedcd86307d5f7..1cf60c23201116a8061f2a5706d42ea12d62bc17 100644 (file)
@@ -34,7 +34,7 @@
 #include <string>
 
 #include "base/cprintf.hh"
-#include "base/misc.hh"
+#include "base/logging.hh"
 
 using namespace std;
 
index fdd865f2ddcce31f888c951bdff2b674395286a0..7f9dd3593bd5eb895d4a926f7cb8044d56e0e075 100644 (file)
@@ -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;
index e3722204b7798deafa9d168627cce6d924cdc5a3..daf0b864990dfb5212d5d5d817b34a70f2677c2f 100644 (file)
@@ -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"
index 3f890009de50af24a6fb6e119b4481af70ece642..dafa80ee9aa35d5b86799eb93e6ea5f26d48ec10 100644 (file)
@@ -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"