base.cc (4377:ca55a0b1990a) | base.cc (4400:619191b2f011) |
---|---|
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; --- 65 unchanged lines hidden (view full) --- 74{ 75#if FULL_SYSTEM 76 thread = new SimpleThread(this, 0, p->system, p->itb, p->dtb); 77#else 78 thread = new SimpleThread(this, /* thread_num */ 0, p->process, 79 /* asid */ 0); 80#endif // !FULL_SYSTEM 81 | 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; --- 65 unchanged lines hidden (view full) --- 74{ 75#if FULL_SYSTEM 76 thread = new SimpleThread(this, 0, p->system, p->itb, p->dtb); 77#else 78 thread = new SimpleThread(this, /* thread_num */ 0, p->process, 79 /* asid */ 0); 80#endif // !FULL_SYSTEM 81 |
82 thread->setStatus(ThreadContext::Suspended); | 82 thread->setStatus(ThreadContext::Unallocated); |
83 84 tc = thread->getTC(); 85 86 numInst = 0; 87 startNumInst = 0; 88 numLoad = 0; 89 startNumLoad = 0; 90 lastIcacheStall = 0; 91 lastDcacheStall = 0; 92 93 threadContexts.push_back(tc); | 83 84 tc = thread->getTC(); 85 86 numInst = 0; 87 startNumInst = 0; 88 numLoad = 0; 89 startNumLoad = 0; 90 lastIcacheStall = 0; 91 lastDcacheStall = 0; 92 93 threadContexts.push_back(tc); |
94 95 fetchOffset = 0; 96 stayAtPC = false; | |
97} 98 99BaseSimpleCPU::~BaseSimpleCPU() 100{ 101} 102 103void 104BaseSimpleCPU::deallocateContext(int thread_num) --- 228 unchanged lines hidden (view full) --- 333#if ISA_HAS_DELAY_SLOT 334 DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p NNPC:%08p\n",thread->readPC(), 335 thread->readNextPC(),thread->readNextNPC()); 336#else 337 DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p",thread->readPC(), 338 thread->readNextPC()); 339#endif 340 | 94} 95 96BaseSimpleCPU::~BaseSimpleCPU() 97{ 98} 99 100void 101BaseSimpleCPU::deallocateContext(int thread_num) --- 228 unchanged lines hidden (view full) --- 330#if ISA_HAS_DELAY_SLOT 331 DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p NNPC:%08p\n",thread->readPC(), 332 thread->readNextPC(),thread->readNextNPC()); 333#else 334 DPRINTF(Fetch,"Fetch: PC:%08p NPC:%08p",thread->readPC(), 335 thread->readNextPC()); 336#endif 337 |
341 const Addr PCMask = ~(sizeof(MachInst) - 1); 342 Addr fetchPC = thread->readPC() + fetchOffset; 343 req->setVirt(0, fetchPC & PCMask, sizeof(MachInst), 0, thread->readPC()); | 338 req->setVirt(0, thread->readPC() & ~3, sizeof(MachInst), 339 (FULL_SYSTEM && (thread->readPC() & 1)) ? PHYSICAL : 0, 340 thread->readPC()); |
344 345 Fault fault = thread->translateInstReq(req); 346 347 return fault; 348} 349 350 351void --- 11 unchanged lines hidden (view full) --- 363 364 thread->funcExeInst++; 365 366 // check for instruction-count-based events 367 comInstEventQueue[0]->serviceEvents(numInst); 368 369 // decode the instruction 370 inst = gtoh(inst); | 341 342 Fault fault = thread->translateInstReq(req); 343 344 return fault; 345} 346 347 348void --- 11 unchanged lines hidden (view full) --- 360 361 thread->funcExeInst++; 362 363 // check for instruction-count-based events 364 comInstEventQueue[0]->serviceEvents(numInst); 365 366 // decode the instruction 367 inst = gtoh(inst); |
371 | |
372 //If we're not in the middle of a macro instruction 373 if (!curMacroStaticInst) { | 368 //If we're not in the middle of a macro instruction 369 if (!curMacroStaticInst) { |
374 | |
375 StaticInstPtr instPtr = NULL; 376 377 //Predecode, ie bundle up an ExtMachInst 378 //This should go away once the constructor can be set up properly 379 predecoder.setTC(thread->getTC()); 380 //If more fetch data is needed, pass it in. | 370 StaticInstPtr instPtr = NULL; 371 372 //Predecode, ie bundle up an ExtMachInst 373 //This should go away once the constructor can be set up properly 374 predecoder.setTC(thread->getTC()); 375 //If more fetch data is needed, pass it in. |
381 const Addr PCMask = ~(sizeof(MachInst) - 1); | |
382 if(predecoder.needMoreBytes()) | 376 if(predecoder.needMoreBytes()) |
383 predecoder.moreBytes((thread->readPC() & PCMask) + fetchOffset, 384 0, inst); | 377 predecoder.moreBytes(thread->readPC(), 0, inst); |
385 else 386 predecoder.process(); | 378 else 379 predecoder.process(); |
387 388 //If an instruction is ready, decode it. Otherwise, we'll have to 389 //fetch beyond the MachInst at the current pc. 390 if (predecoder.extMachInstReady()) { 391#if THE_ISA == X86_ISA 392 thread->setNextPC(thread->readPC() + predecoder.getInstSize()); 393#endif // X86_ISA 394 stayAtPC = false; | 380 //If an instruction is ready, decode it 381 if (predecoder.extMachInstReady()) |
395 instPtr = StaticInst::decode(predecoder.getExtMachInst()); | 382 instPtr = StaticInst::decode(predecoder.getExtMachInst()); |
396 } else { 397 stayAtPC = true; 398 fetchOffset += sizeof(MachInst); 399 } | |
400 401 //If we decoded an instruction and it's microcoded, start pulling 402 //out micro ops 403 if (instPtr && instPtr->isMacroOp()) { 404 curMacroStaticInst = instPtr; 405 curStaticInst = curMacroStaticInst-> 406 fetchMicroOp(thread->readMicroPC()); 407 } else { --- 51 unchanged lines hidden (view full) --- 459 traceData = NULL; 460 } 461} 462 463 464void 465BaseSimpleCPU::advancePC(Fault fault) 466{ | 383 384 //If we decoded an instruction and it's microcoded, start pulling 385 //out micro ops 386 if (instPtr && instPtr->isMacroOp()) { 387 curMacroStaticInst = instPtr; 388 curStaticInst = curMacroStaticInst-> 389 fetchMicroOp(thread->readMicroPC()); 390 } else { --- 51 unchanged lines hidden (view full) --- 442 traceData = NULL; 443 } 444} 445 446 447void 448BaseSimpleCPU::advancePC(Fault fault) 449{ |
467 //Since we're moving to a new pc, zero out the offset 468 fetchOffset = 0; | |
469 if (fault != NoFault) { 470 curMacroStaticInst = StaticInst::nullStaticInstPtr; 471 fault->invoke(tc); 472 thread->setMicroPC(0); 473 thread->setNextMicroPC(1); | 450 if (fault != NoFault) { 451 curMacroStaticInst = StaticInst::nullStaticInstPtr; 452 fault->invoke(tc); 453 thread->setMicroPC(0); 454 thread->setNextMicroPC(1); |
474 } else { | 455 } else if (predecoder.needMoreBytes()) { |
475 //If we're at the last micro op for this instruction 476 if (curStaticInst && curStaticInst->isLastMicroOp()) { 477 //We should be working with a macro op 478 assert(curMacroStaticInst); 479 //Close out this macro op, and clean up the 480 //microcode state 481 curMacroStaticInst = StaticInst::nullStaticInstPtr; 482 thread->setMicroPC(0); --- 27 unchanged lines hidden --- | 456 //If we're at the last micro op for this instruction 457 if (curStaticInst && curStaticInst->isLastMicroOp()) { 458 //We should be working with a macro op 459 assert(curMacroStaticInst); 460 //Close out this macro op, and clean up the 461 //microcode state 462 curMacroStaticInst = StaticInst::nullStaticInstPtr; 463 thread->setMicroPC(0); --- 27 unchanged lines hidden --- |