base.cc (4375:b89532cd1b7d) base.cc (4376:ecc6222371af)
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;

--- 321 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
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;

--- 321 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
338 req->setVirt(0, thread->readPC() & ~3, sizeof(MachInst), 0,
338 // This will generate a mask which aligns the pc on MachInst size
339 // boundaries. It won't work for non-power-of-two sized MachInsts, but
340 // it will work better than a hard coded mask.
341 const Addr PCMask = ~(sizeof(MachInst) - 1);
342 req->setVirt(0, thread->readPC() & PCMask, sizeof(MachInst), 0,
339 thread->readPC());
340
341 Fault fault = thread->translateInstReq(req);
342
343 return fault;
344}
345
346

--- 143 unchanged lines hidden --- 		343 thread->readPC());
344
345 Fault fault = thread->translateInstReq(req);
346
347 return fault;
348}
349
350

--- 143 unchanged lines hidden ---