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

Side by Side Diff: src/ia32/code-stubs-ia32.cc

Issue 6720014: Isolates: Cleanup usage of FACTORY in code stubs and bootstrapper. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Minor edits. Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2029 2029
2030 void TypeRecordingBinaryOpStub::GenerateOddballStub(MacroAssembler* masm) { 2030 void TypeRecordingBinaryOpStub::GenerateOddballStub(MacroAssembler* masm) {
2031 Label call_runtime; 2031 Label call_runtime;
2032 2032
2033 if (op_ == Token::ADD) { 2033 if (op_ == Token::ADD) {
2034 // Handle string addition here, because it is the only operation 2034 // Handle string addition here, because it is the only operation
2035 // that does not do a ToNumber conversion on the operands. 2035 // that does not do a ToNumber conversion on the operands.
2036 GenerateAddStrings(masm); 2036 GenerateAddStrings(masm);
2037 } 2037 }
2038 2038
2039 Factory* factory = masm->isolate()->factory();
2040
2039 // Convert odd ball arguments to numbers. 2041 // Convert odd ball arguments to numbers.
2040 NearLabel check, done; 2042 NearLabel check, done;
2041 __ cmp(edx, FACTORY->undefined_value()); 2043 __ cmp(edx, factory->undefined_value());
2042 __ j(not_equal, &check); 2044 __ j(not_equal, &check);
2043 if (Token::IsBitOp(op_)) { 2045 if (Token::IsBitOp(op_)) {
2044 __ xor_(edx, Operand(edx)); 2046 __ xor_(edx, Operand(edx));
2045 } else { 2047 } else {
2046 __ mov(edx, Immediate(FACTORY->nan_value())); 2048 __ mov(edx, Immediate(factory->nan_value()));
2047 } 2049 }
2048 __ jmp(&done); 2050 __ jmp(&done);
2049 __ bind(&check); 2051 __ bind(&check);
2050 __ cmp(eax, FACTORY->undefined_value()); 2052 __ cmp(eax, factory->undefined_value());
2051 __ j(not_equal, &done); 2053 __ j(not_equal, &done);
2052 if (Token::IsBitOp(op_)) { 2054 if (Token::IsBitOp(op_)) {
2053 __ xor_(eax, Operand(eax)); 2055 __ xor_(eax, Operand(eax));
2054 } else { 2056 } else {
2055 __ mov(eax, Immediate(FACTORY->nan_value())); 2057 __ mov(eax, Immediate(factory->nan_value()));
2056 } 2058 }
2057 __ bind(&done); 2059 __ bind(&done);
2058 2060
2059 GenerateHeapNumberStub(masm); 2061 GenerateHeapNumberStub(masm);
2060 } 2062 }
2061 2063
2062 2064
2063 void TypeRecordingBinaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) { 2065 void TypeRecordingBinaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) {
2064 Label call_runtime; 2066 Label call_runtime;
2065 2067
(...skipping 4474 matching lines...) Expand 10 before | Expand all | Expand 10 after
6540 // Do a tail call to the rewritten stub. 6542 // Do a tail call to the rewritten stub.
6541 __ jmp(Operand(edi)); 6543 __ jmp(Operand(edi));
6542 } 6544 }
6543 6545
6544 6546
6545 #undef __ 6547 #undef __
6546 6548
6547 } } // namespace v8::internal 6549 } } // namespace v8::internal
6548 6550
6549 #endif // V8_TARGET_ARCH_IA32 6551 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« src/bootstrapper.cc ('K') | « src/debug.cc ('k') | src/x64/code-stubs-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698