| OLD | NEW |
| 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 2302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2313 __ ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset)); | 2313 __ ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset)); |
| 2314 __ ldr(result, FieldMemOperand(result, instr->hydrogen()->offset())); | 2314 __ ldr(result, FieldMemOperand(result, instr->hydrogen()->offset())); |
| 2315 } | 2315 } |
| 2316 } | 2316 } |
| 2317 | 2317 |
| 2318 | 2318 |
| 2319 void LCodeGen::EmitLoadFieldOrConstantFunction(Register result, | 2319 void LCodeGen::EmitLoadFieldOrConstantFunction(Register result, |
| 2320 Register object, | 2320 Register object, |
| 2321 Handle<Map> type, | 2321 Handle<Map> type, |
| 2322 Handle<String> name) { | 2322 Handle<String> name) { |
| 2323 LookupResult lookup; | 2323 LookupResult lookup(isolate()); |
| 2324 type->LookupInDescriptors(NULL, *name, &lookup); | 2324 type->LookupInDescriptors(NULL, *name, &lookup); |
| 2325 ASSERT(lookup.IsProperty() && | 2325 ASSERT(lookup.IsProperty() && |
| 2326 (lookup.type() == FIELD || lookup.type() == CONSTANT_FUNCTION)); | 2326 (lookup.type() == FIELD || lookup.type() == CONSTANT_FUNCTION)); |
| 2327 if (lookup.type() == FIELD) { | 2327 if (lookup.type() == FIELD) { |
| 2328 int index = lookup.GetLocalFieldIndexFromMap(*type); | 2328 int index = lookup.GetLocalFieldIndexFromMap(*type); |
| 2329 int offset = index * kPointerSize; | 2329 int offset = index * kPointerSize; |
| 2330 if (index < 0) { | 2330 if (index < 0) { |
| 2331 // Negative property indices are in-object properties, indexed | 2331 // Negative property indices are in-object properties, indexed |
| 2332 // from the end of the fixed part of the object. | 2332 // from the end of the fixed part of the object. |
| 2333 __ ldr(result, FieldMemOperand(object, offset + type->instance_size())); | 2333 __ ldr(result, FieldMemOperand(object, offset + type->instance_size())); |
| (...skipping 2263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4597 ASSERT(osr_pc_offset_ == -1); | 4597 ASSERT(osr_pc_offset_ == -1); |
| 4598 osr_pc_offset_ = masm()->pc_offset(); | 4598 osr_pc_offset_ = masm()->pc_offset(); |
| 4599 } | 4599 } |
| 4600 | 4600 |
| 4601 | 4601 |
| 4602 | 4602 |
| 4603 | 4603 |
| 4604 #undef __ | 4604 #undef __ |
| 4605 | 4605 |
| 4606 } } // namespace v8::internal | 4606 } } // namespace v8::internal |
| OLD | NEW |