[Lldb-commits] [lldb] r192306 - Re-enable test_convenience_registers_16bit_with_process_attach test for Linux.

[Michael Sartain]

Author: mikesart
Date: Wed Oct  9 12:44:52 2013
New Revision: 192306

URL: http://llvm.org/viewvc/llvm-project?rev=192306&view=rev
Log:
Re-enable test_convenience_registers_16bit_with_process_attach test for Linux.
Remove 32-bit POSIX register hack in ConvertBetweenRegisterKinds.


Modified:
    lldb/trunk/source/Target/RegisterContext.cpp
    lldb/trunk/test/functionalities/register/TestRegisters.py

Modified: lldb/trunk/source/Target/RegisterContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/RegisterContext.cpp?rev=192306&r1=192305&r2=192306&view=diff
==============================================================================
--- lldb/trunk/source/Target/RegisterContext.cpp (original)
+++ lldb/trunk/source/Target/RegisterContext.cpp Wed Oct  9 12:44:52 2013
@@ -469,15 +469,6 @@ RegisterContext::CalculateExecutionConte
 bool
 RegisterContext::ConvertBetweenRegisterKinds (int source_rk, uint32_t source_regnum, int target_rk, uint32_t& target_regnum)
 {
-    // FIXME: This works around a problem with 32-bit register mapping on Linux.
-    // A more general fix is needed.
-    if (target_rk == eRegisterKindLLDB)
-    {
-        target_regnum = ConvertRegisterKindToRegisterNumber(source_rk, source_regnum);
-        if (target_regnum != LLDB_INVALID_REGNUM)
-            return true;
-    }
-
     const uint32_t num_registers = GetRegisterCount();
     for (uint32_t reg = 0; reg < num_registers; ++reg)
     {

Modified: lldb/trunk/test/functionalities/register/TestRegisters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/register/TestRegisters.py?rev=192306&r1=192305&r2=192306&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/register/TestRegisters.py (original)
+++ lldb/trunk/test/functionalities/register/TestRegisters.py Wed Oct  9 12:44:52 2013
@@ -52,7 +52,6 @@ class RegisterCommandsTestCase(TestBase)
         self.buildDefault()
         self.convenience_registers_with_process_attach(test_16bit_regs=False)
 
-    @expectedFailureLinux("llvm.org/pr14600") # Linux doesn't support 16-bit convenience registers
     def test_convenience_registers_16bit_with_process_attach(self):
         """Test convenience registers after a 'process attach'."""
         if not self.getArchitecture() in ['x86_64']: