str: add an overloaded startswith() utility method

[gem5.git] / src / base / condcodes.hh

diff --git a/src/base/condcodes.hh b/src/base/condcodes.hh
index efff12dc8cab2581bc3fa3c4497025162958f390..986e8d3106730f039de45879cc89321573532478 100644 (file)
--- a/src/base/condcodes.hh
+++ b/src/base/condcodes.hh
@@ -54,7 +54,7 @@ inline
 bool
 findOverflow(int width, uint64_t dest, uint64_t src1, uint64_t src2) {
     int shift = width - 1;
-    return ((src1 ^ ~src2) & (src1 ^ dest)) & (1 << shift);
+    return ((src1 ^ ~src2) & (src1 ^ dest)) & (1ULL << shift);
 }
 
 /**
@@ -63,7 +63,7 @@ findOverflow(int width, uint64_t dest, uint64_t src1, uint64_t src2) {
 inline
 bool
 findParity(int width, uint64_t dest) {
-    dest &= width;
+    dest &= mask(width);
     dest ^= (dest >> 32);
     dest ^= (dest >> 16);
     dest ^= (dest >> 8);