diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-09 12:29:40 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-09 12:29:40 -0400 |
| commit | 4b732e43a61bd87db39a0316105a32dcde9b0fb8 (patch) | |
| tree | a67dfe55148f68243a9ffa757a22909e42bf5b76 /src/cpu | |
| parent | a7f5f54ff8d7097c60fdf09bf4bbba121aaff5c6 (diff) | |
| parent | 6875e8d8391035edf8fc4a8fdb29f614a527b0bc (diff) | |
| download | gem5-4b732e43a61bd87db39a0316105a32dcde9b0fb8.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
--HG--
extra : convert_revision : 184b6ff6c11de8f9c9083dcb93754cb451d9cfce
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/simple_thread.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index 219167e4e..48383ca93 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -314,9 +314,10 @@ SimpleThread::getVirtPort(ThreadContext *src_tc) void SimpleThread::delVirtPort(VirtualPort *vp) { -// assert(!vp->nullThreadContext()); - delete vp->getPeer(); - delete vp; + if (vp != virtPort) { + delete vp->getPeer(); + delete vp; + } } |