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

Side by Side Diff: src/x64/virtual-frame-x64.cc

Issue 261024: X64: Fix incompatability with previous revision. (Closed)
Patch Set: Created 11 years, 2 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/x64/macro-assembler-x64.cc ('k') | test/cctest/test-api.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // rbp: base pointer, points to previous JS, ArgumentsAdaptor, or 59 // rbp: base pointer, points to previous JS, ArgumentsAdaptor, or
60 // Trampoline frame. 60 // Trampoline frame.
61 // rsi: context of this function call. 61 // rsi: context of this function call.
62 // rdi: pointer to this function object. 62 // rdi: pointer to this function object.
63 Comment cmnt(masm(), "[ Enter JS frame"); 63 Comment cmnt(masm(), "[ Enter JS frame");
64 64
65 #ifdef DEBUG 65 #ifdef DEBUG
66 if (FLAG_debug_code) { 66 if (FLAG_debug_code) {
67 // Verify that rdi contains a JS function. The following code 67 // Verify that rdi contains a JS function. The following code
68 // relies on rax being available for use. 68 // relies on rax being available for use.
69 Condition not_smi = masm()->CheckNotSmi(rdi); 69 Condition not_smi = NegateCondition(masm()->CheckSmi(rdi));
70 __ Check(not_smi, 70 __ Check(not_smi,
71 "VirtualFrame::Enter - rdi is not a function (smi check)."); 71 "VirtualFrame::Enter - rdi is not a function (smi check).");
72 __ CmpObjectType(rdi, JS_FUNCTION_TYPE, rax); 72 __ CmpObjectType(rdi, JS_FUNCTION_TYPE, rax);
73 __ Check(equal, 73 __ Check(equal,
74 "VirtualFrame::Enter - rdi is not a function (map check)."); 74 "VirtualFrame::Enter - rdi is not a function (map check).");
75 } 75 }
76 #endif 76 #endif
77 77
78 EmitPush(rbp); 78 EmitPush(rbp);
79 79
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 // Grow the expression stack by handler size less one (the return 1063 // Grow the expression stack by handler size less one (the return
1064 // address is already pushed by a call instruction). 1064 // address is already pushed by a call instruction).
1065 Adjust(kHandlerSize - 1); 1065 Adjust(kHandlerSize - 1);
1066 __ PushTryHandler(IN_JAVASCRIPT, type); 1066 __ PushTryHandler(IN_JAVASCRIPT, type);
1067 } 1067 }
1068 1068
1069 1069
1070 #undef __ 1070 #undef __
1071 1071
1072 } } // namespace v8::internal 1072 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/x64/macro-assembler-x64.cc ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698