| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "src/disassembler.h" | 5 #include "src/disassembler.h" |
| 6 | 6 |
| 7 #include "src/code-stubs.h" | 7 #include "src/code-stubs.h" |
| 8 #include "src/codegen.h" | 8 #include "src/codegen.h" |
| 9 #include "src/debug/debug.h" | 9 #include "src/debug/debug.h" |
| 10 #include "src/deoptimizer.h" | 10 #include "src/deoptimizer.h" |
| 11 #include "src/disasm.h" | 11 #include "src/disasm.h" |
| 12 #include "src/ic/ic.h" |
| 12 #include "src/macro-assembler.h" | 13 #include "src/macro-assembler.h" |
| 13 #include "src/snapshot/serializer-common.h" | 14 #include "src/snapshot/serializer-common.h" |
| 14 #include "src/string-stream.h" | 15 #include "src/string-stream.h" |
| 15 | 16 |
| 16 namespace v8 { | 17 namespace v8 { |
| 17 namespace internal { | 18 namespace internal { |
| 18 | 19 |
| 19 #ifdef ENABLE_DISASSEMBLER | 20 #ifdef ENABLE_DISASSEMBLER |
| 20 | 21 |
| 21 class V8NameConverter: public disasm::NameConverter { | 22 class V8NameConverter: public disasm::NameConverter { |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 } else if (RelocInfo::IsCodeTarget(rmode)) { | 199 } else if (RelocInfo::IsCodeTarget(rmode)) { |
| 199 out.AddFormatted(" ;; code:"); | 200 out.AddFormatted(" ;; code:"); |
| 200 Code* code = Code::GetCodeFromTargetAddress(relocinfo.target_address()); | 201 Code* code = Code::GetCodeFromTargetAddress(relocinfo.target_address()); |
| 201 Code::Kind kind = code->kind(); | 202 Code::Kind kind = code->kind(); |
| 202 if (code->is_inline_cache_stub()) { | 203 if (code->is_inline_cache_stub()) { |
| 203 if (kind == Code::LOAD_IC && | 204 if (kind == Code::LOAD_IC && |
| 204 LoadICState::GetTypeofMode(code->extra_ic_state()) == | 205 LoadICState::GetTypeofMode(code->extra_ic_state()) == |
| 205 NOT_INSIDE_TYPEOF) { | 206 NOT_INSIDE_TYPEOF) { |
| 206 out.AddFormatted(" contextual,"); | 207 out.AddFormatted(" contextual,"); |
| 207 } | 208 } |
| 208 InlineCacheState ic_state = code->ic_state(); | 209 out.AddFormatted(" %s", Code::Kind2String(kind)); |
| 209 out.AddFormatted(" %s, %s", Code::Kind2String(kind), | 210 if (!IC::ICUseVector(kind)) { |
| 210 Code::ICState2String(ic_state)); | 211 InlineCacheState ic_state = IC::StateFromCode(code); |
| 212 out.AddFormatted(" %s", Code::ICState2String(ic_state)); |
| 213 } |
| 211 } else if (kind == Code::STUB || kind == Code::HANDLER) { | 214 } else if (kind == Code::STUB || kind == Code::HANDLER) { |
| 212 // Get the STUB key and extract major and minor key. | 215 // Get the STUB key and extract major and minor key. |
| 213 uint32_t key = code->stub_key(); | 216 uint32_t key = code->stub_key(); |
| 214 uint32_t minor_key = CodeStub::MinorKeyFromKey(key); | 217 uint32_t minor_key = CodeStub::MinorKeyFromKey(key); |
| 215 CodeStub::Major major_key = CodeStub::GetMajorKey(code); | 218 CodeStub::Major major_key = CodeStub::GetMajorKey(code); |
| 216 DCHECK(major_key == CodeStub::MajorKeyFromKey(key)); | 219 DCHECK(major_key == CodeStub::MajorKeyFromKey(key)); |
| 217 out.AddFormatted(" %s, %s, ", Code::Kind2String(kind), | 220 out.AddFormatted(" %s, %s, ", Code::Kind2String(kind), |
| 218 CodeStub::MajorName(major_key)); | 221 CodeStub::MajorName(major_key)); |
| 219 out.AddFormatted("minor: %d", minor_key); | 222 out.AddFormatted("minor: %d", minor_key); |
| 220 } else { | 223 } else { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 | 285 |
| 283 int Disassembler::Decode(Isolate* isolate, std::ostream* os, byte* begin, | 286 int Disassembler::Decode(Isolate* isolate, std::ostream* os, byte* begin, |
| 284 byte* end, Code* code) { | 287 byte* end, Code* code) { |
| 285 return 0; | 288 return 0; |
| 286 } | 289 } |
| 287 | 290 |
| 288 #endif // ENABLE_DISASSEMBLER | 291 #endif // ENABLE_DISASSEMBLER |
| 289 | 292 |
| 290 } // namespace internal | 293 } // namespace internal |
| 291 } // namespace v8 | 294 } // namespace v8 |
| OLD | NEW |