diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-07-29 01:24:57 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-07-29 01:24:57 -0700 |
| commit | 3dcd848ec340e96f374ee9859bf4f8906fb577cc (patch) | |
| tree | 8a1985dedd8d6f28de304dce53f8831bf1d4a5bf /src/arch | |
| parent | dc86f3229c2d3278bf5f32fb9b0b4bf039c0735e (diff) | |
| download | gem5-3dcd848ec340e96f374ee9859bf4f8906fb577cc.tar.xz | |
X86: Fix a bug with merge
Merge was returning the value to merge in, not the actual result of the merge.
--HG--
extra : convert_revision : 230b4b5064037d099ae7859edabdf5be84603849
Diffstat (limited to 'src/arch')
| -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) |