diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-29 13:25:14 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-29 13:25:14 -0700 |
| commit | 08474ccf68e14f59b4517c6024a9bc6ecbd4a1d5 (patch) | |
| tree | 5c1dc885b4fd33fc48d91a9ce489e24c88c9f3c2 /src/arch/x86/insts/static_inst.hh | |
| parent | 4a7d0c4b79450e05b87da4cfc48c2361758127c1 (diff) | |
| parent | 362ff1bcebd78c0c247e435eac657c8a1134b1fb (diff) | |
| download | gem5-08474ccf68e14f59b4517c6024a9bc6ecbd4a1d5.tar.xz | |
Merge Gabe's changes from head.
--HG--
extra : convert_revision : d00b7b09c7f19bc0e37b385ef7c124f69c0e917f
Diffstat (limited to 'src/arch/x86/insts/static_inst.hh')
| -rw-r--r-- | src/arch/x86/insts/static_inst.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/insts/static_inst.hh b/src/arch/x86/insts/static_inst.hh index c39c2956e..f42e6693d 100644 --- a/src/arch/x86/insts/static_inst.hh +++ b/src/arch/x86/insts/static_inst.hh @@ -58,6 +58,7 @@ #ifndef __ARCH_X86_INSTS_STATICINST_HH__ #define __ARCH_X86_INSTS_STATICINST_HH__ +#include "base/trace.hh" #include "cpu/static_inst.hh" namespace X86ISA @@ -113,7 +114,7 @@ namespace X86ISA default: panic("Tried to merge with unrecognized size %d.\n", size); } - return val; + return reg; } inline uint64_t pick(uint64_t from, int size) |