Adds ldr and str to arm64.

runtime/vm/disassembler_arm64.cc

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/disassembler.h"
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM64.
 #if defined(TARGET_ARCH_ARM64)
 #include "platform/assert.h"
 
@@ skipping 14 matching lines @@
   // Returns true if the instruction was successfully decoded, false otherwise.
   void InstructionDecode(uword pc);
 
  private:
   // Bottleneck functions to print into the out_buffer.
   void Print(const char* str);
 
   // Printing of common values.
   void PrintRegister(int reg, R31Type r31t);
   void PrintShiftExtendRm(Instr* instr);
+  void PrintMemOperand(Instr* instr);
   void PrintS(Instr* instr);
 
   // Handle formatting of instructions and their options.
   int FormatRegister(Instr* instr, const char* option);
   int FormatOption(Instr* instr, const char* format);
   void Format(Instr* instr, const char* format);
   void Unknown(Instr* instr);
 
   // Decode instructions.
   #define DECODE_OP(op)                                                        \
@@ skipping 109 matching lines @@
       // Shift amount.
       buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
                                  remaining_size_in_buffer(),
                                  " %d",
                                  extend_shift_amount);
     }
   }
 }
 
 
+void ARM64Decoder::PrintMemOperand(Instr* instr) {
+  const Register rn = instr->RnField();
+  if (instr->Bit(24) == 1) {
+    // rn + scaled unsigned 12-bit immediate offset.
+    const uint32_t scale = instr->SzField();
+    const uint32_t imm12 = instr->Imm12Field();
+    const uint32_t off = imm12 << scale;
+    Print("[");
+    PrintRegister(rn, R31IsSP);
+    if (off != 0) {
+      buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
+                                 remaining_size_in_buffer(),
+                                 ", #%d",
+                                 off);
+    }
+    Print("]");
+  } else {
+    switch (instr->Bits(10, 2)) {
+      case 1: {
+        const int32_t imm9 = instr->SImm9Field();
+        // rn + signed 9-bit immediate, post-index, writeback.
+        Print("[");
+        PrintRegister(rn, R31IsSP);
+        Print("]");
+        buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
+                                   remaining_size_in_buffer(),
+                                   ", #%d !",
+                                   imm9);
+        break;
+      }
+      case 3: {
+        const int32_t imm9 = instr->SImm9Field();
+        // rn + signed 9-bit immediate, pre-index, writeback.
+        Print("[");
+        PrintRegister(rn, R31IsSP);
+        buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
+                                   remaining_size_in_buffer(),
+                                   ", #%d",
+                                   imm9);
+        Print("] !");
+        break;
+      }
+      case 2: {
+        const Register rm = instr->RmField();
+        const Extend ext = instr->ExtendTypeField();
+        const int s = instr->Bit(12);
+        Print("[");
+        PrintRegister(rn, R31IsSP);
+        Print(", ");
+        PrintRegister(rm, R31IsZR);
+        buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
+                                   remaining_size_in_buffer(),
+                                   " %s",
+                                   extend_names[ext]);
+        if (s == 1) {
+          Print(" scaled");
+        }
+        Print("]");
+        break;
+      }
+      default: {
+        Print("???");
+      }
+    }
+  }
+}
+
+
 // Handle all register based formatting in these functions to reduce the
 // complexity of FormatOption.
 int ARM64Decoder::FormatRegister(Instr* instr, const char* format) {
   ASSERT(format[0] == 'r');
   if (format[1] == 'n') {  // 'rn: Rn register
     int reg = instr->RnField();
     PrintRegister(reg, instr->RnMode());
     return 2;
   } else if (format[1] == 'd') {  // 'rd: Rd register
     int reg = instr->RdField();
     PrintRegister(reg, instr->RdMode());
     return 2;
   } else if (format[1] == 'm') {  // 'rm: Rm register
     int reg = instr->RmField();
     PrintRegister(reg, R31IsZR);
     return 2;
+  } else if (format[1] == 't') {  // 'rt: Rt register
+    int reg = instr->RtField();
+    PrintRegister(reg, R31IsZR);
+    return 2;
   }
   UNREACHABLE();
   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
 // consumed by the caller.)  FormatOption returns the number of
@@ skipping 33 matching lines @@
       } else if (format[1] == 'f') {
         ASSERT(STRING_STARTS_WITH(format, "sf"));
         if (instr->SFField() == 1) {
           // TODO(zra): If we don't use the w form much, we can omit printing
           // this x.
           Print("x");
         } else {
           Print("w");
         }
         return 2;
+      } else if (format[1] == 'z') {
+        ASSERT(STRING_STARTS_WITH(format, "sz"));
+        const int sz = instr->SzField();
+        char const* sz_str;
+        switch (sz) {
+          case 0: sz_str = "b"; break;
+          case 1: sz_str = "h"; break;
+          case 2: sz_str = "w"; break;
+          case 3: sz_str = "x"; break;
+          default: sz_str = "?"; break;
+        }
+        buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
+                                   remaining_size_in_buffer(),
+                                   "%s",
+                                   sz_str);
+        return 2;
       } else if (format[1] == ' ') {
         if (instr->HasS()) {
           Print("s");
         }
         return 1;
       } else {
         UNREACHABLE();
       }
     }
     case 'r': {
       return FormatRegister(instr, format);
     }
     case 'h': {
       ASSERT(STRING_STARTS_WITH(format, "hw"));
       const int shift = instr->HWField() << 4;
       if (shift != 0) {
         buffer_pos_ += OS::SNPrint(current_position_in_buffer(),
                                    remaining_size_in_buffer(),
                                    "lsl %d",
                                    shift);
       }
       return 2;
     }
