@@ -2952,15 +2952,8 @@ kern_return_t DNBArchMachARM64::SetRegisterState(int set) {
2952
2952
return err;
2953
2953
2954
2954
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 );
2964
2957
case e_regSetGPR:
2965
2958
return SetGPRState ();
2966
2959
case e_regSetVFP:
@@ -3126,20 +3119,9 @@ uint32_t DNBArchMachARM64::SaveRegisterState() {
3126
3119
" error: GPR regs failed to read: %u " ,
3127
3120
kret);
3128
3121
} 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" ,
3132
3124
" 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);
3143
3125
} else {
3144
3126
const uint32_t save_id = GetNextRegisterStateSaveID ();
3145
3127
m_saved_register_states[save_id] = m_state.context ;
@@ -3162,26 +3144,11 @@ bool DNBArchMachARM64::RestoreRegisterState(uint32_t save_id) {
3162
3144
save_id, kret);
3163
3145
success = false ;
3164
3146
} 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" ,
3169
3150
save_id, " VFP" , kret);
3170
3151
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 ;
3185
3152
}
3186
3153
m_saved_register_states.erase (pos);
3187
3154
return success;
0 commit comments