diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-15 15:16:35 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-15 15:16:35 -0400 |
| commit | c6e1dc61c23dc1f5300610ce8348f9a0e9c128cc (patch) | |
| tree | e044c5007a2e7e7bad6e14afee930f5626eebdec /src/cpu | |
| parent | 47c8d9d3462db91cb296f8f42b2c401e736d4daa (diff) | |
| parent | 3a5a20769b2ba15905fc2e0a833a8ecbf3098646 (diff) | |
| download | gem5-c6e1dc61c23dc1f5300610ce8348f9a0e9c128cc.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 6a75fa02391c4c65063c5412a568705bb1dd892b
Diffstat (limited to 'src/cpu')
| -rwxr-xr-x | src/cpu/o3/thread_context_impl.hh | 2 | ||||
| -rw-r--r-- | src/cpu/ozone/cpu_impl.hh | 2 | ||||
| -rw-r--r-- | src/cpu/simple_thread.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh index d2acc6232..a145e046e 100755 --- a/src/cpu/o3/thread_context_impl.hh +++ b/src/cpu/o3/thread_context_impl.hh @@ -103,7 +103,7 @@ void O3ThreadContext<Impl>::delVirtPort(VirtualPort *vp) { if (vp != thread->getVirtPort()) { - delete vp->getPeer(); + vp->removeConn(); delete vp; } } diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index 4a76ae110..d78162243 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -748,7 +748,7 @@ template <class Impl> void OzoneCPU<Impl>::OzoneTC::delVirtPort(VirtualPort *vp) { - delete vp->getPeer(); + vp->removeConn(); delete vp; } #endif diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index 13d0e2e29..39f31782b 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -305,7 +305,7 @@ void SimpleThread::delVirtPort(VirtualPort *vp) { if (vp != virtPort) { - delete vp->getPeer(); + vp->removeConn(); delete vp; } } |