Chromium Code Reviews| Index: src/arm/disasm-arm.cc |
| diff --git a/src/arm/disasm-arm.cc b/src/arm/disasm-arm.cc |
| index f154839c762bac3155970a343a92e82078f23cc4..5f8694f5e22833cd798958058698177c0ab5309f 100644 |
| --- a/src/arm/disasm-arm.cc |
| +++ b/src/arm/disasm-arm.cc |
| @@ -899,6 +899,7 @@ void Decoder::DecodeType2(Instruction* instr) { |
| case da_x: { |
| if (instr->HasW()) { |
| Unknown(instr); // not used in V8 |
| + return; |
| } |
| Format(instr, "'memop'cond'b 'rd, ['rn], #-'off12"); |
| break; |
| @@ -906,6 +907,7 @@ void Decoder::DecodeType2(Instruction* instr) { |
| case ia_x: { |
| if (instr->HasW()) { |
| Unknown(instr); // not used in V8 |
| + return; |
| } |
| Format(instr, "'memop'cond'b 'rd, ['rn], #+'off12"); |
| break; |
| @@ -992,11 +994,15 @@ void Decoder::DecodeType3(Instruction* instr) { |
| void Decoder::DecodeType4(Instruction* instr) { |
| - ASSERT(instr->Bit(22) == 0); // Privileged mode currently not supported. |
| - if (instr->HasL()) { |
| - Format(instr, "ldm'cond'pu 'rn'w, 'rlist"); |
| + if (instr->Bit(22) != 0) { |
| + // Privileged mode currently not supported. |
| + Unknown(instr); |
| } else { |
| - Format(instr, "stm'cond'pu 'rn'w, 'rlist"); |
| + if (instr->HasL()) { |
| + Format(instr, "ldm'cond'pu 'rn'w, 'rlist"); |
| + } else { |
| + Format(instr, "stm'cond'pu 'rn'w, 'rlist"); |
| + } |
| } |
| } |
| @@ -1042,6 +1048,8 @@ int Decoder::DecodeType7(Instruction* instr) { |
| // vmov: Rt = Sn |
| // vcvt: Dd = Sm |
| // vcvt: Sd = Dm |
| +// Dd = vabs(Dm) |
| +// Dd = vneg(Dm) |
| // Dd = vadd(Dn, Dm) |
| // Dd = vsub(Dn, Dm) |
| // Dd = vmul(Dn, Dm) |
| @@ -1297,7 +1305,7 @@ void Decoder::DecodeType6CoprocessorIns(Instruction* instr) { |
| break; |
| } |
| } else { |
| - UNIMPLEMENTED(); // Not used by V8. |
| + Unknown(instr); // Not used by V8. |
| } |
| } |
| @@ -1310,7 +1318,12 @@ int Decoder::InstructionDecode(byte* instr_ptr) { |
| "%08x ", |
| instr->InstructionBits()); |
| if (instr->ConditionField() == kSpecialCondition) { |
| - UNIMPLEMENTED(); |
| + Unknown(instr); |
| + return Instruction::kInstrSize; |
| + } |
| + int instruction_bits = *(reinterpret_cast<int*>(instr_ptr)); |
| + if ((instruction_bits & 0xfff00000) == 0x03000000) { |
| + Format(instr, "constant pool begin"); |
|
Søren Thygesen Gjesse
2011/03/16 22:28:42
Maybe print the constant pool size which is encode
Karl Klose
2011/03/17 10:10:07
Done.
|
| return Instruction::kInstrSize; |
| } |
| switch (instr->TypeValue()) { |