OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 Heap::RootListIndex index, | 393 Heap::RootListIndex index, |
394 Condition cond) { | 394 Condition cond) { |
395 str(source, MemOperand(kRootRegister, index << kPointerSizeLog2), cond); | 395 str(source, MemOperand(kRootRegister, index << kPointerSizeLog2), cond); |
396 } | 396 } |
397 | 397 |
398 | 398 |
399 void MacroAssembler::LoadHeapObject(Register result, | 399 void MacroAssembler::LoadHeapObject(Register result, |
400 Handle<HeapObject> object) { | 400 Handle<HeapObject> object) { |
401 AllowDeferredHandleDereference using_raw_address; | 401 AllowDeferredHandleDereference using_raw_address; |
402 if (isolate()->heap()->InNewSpace(*object)) { | 402 if (isolate()->heap()->InNewSpace(*object)) { |
403 Handle<JSGlobalPropertyCell> cell = | 403 Handle<Cell> cell = isolate()->factory()->NewCell(object); |
404 isolate()->factory()->NewJSGlobalPropertyCell(object); | |
405 mov(result, Operand(cell)); | 404 mov(result, Operand(cell)); |
406 ldr(result, FieldMemOperand(result, JSGlobalPropertyCell::kValueOffset)); | 405 ldr(result, FieldMemOperand(result, Cell::kValueOffset)); |
407 } else { | 406 } else { |
408 mov(result, Operand(object)); | 407 mov(result, Operand(object)); |
409 } | 408 } |
410 } | 409 } |
411 | 410 |
412 | 411 |
413 void MacroAssembler::InNewSpace(Register object, | 412 void MacroAssembler::InNewSpace(Register object, |
414 Register scratch, | 413 Register scratch, |
415 Condition cond, | 414 Condition cond, |
416 Label* branch) { | 415 Label* branch) { |
(...skipping 3377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3794 void CodePatcher::EmitCondition(Condition cond) { | 3793 void CodePatcher::EmitCondition(Condition cond) { |
3795 Instr instr = Assembler::instr_at(masm_.pc_); | 3794 Instr instr = Assembler::instr_at(masm_.pc_); |
3796 instr = (instr & ~kCondMask) | cond; | 3795 instr = (instr & ~kCondMask) | cond; |
3797 masm_.emit(instr); | 3796 masm_.emit(instr); |
3798 } | 3797 } |
3799 | 3798 |
3800 | 3799 |
3801 } } // namespace v8::internal | 3800 } } // namespace v8::internal |
3802 | 3801 |
3803 #endif // V8_TARGET_ARCH_ARM | 3802 #endif // V8_TARGET_ARCH_ARM |
OLD | NEW |