| 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 default: | 274 default: |
| 275 out.AddFormatted("minor: %d", minor_key); | 275 out.AddFormatted("minor: %d", minor_key); |
| 276 } | 276 } |
| 277 } | 277 } |
| 278 } else { | 278 } else { |
| 279 out.AddFormatted(" %s", Code::Kind2String(kind)); | 279 out.AddFormatted(" %s", Code::Kind2String(kind)); |
| 280 } | 280 } |
| 281 if (rmode == RelocInfo::CODE_TARGET_WITH_ID) { | 281 if (rmode == RelocInfo::CODE_TARGET_WITH_ID) { |
| 282 out.AddFormatted(" (id = %d)", static_cast<int>(relocinfo.data())); | 282 out.AddFormatted(" (id = %d)", static_cast<int>(relocinfo.data())); |
| 283 } | 283 } |
| 284 } else if (rmode == RelocInfo::RUNTIME_ENTRY && | 284 } else if ((rmode == RelocInfo::RUNTIME_ENTRY || |
| 285 rmode == RelocInfo::EXTERNAL_REFERENCE) && |
| 285 Isolate::Current()->deoptimizer_data() != NULL) { | 286 Isolate::Current()->deoptimizer_data() != NULL) { |
| 286 // A runtime entry reloinfo might be a deoptimization bailout. | 287 // A runtime entry reloinfo might be a deoptimization bailout. |
| 287 Address addr = relocinfo.target_address(); | 288 Address addr = relocinfo.target_address(); |
| 288 int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER); | 289 int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER); |
| 289 if (id == Deoptimizer::kNotDeoptimizationEntry) { | 290 if (id == Deoptimizer::kNotDeoptimizationEntry) { |
| 290 id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::LAZY); | 291 id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::LAZY); |
| 291 if (id == Deoptimizer::kNotDeoptimizationEntry) { | 292 if (id == Deoptimizer::kNotDeoptimizationEntry) { |
| 292 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); | 293 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); |
| 293 } else { | 294 } else { |
| 294 out.AddFormatted(" ;; lazy deoptimization bailout %d", id); | 295 out.AddFormatted(" ;; lazy deoptimization bailout %d", id); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 | 346 |
| 346 #else // ENABLE_DISASSEMBLER | 347 #else // ENABLE_DISASSEMBLER |
| 347 | 348 |
| 348 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {} | 349 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {} |
| 349 int Disassembler::Decode(FILE* f, byte* begin, byte* end) { return 0; } | 350 int Disassembler::Decode(FILE* f, byte* begin, byte* end) { return 0; } |
| 350 void Disassembler::Decode(FILE* f, Code* code) {} | 351 void Disassembler::Decode(FILE* f, Code* code) {} |
| 351 | 352 |
| 352 #endif // ENABLE_DISASSEMBLER | 353 #endif // ENABLE_DISASSEMBLER |
| 353 | 354 |
| 354 } } // namespace v8::internal | 355 } } // namespace v8::internal |
| OLD | NEW |