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/sim/fault.hh | 40 ---------------------------------------- src/sim/fault_fwd.hh | 40 ++++++++++++++++++++++++++++++++++++++++ src/sim/faults.hh | 2 +- src/sim/tlb.hh | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 src/sim/fault.hh create mode 100644 src/sim/fault_fwd.hh (limited to 'src/sim') 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