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

Unified Diff: runtime/vm/assembler_arm64.cc

Issue 281823002: Fix an undetected Smi overflow on ARM. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 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
Index: runtime/vm/assembler_arm64.cc
===================================================================
--- runtime/vm/assembler_arm64.cc (revision 36182)
+++ runtime/vm/assembler_arm64.cc (working copy)
@@ -684,6 +684,12 @@
void Assembler::AddImmediate(
Register dest, Register rn, int64_t imm, Register pp) {
Operand op;
+ if (imm == 0) {
+ if (dest != rn) {
+ mov(dest, rn);
+ }
+ return;
+ }
if (Operand::CanHold(imm, kXRegSizeInBits, &op) == Operand::Immediate) {
add(dest, rn, op);
} else if (Operand::CanHold(-imm, kXRegSizeInBits, &op) ==
@@ -705,6 +711,7 @@
adds(dest, rn, op);
} else if (Operand::CanHold(-imm, kXRegSizeInBits, &op) ==
Operand::Immediate) {
+ ASSERT(imm != kMinInt64); // Would cause erroneous overflow detection.
subs(dest, rn, op);
} else {
zra 2014/05/14 19:40:55 ASSERT(imm != kMinInt64);
regis 2014/05/14 19:54:53 It would not be a problem here, since we emit an a
// TODO(zra): Try adding top 12 bits, then bottom 12 bits.
@@ -715,6 +722,24 @@
}
+void Assembler::SubImmediateSetFlags(
+ Register dest, Register rn, int64_t imm, Register pp) {
+ Operand op;
+ if (Operand::CanHold(imm, kXRegSizeInBits, &op) == Operand::Immediate) {
zra 2014/05/14 19:40:55 ditto
regis 2014/05/14 19:54:53 Done.
+ subs(dest, rn, op);
+ } else if (Operand::CanHold(-imm, kXRegSizeInBits, &op) ==
+ Operand::Immediate) {
+ ASSERT(imm != kMinInt64); // Would cause erroneous overflow detection.
+ adds(dest, rn, op);
+ } else {
zra 2014/05/14 19:40:55 ASSERT(imm != kMinInt64);
regis 2014/05/14 19:54:53 It would not be a problem here, since we emit a su
+ // TODO(zra): Try subtracting top 12 bits, then bottom 12 bits.
+ ASSERT(rn != TMP2);
+ LoadImmediate(TMP2, imm, pp);
+ subs(dest, rn, Operand(TMP2));
+ }
+}
+
+
void Assembler::AndImmediate(
Register rd, Register rn, int64_t imm, Register pp) {
Operand imm_op;

Powered by Google App Engine
This is Rietveld 408576698