base.cc (3476:0e26b5458236) | base.cc (3484:9b7ac1654430) |
---|---|
1/* 2 * Copyright (c) 2002-2005 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; --- 384 unchanged lines hidden (view full) --- 393 394 // check for instruction-count-based events 395 comInstEventQueue[0]->serviceEvents(numInst); 396 397 // decode the instruction 398 inst = gtoh(inst); 399 //If we're not in the middle of a macro instruction 400 if (!curMacroStaticInst) { | 1/* 2 * Copyright (c) 2002-2005 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; --- 384 unchanged lines hidden (view full) --- 393 394 // check for instruction-count-based events 395 comInstEventQueue[0]->serviceEvents(numInst); 396 397 // decode the instruction 398 inst = gtoh(inst); 399 //If we're not in the middle of a macro instruction 400 if (!curMacroStaticInst) { |
401#if THE_ISA == ALPHA_ISA 402 StaticInstPtr instPtr = StaticInst::decode(makeExtMI(inst, thread->readPC())); 403#elif THE_ISA == SPARC_ISA |
|
401 StaticInstPtr instPtr = StaticInst::decode(makeExtMI(inst, thread->getTC())); | 404 StaticInstPtr instPtr = StaticInst::decode(makeExtMI(inst, thread->getTC())); |
405#endif |
|
402 if (instPtr->isMacroOp()) { 403 curMacroStaticInst = instPtr; 404 curStaticInst = curMacroStaticInst-> 405 fetchMicroOp(thread->readMicroPC()); 406 } else { 407 curStaticInst = instPtr; 408 } 409 } else { --- 94 unchanged lines hidden --- | 406 if (instPtr->isMacroOp()) { 407 curMacroStaticInst = instPtr; 408 curStaticInst = curMacroStaticInst-> 409 fetchMicroOp(thread->readMicroPC()); 410 } else { 411 curStaticInst = instPtr; 412 } 413 } else { --- 94 unchanged lines hidden --- |