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

Side by Side Diff: src/ic/x87/handler-compiler-x87.cc

Issue 1406113007: Merge GlobalObject with JSGlobalObject. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month 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/ic/x64/handler-compiler-x64.cc ('k') | src/isolate.h » ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if V8_TARGET_ARCH_X87 5 #if V8_TARGET_ARCH_X87
6 6
7 #include "src/ic/call-optimization.h" 7 #include "src/ic/call-optimization.h"
8 #include "src/ic/handler-compiler.h" 8 #include "src/ic/handler-compiler.h"
9 #include "src/ic/ic.h" 9 #include "src/ic/ic.h"
10 #include "src/isolate-inl.h" 10 #include "src/isolate-inl.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 properties, name, scratch1); 109 properties, name, scratch1);
110 __ bind(&done); 110 __ bind(&done);
111 __ DecrementCounter(counters->negative_lookups_miss(), 1); 111 __ DecrementCounter(counters->negative_lookups_miss(), 1);
112 } 112 }
113 113
114 114
115 void NamedLoadHandlerCompiler::GenerateDirectLoadGlobalFunctionPrototype( 115 void NamedLoadHandlerCompiler::GenerateDirectLoadGlobalFunctionPrototype(
116 MacroAssembler* masm, int index, Register result, Label* miss) { 116 MacroAssembler* masm, int index, Register result, Label* miss) {
117 const int offset = Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX); 117 const int offset = Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX);
118 __ mov(result, Operand(esi, offset)); 118 __ mov(result, Operand(esi, offset));
119 __ mov(result, FieldOperand(result, GlobalObject::kNativeContextOffset)); 119 __ mov(result, FieldOperand(result, JSGlobalObject::kNativeContextOffset));
120 __ mov(result, Operand(result, Context::SlotOffset(index))); 120 __ mov(result, Operand(result, Context::SlotOffset(index)));
121 // Load its initial map. The global functions all have initial maps. 121 // Load its initial map. The global functions all have initial maps.
122 __ mov(result, 122 __ mov(result,
123 FieldOperand(result, JSFunction::kPrototypeOrInitialMapOffset)); 123 FieldOperand(result, JSFunction::kPrototypeOrInitialMapOffset));
124 // Load the prototype from the initial map. 124 // Load the prototype from the initial map.
125 __ mov(result, FieldOperand(result, Map::kPrototypeOffset)); 125 __ mov(result, FieldOperand(result, Map::kPrototypeOffset));
126 } 126 }
127 127
128 128
129 void NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype( 129 void NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype(
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 // Return the generated code. 821 // Return the generated code.
822 return GetCode(kind(), Code::NORMAL, name); 822 return GetCode(kind(), Code::NORMAL, name);
823 } 823 }
824 824
825 825
826 #undef __ 826 #undef __
827 } // namespace internal 827 } // namespace internal
828 } // namespace v8 828 } // namespace v8
829 829
830 #endif // V8_TARGET_ARCH_X87 830 #endif // V8_TARGET_ARCH_X87
OLDNEW
« no previous file with comments | « src/ic/x64/handler-compiler-x64.cc ('k') | src/isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698