runtime/vm/stub_code_ia32.cc - Issue 9481018: Fix merge error, Debug_StepInto test

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9481018: Fix merge error, Debug_StepInto test (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 9 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

OLD	NEW
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/code_generator.h"	8 #include "vm/code_generator.h"

9 #include "vm/compiler.h"	9 #include "vm/compiler.h"

10 #include "vm/object_store.h"	10 #include "vm/object_store.h"

(...skipping 1730 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1741 __ pushl(ECX);	1741 __ pushl(ECX);

1742 __ pushl(EDX);	1742 __ pushl(EDX);

1743 __ CallRuntimeFromStub(kBreakpointDynamicHandlerRuntimeEntry);	1743 __ CallRuntimeFromStub(kBreakpointDynamicHandlerRuntimeEntry);

1744 __ popl(EDX);	1744 __ popl(EDX);

1745 __ popl(ECX);	1745 __ popl(ECX);

1746 __ LeaveFrame();	1746 __ LeaveFrame();

1747	1747

1748 // Find out which dispatch stub to call.	1748 // Find out which dispatch stub to call.

1749 Label ic_cache_one_arg;	1749 Label ic_cache_one_arg;

1750 __ movl(EBX, FieldAddress(ECX, ICData::num_args_tested_offset()));	1750 __ movl(EBX, FieldAddress(ECX, ICData::num_args_tested_offset()));

1751 const Immediate value =	1751 __ cmpl(EBX, Immediate(1));

1752 Immediate(reinterpret_cast<int32_t>(Smi::New(1)));

1753 __ cmpl(EBX, value);

1754 __ j(EQUAL, &ic_cache_one_arg, Assembler::kNearJump);	1752 __ j(EQUAL, &ic_cache_one_arg, Assembler::kNearJump);

1755 __ jmp(&StubCode::TwoArgsCheckInlineCacheLabel());	1753 __ jmp(&StubCode::TwoArgsCheckInlineCacheLabel());

1756 __ Bind(&ic_cache_one_arg);	1754 __ Bind(&ic_cache_one_arg);

1757 __ jmp(&StubCode::OneArgCheckInlineCacheLabel());	1755 __ jmp(&StubCode::OneArgCheckInlineCacheLabel());

1758 }	1756 }

1759	1757

1760 } // namespace dart	1758 } // namespace dart

1761	1759

1762 #endif // defined TARGET_ARCH_IA32	1760 #endif // defined TARGET_ARCH_IA32

OLD	NEW

« no previous file with comments | « runtime/vm/code_patcher_x64.cc ('k') | runtime/vm/stub_code_x64.cc » ('j') | no next file with comments »