base.cc (10193:d717abc806aa) base.cc (10379:c00f6d7e2681)
1/*
2 * Copyright (c) 2010-2012 ARM Limited
3 * Copyright (c) 2013 Advanced Micro Devices, Inc.
4 * All rights reserved
5 *
6 * The license below extends only to copyright in the software and shall
7 * not be construed as granting a license to any other intellectual
8 * property including but not limited to intellectual property relating

--- 541 unchanged lines hidden (view full) ---

550 if (traceData) {
551 traceData->dump();
552 delete traceData;
553 traceData = NULL;
554 }
555}
556
557void
1/*
2 * Copyright (c) 2010-2012 ARM Limited
3 * Copyright (c) 2013 Advanced Micro Devices, Inc.
4 * All rights reserved
5 *
6 * The license below extends only to copyright in the software and shall
7 * not be construed as granting a license to any other intellectual
8 * property including but not limited to intellectual property relating

--- 541 unchanged lines hidden (view full) ---

550 if (traceData) {
551 traceData->dump();
552 delete traceData;
553 traceData = NULL;
554 }
555}
556
557void
558BaseSimpleCPU::advancePC(Fault fault)
558BaseSimpleCPU::advancePC(const Fault &fault)
559{
560 const bool branching(thread->pcState().branching());
561
562 //Since we're moving to a new pc, zero out the offset
563 fetchOffset = 0;
564 if (fault != NoFault) {
565 curMacroStaticInst = StaticInst::nullStaticInstPtr;
566 fault->invoke(tc, curStaticInst);

--- 35 unchanged lines hidden --- 		559{
560 const bool branching(thread->pcState().branching());
561
562 //Since we're moving to a new pc, zero out the offset
563 fetchOffset = 0;
564 if (fault != NoFault) {
565 curMacroStaticInst = StaticInst::nullStaticInstPtr;
566 fault->invoke(tc, curStaticInst);

--- 35 unchanged lines hidden ---