thread_context_impl.hh (3675:dc883b610345) | thread_context_impl.hh (3686:fa8d8b90cd8a) |
---|---|
1/* 2 * Copyright (c) 2004-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 87 unchanged lines hidden (view full) --- 96 thread->trapPending = false; 97} 98 99#if FULL_SYSTEM 100template <class Impl> 101void 102O3ThreadContext<Impl>::delVirtPort(VirtualPort *vp) 103{ | 1/* 2 * Copyright (c) 2004-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 87 unchanged lines hidden (view full) --- 96 thread->trapPending = false; 97} 98 99#if FULL_SYSTEM 100template <class Impl> 101void 102O3ThreadContext<Impl>::delVirtPort(VirtualPort *vp) 103{ |
104 delete vp->getPeer(); 105 delete vp; | 104 if (vp != thread->getVirtPort()) { 105 delete vp->getPeer(); 106 delete vp; 107 } |
106} 107#endif 108 109template <class Impl> 110void 111O3ThreadContext<Impl>::activate(int delay) 112{ 113 DPRINTF(O3CPU, "Calling activate on Thread Context %d\n", --- 374 unchanged lines hidden --- | 108} 109#endif 110 111template <class Impl> 112void 113O3ThreadContext<Impl>::activate(int delay) 114{ 115 DPRINTF(O3CPU, "Calling activate on Thread Context %d\n", --- 374 unchanged lines hidden --- |