diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-11-02 15:20:47 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-11-02 15:20:47 -0500 |
| commit | e71ccde66369951c23eb20281c68a8cb66c4a504 (patch) | |
| tree | 209293eb44ceeee7eb04bc778956f57ae812978b /src/arch | |
| parent | 683d8f0831b476a906dc2720265a2334ba0117e3 (diff) | |
| parent | 45363ea658251df0c31a75d7bd5d0ac3a3809623 (diff) | |
| download | gem5-e71ccde66369951c23eb20281c68a8cb66c4a504.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix
--HG--
extra : convert_revision : a9a41e2c292bd95aa148e1cf4d9a77c0622a462b
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/alpha/utility.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/alpha/utility.hh b/src/arch/alpha/utility.hh index 0304d1c3a..cb86c7e9e 100644 --- a/src/arch/alpha/utility.hh +++ b/src/arch/alpha/utility.hh @@ -43,11 +43,11 @@ namespace AlphaISA { static inline ExtMachInst - makeExtMI(MachInst inst, ThreadContext * xc) { + makeExtMI(MachInst inst, Addr pc) { #if FULL_SYSTEM ExtMachInst ext_inst = inst; - if (xc->readPC() && 0x1) - return ext_inst|=(static_cast<ExtMachInst>(xc->readPC() & 0x1) << 32); + if (pc && 0x1) + return ext_inst|=(static_cast<ExtMachInst>(pc & 0x1) << 32); else return ext_inst; #else |