[Lldb-commits] [lldb] a19c018 - Revert "[lldb][debugserver] Save and restore the SVE/SME register state (#134184)"

[Jason Molenda via lldb-commits]

Author: Jason Molenda
Date: 2025-04-02T23:01:51-07:00
New Revision: a19c018379a1d08eceb5db533a19a6bf37423975

URL: https://github.com/llvm/llvm-project/commit/a19c018379a1d08eceb5db533a19a6bf37423975
DIFF: https://github.com/llvm/llvm-project/commit/a19c018379a1d08eceb5db533a19a6bf37423975.diff

LOG: Revert "[lldb][debugserver] Save and restore the SVE/SME register state (#134184)"

This reverts commit 4e40c7c4bd66d98f529a807dbf410dc46444f4ca.

arm64 CI is getting a failure in
lldb-api.tools/lldb-server.TestGdbRemoteRegisterState.py
with this commit, need to investigate and re-land.

Added: 
    

Modified: 
    lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
index d32a63daa5672..34a4ee21f8502 100644
--- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
@@ -2952,15 +2952,8 @@ kern_return_t DNBArchMachARM64::SetRegisterState(int set) {
     return err;
 
   switch (set) {
-  case e_regSetALL: {
-    kern_return_t ret =
-        SetGPRState() | SetVFPState() | SetEXCState() | SetDBGState(false);
-    if (CPUHasSME()) {
-      ret |= SetSVEState();
-      ret |= SetSMEState();
-    }
-    return ret;
-  }
+  case e_regSetALL:
+    return SetGPRState() | SetVFPState() | SetEXCState() | SetDBGState(false);
   case e_regSetGPR:
     return SetGPRState();
   case e_regSetVFP:
@@ -3126,20 +3119,9 @@ uint32_t DNBArchMachARM64::SaveRegisterState() {
                                  "error: GPR regs failed to read: %u ",
                      kret);
   } else if ((kret = GetVFPState(force)) != KERN_SUCCESS) {
-    DNBLogThreadedIf(LOG_THREAD,
-                     "DNBArchMachARM64::SaveRegisterState () "
-                     "error: %s regs failed to read: %u",
+    DNBLogThreadedIf(LOG_THREAD, "DNBArchMachARM64::SaveRegisterState () "
+                                 "error: %s regs failed to read: %u",
                      "VFP", kret);
-  } else if (CPUHasSME() && (kret = SetSVEState() != KERN_SUCCESS)) {
-    DNBLogThreadedIf(LOG_THREAD,
-                     "DNBArchMachARM64::SaveRegisterState () "
-                     "error: %s regs failed to read: %u",
-                     "SVE", kret);
-  } else if (CPUHasSME() && (kret = SetSMEState() != KERN_SUCCESS)) {
-    DNBLogThreadedIf(LOG_THREAD,
-                     "DNBArchMachARM64::SaveRegisterState () "
-                     "error: %s regs failed to read: %u",
-                     "SME", kret);
   } else {
     const uint32_t save_id = GetNextRegisterStateSaveID();
     m_saved_register_states[save_id] = m_state.context;
@@ -3162,26 +3144,11 @@ bool DNBArchMachARM64::RestoreRegisterState(uint32_t save_id) {
                        save_id, kret);
       success = false;
     } else if ((kret = SetVFPState()) != KERN_SUCCESS) {
-      DNBLogThreadedIf(LOG_THREAD,
-                       "DNBArchMachARM64::RestoreRegisterState "
-                       "(save_id = %u) error: %s regs failed to "
-                       "write: %u",
+      DNBLogThreadedIf(LOG_THREAD, "DNBArchMachARM64::RestoreRegisterState "
+                                   "(save_id = %u) error: %s regs failed to "
+                                   "write: %u",
                        save_id, "VFP", kret);
       success = false;
-    } else if ((kret = SetSVEState()) != KERN_SUCCESS) {
-      DNBLogThreadedIf(LOG_THREAD,
-                       "DNBArchMachARM64::RestoreRegisterState "
-                       "(save_id = %u) error: %s regs failed to "
-                       "write: %u",
-                       save_id, "SVE", kret);
-      success = false;
-    } else if ((kret = SetSMEState()) != KERN_SUCCESS) {
-      DNBLogThreadedIf(LOG_THREAD,
-                       "DNBArchMachARM64::RestoreRegisterState "
-                       "(save_id = %u) error: %s regs failed to "
-                       "write: %u",
-                       save_id, "SME", kret);
-      success = false;
     }
     m_saved_register_states.erase(pos);
     return success;