lsq_unit_impl.hh (3772:71cccab4eff8) | lsq_unit_impl.hh (3791:f1783bae1afe) |
---|---|
1/* 2 * Copyright (c) 2004-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; --- 404 unchanged lines hidden (view full) --- 413 414 // If the instruction faulted, then we need to send it along to commit 415 // without the instruction completing. 416 if (load_fault != NoFault) { 417 // Send this instruction to commit, also make sure iew stage 418 // realizes there is activity. 419 // Mark it as executed unless it is an uncached load that 420 // needs to hit the head of commit. | 1/* 2 * Copyright (c) 2004-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; --- 404 unchanged lines hidden (view full) --- 413 414 // If the instruction faulted, then we need to send it along to commit 415 // without the instruction completing. 416 if (load_fault != NoFault) { 417 // Send this instruction to commit, also make sure iew stage 418 // realizes there is activity. 419 // Mark it as executed unless it is an uncached load that 420 // needs to hit the head of commit. |
421 if (!(inst->req->isUncacheable()) || inst->isAtCommit()) { | 421 if (!(inst->req && inst->req->isUncacheable()) || 422 inst->isAtCommit()) { |
422 inst->setExecuted(); 423 } 424 iewStage->instToCommit(inst); 425 iewStage->activityThisCycle(); 426 } 427 428 return load_fault; 429} --- 552 unchanged lines hidden --- | 423 inst->setExecuted(); 424 } 425 iewStage->instToCommit(inst); 426 iewStage->activityThisCycle(); 427 } 428 429 return load_fault; 430} --- 552 unchanged lines hidden --- |