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

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

Issue 8321002: Replace calls_eval() by calls_non_strict_eval() where possible. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | src/ia32/full-codegen-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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 void FullCodeGenerator::EmitLoadGlobalCheckExtensions(Variable* var, 1121 void FullCodeGenerator::EmitLoadGlobalCheckExtensions(Variable* var,
1122 TypeofState typeof_state, 1122 TypeofState typeof_state,
1123 Label* slow) { 1123 Label* slow) {
1124 Register current = cp; 1124 Register current = cp;
1125 Register next = r1; 1125 Register next = r1;
1126 Register temp = r2; 1126 Register temp = r2;
1127 1127
1128 Scope* s = scope(); 1128 Scope* s = scope();
1129 while (s != NULL) { 1129 while (s != NULL) {
1130 if (s->num_heap_slots() > 0) { 1130 if (s->num_heap_slots() > 0) {
1131 if (s->calls_eval()) { 1131 if (s->calls_non_strict_eval()) {
1132 // Check that extension is NULL. 1132 // Check that extension is NULL.
1133 __ ldr(temp, ContextOperand(current, Context::EXTENSION_INDEX)); 1133 __ ldr(temp, ContextOperand(current, Context::EXTENSION_INDEX));
1134 __ tst(temp, temp); 1134 __ tst(temp, temp);
1135 __ b(ne, slow); 1135 __ b(ne, slow);
1136 } 1136 }
1137 // Load next context in chain. 1137 // Load next context in chain.
1138 __ ldr(next, ContextOperand(current, Context::PREVIOUS_INDEX)); 1138 __ ldr(next, ContextOperand(current, Context::PREVIOUS_INDEX));
1139 // Walk the rest of the chain without clobbering cp. 1139 // Walk the rest of the chain without clobbering cp.
1140 current = next; 1140 current = next;
1141 } 1141 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 1178
1179 MemOperand FullCodeGenerator::ContextSlotOperandCheckExtensions(Variable* var, 1179 MemOperand FullCodeGenerator::ContextSlotOperandCheckExtensions(Variable* var,
1180 Label* slow) { 1180 Label* slow) {
1181 ASSERT(var->IsContextSlot()); 1181 ASSERT(var->IsContextSlot());
1182 Register context = cp; 1182 Register context = cp;
1183 Register next = r3; 1183 Register next = r3;
1184 Register temp = r4; 1184 Register temp = r4;
1185 1185
1186 for (Scope* s = scope(); s != var->scope(); s = s->outer_scope()) { 1186 for (Scope* s = scope(); s != var->scope(); s = s->outer_scope()) {
1187 if (s->num_heap_slots() > 0) { 1187 if (s->num_heap_slots() > 0) {
1188 if (s->calls_eval()) { 1188 if (s->calls_non_strict_eval()) {
1189 // Check that extension is NULL. 1189 // Check that extension is NULL.
1190 __ ldr(temp, ContextOperand(context, Context::EXTENSION_INDEX)); 1190 __ ldr(temp, ContextOperand(context, Context::EXTENSION_INDEX));
1191 __ tst(temp, temp); 1191 __ tst(temp, temp);
1192 __ b(ne, slow); 1192 __ b(ne, slow);
1193 } 1193 }
1194 __ ldr(next, ContextOperand(context, Context::PREVIOUS_INDEX)); 1194 __ ldr(next, ContextOperand(context, Context::PREVIOUS_INDEX));
1195 // Walk the rest of the chain without clobbering cp. 1195 // Walk the rest of the chain without clobbering cp.
1196 context = next; 1196 context = next;
1197 } 1197 }
1198 } 1198 }
(...skipping 3061 matching lines...) Expand 10 before | Expand all | Expand 10 after
4260 *context_length = 0; 4260 *context_length = 0;
4261 return previous_; 4261 return previous_;
4262 } 4262 }
4263 4263
4264 4264
4265 #undef __ 4265 #undef __
4266 4266
4267 } } // namespace v8::internal 4267 } } // namespace v8::internal
4268 4268
4269 #endif // V8_TARGET_ARCH_ARM 4269 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/full-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698