diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2014-10-16 05:49:51 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2014-10-16 05:49:51 -0400 |
commit | a2d246b6b8379f9a74dbc56feefc155f615b5ea4 (patch) | |
tree | bbfaf7a39edebda5ca7ddac9af5e205823d37e10 /src/sim | |
parent | a769963d16b7b259580fa2da1e84f62aae0a5a42 (diff) | |
download | gem5-a2d246b6b8379f9a74dbc56feefc155f615b5ea4.tar.xz |
arch: Use shared_ptr for all Faults
This patch takes quite a large step in transitioning from the ad-hoc
RefCountingPtr to the c++11 shared_ptr by adopting its use for all
Faults. There are no changes in behaviour, and the code modifications
are mostly just replacing "new" with "make_shared".
Diffstat (limited to 'src/sim')
-rw-r--r-- | src/sim/fault_fwd.hh | 41 | ||||
-rw-r--r-- | src/sim/faults.hh | 4 | ||||
-rw-r--r-- | src/sim/tlb.hh | 1 |
3 files changed, 1 insertions, 45 deletions
diff --git a/src/sim/fault_fwd.hh b/src/sim/fault_fwd.hh deleted file mode 100644 index 3fd90caeb..000000000 --- a/src/sim/fault_fwd.hh +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2010 Advanced Micro Devices, Inc. - * 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_FWD_HH__ -#define __SIM_FAULT_FWD_HH__ - -#include "base/refcnt.hh" - -class FaultBase; -typedef RefCountingPtr<FaultBase> Fault; - -FaultBase * const NoFault = 0; - -#endif // __SIM_FAULT_FWD_HH__ diff --git a/src/sim/faults.hh b/src/sim/faults.hh index 0377c0893..dd42c35ab 100644 --- a/src/sim/faults.hh +++ b/src/sim/faults.hh @@ -32,10 +32,8 @@ #ifndef __FAULTS_HH__ #define __FAULTS_HH__ -#include "base/refcnt.hh" #include "base/types.hh" #include "cpu/static_inst.hh" -#include "sim/fault_fwd.hh" #include "sim/stats.hh" class ThreadContext; @@ -50,7 +48,7 @@ typedef Stats::Scalar FaultStat; // all faults returned using the Fault type) will use the // generic FaultBase name. -class FaultBase : public RefCounted +class FaultBase { public: virtual FaultName name() const = 0; diff --git a/src/sim/tlb.hh b/src/sim/tlb.hh index 6296602a0..9557fa3b1 100644 --- a/src/sim/tlb.hh +++ b/src/sim/tlb.hh @@ -45,7 +45,6 @@ #include "base/misc.hh" #include "mem/request.hh" -#include "sim/fault_fwd.hh" #include "sim/sim_object.hh" class ThreadContext; |