sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

X86: Fix a bug with merge

Browse source 
Merge was returning the value to merge in, not the actual result of the merge.

--HG--
extra : convert_revision : 230b4b5064037d099ae7859edabdf5be84603849
This commit is contained in:
Gabe Black 2007-07-29 01:24:57 -07:00
parent dc86f3229c
commit 3dcd848ec3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/arch/x86/insts/static_inst.hh
View file

@ -58,6 +58,7 @@
#ifndef __ARCH_X86_INSTS_STATICINST_HH__ #ifndef __ARCH_X86_INSTS_STATICINST_HH__
#define __ARCH_X86_INSTS_STATICINST_HH__ #define __ARCH_X86_INSTS_STATICINST_HH__
#include "base/trace.hh"
#include "cpu/static_inst.hh" #include "cpu/static_inst.hh"
namespace X86ISA namespace X86ISA
@ -113,7 +114,7 @@ namespace X86ISA
default: default:
panic("Tried to merge with unrecognized size %d.\n", size); panic("Tried to merge with unrecognized size %d.\n", size);
} }
return val; return reg;
} }
inline uint64_t pick(uint64_t from, int size) inline uint64_t pick(uint64_t from, int size)