Reviewers: Rico,

Description:
Fix bug in CheckBothPositiveSmi macro.
Fix lint.

Please review this at http://codereview.chromium.org/2826021/show

Affected files:
  M src/ia32/codegen-ia32.cc
  M src/x64/macro-assembler-x64.cc


Index: src/ia32/codegen-ia32.cc
diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc
index bd2926f1cfacbf7c1cfb43a75486fca4be9ac304..c0c54426a39377d4a95e18c31179dedae4122561 100644
--- a/src/ia32/codegen-ia32.cc
+++ b/src/ia32/codegen-ia32.cc
@@ -13410,7 +13410,6 @@ void SubStringStub::Generate(MacroAssembler* masm) {
   // Just jump to runtime to create the sub string.
   __ bind(&runtime);
   __ TailCallRuntime(Runtime::kSubString, 3, 1);
-
 }


Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index 0259054e4417e495b8a3e4751a27acd0cac6a6af..32cd2dbc130bfdb4dab1f0856d10d7ff8a0385e9 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -652,8 +652,8 @@ Condition MacroAssembler::CheckBothPositiveSmi(Register first,
   if (first.is(second)) {
     return CheckPositiveSmi(first);
   }
-  movl(kScratchRegister, first);
-  orl(kScratchRegister, second);
+  movq(kScratchRegister, first);
+  or_(kScratchRegister, second);
   rol(kScratchRegister, Immediate(1));
   testl(kScratchRegister, Immediate(0x03));
   return zero;


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to