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

Side by Side Diff: src/arm/codegen-arm.cc

Issue 604064: Fix stack corruption when calling non-function. (Closed)
Patch Set: Created 10 years, 10 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
« no previous file with comments | « src/arm/builtins-arm.cc ('k') | src/ia32/builtins-ia32.cc » ('j') | 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 6899 matching lines...) Expand 10 before | Expand all | Expand 10 after
6910 __ CompareObjectType(r1, r2, r2, JS_FUNCTION_TYPE); 6910 __ CompareObjectType(r1, r2, r2, JS_FUNCTION_TYPE);
6911 __ b(ne, &slow); 6911 __ b(ne, &slow);
6912 6912
6913 // Fast-case: Invoke the function now. 6913 // Fast-case: Invoke the function now.
6914 // r1: pushed function 6914 // r1: pushed function
6915 ParameterCount actual(argc_); 6915 ParameterCount actual(argc_);
6916 __ InvokeFunction(r1, actual, JUMP_FUNCTION); 6916 __ InvokeFunction(r1, actual, JUMP_FUNCTION);
6917 6917
6918 // Slow-case: Non-function called. 6918 // Slow-case: Non-function called.
6919 __ bind(&slow); 6919 __ bind(&slow);
6920 // CALL_NON_FUNCTION expects the non-function callee as receiver (instead
6921 // of the original receiver from the call site).
6922 __ str(r1, MemOperand(sp, argc_ * kPointerSize));
6920 __ mov(r0, Operand(argc_)); // Setup the number of arguments. 6923 __ mov(r0, Operand(argc_)); // Setup the number of arguments.
6921 __ mov(r2, Operand(0)); 6924 __ mov(r2, Operand(0));
6922 __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION); 6925 __ GetBuiltinEntry(r3, Builtins::CALL_NON_FUNCTION);
6923 __ Jump(Handle<Code>(Builtins::builtin(Builtins::ArgumentsAdaptorTrampoline)), 6926 __ Jump(Handle<Code>(Builtins::builtin(Builtins::ArgumentsAdaptorTrampoline)),
6924 RelocInfo::CODE_TARGET); 6927 RelocInfo::CODE_TARGET);
6925 } 6928 }
6926 6929
6927 6930
6928 const char* CompareStub::GetName() { 6931 const char* CompareStub::GetName() {
6929 switch (cc_) { 6932 switch (cc_) {
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
7612 7615
7613 // Just jump to runtime to add the two strings. 7616 // Just jump to runtime to add the two strings.
7614 __ bind(&string_add_runtime); 7617 __ bind(&string_add_runtime);
7615 __ TailCallRuntime(ExternalReference(Runtime::kStringAdd), 2, 1); 7618 __ TailCallRuntime(ExternalReference(Runtime::kStringAdd), 2, 1);
7616 } 7619 }
7617 7620
7618 7621
7619 #undef __ 7622 #undef __
7620 7623
7621 } } // namespace v8::internal 7624 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/builtins-arm.cc ('k') | src/ia32/builtins-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698