Deleted Added
sdiff udiff text old ( 7720:65d338a8dba4 ) new ( 7758:28a677d7cb51 )
full compact
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;

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

108
109 return this->fault;
110}
111
112template <class Impl>
113Fault
114BaseO3DynInst<Impl>::completeAcc(PacketPtr pkt)
115{
116 // @todo: Pretty convoluted way to avoid squashing from happening
117 // when using the TC during an instruction's execution
118 // (specifically for instructions that have side-effects that use
119 // the TC). Fix this.
120 bool in_syscall = this->thread->inSyscall;
121 this->thread->inSyscall = true;
122
123 this->fault = this->staticInst->completeAcc(pkt, this, this->traceData);
124
125 this->thread->inSyscall = in_syscall;
126
127 return this->fault;
128}
129
130#if FULL_SYSTEM
131template <class Impl>
132Fault
133BaseO3DynInst<Impl>::hwrei()
134{

--- 57 unchanged lines hidden ---