From a2d246b6b8379f9a74dbc56feefc155f615b5ea4 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 16 Oct 2014 05:49:51 -0400 Subject: 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". --- src/cpu/inorder/inorder_dyn_inst.cc | 3 +-- src/cpu/inorder/inorder_dyn_inst.hh | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/cpu/inorder') diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc index adde35fdf..18281e636 100644 --- a/src/cpu/inorder/inorder_dyn_inst.cc +++ b/src/cpu/inorder/inorder_dyn_inst.cc @@ -46,7 +46,6 @@ #include "cpu/reg_class.hh" #include "debug/InOrderDynInst.hh" #include "mem/request.hh" -#include "sim/fault_fwd.hh" #include "sim/full_system.hh" using namespace std; @@ -278,7 +277,7 @@ InOrderDynInst::hwrei() #if THE_ISA == ALPHA_ISA // Can only do a hwrei when in pal mode. if (!(this->instAddr() & 0x3)) - return new AlphaISA::UnimplementedOpcodeFault; + return std::make_shared(); // Set the next PC based on the value of the EXC_ADDR IPR. AlphaISA::PCState pc = this->pcState(); diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh index 053a72d1d..369ebe2f4 100644 --- a/src/cpu/inorder/inorder_dyn_inst.hh +++ b/src/cpu/inorder/inorder_dyn_inst.hh @@ -58,7 +58,6 @@ #include "cpu/thread_context.hh" #include "debug/InOrderDynInst.hh" #include "mem/packet.hh" -#include "sim/fault_fwd.hh" #include "sim/system.hh" #if THE_ISA == ALPHA_ISA -- cgit v1.2.3