OLD | NEW |
1 // Copyright (c) 1994-2006 Sun Microsystems Inc. | 1 // Copyright (c) 1994-2006 Sun Microsystems Inc. |
2 // All Rights Reserved. | 2 // All Rights Reserved. |
3 // | 3 // |
4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
5 // modification, are permitted provided that the following conditions | 5 // modification, are permitted provided that the following conditions |
6 // are met: | 6 // are met: |
7 // | 7 // |
8 // - Redistributions of source code must retain the above copyright notice, | 8 // - Redistributions of source code must retain the above copyright notice, |
9 // this list of conditions and the following disclaimer. | 9 // this list of conditions and the following disclaimer. |
10 // | 10 // |
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 } | 393 } |
394 | 394 |
395 | 395 |
396 void Assembler::deserialization_set_target_internal_reference_at( | 396 void Assembler::deserialization_set_target_internal_reference_at( |
397 Isolate* isolate, Address pc, Address target, RelocInfo::Mode mode) { | 397 Isolate* isolate, Address pc, Address target, RelocInfo::Mode mode) { |
398 Memory::Address_at(pc) = target; | 398 Memory::Address_at(pc) = target; |
399 } | 399 } |
400 | 400 |
401 | 401 |
402 bool Assembler::is_constant_pool_load(Address pc) { | 402 bool Assembler::is_constant_pool_load(Address pc) { |
403 return IsLdrPcImmediateOffset(Memory::int32_at(pc)); | 403 if (CpuFeatures::IsSupported(ARMv7)) { |
| 404 return !Assembler::IsMovW(Memory::int32_at(pc)); |
| 405 } else { |
| 406 return !Assembler::IsMovImmed(Memory::int32_at(pc)); |
| 407 } |
404 } | 408 } |
405 | 409 |
406 | 410 |
407 Address Assembler::constant_pool_entry_address(Address pc, | 411 Address Assembler::constant_pool_entry_address(Address pc, |
408 Address constant_pool) { | 412 Address constant_pool) { |
409 DCHECK(Assembler::IsLdrPcImmediateOffset(Memory::int32_at(pc))); | 413 DCHECK(Assembler::IsLdrPcImmediateOffset(Memory::int32_at(pc))); |
410 Instr instr = Memory::int32_at(pc); | 414 Instr instr = Memory::int32_at(pc); |
411 return pc + GetLdrRegisterImmediateOffset(instr) + kPcLoadDelta; | 415 return pc + GetLdrRegisterImmediateOffset(instr) + kPcLoadDelta; |
412 } | 416 } |
413 | 417 |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 Address constant_pool = code ? code->constant_pool() : NULL; | 510 Address constant_pool = code ? code->constant_pool() : NULL; |
507 set_target_address_at(isolate, pc, constant_pool, target, icache_flush_mode); | 511 set_target_address_at(isolate, pc, constant_pool, target, icache_flush_mode); |
508 } | 512 } |
509 | 513 |
510 EnsureSpace::EnsureSpace(Assembler* assembler) { assembler->CheckBuffer(); } | 514 EnsureSpace::EnsureSpace(Assembler* assembler) { assembler->CheckBuffer(); } |
511 | 515 |
512 } // namespace internal | 516 } // namespace internal |
513 } // namespace v8 | 517 } // namespace v8 |
514 | 518 |
515 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ | 519 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ |
OLD | NEW |