Revision: 18850
Author: [email protected]
Date: Mon Jan 27 11:13:50 2014 UTC
Log: fix windows after r18847
[email protected]
BUG=
Review URL: https://codereview.chromium.org/145353005
http://code.google.com/p/v8/source/detail?r=18850
Modified:
/branches/bleeding_edge/src/x64/code-stubs-x64.cc
/branches/bleeding_edge/src/x64/macro-assembler-x64.cc
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/x64/code-stubs-x64.cc Mon Jan 27 09:57:54
2014 UTC
+++ /branches/bleeding_edge/src/x64/code-stubs-x64.cc Mon Jan 27 11:13:50
2014 UTC
@@ -5312,7 +5312,7 @@
Register callback_arg = rsi;
#endif
- // It's okay if callback_arg == api_function_address
+ // It's okay if api_function_address == callback_arg
// but not arguments_arg
ASSERT(!api_function_address.is(arguments_arg));
=======================================
--- /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Mon Jan 27
09:57:54 2014 UTC
+++ /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Mon Jan 27
11:13:50 2014 UTC
@@ -697,7 +697,7 @@
ExternalReference scheduled_exception_address =
ExternalReference::scheduled_exception_address(isolate());
- ASSERT(rdx.is(function_address));
+ ASSERT(rdx.is(function_address) || r8.is(function_address));
// Allocate HandleScope in callee-save registers.
Register prev_next_address_reg = r14;
Register prev_limit_reg = rbx;
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Mon Jan 27 09:57:54
2014 UTC
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Mon Jan 27 11:13:50
2014 UTC
@@ -1252,7 +1252,12 @@
Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback);
- Register api_function_address = rdx;
+ Register api_function_address = r8;
+ // It's okay if api_function_address == getter_arg
+ // but not accessor_info_arg or name_arg
+ ASSERT(!api_function_address.is(accessor_info_arg) &&
+ !api_function_address.is(name_arg));
+
__ Move(api_function_address, getter_address,
RelocInfo::EXTERNAL_REFERENCE);
// The name handler is counted as an argument.
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
