diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-05-09 12:02:36 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-05-09 12:02:36 -0400 |
| commit | 939cbd8201a4b0dfad6a56b5d9fb68cc2b23ae73 (patch) | |
| tree | 5552e05d8e3090464be3f8006b556f457959823f | |
| parent | aa095b63cd162c13112831f51045ab81eb643214 (diff) | |
| parent | ee70d8cfc430e38b84945e8b9ea870585b98f87c (diff) | |
| download | gem5-939cbd8201a4b0dfad6a56b5d9fb68cc2b23ae73.tar.xz | |
Merge zizzer:/bk/newmem
into udhcp-macvpn-703.public.engin.umich.edu:/Users/ali/work/m5.newmem
--HG--
extra : convert_revision : e977c5b194954774b6503484797f1c1e0eb4e425
| -rw-r--r-- | src/base/bitfield.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh index 69cce2245..518bad6b8 100644 --- a/src/base/bitfield.hh +++ b/src/base/bitfield.hh @@ -96,8 +96,9 @@ inline T insertBits(T val, int first, int last, B bit_val) { + T t_bit_val = bit_val; T bmask = mask(first - last + 1) << last; - return ((bit_val << last) & bmask) | (val & ~bmask); + return ((t_bit_val << last) & bmask) | (val & ~bmask); } /** |