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 are | 5 // modification, are permitted provided that the following conditions are |
6 // met: | 6 // 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 if (obj->IsHeapObject()) { | 328 if (obj->IsHeapObject()) { |
329 emit(reinterpret_cast<intptr_t>(handle.location()), | 329 emit(reinterpret_cast<intptr_t>(handle.location()), |
330 RelocInfo::EMBEDDED_OBJECT); | 330 RelocInfo::EMBEDDED_OBJECT); |
331 } else { | 331 } else { |
332 // no relocation needed | 332 // no relocation needed |
333 emit(reinterpret_cast<intptr_t>(obj)); | 333 emit(reinterpret_cast<intptr_t>(obj)); |
334 } | 334 } |
335 } | 335 } |
336 | 336 |
337 | 337 |
338 void Assembler::emit(uint32_t x, RelocInfo::Mode rmode, unsigned id) { | 338 void Assembler::emit(uint32_t x, RelocInfo::Mode rmode, TypeFeedbackId id) { |
339 if (rmode == RelocInfo::CODE_TARGET && id != kNoASTId) { | 339 if (rmode == RelocInfo::CODE_TARGET && !id.IsNone()) { |
340 RecordRelocInfo(RelocInfo::CODE_TARGET_WITH_ID, static_cast<intptr_t>(id)); | 340 RecordRelocInfo(RelocInfo::CODE_TARGET_WITH_ID, id.ToInt()); |
341 } else if (rmode != RelocInfo::NONE) { | 341 } else if (rmode != RelocInfo::NONE) { |
342 RecordRelocInfo(rmode); | 342 RecordRelocInfo(rmode); |
343 } | 343 } |
344 emit(x); | 344 emit(x); |
345 } | 345 } |
346 | 346 |
347 | 347 |
348 void Assembler::emit(const Immediate& x) { | 348 void Assembler::emit(const Immediate& x) { |
349 if (x.rmode_ == RelocInfo::INTERNAL_REFERENCE) { | 349 if (x.rmode_ == RelocInfo::INTERNAL_REFERENCE) { |
350 Label* label = reinterpret_cast<Label*>(x.x_); | 350 Label* label = reinterpret_cast<Label*>(x.x_); |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 | 461 |
462 Operand::Operand(int32_t disp, RelocInfo::Mode rmode) { | 462 Operand::Operand(int32_t disp, RelocInfo::Mode rmode) { |
463 // [disp/r] | 463 // [disp/r] |
464 set_modrm(0, ebp); | 464 set_modrm(0, ebp); |
465 set_dispr(disp, rmode); | 465 set_dispr(disp, rmode); |
466 } | 466 } |
467 | 467 |
468 } } // namespace v8::internal | 468 } } // namespace v8::internal |
469 | 469 |
470 #endif // V8_IA32_ASSEMBLER_IA32_INL_H_ | 470 #endif // V8_IA32_ASSEMBLER_IA32_INL_H_ |
OLD | NEW |