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

Side by Side Diff: src/ia32/full-codegen-ia32.cc

Issue 2862028: Fixing the regression introduced in r4716.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 10 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 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 2157 matching lines...) Expand 10 before | Expand all | Expand 10 after
2168 // Check that the object is a JS object but take special care of JS 2168 // Check that the object is a JS object but take special care of JS
2169 // functions to make sure they have 'Function' as their class. 2169 // functions to make sure they have 'Function' as their class.
2170 __ CmpObjectType(eax, FIRST_JS_OBJECT_TYPE, eax); // Map is now in eax. 2170 __ CmpObjectType(eax, FIRST_JS_OBJECT_TYPE, eax); // Map is now in eax.
2171 __ j(below, &null); 2171 __ j(below, &null);
2172 2172
2173 // As long as JS_FUNCTION_TYPE is the last instance type and it is 2173 // As long as JS_FUNCTION_TYPE is the last instance type and it is
2174 // right after LAST_JS_OBJECT_TYPE, we can avoid checking for 2174 // right after LAST_JS_OBJECT_TYPE, we can avoid checking for
2175 // LAST_JS_OBJECT_TYPE. 2175 // LAST_JS_OBJECT_TYPE.
2176 ASSERT(LAST_TYPE == JS_FUNCTION_TYPE); 2176 ASSERT(LAST_TYPE == JS_FUNCTION_TYPE);
2177 ASSERT(JS_FUNCTION_TYPE == LAST_JS_OBJECT_TYPE + 1); 2177 ASSERT(JS_FUNCTION_TYPE == LAST_JS_OBJECT_TYPE + 1);
2178 __ cmp(ebx, JS_FUNCTION_TYPE); 2178 __ CmpInstanceType(eax, JS_FUNCTION_TYPE);
2179 __ j(equal, &function); 2179 __ j(equal, &function);
2180 2180
2181 // Check if the constructor in the map is a function. 2181 // Check if the constructor in the map is a function.
2182 __ mov(eax, FieldOperand(eax, Map::kConstructorOffset)); 2182 __ mov(eax, FieldOperand(eax, Map::kConstructorOffset));
2183 __ CmpObjectType(eax, JS_FUNCTION_TYPE, ebx); 2183 __ CmpObjectType(eax, JS_FUNCTION_TYPE, ebx);
2184 __ j(not_equal, &non_function_constructor); 2184 __ j(not_equal, &non_function_constructor);
2185 2185
2186 // eax now contains the constructor function. Grab the 2186 // eax now contains the constructor function. Grab the
2187 // instance class name from there. 2187 // instance class name from there.
2188 __ mov(eax, FieldOperand(eax, JSFunction::kSharedFunctionInfoOffset)); 2188 __ mov(eax, FieldOperand(eax, JSFunction::kSharedFunctionInfoOffset));
(...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
3251 // And return. 3251 // And return.
3252 __ ret(0); 3252 __ ret(0);
3253 } 3253 }
3254 3254
3255 3255
3256 #undef __ 3256 #undef __
3257 3257
3258 } } // namespace v8::internal 3258 } } // namespace v8::internal
3259 3259
3260 #endif // V8_TARGET_ARCH_IA32 3260 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698