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

Unified Diff: runtime/vm/flow_graph_compiler.cc

Issue 540303002: Fix xcode build for real. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler.cc
===================================================================
--- runtime/vm/flow_graph_compiler.cc (revision 39906)
+++ runtime/vm/flow_graph_compiler.cc (working copy)
@@ -1351,18 +1351,23 @@
}
+static inline intptr_t MaskBit(Register reg) {
+ return reg != kNoRegister ? 1 << reg : 0;
Vyacheslav Egorov (Google) 2014/09/05 11:29:45 (1 << reg) (reg != kNoRegister)
+}
+
+
ParallelMoveResolver::ScratchRegisterScope::ScratchRegisterScope(
ParallelMoveResolver* resolver, Register blocked)
: resolver_(resolver),
reg_(kNoRegister),
spilled_(false) {
- uword blocked_mask = ((blocked > kNoRegister) ? 1 << blocked : 0)
- | 1 << CTX
- | 1 << SPREG
- | 1 << FPREG
- | ((TMP > kNoRegister) ? 1 << TMP : 0)
- | ((TMP2 > kNoRegister) ? 1 << TMP2 : 0)
- | ((PP > kNoRegister) ? 1 << PP : 0);
+ uword blocked_mask = MaskBit(blocked)
+ | MaskBit(CTX)
+ | MaskBit(SPREG)
+ | MaskBit(FPREG)
+ | MaskBit(TMP)
+ | MaskBit(TMP2)
+ | MaskBit(PP);
reg_ = static_cast<Register>(
resolver_->AllocateScratchRegister(Location::kRegister,
blocked_mask,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698