Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: src/arm/assembler-arm.h

Issue 9968008: Fix ARM simulator build on Windows. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/arm/assembler-arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/arm/assembler-arm.h
===================================================================
--- src/arm/assembler-arm.h (revision 11193)
+++ src/arm/assembler-arm.h (working copy)
@@ -510,7 +510,7 @@
static bool IsSupported(CpuFeature f) {
ASSERT(initialized_);
if (f == VFP3 && !FLAG_enable_vfp3) return false;
- return (supported_ & (1u << f)) != 0;
+ return (supported_ & (static_cast<uint64_t>(1u) << f)) != 0;
}
#ifdef DEBUG
@@ -567,7 +567,7 @@
explicit TryForceFeatureScope(CpuFeature f)
: old_supported_(CpuFeatures::supported_) {
if (CanForce()) {
- CpuFeatures::supported_ |= (1u << f);
+ CpuFeatures::supported_ |= (static_cast<uint64_t>(1u) << f);
}
}
@@ -585,15 +585,15 @@
return Serializer::enabled();
}
- const unsigned old_supported_;
+ const uint64_t old_supported_;
};
private:
#ifdef DEBUG
static bool initialized_;
#endif
- static unsigned supported_;
- static unsigned found_by_runtime_probing_;
+ static uint64_t supported_;
+ static uint64_t found_by_runtime_probing_;
DISALLOW_COPY_AND_ASSIGN(CpuFeatures);
};
« no previous file with comments | « no previous file | src/arm/assembler-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698