diff --git a/src/arch/SConscript b/src/arch/SConscript index a4825e5aee..226b50d715 100644 --- a/src/arch/SConscript +++ b/src/arch/SConscript @@ -64,7 +64,6 @@ env.SwitchingHeaders( registers.hh remote_gdb.hh types.hh - utility.hh '''), env.subst('${TARGET_ISA}')) diff --git a/src/arch/power/isa/includes.isa b/src/arch/power/isa/includes.isa index c219d97fa1..55b51cf9c8 100644 --- a/src/arch/power/isa/includes.isa +++ b/src/arch/power/isa/includes.isa @@ -56,7 +56,6 @@ output decoder {{ #include "arch/power/decoder.hh" #include "arch/power/faults.hh" #include "arch/power/isa_traits.hh" -#include "arch/power/utility.hh" #include "base/loader/symtab.hh" #include "base/cprintf.hh" #include "cpu/thread_context.hh" @@ -71,7 +70,6 @@ output exec {{ #include "arch/power/faults.hh" #include "arch/power/isa_traits.hh" #include "arch/power/miscregs.hh" -#include "arch/power/utility.hh" #include "base/condcodes.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" diff --git a/src/arch/power/pagetable.hh b/src/arch/power/pagetable.hh index 1f0ec4cd4a..f19398791b 100644 --- a/src/arch/power/pagetable.hh +++ b/src/arch/power/pagetable.hh @@ -33,7 +33,6 @@ #define __ARCH_POWER_PAGETABLE_H__ #include "arch/power/isa_traits.hh" -#include "arch/power/utility.hh" #include "sim/serialize.hh" namespace PowerISA diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc index dca8d7bed9..410b12c983 100644 --- a/src/arch/power/tlb.cc +++ b/src/arch/power/tlb.cc @@ -36,7 +36,6 @@ #include "arch/power/faults.hh" #include "arch/power/pagetable.hh" -#include "arch/power/utility.hh" #include "base/inifile.hh" #include "base/str.hh" #include "base/trace.hh" diff --git a/src/arch/power/tlb.hh b/src/arch/power/tlb.hh index a9653e6c5a..7dcc3c000e 100644 --- a/src/arch/power/tlb.hh +++ b/src/arch/power/tlb.hh @@ -37,7 +37,6 @@ #include "arch/generic/tlb.hh" #include "arch/power/isa_traits.hh" #include "arch/power/pagetable.hh" -#include "arch/power/utility.hh" #include "base/statistics.hh" #include "mem/request.hh" #include "params/PowerTLB.hh" diff --git a/src/arch/power/utility.hh b/src/arch/power/utility.hh deleted file mode 100644 index dfe3d069db..0000000000 --- a/src/arch/power/utility.hh +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2003-2005 The Regents of The University of Michigan - * Copyright (c) 2007-2008 The Florida State University - * Copyright (c) 2009 The University of Edinburgh - * 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. - */ - -#ifndef __ARCH_POWER_UTILITY_HH__ -#define __ARCH_POWER_UTILITY_HH__ - -#endif // __ARCH_POWER_UTILITY_HH__ diff --git a/src/arch/sparc/linux/linux.hh b/src/arch/sparc/linux/linux.hh index 2c9a4bc7f8..1624e2c982 100644 --- a/src/arch/sparc/linux/linux.hh +++ b/src/arch/sparc/linux/linux.hh @@ -31,7 +31,6 @@ #include "arch/sparc/asi.hh" #include "arch/sparc/miscregs.hh" -#include "arch/sparc/utility.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh deleted file mode 100644 index 5c3d12dd50..0000000000 --- a/src/arch/sparc/utility.hh +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2003-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. - */ - -#ifndef __ARCH_SPARC_UTILITY_HH__ -#define __ARCH_SPARC_UTILITY_HH__ - -#endif diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh index 87049f0d7f..491c68b302 100644 --- a/src/cpu/base_dyn_inst.hh +++ b/src/cpu/base_dyn_inst.hh @@ -51,7 +51,6 @@ #include #include "arch/generic/tlb.hh" -#include "arch/utility.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "cpu/checker/cpu.hh" diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index 76db4d7b8d..be861610f5 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -43,7 +43,6 @@ #include #include -#include "arch/utility.hh" #include "base/loader/symtab.hh" #include "config/the_isa.hh" #include "cpu/base.hh" diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index 7b523a422b..706b8f6a3c 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -46,7 +46,6 @@ #include #include -#include "arch/utility.hh" #include "debug/Checkpoint.hh" #include "debug/Drain.hh" #include "debug/Kvm.hh" diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc index 0af81c53be..1c23f2dfef 100644 --- a/src/cpu/minor/cpu.cc +++ b/src/cpu/minor/cpu.cc @@ -37,7 +37,6 @@ #include "cpu/minor/cpu.hh" -#include "arch/utility.hh" #include "cpu/minor/dyn_inst.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/pipeline.hh" diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc index d5a6619051..5974bd8947 100644 --- a/src/cpu/minor/fetch2.cc +++ b/src/cpu/minor/fetch2.cc @@ -40,7 +40,6 @@ #include #include "arch/decoder.hh" -#include "arch/utility.hh" #include "base/logging.hh" #include "base/trace.hh" #include "cpu/minor/pipeline.hh" diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index a435f3e1ba..896f71f74a 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -45,7 +45,6 @@ #include #include -#include "arch/utility.hh" #include "base/loader/symtab.hh" #include "base/logging.hh" #include "config/the_isa.hh" diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh index d605a6ae51..8a0d424b34 100644 --- a/src/cpu/o3/fetch.hh +++ b/src/cpu/o3/fetch.hh @@ -42,7 +42,6 @@ #define __CPU_O3_FETCH_HH__ #include "arch/decoder.hh" -#include "arch/utility.hh" #include "base/statistics.hh" #include "config/the_isa.hh" #include "cpu/pc_event.hh" diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh index ab59fe16a1..13e86430aa 100644 --- a/src/cpu/o3/fetch_impl.hh +++ b/src/cpu/o3/fetch_impl.hh @@ -49,7 +49,6 @@ #include #include "arch/generic/tlb.hh" -#include "arch/utility.hh" #include "base/random.hh" #include "base/types.hh" #include "config/the_isa.hh" diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh index ee2d0e76de..787d5dbf6b 100644 --- a/src/cpu/o3/iew_impl.hh +++ b/src/cpu/o3/iew_impl.hh @@ -48,7 +48,6 @@ #include -#include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/checker/cpu.hh" #include "cpu/o3/fu_pool.hh" diff --git a/src/cpu/pred/bpred_unit.cc b/src/cpu/pred/bpred_unit.cc index a8d25926c1..b45c956080 100644 --- a/src/cpu/pred/bpred_unit.cc +++ b/src/cpu/pred/bpred_unit.cc @@ -45,7 +45,6 @@ #include #include "arch/types.hh" -#include "arch/utility.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "debug/Branch.hh" diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index f0c276bb1f..000cc30db0 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -42,7 +42,6 @@ #include "cpu/simple/atomic.hh" #include "arch/locked_mem.hh" -#include "arch/utility.hh" #include "base/output.hh" #include "config/the_isa.hh" #include "cpu/exetrace.hh" diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index 3109f8a183..6891746d18 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -42,7 +42,6 @@ #include "cpu/simple/timing.hh" #include "arch/locked_mem.hh" -#include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/exetrace.hh" #include "debug/Config.hh" diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index c776e481ca..6a577f01f6 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -42,7 +42,6 @@ #include -#include "arch/utility.hh" #include "base/callback.hh" #include "base/compiler.hh" #include "base/cprintf.hh" diff --git a/src/kern/freebsd/events.cc b/src/kern/freebsd/events.cc index e6b66fa68a..5b8b8ccec2 100644 --- a/src/kern/freebsd/events.cc +++ b/src/kern/freebsd/events.cc @@ -34,7 +34,6 @@ #include -#include "arch/utility.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "debug/DebugPrintf.hh" diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc index 8ae76b33b5..d46fdf6283 100644 --- a/src/kern/linux/events.cc +++ b/src/kern/linux/events.cc @@ -42,7 +42,6 @@ #include -#include "arch/utility.hh" #include "base/output.hh" #include "base/trace.hh" #include "cpu/base.hh" diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc index 4f6716b920..57132c07e7 100644 --- a/src/sim/syscall_emul.cc +++ b/src/sim/syscall_emul.cc @@ -38,7 +38,6 @@ #include #include -#include "arch/utility.hh" #include "base/chunk_generator.hh" #include "base/trace.hh" #include "config/the_isa.hh" diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh index 763c30f550..63a9ea67d3 100644 --- a/src/sim/syscall_emul.hh +++ b/src/sim/syscall_emul.hh @@ -86,7 +86,6 @@ #include #include "arch/generic/tlb.hh" -#include "arch/utility.hh" #include "base/intmath.hh" #include "base/loader/object_file.hh" #include "base/logging.hh" diff --git a/src/sim/system.cc b/src/sim/system.cc index 4a9c6cdf6c..c7a3baae9c 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -44,7 +44,6 @@ #include #include "arch/remote_gdb.hh" -#include "arch/utility.hh" #include "base/compiler.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh"