[Lldb-commits] [lldb] r158222 - /lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

[Johnny Chen]

Author: johnny
Date: Fri Jun  8 14:06:28 2012
New Revision: 158222

URL: http://llvm.org/viewvc/llvm-project?rev=158222&view=rev
Log:
rdar://problem/11487457

Previous fix to add convenience registers for x86_64 did not take the 'process attach' scenario into account.
This patch fixes that.

Modified:
    lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=158222&r1=158221&r2=158222&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Fri Jun  8 14:06:28 2012
@@ -401,7 +401,8 @@
     }
 
     // Add some convenience registers (eax, ebx, ecx, edx, esi, edi, ebp, esp) to x86_64.
-    if (target_arch.IsValid() && target_arch.GetMachine() == llvm::Triple::x86_64)
+    if ((target_arch.IsValid() && target_arch.GetMachine() == llvm::Triple::x86_64)
+        || (remote_arch.IsValid() && remote_arch.GetMachine() == llvm::Triple::x86_64))
         m_register_info.Addx86_64ConvenienceRegisters();
 
     // At this point, we can finalize our register info.