fetch_impl.hh (6664:4df6f4bd36cd) fetch_impl.hh (7615:50f6494d9b55)
1/*
2 * Copyright (c) 2004-2006 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;

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

1157 //DPRINTF(Fetch, "[tid:%i]: MachInst is %#x\n", tid, ext_inst);
1158
1159 DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n",
1160 tid, instruction->staticInst->disassemble(fetch_PC));
1161
1162#if TRACING_ON
1163 instruction->traceData =
1164 cpu->getTracer()->getInstRecord(curTick, cpu->tcBase(tid),
1/*
2 * Copyright (c) 2004-2006 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;

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

1157 //DPRINTF(Fetch, "[tid:%i]: MachInst is %#x\n", tid, ext_inst);
1158
1159 DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n",
1160 tid, instruction->staticInst->disassemble(fetch_PC));
1161
1162#if TRACING_ON
1163 instruction->traceData =
1164 cpu->getTracer()->getInstRecord(curTick, cpu->tcBase(tid),
1165 instruction->staticInst, instruction->readPC());
1165 instruction->staticInst, instruction->readPC(),
1166 macroop, instruction->readMicroPC());
1166#else
1167 instruction->traceData = NULL;
1168#endif
1169
1170 ///FIXME This needs to be more robust in dealing with delay slots
1171 predicted_branch |=
1172 lookupAndUpdateNextPC(instruction, next_PC, next_NPC, next_MicroPC);
1173

--- 279 unchanged lines hidden --- 		1167#else
1168 instruction->traceData = NULL;
1169#endif
1170
1171 ///FIXME This needs to be more robust in dealing with delay slots
1172 predicted_branch |=
1173 lookupAndUpdateNextPC(instruction, next_PC, next_NPC, next_MicroPC);
1174

--- 279 unchanged lines hidden ---