summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-05-10 00:36:47 -0400
committerAli Saidi <saidi@eecs.umich.edu>2007-05-10 00:36:47 -0400
commite08a5c60524d9e8d9a84d661c9464e3fe1289e2f (patch)
treec290b4674ddbebc7afeb016999ec8d993cd91bc4 /src
parent77fd734b997f6d63edf4a84447fc76b38088bfa3 (diff)
parent939cbd8201a4b0dfad6a56b5d9fb68cc2b23ae73 (diff)
downloadgem5-e08a5c60524d9e8d9a84d661c9464e3fe1289e2f.tar.xz
Merge zizzer:/bk/newmem
into pb15.local:/Users/ali/work/m5.newmem.zeep tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt: tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt: the new version of this is what we want --HG-- extra : convert_revision : 204df6f8181df81e423def4695cd81544c485c47
Diffstat (limited to 'src')
-rw-r--r--src/base/bitfield.hh3
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);
}
/**