diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-09 18:32:13 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-09 18:32:13 -0500 |
| commit | df1ea2cf05e41c0be33eeb9f91c3adfb985005c2 (patch) | |
| tree | 0c9c9001bcedaa8ae986bbc638a92d1465cc89a9 /src/cpu/thread_state.cc | |
| parent | f1e3e1c3053866f63f3826126260f43bf0c7d0c7 (diff) | |
| parent | dc4d47bad4f95501ebd144dc4aa53aa17563abcc (diff) | |
| download | gem5-df1ea2cf05e41c0be33eeb9f91c3adfb985005c2.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace
--HG--
extra : convert_revision : 82a956ffc1bedb2c0d05c4ea3469f843f559a475
Diffstat (limited to 'src/cpu/thread_state.cc')
| -rw-r--r-- | src/cpu/thread_state.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc index 93dd1e2eb..4b65ca4b8 100644 --- a/src/cpu/thread_state.cc +++ b/src/cpu/thread_state.cc @@ -125,7 +125,10 @@ ThreadState::connectPhysPort() // @todo: For now this disregards any older port that may have // already existed. Fix this memory leak once the bus port IDs // for functional ports is resolved. - physPort = new FunctionalPort(csprintf("%s-%d-funcport", + if (physPort) + physPort->removeConn(); + else + physPort = new FunctionalPort(csprintf("%s-%d-funcport", baseCpu->name(), tid)); connectToMemFunc(physPort); } @@ -136,7 +139,10 @@ ThreadState::connectVirtPort() // @todo: For now this disregards any older port that may have // already existed. Fix this memory leak once the bus port IDs // for functional ports is resolved. - virtPort = new VirtualPort(csprintf("%s-%d-vport", + if (virtPort) + virtPort->removeConn(); + else + virtPort = new VirtualPort(csprintf("%s-%d-vport", baseCpu->name(), tid)); connectToMemFunc(virtPort); } |