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

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 15692005: Fix a bug in optimized ARM code. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 7 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 | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_arm.cc
===================================================================
--- runtime/vm/intermediate_language_arm.cc (revision 23168)
+++ runtime/vm/intermediate_language_arm.cc (working copy)
@@ -527,6 +527,7 @@
__ LoadObject(result, Bool::False(), NegateCondition(cond));
}
} else {
+ __ PushList((1 << R0) | (1 << R1));
const int kNumberOfArguments = 2;
const Array& kNoArgumentNames = Array::Handle();
compiler->GenerateStaticCall(deopt_id,
@@ -614,6 +615,25 @@
}
+static Condition FlipCondition(Condition condition) {
+ switch (condition) {
+ case EQ: return EQ;
+ case NE: return NE;
+ case LT: return GT;
+ case LE: return GE;
+ case GT: return LT;
+ case GE: return LE;
+ case CC: return HI;
+ case LS: return CS;
+ case HI: return CC;
+ case CS: return LS;
+ default:
+ UNIMPLEMENTED();
+ return EQ;
+ }
+}
+
+
static void EmitSmiComparisonOp(FlowGraphCompiler* compiler,
const LocationSummary& locs,
Token::Kind kind,
@@ -626,7 +646,7 @@
if (left.IsConstant()) {
__ CompareObject(right.reg(), left.constant());
- true_condition = FlowGraphCompiler::FlipCondition(true_condition);
+ true_condition = FlipCondition(true_condition);
} else if (right.IsConstant()) {
__ CompareObject(left.reg(), right.constant());
} else {
@@ -2530,7 +2550,8 @@
}
// Load receiver into R0.
- __ ldr(R0, Address(SP, (instance_call()->ArgumentCount() - 1) * kWordSize));
+ __ LoadFromOffset(kLoadWord, R0, SP,
+ (instance_call()->ArgumentCount() - 1) * kWordSize);
LoadValueCid(compiler, R2, R0,
(ic_data().GetReceiverClassIdAt(0) == kSmiCid) ? NULL : deopt);
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698