+    case 'm': {
+      ASSERT(STRING_STARTS_WITH(format, "memop"));
+      PrintMemOperand(instr);
+      return 5;
+    }
     default: {
       UNREACHABLE();
       break;
     }
   }
   UNREACHABLE();
   return -1;
 }
 
 
@@ skipping 32 matching lines @@
     case 3:
       Format(instr, "movk'sf 'rd, 'imm16 'hw");
       break;
     default:
       Unknown(instr);
       break;
   }
 }
 
 
+void ARM64Decoder::DecodeLoadStoreReg(Instr* instr) {
+  if (instr->Bits(25, 2) != 0) {
+    Unknown(instr);
+    return;
+  }
+  if (instr->Bit(22) == 1) {
+    Format(instr, "ldr'sz 'rt, 'memop");
+  } else {
+    Format(instr, "str'sz 'rt, 'memop");
+  }
+}
+
+
 void ARM64Decoder::DecodeAddSubImm(Instr* instr) {
   switch (instr->Bit(30)) {
     case 0:
       Format(instr, "addi'sf's 'rd, 'rn, 'imm12s");
       break;
     case 1:
       Format(instr, "subi'sf's 'rd, 'rn, 'imm12s");
       break;
     default:
       Unknown(instr);
@@ skipping 69 matching lines @@
     DecodeSystem(instr);
   } else if (instr->IsUnconditionalBranchRegOp()) {
     DecodeUnconditionalBranchReg(instr);
   } else {
     Unknown(instr);
   }
 }
 
 
 void ARM64Decoder::DecodeLoadStore(Instr* instr) {
-  Unknown(instr);
+  if (instr->IsLoadStoreRegOp()) {
+    DecodeLoadStoreReg(instr);
+  } else {
+    Unknown(instr);
+  }
 }
 
 
 void ARM64Decoder::DecodeAddSubShiftExt(Instr* instr) {
   switch (instr->Bit(30)) {
     case 0:
       Format(instr, "add'sf's 'rd, 'rn, 'shift_op");
       break;
     case 1:
       Format(instr, "sub'sf's 'rd, 'rn, 'shift_op");
@@ skipping 85 matching lines @@
                                   human_buffer,
                                   sizeof(human_buffer),
                                   pc);
     pc += instruction_length;
   }
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM