Revert r244308 since it's introducing test regressions on Linux:

 - TestLldbGdbServer.py both clang & gcc, i386 and x86_64
 - TestConstVariables.py gcc, i386 and x86_64
 - 112 failures clang, i386

llvm-svn: 244514

3 files changed, 64 insertions, 337 deletions

diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux.cpp
index df0a008ff5f..9628b4e6f72 100644
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux.cpp
@@ -136,7 +136,7 @@ NativeRegisterContextLinux::ReadFPR()
 {
     void* buf = GetFPRBuffer();
     if (!buf)
-        return Error("FPR buffer is NULL");
+        return Error("GPR buffer is NULL");
     size_t buf_size = GetFPRSize();
 
     return DoReadFPR(buf, buf_size);
@@ -147,7 +147,7 @@ NativeRegisterContextLinux::WriteFPR()
 {
     void* buf = GetFPRBuffer();
     if (!buf)
-        return Error("FPR buffer is NULL");
+        return Error("GPR buffer is NULL");
     size_t buf_size = GetFPRSize();
 
     return DoWriteFPR(buf, buf_size);
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp
index 4be535f8af9..917f1351563 100644
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp
@@ -25,10 +25,6 @@
 #include "Plugins/Process/Linux/Procfs.h"
 #include "Plugins/Process/Utility/RegisterContextLinux_mips64.h"
 #include "Plugins/Process/Utility/RegisterContextLinux_mips.h"
-#define NT_MIPS_MSA 0x600
-#define CONFIG5_FRE (1 << 8)
-#define SR_FR (1 << 26)
-#define NUM_REGISTERS 32
 
 #include <sys/ptrace.h>
 #include <asm/ptrace.h>
@@ -122,13 +118,12 @@ namespace
         gpr_sp_mips,
         gpr_r30_mips,
         gpr_ra_mips,
-        gpr_sr_mips,
         gpr_mullo_mips,
         gpr_mulhi_mips,
+        gpr_pc_mips,
         gpr_badvaddr_mips,
+        gpr_sr_mips,
         gpr_cause_mips,
-        gpr_pc_mips,
-        gpr_config5_mips,
         LLDB_INVALID_REGNUM     // register sets need to end with this flag
     };
 
@@ -173,60 +168,12 @@ namespace
         fpr_f31_mips,
         fpr_fcsr_mips,
         fpr_fir_mips,
-        fpr_config5_mips,
         LLDB_INVALID_REGNUM     // register sets need to end with this flag
     };
 
     static_assert((sizeof(g_fp_regnums_mips) / sizeof(g_fp_regnums_mips[0])) - 1 == k_num_fpr_registers_mips,
                   "g_fp_regnums_mips has wrong number of register infos");
 
-    // mips MSA registers.
-    const uint32_t
-    g_msa_regnums_mips[] =
-    {
-        msa_w0_mips,
-        msa_w1_mips,
-        msa_w2_mips,
-        msa_w3_mips,
-        msa_w4_mips,
-        msa_w5_mips,
-        msa_w6_mips,
-        msa_w7_mips,
-        msa_w8_mips,
-        msa_w9_mips,
-        msa_w10_mips,
-        msa_w11_mips,
-        msa_w12_mips,
-        msa_w13_mips,
-        msa_w14_mips,
-        msa_w15_mips,
-        msa_w16_mips,
-        msa_w17_mips,
-        msa_w18_mips,
-        msa_w19_mips,
-        msa_w20_mips,
-        msa_w21_mips,
-        msa_w22_mips,
-        msa_w23_mips,
-        msa_w24_mips,
-        msa_w25_mips,
-        msa_w26_mips,
-        msa_w27_mips,
-        msa_w28_mips,
-        msa_w29_mips,
-        msa_w30_mips,
-        msa_w31_mips,
-        msa_fcsr_mips,
-        msa_fir_mips,
-        msa_mcsr_mips,
-        msa_mir_mips,
-        msa_config5_mips,
-        LLDB_INVALID_REGNUM     // register sets need to end with this flag
-    };
-
-    static_assert((sizeof(g_msa_regnums_mips) / sizeof(g_msa_regnums_mips[0])) - 1 == k_num_msa_registers_mips,
-                  "g_msa_regnums_mips has wrong number of register infos");
-
     // mips64 general purpose registers.
     const uint32_t
     g_gp_regnums_mips64[] =
@@ -263,13 +210,14 @@ namespace
         gpr_sp_mips64,
         gpr_r30_mips64,
         gpr_ra_mips64,
-        gpr_sr_mips64,
         gpr_mullo_mips64,
         gpr_mulhi_mips64,
+        gpr_pc_mips64,
         gpr_badvaddr_mips64,
+        gpr_sr_mips64,
         gpr_cause_mips64,
-        gpr_pc_mips64,
-        gpr_config5_mips64,
+        gpr_ic_mips64,
+        gpr_dummy_mips64,
         LLDB_INVALID_REGNUM     // register sets need to end with this flag
     };
 
@@ -314,64 +262,16 @@ namespace
         fpr_f31_mips64,
         fpr_fcsr_mips64,
         fpr_fir_mips64,
-        fpr_config5_mips64,
         LLDB_INVALID_REGNUM     // register sets need to end with this flag
     };
 
     static_assert((sizeof(g_fp_regnums_mips64) / sizeof(g_fp_regnums_mips64[0])) - 1 == k_num_fpr_registers_mips64,
                   "g_fp_regnums_mips64 has wrong number of register infos");
 
-    // mips64 MSA registers.
-    const uint32_t
-    g_msa_regnums_mips64[] =
-    {
-        msa_w0_mips64,
-        msa_w1_mips64,
-        msa_w2_mips64,
-        msa_w3_mips64,
-        msa_w4_mips64,
-        msa_w5_mips64,
-        msa_w6_mips64,
-        msa_w7_mips64,
-        msa_w8_mips64,
-        msa_w9_mips64,
-        msa_w10_mips64,
-        msa_w11_mips64,
-        msa_w12_mips64,
-        msa_w13_mips64,
-        msa_w14_mips64,
-        msa_w15_mips64,
-        msa_w16_mips64,
-        msa_w17_mips64,
-        msa_w18_mips64,
-        msa_w19_mips64,
-        msa_w20_mips64,
-        msa_w21_mips64,
-        msa_w22_mips64,
-        msa_w23_mips64,
-        msa_w24_mips64,
-        msa_w25_mips64,
-        msa_w26_mips64,
-        msa_w27_mips64,
-        msa_w28_mips64,
-        msa_w29_mips64,
-        msa_w30_mips64,
-        msa_w31_mips64,
-        msa_fcsr_mips64,
-        msa_fir_mips64,
-        msa_mcsr_mips64,
-        msa_mir_mips64,
-        msa_config5_mips64,
-        LLDB_INVALID_REGNUM     // register sets need to end with this flag
-    };
-
-    static_assert((sizeof(g_msa_regnums_mips64) / sizeof(g_msa_regnums_mips64[0])) - 1 == k_num_msa_registers_mips64,
-                  "g_msa_regnums_mips64 has wrong number of register infos");
-
     // Number of register sets provided by this context.
     enum
     {
-        k_num_register_sets = 3
+        k_num_register_sets = 2
     };
 
     // Register sets for mips.
@@ -379,8 +279,7 @@ namespace
     g_reg_sets_mips[k_num_register_sets] =
     {
         { "General Purpose Registers",  "gpr", k_num_gpr_registers_mips, g_gp_regnums_mips },
-        { "Floating Point Registers",   "fpu", k_num_fpr_registers_mips, g_fp_regnums_mips },
-        { "MSA Registers",              "msa", k_num_msa_registers_mips, g_msa_regnums_mips }
+        { "Floating Point Registers",   "fpu", k_num_fpr_registers_mips, g_fp_regnums_mips }
     };
 
     // Register sets for mips64.
@@ -388,8 +287,7 @@ namespace
     g_reg_sets_mips64[k_num_register_sets] =
     {
         { "General Purpose Registers",  "gpr", k_num_gpr_registers_mips64, g_gp_regnums_mips64 },
-        { "Floating Point Registers",   "fpu", k_num_fpr_registers_mips64, g_fp_regnums_mips64 },
-        { "MSA Registers",              "msa", k_num_msa_registers_mips64, g_msa_regnums_mips64 },
+        { "Floating Point Registers",   "fpu", k_num_fpr_registers_mips64, g_fp_regnums_mips64 }
     };
 
 } // end of anonymous namespace
@@ -402,7 +300,7 @@ NativeRegisterContextLinux::CreateHostNativeRegisterContextLinux(const ArchSpec&
     return new NativeRegisterContextLinux_mips64(target_arch, native_thread, concrete_frame_idx);
 }
 
-#define REG_CONTEXT_SIZE (GetRegisterInfoInterface ().GetGPRSize () + sizeof(FPR_linux_mips) + sizeof(MSA_linux_mips))
+#define REG_CONTEXT_SIZE (GetRegisterInfoInterface ().GetGPRSize () + sizeof(FPR_mips))
 
 // ----------------------------------------------------------------------------
 // NativeRegisterContextLinux_mips64 members.
@@ -440,8 +338,6 @@ NativeRegisterContextLinux_mips64::NativeRegisterContextLinux_mips64 (const Arch
             m_reg_info.last_gpr             = k_last_gpr_mips;
             m_reg_info.first_fpr            = k_first_fpr_mips;
             m_reg_info.last_fpr             = k_last_fpr_mips;
-            m_reg_info.first_msa            = k_first_msa_mips;
-            m_reg_info.last_msa             = k_last_msa_mips;
             break;
         case llvm::Triple::mips64:
         case llvm::Triple::mips64el:
@@ -451,27 +347,18 @@ NativeRegisterContextLinux_mips64::NativeRegisterContextLinux_mips64 (const Arch
             m_reg_info.last_gpr             = k_last_gpr_mips64;
             m_reg_info.first_fpr            = k_first_fpr_mips64;
             m_reg_info.last_fpr             = k_last_fpr_mips64;
-            m_reg_info.first_msa            = k_first_msa_mips64;
-            m_reg_info.last_msa             = k_last_msa_mips64;
             break;
         default:
             assert(false && "Unhandled target architecture.");
             break;
     }
 
-    // Initialize m_iovec to point to the buffer and buffer size
-    // using the conventions of Berkeley style UIO structures, as required
-    // by PTRACE extensions.
-    m_iovec.iov_base = &m_msa;
-    m_iovec.iov_len = sizeof(MSA_linux_mips);
+    // Clear out the FPR state.
+    ::memset(&m_fpr, 0, sizeof(FPR_mips));
 
     // init h/w watchpoint addr map
     for (int index = 0;index <= MAX_NUM_WP; index++)
         hw_addr_map[index] = LLDB_INVALID_ADDRESS;
-
-    ::memset(&m_gpr, 0, sizeof(GPR_linux_mips));
-    ::memset(&m_fpr, 0, sizeof(FPR_linux_mips));
-    ::memset(&m_msa, 0, sizeof(MSA_linux_mips));
 }
 
 uint32_t
@@ -573,38 +460,16 @@ NativeRegisterContextLinux_mips64::ReadRegister (const RegisterInfo *reg_info, R
         return error;
     }
 
-    if (IsMSA(reg) && !IsMSAAvailable())
-    {
-        error.SetErrorString ("MSA not available on this processor");
-        return error;
-    }
-
-    if (IsMSA(reg) || IsFPR(reg))
+    if (IsFPR(reg))
     {
-        uint8_t *src;
-        type128 int128;
-
-        error = ReadCP1();
-
+        error = ReadFPR();
         if (!error.Success())
         {
-            error.SetErrorString ("failed to read co-processor 1 register");
+            error.SetErrorString ("failed to read floating point register");
             return error;
         }
-
-        if (IsFPR(reg))
-        {
-            assert (reg_info->byte_offset < sizeof(UserArea));
-            src = (uint8_t *)&m_fpr + reg_info->byte_offset - (sizeof(m_gpr));
-        }
-        else
-        {
-            assert (reg_info->byte_offset < sizeof(UserArea));
-            src = (uint8_t *)&m_msa + reg_info->byte_offset - (sizeof(m_gpr) + sizeof(m_fpr));
-        }
-        int128.x[0] = *(uint64_t *)src;
-        int128.x[1] = *(uint64_t *)(src + 8); 
-        llvm::APInt rhs = llvm::APInt(128, 2, int128.x);
+        assert (reg_info->byte_offset < sizeof(FPR_mips));
+        uint8_t *src = (uint8_t *)&m_fpr + reg_info->byte_offset;
         switch (reg_info->byte_size)
         {
             case 4:
@@ -613,9 +478,6 @@ NativeRegisterContextLinux_mips64::ReadRegister (const RegisterInfo *reg_info, R
             case 8:
                 reg_value.SetUInt64(*(uint64_t *)src);
                 break;
-            case 16:
-                reg_value.SetUInt128(rhs);
-                break;
             default:
                 assert(false && "Unhandled data size.");
                 error.SetErrorStringWithFormat ("unhandled byte size: %" PRIu32, reg_info->byte_size);
@@ -649,32 +511,10 @@ NativeRegisterContextLinux_mips64::WriteRegister (const RegisterInfo *reg_info,
     if (reg_index == LLDB_INVALID_REGNUM)
         return Error ("no lldb regnum for %s", reg_info && reg_info->name ? reg_info->name : "<unknown register>");
 
-    if (IsMSA(reg_index) && !IsMSAAvailable())
-    {
-        error.SetErrorString ("MSA not available on this processor");
-        return error;
-    }
-
-    if (IsFPR(reg_index) || IsMSA(reg_index))
+    if (IsFPR(reg_index))
     {
-        uint8_t *dst;
-        const uint64_t *src;
-
-        // Initialise the FP and MSA buffers by reading all co-processor 1 registers
-        ReadCP1();
-
-        if (IsFPR(reg_index))
-        {
-            assert (reg_info->byte_offset < sizeof(UserArea));
-            dst = (uint8_t *)&m_fpr + reg_info->byte_offset - (sizeof(m_gpr));
-        }
-        else
-        {
-            assert (reg_info->byte_offset < sizeof(UserArea));
-            dst = (uint8_t *)&m_msa + reg_info->byte_offset - (sizeof(m_gpr) + sizeof(m_fpr));
-        }
-        llvm::APInt lhs;
-        llvm::APInt fail_value = llvm::APInt::getMaxValue(128);
+        assert (reg_info->byte_offset < sizeof(FPR_mips));
+        uint8_t *dst = (uint8_t *)&m_fpr + reg_info->byte_offset;
         switch (reg_info->byte_size)
         {
             case 4:
@@ -683,21 +523,15 @@ NativeRegisterContextLinux_mips64::WriteRegister (const RegisterInfo *reg_info,
             case 8:
                 *(uint64_t *)dst = reg_value.GetAsUInt64();
                 break;
-            case 16:
-                lhs = reg_value.GetAsUInt128(fail_value);
-                src = lhs.getRawData();
-                *(uint64_t *)dst = *src; 
-                *(uint64_t *)(dst + 8) = *(src + 1);
-                break;
             default:
                 assert(false && "Unhandled data size.");
                 error.SetErrorStringWithFormat ("unhandled byte size: %" PRIu32, reg_info->byte_size);
                 break;
         }
-        error = WriteCP1();
+        error = WriteFPR();
         if (!error.Success())
         {
-            error.SetErrorString ("failed to write co-processor 1 register");
+            error.SetErrorString ("failed to write floating point register");
             return error;
         }
     }
@@ -728,10 +562,10 @@ NativeRegisterContextLinux_mips64::ReadAllRegisterValues (lldb::DataBufferSP &da
         return error;
     }
 
-    error = ReadCP1();
+    error = ReadFPR();
     if (!error.Success())
     {
-        error.SetErrorString ("ReadCP1() failed");
+        error.SetErrorString ("ReadFPR() failed");
         return error;
     }
 
@@ -742,13 +576,10 @@ NativeRegisterContextLinux_mips64::ReadAllRegisterValues (lldb::DataBufferSP &da
         return error;
     }
 
-    ::memcpy (dst, &m_gpr, GetRegisterInfoInterface ().GetGPRSize ());
+    ::memcpy (dst, &m_gpr_mips64, GetRegisterInfoInterface ().GetGPRSize ());
     dst += GetRegisterInfoInterface ().GetGPRSize ();
 
-    ::memcpy (dst, &m_fpr, GetFPRSize ());
-    dst += GetFPRSize ();
-
-    ::memcpy (dst, &m_msa, sizeof(MSA_linux_mips));
+    ::memcpy (dst, &m_fpr, sizeof(FPR_mips));
 
     return error;
 }
@@ -777,14 +608,10 @@ NativeRegisterContextLinux_mips64::WriteAllRegisterValues (const lldb::DataBuffe
         error.SetErrorStringWithFormat ("NativeRegisterContextLinux_mips64::%s DataBuffer::GetBytes() returned a null pointer", __FUNCTION__);
         return error;
     }
-
-    ::memcpy (&m_gpr, src, GetRegisterInfoInterface ().GetGPRSize ());
+    ::memcpy (&m_gpr_mips64, src, GetRegisterInfoInterface ().GetGPRSize ());
     src += GetRegisterInfoInterface ().GetGPRSize ();
 
-    ::memcpy (&m_fpr, src, GetFPRSize ());
-    src += GetFPRSize ();
-
-    ::memcpy (&m_msa, src, sizeof(MSA_linux_mips));
+    ::memcpy (&m_fpr, src, sizeof(FPR_mips));
 
     error = WriteGPR();
     if (!error.Success())
@@ -793,10 +620,10 @@ NativeRegisterContextLinux_mips64::WriteAllRegisterValues (const lldb::DataBuffe
         return error;
     }
 
-    error = WriteCP1();
+    error = WriteFPR();
     if (!error.Success())
     {
-        error.SetErrorStringWithFormat ("NativeRegisterContextLinux_mips64::%s WriteCP1() failed", __FUNCTION__);
+        error.SetErrorStringWithFormat ("NativeRegisterContextLinux_mips64::%s WriteFPR() failed", __FUNCTION__);
         return error;
     }
 
@@ -804,47 +631,22 @@ NativeRegisterContextLinux_mips64::WriteAllRegisterValues (const lldb::DataBuffe
 }
 
 Error
-NativeRegisterContextLinux_mips64::ReadCP1()
+NativeRegisterContextLinux_mips64::ReadFPR()
 {
-    Error error;
-
-    uint8_t *src, *dst;
+    void* buf = GetFPRBuffer();
+    if (!buf)
+        return Error("FPR buffer is NULL");
 
-    lldb::ByteOrder byte_order = GetByteOrder();
+    Error error = NativeRegisterContextLinux::ReadFPR();
 
-    uint32_t IsBigEndian = (byte_order == lldb::eByteOrderBig);
-
-    if (IsMSAAvailable())
+    if (IsFR0())
     {
-        error = NativeRegisterContextLinux::ReadRegisterSet(&m_iovec, sizeof(MSA_linux_mips), NT_MIPS_MSA);
-        src = (uint8_t *)&m_msa + (IsBigEndian * 8);
-        dst = (uint8_t *)&m_fpr;
-        for ( int i = 0; i < NUM_REGISTERS; i++)
-        {
-            // Copy fp values from msa buffer fetched via ptrace
-            *(uint64_t *) dst = *(uint64_t *) src;
-            src = src + 16;
-            dst = dst + 8;
-        }
-        m_fpr.fir = m_msa.fir;
-        m_fpr.fcsr = m_msa.fcsr;
-        m_fpr.config5 = m_msa.config5;
-    }
-    else
-    {
-        error = NativeRegisterContextLinux::ReadFPR();
-    }
-
-    if (IsFR0() || IsFRE())
-    {
-         src = (uint8_t *)&m_fpr + 4 + (IsBigEndian * 4);
-         dst = (uint8_t *)&m_fpr + 8 + (IsBigEndian * 4);
-         for (int i = 0; i < (NUM_REGISTERS / 2); i++)
+         for (int i = 0; i < 16; i++)
          {
               // copy odd single from top of neighbouring even double
+              uint8_t * src = (uint8_t *)buf + 4 + (i * 16);
+              uint8_t * dst = (uint8_t *)buf + 8 + (i * 16);
               *(uint32_t *) dst = *(uint32_t *) src;
-              src = src + 16;
-              dst = dst + 16;
          }
     }
 
@@ -852,77 +654,37 @@ NativeRegisterContextLinux_mips64::ReadCP1()
 }
 
 Error
-NativeRegisterContextLinux_mips64::WriteCP1()
+NativeRegisterContextLinux_mips64::WriteFPR()
 {
-    Error error;
-
-    uint8_t *src, *dst;
-
-    lldb::ByteOrder byte_order = GetByteOrder();
-
-    uint32_t IsBigEndian = (byte_order == lldb::eByteOrderBig);
+    void* buf = GetFPRBuffer();
+    if (!buf)
+        return Error("FPR buffer is NULL");
 
-    if (IsFR0() || IsFRE())
+    if (IsFR0())
     {
-        src = (uint8_t *)&m_fpr + 8 + (IsBigEndian * 4);
-        dst = (uint8_t *)&m_fpr + 4 + (IsBigEndian * 4);
-        for (int i = 0; i < (NUM_REGISTERS / 2); i++)
-        {
+         for (int i = 0; i < 16; i++)
+         {
              // copy odd single to top of neighbouring even double
+             uint8_t * src = (uint8_t *)buf + 8 + (i * 16);
+             uint8_t * dst = (uint8_t *)buf + 4 + (i * 16);
              *(uint32_t *) dst = *(uint32_t *) src;
-             src = src + 16;
-             dst = dst + 16;
-        }
-    }
-
-    if (IsMSAAvailable())
-    {
-        dst = (uint8_t *)&m_msa + (IsBigEndian * 8);
-        src = (uint8_t *)&m_fpr;
-        for (int i = 0; i < NUM_REGISTERS; i++)
-        {
-            // Copy fp values to msa buffer for ptrace
-            *(uint64_t *) dst = *(uint64_t *) src;
-            dst = dst + 16;
-            src = src + 8;
-        }
-        m_msa.fir = m_fpr.fir;
-        m_msa.fcsr = m_fpr.fcsr;
-        m_msa.config5 = m_fpr.config5;
-        error = NativeRegisterContextLinux::WriteRegisterSet(&m_iovec, sizeof(MSA_linux_mips), NT_MIPS_MSA);
-    }
-    else
-    {
-        error = NativeRegisterContextLinux::WriteFPR();
+         }
     }
 
-    return error;
+    return NativeRegisterContextLinux::WriteFPR();
 }
 
 bool
 NativeRegisterContextLinux_mips64::IsFR0()
 {
-    const RegisterInfo *const reg_info_p = GetRegisterInfoAtIndex (gpr_sr_mips64);
+    const RegisterInfo *const reg_info_p = GetRegisterInfoAtIndex (36); // Status Register is at index 36 of the register array
 
     RegisterValue reg_value;
     ReadRegister (reg_info_p, reg_value);
 
     uint64_t value = reg_value.GetAsUInt64();
 
-    return (!(value & SR_FR));
-}
-
-bool
-NativeRegisterContextLinux_mips64::IsFRE()
-{
-    const RegisterInfo *const reg_info_p = GetRegisterInfoAtIndex (gpr_config5_mips64);
-
-    RegisterValue reg_value;
-    ReadRegister (reg_info_p, reg_value);
-
-    uint64_t config5 = reg_value.GetAsUInt64();
-
-    return (config5 & CONFIG5_FRE);
+    return (!(value & 0x4000000));
 }
 
 bool
@@ -1107,25 +869,6 @@ GetVacantWatchIndex (struct pt_watch_regs *regs, lldb::addr_t addr, uint32_t siz
     return 0;
 }
 
-bool
-NativeRegisterContextLinux_mips64::IsMSA(uint32_t reg_index) const
-{
-    return (m_reg_info.first_msa <= reg_index && reg_index <= m_reg_info.last_msa);
-}
-
-bool
-NativeRegisterContextLinux_mips64::IsMSAAvailable()
-{
-    Error error = NativeRegisterContextLinux::ReadRegisterSet(&m_msa, sizeof(MSA_linux_mips), NT_MIPS_MSA);
-
-    if (error.Success() && m_msa.mir)
-    {
-        return true;
-    }
-
-    return false;
-}
-
 Error
 NativeRegisterContextLinux_mips64::IsWatchpointHit (uint32_t wp_index, bool &is_hit)
 {
@@ -1285,14 +1028,13 @@ NativeRegisterContextLinux_mips64::DoReadRegisterValue(uint32_t offset,
                                                        uint32_t size,
                                                        RegisterValue &value)
 {
-    GPR_linux_mips regs;
-    ::memset(&regs, 0, sizeof(GPR_linux_mips));
+    elf_gregset_t regs;
     Error error = NativeProcessLinux::PtraceWrapper(PTRACE_GETREGS, m_thread.GetID(), NULL, &regs, sizeof regs);
     if (error.Success())
     {
         lldb_private::ArchSpec arch;
         if (m_thread.GetProcess()->GetArchitecture(arch))
-            value.SetBytes((void *)(((unsigned char *)(&regs)) + offset), 8, arch.GetByteOrder());
+            value.SetBytes((void *)(((unsigned char *)(regs)) + offset), 8, arch.GetByteOrder());
         else
             error.SetErrorString("failed to get architecture");
     }
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.h b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.h
index 9f21bef258f..9a2e89f5bf2 100644
--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.h
+++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.h
@@ -13,8 +13,8 @@
 #define lldb_NativeRegisterContextLinux_mips64_h
 
 #include "Plugins/Process/Linux/NativeRegisterContextLinux.h"
-#include "Plugins/Process/Utility/RegisterContext_mips.h"
-#include "Plugins/Process/Utility/lldb-mips-linux-register-enums.h"
+#include "Plugins/Process/Utility/RegisterContext_mips64.h"
+#include "Plugins/Process/Utility/lldb-mips64-register-enums.h"
 
 #define MAX_NUM_WP 8
 
@@ -52,10 +52,10 @@ namespace process_linux {
         WriteAllRegisterValues (const lldb::DataBufferSP &data_sp) override;
 
         Error
-        ReadCP1();
+        ReadFPR() override;
 
         Error
-        WriteCP1();
+        WriteFPR() override;
 
         Error
         IsWatchpointHit (uint32_t wp_index, bool &is_hit) override;
@@ -108,25 +108,16 @@ namespace process_linux {
         IsFR0();
 
         bool
-        IsFRE();
-
-        bool
         IsFPR(uint32_t reg_index) const;
 
-        bool
-        IsMSA(uint32_t reg_index) const;
-
-        bool
-        IsMSAAvailable();
-
         void*
-        GetGPRBuffer() override { return &m_gpr; }
+        GetGPRBuffer() override { return &m_gpr_mips64; }
 
         void*
         GetFPRBuffer() override { return &m_fpr; }
 
         size_t
-        GetFPRSize() override { return sizeof(FPR_linux_mips); }
+        GetFPRSize() override { return sizeof(FPR_mips); }
 
     private:
         // Info about register ranges.
@@ -139,21 +130,15 @@ namespace process_linux {
             uint32_t last_gpr;
             uint32_t first_fpr;
             uint32_t last_fpr;
-            uint32_t first_msa;
-            uint32_t last_msa;
         };
 
         RegInfo m_reg_info;
 
-        GPR_linux_mips m_gpr;
+        uint64_t m_gpr_mips64[k_num_gpr_registers_mips64];
 
-        FPR_linux_mips m_fpr;
-
-        MSA_linux_mips m_msa;
+        FPR_mips m_fpr;
 
         lldb::addr_t hw_addr_map[MAX_NUM_WP];
-
-        IOVEC_mips m_iovec;
     };
 
 } // namespace process_linux