| Index: runtime/vm/disassembler_dbc.cc
|
| diff --git a/runtime/vm/disassembler_dbc.cc b/runtime/vm/disassembler_dbc.cc
|
| index 3759bb97d20eca73872e1277997e623a7883c1bc..e12fdf330e2f41c90f5e623f7fc7743f1543d86e 100644
|
| --- a/runtime/vm/disassembler_dbc.cc
|
| +++ b/runtime/vm/disassembler_dbc.cc
|
| @@ -29,7 +29,6 @@ typedef void (*BytecodeFormatter)(char* buffer,
|
| uint32_t bc);
|
| typedef void (*Fmt)(char** buf, intptr_t* size, uword pc, int32_t value);
|
|
|
| -
|
| template <typename ValueType>
|
| void FormatOperand(char** buf,
|
| intptr_t* size,
|
| @@ -44,25 +43,20 @@ void FormatOperand(char** buf,
|
| }
|
| }
|
|
|
| -
|
| static void Fmt___(char** buf, intptr_t* size, uword pc, int32_t value) {}
|
|
|
| -
|
| static void Fmttgt(char** buf, intptr_t* size, uword pc, int32_t value) {
|
| FormatOperand(buf, size, "-> %" Px, pc + (value << 2));
|
| }
|
|
|
| -
|
| static void Fmtlit(char** buf, intptr_t* size, uword pc, int32_t value) {
|
| FormatOperand(buf, size, "k%d", value);
|
| }
|
|
|
| -
|
| static void Fmtreg(char** buf, intptr_t* size, uword pc, int32_t value) {
|
| FormatOperand(buf, size, "r%d", value);
|
| }
|
|
|
| -
|
| static void Fmtxeg(char** buf, intptr_t* size, uword pc, int32_t value) {
|
| if (value < 0) {
|
| FormatOperand(buf, size, "FP[%d]", value);
|
| @@ -71,12 +65,10 @@ static void Fmtxeg(char** buf, intptr_t* size, uword pc, int32_t value) {
|
| }
|
| }
|
|
|
| -
|
| static void Fmtnum(char** buf, intptr_t* size, uword pc, int32_t value) {
|
| FormatOperand(buf, size, "#%d", value);
|
| }
|
|
|
| -
|
| static void Apply(char** buf,
|
| intptr_t* size,
|
| uword pc,
|
| @@ -93,7 +85,6 @@ static void Apply(char** buf,
|
| }
|
| }
|
|
|
| -
|
| static void Format0(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -102,7 +93,6 @@ static void Format0(char* buf,
|
| Fmt op2,
|
| Fmt op3) {}
|
|
|
| -
|
| static void FormatT(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -114,7 +104,6 @@ static void FormatT(char* buf,
|
| Apply(&buf, &size, pc, op1, x, "");
|
| }
|
|
|
| -
|
| static void FormatA(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -126,7 +115,6 @@ static void FormatA(char* buf,
|
| Apply(&buf, &size, pc, op1, a, "");
|
| }
|
|
|
| -
|
| static void FormatA_D(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -140,7 +128,6 @@ static void FormatA_D(char* buf,
|
| Apply(&buf, &size, pc, op2, bc, "");
|
| }
|
|
|
| -
|
| static void FormatA_X(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -154,7 +141,6 @@ static void FormatA_X(char* buf,
|
| Apply(&buf, &size, pc, op2, bc, "");
|
| }
|
|
|
| -
|
| static void FormatX(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -166,7 +152,6 @@ static void FormatX(char* buf,
|
| Apply(&buf, &size, pc, op1, bc, "");
|
| }
|
|
|
| -
|
| static void FormatD(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -178,7 +163,6 @@ static void FormatD(char* buf,
|
| Apply(&buf, &size, pc, op1, bc, "");
|
| }
|
|
|
| -
|
| static void FormatA_B_C(char* buf,
|
| intptr_t size,
|
| uword pc,
|
| @@ -194,7 +178,6 @@ static void FormatA_B_C(char* buf,
|
| Apply(&buf, &size, pc, op3, c, "");
|
| }
|
|
|
| -
|
| #define BYTECODE_FORMATTER(name, encoding, op1, op2, op3) \
|
| static void Format##name(char* buf, intptr_t size, uword pc, uint32_t op) { \
|
| Format##encoding(buf, size, pc, op, Fmt##op1, Fmt##op2, Fmt##op3); \
|
| @@ -202,14 +185,12 @@ static void FormatA_B_C(char* buf,
|
| BYTECODES_LIST(BYTECODE_FORMATTER)
|
| #undef BYTECODE_FORMATTER
|
|
|
| -
|
| static const BytecodeFormatter kFormatters[] = {
|
| #define BYTECODE_FORMATTER(name, encoding, op1, op2, op3) &Format##name,
|
| BYTECODES_LIST(BYTECODE_FORMATTER)
|
| #undef BYTECODE_FORMATTER
|
| };
|
|
|
| -
|
| void Disassembler::DecodeInstruction(char* hex_buffer,
|
| intptr_t hex_size,
|
| char* human_buffer,
|
| @@ -242,7 +223,6 @@ void Disassembler::DecodeInstruction(char* hex_buffer,
|
| }
|
| }
|
|
|
| -
|
| } // namespace dart
|
|
|
| #endif // defined TARGET_ARCH_DBC
|
|
|