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

Side by Side Diff: runtime/vm/runtime_entry_ia32.cc

Issue 23672011: Fix the previously ineffective assert checking the number of arguments passed to (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 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 | « runtime/vm/runtime_entry_arm.cc ('k') | runtime/vm/runtime_entry_mips.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 (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/globals.h" 5 #include "vm/globals.h"
6 #if defined(TARGET_ARCH_IA32) 6 #if defined(TARGET_ARCH_IA32)
7 7
8 #include "vm/runtime_entry.h" 8 #include "vm/runtime_entry.h"
9 9
10 #include "vm/assembler.h" 10 #include "vm/assembler.h"
11 #include "vm/stub_code.h" 11 #include "vm/stub_code.h"
12 12
13 namespace dart { 13 namespace dart {
14 14
15 #define __ assembler-> 15 #define __ assembler->
16 16
17 17
18 // Generate code to call into the stub which will call the runtime 18 // Generate code to call into the stub which will call the runtime
19 // function. Input for the stub is as follows: 19 // function. Input for the stub is as follows:
20 // For regular runtime calls - 20 // For regular runtime calls -
21 // ESP : points to the arguments and return value array. 21 // ESP : points to the arguments and return value array.
22 // ECX : address of the runtime function to call. 22 // ECX : address of the runtime function to call.
23 // EDX : number of arguments to the call. 23 // EDX : number of arguments to the call.
24 // For leaf calls the caller is responsible to setup the arguments 24 // For leaf calls the caller is responsible to setup the arguments
25 // and look for return values based on the C calling convention. 25 // and look for return values based on the C calling convention.
26 void RuntimeEntry::Call(Assembler* assembler) const { 26 void RuntimeEntry::Call(Assembler* assembler, intptr_t argument_count) const {
27 if (!is_leaf()) { 27 if (is_leaf()) {
28 __ movl(ECX, Immediate(GetEntryPoint())); 28 ASSERT(argument_count == this->argument_count());
29 __ movl(EDX, Immediate(argument_count()));
30 __ call(&StubCode::CallToRuntimeLabel());
31 } else {
32 ExternalLabel label(name(), GetEntryPoint()); 29 ExternalLabel label(name(), GetEntryPoint());
33 __ call(&label); 30 __ call(&label);
31 } else {
32 // Argument count is not checked here, but in the runtime entry for a more
33 // informative error message.
34 __ movl(ECX, Immediate(GetEntryPoint()));
35 __ movl(EDX, Immediate(argument_count));
36 __ call(&StubCode::CallToRuntimeLabel());
34 } 37 }
35 } 38 }
36 39
37 } // namespace dart 40 } // namespace dart
38 41
39 #endif // defined TARGET_ARCH_IA32 42 #endif // defined TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « runtime/vm/runtime_entry_arm.cc ('k') | runtime/vm/runtime_entry_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698