[Lldb-commits] [lldb] r241347 - Fix aarch64 breakpoint PC offset

[Tamas Berghammer]

Author: tberghammer
Date: Fri Jul  3 07:51:30 2015
New Revision: 241347

URL: http://llvm.org/viewvc/llvm-project?rev=241347&view=rev
Log:
Fix aarch64 breakpoint PC offset

Modified:
    lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp

Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=241347&r1=241346&r2=241347&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Fri Jul  3 07:51:30 2015
@@ -2851,28 +2851,22 @@ NativeProcessLinux::GetSoftwareBreakpoin
 {
     // FIXME put this behind a breakpoint protocol class that can be
     // set per architecture.  Need ARM, MIPS support here.
-    static const uint8_t g_aarch64_opcode[] = { 0x00, 0x00, 0x20, 0xd4 };
     static const uint8_t g_i386_opcode [] = { 0xCC };
 
     switch (m_arch.GetMachine ())
     {
-        case llvm::Triple::aarch64:
-            actual_opcode_size = static_cast<uint32_t> (sizeof(g_aarch64_opcode));
-            return Error ();
-
-        case llvm::Triple::arm:
-            actual_opcode_size = 0; // On arm the PC don't get updated for breakpoint hits
-            return Error ();
-
         case llvm::Triple::x86:
         case llvm::Triple::x86_64:
             actual_opcode_size = static_cast<uint32_t> (sizeof(g_i386_opcode));
             return Error ();
 
+        case llvm::Triple::arm:
+        case llvm::Triple::aarch64:
         case llvm::Triple::mips64:
         case llvm::Triple::mips64el:
         case llvm::Triple::mips:
         case llvm::Triple::mipsel:
+            // On these architectures the PC don't get updated for breakpoint hits
             actual_opcode_size = 0;
             return Error ();