Reviewers: Lasse Reichstein,
Description:
Fix compilation failures when building in x64.
src/x64/code-stubs-x64.cc: In member function 'virtual void
v8::internal::RegExpExecStub::Generate(v8::internal::MacroAssembler*)':
src/x64/code-stubs-x64.cc:1992: error: no matching function for call to
'v8::internal::MacroAssembler::Integer32ToSmi(const v8::internal::Register&,
const v8::internal::Register&, v8::internal::Label*)'
src/x64/macro-assembler-x64.h:220: note: candidates are: void
v8::internal::MacroAssembler::Integer32ToSmi(v8::internal::Register,
v8::internal::Register)
src/x64/macro-assembler-x64.cc:1018: error: no matching function for call to
'v8::internal::Register::is(const v8::internal::Operand&)'
src/x64/assembler-x64.h:96: note: candidates are: bool
v8::internal::Register::is(v8::internal::Register) const
BUG=None
TEST=scons arch=x64 mode=debug library=shared snapshot=on
Patch from Thiago Farina <[email protected]>
Please review this at http://codereview.chromium.org/3442004/show
SVN Base: git://github.com/v8/v8.git
Affected files:
M src/x64/code-stubs-x64.cc
M src/x64/macro-assembler-x64.cc
Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index
13ad8283f5c4511d1f94582e655168bd3aa610f6..9d82e0e31abfc70475b112ac8d28756517bcebd5
100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -1989,7 +1989,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
__ j(negative, &done);
// Read the value from the static offsets vector buffer and make it a
smi.
__ movl(rdi, Operand(rcx, rdx, times_int_size, 0));
- __ Integer32ToSmi(rdi, rdi, &runtime);
+ __ Integer32ToSmi(rdi, rdi);
// Store the smi value in the last match info.
__ movq(FieldOperand(rbx,
rdx,
Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index
7a237c3c24bf0abe6266572bd5d284ad07d33030..e6f81b37a70098c80e8dcb6d4cc5a99f23ec1111
100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2010 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -1015,7 +1015,6 @@ void MacroAssembler::SmiSub(Register dst,
const Operand& src2) {
// No overflow checking. Use only when it's known that
// overflowing is impossible (e.g., subtracting two positive smis).
- ASSERT(!dst.is(src2));
if (dst.is(src1)) {
subq(dst, src2);
} else {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
