Skip to content

Commit a19c018

Browse files
committed
Revert "[lldb][debugserver] Save and restore the SVE/SME register state (#134184)"
This reverts commit 4e40c7c. arm64 CI is getting a failure in lldb-api.tools/lldb-server.TestGdbRemoteRegisterState.py with this commit, need to investigate and re-land.
1 parent 7f2abe8 commit a19c018

File tree

1 file changed

+7
-40
lines changed

1 file changed

+7
-40
lines changed

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

Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2952,15 +2952,8 @@ kern_return_t DNBArchMachARM64::SetRegisterState(int set) {
29522952
return err;
29532953

29542954
switch (set) {
2955-
case e_regSetALL: {
2956-
kern_return_t ret =
2957-
SetGPRState() | SetVFPState() | SetEXCState() | SetDBGState(false);
2958-
if (CPUHasSME()) {
2959-
ret |= SetSVEState();
2960-
ret |= SetSMEState();
2961-
}
2962-
return ret;
2963-
}
2955+
case e_regSetALL:
2956+
return SetGPRState() | SetVFPState() | SetEXCState() | SetDBGState(false);
29642957
case e_regSetGPR:
29652958
return SetGPRState();
29662959
case e_regSetVFP:
@@ -3126,20 +3119,9 @@ uint32_t DNBArchMachARM64::SaveRegisterState() {
31263119
"error: GPR regs failed to read: %u ",
31273120
kret);
31283121
} else if ((kret = GetVFPState(force)) != KERN_SUCCESS) {
3129-
DNBLogThreadedIf(LOG_THREAD,
3130-
"DNBArchMachARM64::SaveRegisterState () "
3131-
"error: %s regs failed to read: %u",
3122+
DNBLogThreadedIf(LOG_THREAD, "DNBArchMachARM64::SaveRegisterState () "
3123+
"error: %s regs failed to read: %u",
31323124
"VFP", kret);
3133-
} else if (CPUHasSME() && (kret = SetSVEState() != KERN_SUCCESS)) {
3134-
DNBLogThreadedIf(LOG_THREAD,
3135-
"DNBArchMachARM64::SaveRegisterState () "
3136-
"error: %s regs failed to read: %u",
3137-
"SVE", kret);
3138-
} else if (CPUHasSME() && (kret = SetSMEState() != KERN_SUCCESS)) {
3139-
DNBLogThreadedIf(LOG_THREAD,
3140-
"DNBArchMachARM64::SaveRegisterState () "
3141-
"error: %s regs failed to read: %u",
3142-
"SME", kret);
31433125
} else {
31443126
const uint32_t save_id = GetNextRegisterStateSaveID();
31453127
m_saved_register_states[save_id] = m_state.context;
@@ -3162,26 +3144,11 @@ bool DNBArchMachARM64::RestoreRegisterState(uint32_t save_id) {
31623144
save_id, kret);
31633145
success = false;
31643146
} else if ((kret = SetVFPState()) != KERN_SUCCESS) {
3165-
DNBLogThreadedIf(LOG_THREAD,
3166-
"DNBArchMachARM64::RestoreRegisterState "
3167-
"(save_id = %u) error: %s regs failed to "
3168-
"write: %u",
3147+
DNBLogThreadedIf(LOG_THREAD, "DNBArchMachARM64::RestoreRegisterState "
3148+
"(save_id = %u) error: %s regs failed to "
3149+
"write: %u",
31693150
save_id, "VFP", kret);
31703151
success = false;
3171-
} else if ((kret = SetSVEState()) != KERN_SUCCESS) {
3172-
DNBLogThreadedIf(LOG_THREAD,
3173-
"DNBArchMachARM64::RestoreRegisterState "
3174-
"(save_id = %u) error: %s regs failed to "
3175-
"write: %u",
3176-
save_id, "SVE", kret);
3177-
success = false;
3178-
} else if ((kret = SetSMEState()) != KERN_SUCCESS) {
3179-
DNBLogThreadedIf(LOG_THREAD,
3180-
"DNBArchMachARM64::RestoreRegisterState "
3181-
"(save_id = %u) error: %s regs failed to "
3182-
"write: %u",
3183-
save_id, "SME", kret);
3184-
success = false;
31853152
}
31863153
m_saved_register_states.erase(pos);
31873154
return success;

0 commit comments

Comments
 (0)