From 091a3e6cc0f089b6ba6877c8127ebd2ebf8e7c21 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 3 Feb 2011 21:47:58 -0800 Subject: Fault: Rename sim/fault.hh to fault_fwd.hh to distinguish it from faults.hh. --HG-- rename : src/sim/fault.hh => src/sim/fault_fwd.hh --- src/arch/alpha/tlb.hh | 2 +- src/arch/arm/table_walker.hh | 2 +- src/arch/arm/tlb.hh | 2 +- src/arch/mips/isa.hh | 2 +- src/arch/mips/tlb.hh | 2 +- src/arch/power/tlb.hh | 2 +- src/arch/sparc/tlb.hh | 2 +- src/arch/sparc/utility.hh | 2 +- src/arch/x86/tlb.hh | 2 +- src/cpu/static_inst.hh | 2 +- src/sim/fault.hh | 40 ---------------------------------------- src/sim/fault_fwd.hh | 40 ++++++++++++++++++++++++++++++++++++++++ src/sim/faults.hh | 2 +- src/sim/tlb.hh | 2 +- 14 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 src/sim/fault.hh create mode 100644 src/sim/fault_fwd.hh diff --git a/src/arch/alpha/tlb.hh b/src/arch/alpha/tlb.hh index ed7e7ab61..b6261769f 100644 --- a/src/arch/alpha/tlb.hh +++ b/src/arch/alpha/tlb.hh @@ -42,7 +42,7 @@ #include "base/statistics.hh" #include "mem/request.hh" #include "params/AlphaTLB.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/tlb.hh" class ThreadContext; diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh index 2739973e8..267a7ad26 100644 --- a/src/arch/arm/table_walker.hh +++ b/src/arch/arm/table_walker.hh @@ -49,7 +49,7 @@ #include "mem/request.hh" #include "params/ArmTableWalker.hh" #include "sim/eventq.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" class DmaPort; class ThreadContext; diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh index 1374123b2..e60de38dd 100644 --- a/src/arch/arm/tlb.hh +++ b/src/arch/arm/tlb.hh @@ -52,7 +52,7 @@ #include "base/statistics.hh" #include "mem/request.hh" #include "params/ArmTLB.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/tlb.hh" class ThreadContext; diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh index 6adf6bddc..8032d20d0 100644 --- a/src/arch/mips/isa.hh +++ b/src/arch/mips/isa.hh @@ -38,7 +38,7 @@ #include "arch/mips/registers.hh" #include "arch/mips/types.hh" #include "sim/eventq.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" class BaseCPU; class Checkpoint; diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh index cb2e434cb..5c8b10263 100644 --- a/src/arch/mips/tlb.hh +++ b/src/arch/mips/tlb.hh @@ -44,7 +44,7 @@ #include "base/statistics.hh" #include "mem/request.hh" #include "params/MipsTLB.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/tlb.hh" #include "sim/sim_object.hh" diff --git a/src/arch/power/tlb.hh b/src/arch/power/tlb.hh index 7e5638cf1..c4e3fadaa 100644 --- a/src/arch/power/tlb.hh +++ b/src/arch/power/tlb.hh @@ -46,7 +46,7 @@ #include "base/statistics.hh" #include "mem/request.hh" #include "params/PowerTLB.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/tlb.hh" class ThreadContext; diff --git a/src/arch/sparc/tlb.hh b/src/arch/sparc/tlb.hh index fa9ebada6..76ef23b64 100644 --- a/src/arch/sparc/tlb.hh +++ b/src/arch/sparc/tlb.hh @@ -37,7 +37,7 @@ #include "config/full_system.hh" #include "mem/request.hh" #include "params/SparcTLB.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/tlb.hh" class ThreadContext; diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh index b1c099a97..d69b42d01 100644 --- a/src/arch/sparc/utility.hh +++ b/src/arch/sparc/utility.hh @@ -38,7 +38,7 @@ #include "base/bitfield.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" namespace SparcISA { diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh index 025418dc7..0e96b26b8 100644 --- a/src/arch/x86/tlb.hh +++ b/src/arch/x86/tlb.hh @@ -50,7 +50,7 @@ #include "mem/mem_object.hh" #include "mem/request.hh" #include "params/X86TLB.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/tlb.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh index 15ac444ae..933496864 100644 --- a/src/cpu/static_inst.hh +++ b/src/cpu/static_inst.hh @@ -43,7 +43,7 @@ #include "base/refcnt.hh" #include "base/types.hh" #include "cpu/op_class.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" // forward declarations struct AlphaSimpleImpl; diff --git a/src/sim/fault.hh b/src/sim/fault.hh deleted file mode 100644 index 26a133328..000000000 --- a/src/sim/fault.hh +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2010 Advanced Micro Devices - * 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: Gabe Black - */ - -#ifndef __SIM_FAULT_HH__ -#define __SIM_FAULT_HH__ - -class FaultBase; -template class RefCountingPtr; -typedef RefCountingPtr Fault; - -FaultBase * const NoFault = 0; - -#endif // __SIM_FAULT_HH__ diff --git a/src/sim/fault_fwd.hh b/src/sim/fault_fwd.hh new file mode 100644 index 000000000..26a133328 --- /dev/null +++ b/src/sim/fault_fwd.hh @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010 Advanced Micro Devices + * 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: Gabe Black + */ + +#ifndef __SIM_FAULT_HH__ +#define __SIM_FAULT_HH__ + +class FaultBase; +template class RefCountingPtr; +typedef RefCountingPtr Fault; + +FaultBase * const NoFault = 0; + +#endif // __SIM_FAULT_HH__ diff --git a/src/sim/faults.hh b/src/sim/faults.hh index 27cc7538c..779e34c8f 100644 --- a/src/sim/faults.hh +++ b/src/sim/faults.hh @@ -34,7 +34,7 @@ #include "base/refcnt.hh" #include "base/types.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/stats.hh" #include "config/full_system.hh" #include "cpu/static_inst.hh" diff --git a/src/sim/tlb.hh b/src/sim/tlb.hh index a3e5c22c7..1512bc0fa 100644 --- a/src/sim/tlb.hh +++ b/src/sim/tlb.hh @@ -33,7 +33,7 @@ #include "base/misc.hh" #include "mem/request.hh" -#include "sim/fault.hh" +#include "sim/fault_fwd.hh" #include "sim/sim_object.hh" class ThreadContext; -- cgit v1.2.3