Revision: 3694
Author: [email protected]
Date: Mon Jan 25 09:03:34 2010
Log: Fixing an assertion fail introduced in 3692.
Also fixing some formatting issues.
Review URL: http://codereview.chromium.org/556002
http://code.google.com/p/v8/source/detail?r=3694
Modified:
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/ia32/codegen-ia32.h
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Mon Jan 25 08:00:03
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Mon Jan 25 09:03:34
2010
@@ -7285,7 +7285,7 @@
__ mov(eax, edx);
GenerateReturn(masm);
- if (HasArgumentsInRegisters()) {
+ if (arg_location == ARGS_IN_REGISTERS) {
__ bind(&after_alloc_failure);
__ mov(edx, eax);
__ mov(eax, ebx);
@@ -7570,8 +7570,7 @@
if (HasArgumentsReversed()) {
if (mode == OVERWRITE_RIGHT) {
mode = OVERWRITE_LEFT;
- }
- else if (mode == OVERWRITE_LEFT) {
+ } else if (mode == OVERWRITE_LEFT) {
mode = OVERWRITE_RIGHT;
}
}
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.h Mon Jan 25 08:00:03 2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.h Mon Jan 25 09:03:34 2010
@@ -702,11 +702,11 @@
// Args in registers are always OK for ADD and SUB. Floating-point MUL
and DIV
// are also OK. Though MUL and DIV on SMIs modify the original registers
so
- // we need to push args on stack anyway.
+ // we need to push args on stack anyway.
bool ArgsInRegistersSupported() {
- return ((op_ == Token::ADD) || (op_ == Token::SUB)) ||
- (((op_ == Token::MUL) || (op_ == Token::DIV))
- && (flags_ == NO_SMI_CODE_IN_STUB));
+ return ((op_ == Token::ADD) || (op_ == Token::SUB)) ||
+ (((op_ == Token::MUL) || (op_ == Token::DIV))
+ && (flags_ == NO_SMI_CODE_IN_STUB));
}
bool IsOperationCommutative() {
return (op_ == Token::ADD) || (op_ == Token::MUL);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
