| base.cc (9235:5aa4896ed55a) | base.cc (9377:6f294e7a93d1) |
|---|---|
| 1/* 2 * Copyright (c) 2010-2011 ARM Limited 3 * All rights reserved 4 * 5 * The license below extends only to copyright in the software and shall 6 * not be construed as granting a license to any other intellectual 7 * property including but not limited to intellectual property relating 8 * to a hardware implementation of the functionality of the software --- 366 unchanged lines hidden (view full) --- 375 curMacroStaticInst); 376 } else if (!curMacroStaticInst) { 377 //We're not in the middle of a macro instruction 378 StaticInstPtr instPtr = NULL; 379 380 TheISA::Decoder *decoder = &(thread->decoder); 381 382 //Predecode, ie bundle up an ExtMachInst | 1/* 2 * Copyright (c) 2010-2011 ARM Limited 3 * All rights reserved 4 * 5 * The license below extends only to copyright in the software and shall 6 * not be construed as granting a license to any other intellectual 7 * property including but not limited to intellectual property relating 8 * to a hardware implementation of the functionality of the software --- 366 unchanged lines hidden (view full) --- 375 curMacroStaticInst); 376 } else if (!curMacroStaticInst) { 377 //We're not in the middle of a macro instruction 378 StaticInstPtr instPtr = NULL; 379 380 TheISA::Decoder *decoder = &(thread->decoder); 381 382 //Predecode, ie bundle up an ExtMachInst |
| 383 //This should go away once the constructor can be set up properly 384 decoder->setTC(thread->getTC()); | |
| 385 //If more fetch data is needed, pass it in. 386 Addr fetchPC = (pcState.instAddr() & PCMask) + fetchOffset; 387 //if(decoder->needMoreBytes()) 388 decoder->moreBytes(pcState, fetchPC, inst); 389 //else 390 // decoder->process(); 391 392 //Decode an instruction if one is ready. Otherwise, we'll have to --- 161 unchanged lines hidden --- | 383 //If more fetch data is needed, pass it in. 384 Addr fetchPC = (pcState.instAddr() & PCMask) + fetchOffset; 385 //if(decoder->needMoreBytes()) 386 decoder->moreBytes(pcState, fetchPC, inst); 387 //else 388 // decoder->process(); 389 390 //Decode an instruction if one is ready. Otherwise, we'll have to --- 161 unchanged lines hidden --- |