X86: Fix a bug with merge
authorGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 08:24:57 +0000 (01:24 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 08:24:57 +0000 (01:24 -0700)
commit3dcd848ec340e96f374ee9859bf4f8906fb577cc
tree8a1985dedd8d6f28de304dce53f8831bf1d4a5bf
parentdc86f3229c2d3278bf5f32fb9b0b4bf039c0735e
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
src/arch/x86/insts/static_inst.hh