Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Unified Diff: runtime/vm/disassembler_arm64.cc

Issue 2974233002: VM: Re-format to use at most one newline between functions (Closed)
Patch Set: Rebase and merge Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/disassembler_arm.cc ('k') | runtime/vm/disassembler_dbc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/disassembler_arm64.cc
diff --git a/runtime/vm/disassembler_arm64.cc b/runtime/vm/disassembler_arm64.cc
index f397db087bd0edfb84f99604eb24db5ec40f305b..17baa0ee0b02d256158b2b3aeb1d5918ce2db39e 100644
--- a/runtime/vm/disassembler_arm64.cc
+++ b/runtime/vm/disassembler_arm64.cc
@@ -51,7 +51,6 @@ class ARM64Decoder : public ValueObject {
APPLY_OP_LIST(DECODE_OP)
#undef DECODE_OP
-
// Convenience functions.
char* get_buffer() const { return buffer_; }
char* current_position_in_buffer() { return buffer_ + buffer_pos_; }
@@ -65,12 +64,10 @@ class ARM64Decoder : public ValueObject {
DISALLOW_COPY_AND_ASSIGN(ARM64Decoder);
};
-
// Support for assertions in the ARM64Decoder formatting functions.
#define STRING_STARTS_WITH(string, compare_string) \
(strncmp(string, compare_string, strlen(compare_string)) == 0)
-
// Append the str to the output buffer.
void ARM64Decoder::Print(const char* str) {
char cur = *str++;
@@ -81,7 +78,6 @@ void ARM64Decoder::Print(const char* str) {
buffer_[buffer_pos_] = '\0';
}
-
// These register names are defined in a way to match the native disassembler
// formatting, except for register aliases ctx (r9), pp (r10) and sp (r19).
// See for example the command "objdump -d <binary file>".
@@ -91,7 +87,6 @@ static const char* reg_names[kNumberOfCpuRegisters] = {
"r22", "r23", "r24", "r25", "thr", "pp", "ctx", "fp", "lr", "r31",
};
-
// Print the register name according to the active name converter.
void ARM64Decoder::PrintRegister(int reg, R31Type r31t) {
ASSERT(0 <= reg);
@@ -104,7 +99,6 @@ void ARM64Decoder::PrintRegister(int reg, R31Type r31t) {
}
}
-
void ARM64Decoder::PrintVRegister(int reg) {
ASSERT(0 <= reg);
ASSERT(reg < kNumberOfVRegisters);
@@ -112,17 +106,14 @@ void ARM64Decoder::PrintVRegister(int reg) {
remaining_size_in_buffer(), "v%d", reg);
}
-
// These shift names are defined in a way to match the native disassembler
// formatting. See for example the command "objdump -d <binary file>".
static const char* shift_names[kMaxShift] = {"lsl", "lsr", "asr", "ror"};
-
static const char* extend_names[kMaxExtend] = {
"uxtb", "uxth", "uxtw", "uxtx", "sxtb", "sxth", "sxtw", "sxtx",
};
-
// These condition names are defined in a way to match the native disassembler
// formatting. See for example the command "objdump -d <binary file>".
static const char* cond_names[kNumberOfConditions] = {
@@ -130,7 +121,6 @@ static const char* cond_names[kNumberOfConditions] = {
"hi", "ls", "ge", "lt", "gt", "le", "", "invalid",
};
-
// Print the condition guarding the instruction.
void ARM64Decoder::PrintCondition(Instr* instr) {
if (instr->IsConditionalSelectOp()) {
@@ -140,7 +130,6 @@ void ARM64Decoder::PrintCondition(Instr* instr) {
}
}
-
// Print the register shift operands for the instruction. Generally used for
// data processing instructions.
void ARM64Decoder::PrintShiftExtendRm(Instr* instr) {
@@ -183,7 +172,6 @@ void ARM64Decoder::PrintShiftExtendRm(Instr* instr) {
}
}
-
void ARM64Decoder::PrintMemOperand(Instr* instr) {
const Register rn = instr->RnField();
if (instr->Bit(24) == 1) {
@@ -252,7 +240,6 @@ void ARM64Decoder::PrintMemOperand(Instr* instr) {
}
}
-
void ARM64Decoder::PrintPairMemOperand(Instr* instr) {
const Register rn = instr->RnField();
const int32_t simm7 = instr->SImm7Field();
@@ -283,7 +270,6 @@ void ARM64Decoder::PrintPairMemOperand(Instr* instr) {
}
}
-
// Handle all register based formatting in these functions to reduce the
// complexity of FormatOption.
int ARM64Decoder::FormatRegister(Instr* instr, const char* format) {
@@ -317,7 +303,6 @@ int ARM64Decoder::FormatRegister(Instr* instr, const char* format) {
return -1;
}
-
int ARM64Decoder::FormatVRegister(Instr* instr, const char* format) {
ASSERT(format[0] == 'v');
if (format[1] == 'd') {
@@ -341,7 +326,6 @@ int ARM64Decoder::FormatVRegister(Instr* instr, const char* format) {
return -1;
}
-
// FormatOption takes a formatting string and interprets it based on
// the current instructions. The format string points to the first
// character of the option string (the option escape has already been
@@ -639,7 +623,6 @@ int ARM64Decoder::FormatOption(Instr* instr, const char* format) {
return -1;
}
-
// Format takes a formatting string for a whole instruction and prints it into
// the output buffer. All escaped options are handed to FormatOption to be
// parsed further.
@@ -656,14 +639,12 @@ void ARM64Decoder::Format(Instr* instr, const char* format) {
buffer_[buffer_pos_] = '\0';
}
-
// For currently unimplemented decodings the disassembler calls Unknown(instr)
// which will just print "unknown" of the instruction bits.
void ARM64Decoder::Unknown(Instr* instr) {
Format(instr, "unknown");
}
-
void ARM64Decoder::DecodeMoveWide(Instr* instr) {
switch (instr->Bits(29, 2)) {
case 0:
@@ -681,7 +662,6 @@ void ARM64Decoder::DecodeMoveWide(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLoadStoreReg(Instr* instr) {
if (instr->Bit(26) == 1) {
// SIMD or FP src/dst.
@@ -700,7 +680,6 @@ void ARM64Decoder::DecodeLoadStoreReg(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLoadStoreRegPair(Instr* instr) {
if (instr->Bit(22) == 1) {
// Load.
@@ -711,7 +690,6 @@ void ARM64Decoder::DecodeLoadStoreRegPair(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLoadRegLiteral(Instr* instr) {
if ((instr->Bit(31) != 0) || (instr->Bit(29) != 0) ||
(instr->Bits(24, 3) != 0)) {
@@ -724,7 +702,6 @@ void ARM64Decoder::DecodeLoadRegLiteral(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLoadStoreExclusive(Instr* instr) {
if ((instr->Bit(23) != 0) || (instr->Bit(21) != 0) || (instr->Bit(15) != 0)) {
Unknown(instr);
@@ -742,7 +719,6 @@ void ARM64Decoder::DecodeLoadStoreExclusive(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeAddSubImm(Instr* instr) {
switch (instr->Bit(30)) {
case 0: {
@@ -772,7 +748,6 @@ void ARM64Decoder::DecodeAddSubImm(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLogicalImm(Instr* instr) {
int op = instr->Bits(29, 2);
switch (op) {
@@ -799,7 +774,6 @@ void ARM64Decoder::DecodeLogicalImm(Instr* instr) {
}
}
-
void ARM64Decoder::DecodePCRel(Instr* instr) {
const int op = instr->Bit(31);
if (op == 0) {
@@ -809,7 +783,6 @@ void ARM64Decoder::DecodePCRel(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeDPImmediate(Instr* instr) {
if (instr->IsMoveWideOp()) {
DecodeMoveWide(instr);
@@ -824,7 +797,6 @@ void ARM64Decoder::DecodeDPImmediate(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeExceptionGen(Instr* instr) {
if ((instr->Bits(0, 2) == 1) && (instr->Bits(2, 3) == 0) &&
(instr->Bits(21, 3) == 0)) {
@@ -847,7 +819,6 @@ void ARM64Decoder::DecodeExceptionGen(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeSystem(Instr* instr) {
if (instr->InstructionBits() == CLREX) {
Format(instr, "clrex");
@@ -867,7 +838,6 @@ void ARM64Decoder::DecodeSystem(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeUnconditionalBranchReg(Instr* instr) {
if ((instr->Bits(0, 5) == 0) && (instr->Bits(10, 5) == 0) &&
(instr->Bits(16, 5) == 0x1f)) {
@@ -888,7 +858,6 @@ void ARM64Decoder::DecodeUnconditionalBranchReg(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeCompareAndBranch(Instr* instr) {
const int op = instr->Bit(24);
if (op == 0) {
@@ -898,7 +867,6 @@ void ARM64Decoder::DecodeCompareAndBranch(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeConditionalBranch(Instr* instr) {
if ((instr->Bit(24) != 0) || (instr->Bit(4) != 0)) {
Unknown(instr);
@@ -907,7 +875,6 @@ void ARM64Decoder::DecodeConditionalBranch(Instr* instr) {
Format(instr, "b'cond 'dest19");
}
-
void ARM64Decoder::DecodeTestAndBranch(Instr* instr) {
const int op = instr->Bit(24);
if (op == 0) {
@@ -917,7 +884,6 @@ void ARM64Decoder::DecodeTestAndBranch(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeUnconditionalBranch(Instr* instr) {
const int op = instr->Bit(31);
if (op == 0) {
@@ -947,7 +913,6 @@ void ARM64Decoder::DecodeCompareBranch(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLoadStore(Instr* instr) {
if (instr->IsLoadStoreRegOp()) {
DecodeLoadStoreReg(instr);
@@ -962,7 +927,6 @@ void ARM64Decoder::DecodeLoadStore(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeAddSubShiftExt(Instr* instr) {
switch (instr->Bit(30)) {
case 0: {
@@ -987,7 +951,6 @@ void ARM64Decoder::DecodeAddSubShiftExt(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeAddSubWithCarry(Instr* instr) {
switch (instr->Bit(30)) {
case 0: {
@@ -1004,7 +967,6 @@ void ARM64Decoder::DecodeAddSubWithCarry(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeLogicalShift(Instr* instr) {
const int op = (instr->Bits(29, 2) << 1) | instr->Bit(21);
switch (op) {
@@ -1044,7 +1006,6 @@ void ARM64Decoder::DecodeLogicalShift(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeMiscDP1Source(Instr* instr) {
if (instr->Bit(29) != 0) {
Unknown(instr);
@@ -1061,7 +1022,6 @@ void ARM64Decoder::DecodeMiscDP1Source(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeMiscDP2Source(Instr* instr) {
if (instr->Bit(29) != 0) {
Unknown(instr);
@@ -1090,7 +1050,6 @@ void ARM64Decoder::DecodeMiscDP2Source(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeMiscDP3Source(Instr* instr) {
if ((instr->Bits(29, 2) == 0) && (instr->Bits(21, 3) == 0) &&
(instr->Bit(15) == 0)) {
@@ -1116,7 +1075,6 @@ void ARM64Decoder::DecodeMiscDP3Source(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeConditionalSelect(Instr* instr) {
if ((instr->Bits(29, 2) == 0) && (instr->Bits(10, 2) == 0)) {
Format(instr, "mov'sf'cond 'rd, 'rn, 'rm");
@@ -1129,7 +1087,6 @@ void ARM64Decoder::DecodeConditionalSelect(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeDPRegister(Instr* instr) {
if (instr->IsAddSubShiftExtOp()) {
DecodeAddSubShiftExt(instr);
@@ -1150,7 +1107,6 @@ void ARM64Decoder::DecodeDPRegister(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeSIMDCopy(Instr* instr) {
const int32_t Q = instr->Bit(30);
const int32_t op = instr->Bit(29);
@@ -1175,7 +1131,6 @@ void ARM64Decoder::DecodeSIMDCopy(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeSIMDThreeSame(Instr* instr) {
const int32_t Q = instr->Bit(30);
const int32_t U = instr->Bit(29);
@@ -1233,7 +1188,6 @@ void ARM64Decoder::DecodeSIMDThreeSame(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeSIMDTwoReg(Instr* instr) {
const int32_t Q = instr->Bit(30);
const int32_t U = instr->Bit(29);
@@ -1288,7 +1242,6 @@ void ARM64Decoder::DecodeSIMDTwoReg(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeDPSimd1(Instr* instr) {
if (instr->IsSIMDCopyOp()) {
DecodeSIMDCopy(instr);
@@ -1301,7 +1254,6 @@ void ARM64Decoder::DecodeDPSimd1(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeFPImm(Instr* instr) {
if ((instr->Bit(31) != 0) || (instr->Bit(29) != 0) || (instr->Bit(23) != 0) ||
(instr->Bits(5, 5) != 0)) {
@@ -1317,7 +1269,6 @@ void ARM64Decoder::DecodeFPImm(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeFPIntCvt(Instr* instr) {
if ((instr->Bit(29) != 0)) {
Unknown(instr);
@@ -1349,7 +1300,6 @@ void ARM64Decoder::DecodeFPIntCvt(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeFPOneSource(Instr* instr) {
const int opc = instr->Bits(15, 6);
@@ -1385,7 +1335,6 @@ void ARM64Decoder::DecodeFPOneSource(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeFPTwoSource(Instr* instr) {
if (instr->Bits(22, 2) != 1) {
Unknown(instr);
@@ -1412,7 +1361,6 @@ void ARM64Decoder::DecodeFPTwoSource(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeFPCompare(Instr* instr) {
if ((instr->Bit(22) == 1) && (instr->Bits(3, 2) == 0)) {
Format(instr, "fcmpd 'vn, 'vm");
@@ -1427,7 +1375,6 @@ void ARM64Decoder::DecodeFPCompare(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeFP(Instr* instr) {
if (instr->IsFPImmOp()) {
DecodeFPImm(instr);
@@ -1444,7 +1391,6 @@ void ARM64Decoder::DecodeFP(Instr* instr) {
}
}
-
void ARM64Decoder::DecodeDPSimd2(Instr* instr) {
if (instr->IsFPOp()) {
DecodeFP(instr);
@@ -1453,7 +1399,6 @@ void ARM64Decoder::DecodeDPSimd2(Instr* instr) {
}
}
-
void ARM64Decoder::InstructionDecode(uword pc) {
Instr* instr = Instr::At(pc);
@@ -1474,7 +1419,6 @@ void ARM64Decoder::InstructionDecode(uword pc) {
}
}
-
void Disassembler::DecodeInstruction(char* hex_buffer,
intptr_t hex_size,
char* human_buffer,
« no previous file with comments | « runtime/vm/disassembler_arm.cc ('k') | runtime/vm/disassembler_dbc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698