@@ -166,10 +166,10 @@ NativeRegisterContextLinux_arm64::NativeRegisterContextLinux_arm64(
166
166
m_tls_is_valid = false ;
167
167
168
168
// SME adds the tpidr2 register
169
- m_tls_size = GetRegisterInfo ().IsSSVEEnabled () ? sizeof (m_tls_regs)
169
+ m_tls_size = GetRegisterInfo ().IsSSVEPresent () ? sizeof (m_tls_regs)
170
170
: sizeof (m_tls_regs.tpidr_reg );
171
171
172
- if (GetRegisterInfo ().IsSVEEnabled () || GetRegisterInfo ().IsSSVEEnabled ())
172
+ if (GetRegisterInfo ().IsSVEPresent () || GetRegisterInfo ().IsSSVEPresent ())
173
173
m_sve_state = SVEState::Unknown;
174
174
else
175
175
m_sve_state = SVEState::Disabled;
@@ -609,8 +609,7 @@ NativeRegisterContextLinux_arm64::CacheAllRegisters(uint32_t &cached_size) {
609
609
if (error.Fail ())
610
610
return error;
611
611
612
- // Here this means, does the system have ZA, not whether it is active.
613
- if (GetRegisterInfo ().IsZAEnabled ()) {
612
+ if (GetRegisterInfo ().IsZAPresent ()) {
614
613
error = ReadZAHeader ();
615
614
if (error.Fail ())
616
615
return error;
@@ -628,7 +627,7 @@ NativeRegisterContextLinux_arm64::CacheAllRegisters(uint32_t &cached_size) {
628
627
}
629
628
630
629
// If SVE is enabled we need not copy FPR separately.
631
- if (GetRegisterInfo ().IsSVEEnabled () || GetRegisterInfo ().IsSSVEEnabled ()) {
630
+ if (GetRegisterInfo ().IsSVEPresent () || GetRegisterInfo ().IsSSVEPresent ()) {
632
631
// Store mode and register data.
633
632
cached_size +=
634
633
sizeof (RegisterSetType) + sizeof (m_sve_state) + GetSVEBufferSize ();
@@ -640,7 +639,7 @@ NativeRegisterContextLinux_arm64::CacheAllRegisters(uint32_t &cached_size) {
640
639
if (error.Fail ())
641
640
return error;
642
641
643
- if (GetRegisterInfo ().IsMTEEnabled ()) {
642
+ if (GetRegisterInfo ().IsMTEPresent ()) {
644
643
cached_size += sizeof (RegisterSetType) + GetMTEControlSize ();
645
644
error = ReadMTEControl ();
646
645
if (error.Fail ())
@@ -708,15 +707,15 @@ Status NativeRegisterContextLinux_arm64::ReadAllRegisterValues(
708
707
// constants and the functions vec_set_vector_length, sve_set_common and
709
708
// za_set in the Linux Kernel.
710
709
711
- if ((m_sve_state != SVEState::Streaming) && GetRegisterInfo ().IsZAEnabled ()) {
710
+ if ((m_sve_state != SVEState::Streaming) && GetRegisterInfo ().IsZAPresent ()) {
712
711
// Use the header size not the buffer size, as we may be using the buffer
713
712
// for fake data, which we do not want to write out.
714
713
assert (m_za_header.size <= GetZABufferSize ());
715
714
dst = AddSavedRegisters (dst, RegisterSetType::SME, GetZABuffer (),
716
715
m_za_header.size );
717
716
}
718
717
719
- if (GetRegisterInfo ().IsSVEEnabled () || GetRegisterInfo ().IsSSVEEnabled ()) {
718
+ if (GetRegisterInfo ().IsSVEPresent () || GetRegisterInfo ().IsSSVEPresent ()) {
720
719
dst = AddRegisterSetType (dst, RegisterSetType::SVE);
721
720
*(reinterpret_cast <SVEState *>(dst)) = m_sve_state;
722
721
dst += sizeof (m_sve_state);
@@ -726,13 +725,13 @@ Status NativeRegisterContextLinux_arm64::ReadAllRegisterValues(
726
725
GetFPRSize ());
727
726
}
728
727
729
- if ((m_sve_state == SVEState::Streaming) && GetRegisterInfo ().IsZAEnabled ()) {
728
+ if ((m_sve_state == SVEState::Streaming) && GetRegisterInfo ().IsZAPresent ()) {
730
729
assert (m_za_header.size <= GetZABufferSize ());
731
730
dst = AddSavedRegisters (dst, RegisterSetType::SME, GetZABuffer (),
732
731
m_za_header.size );
733
732
}
734
733
735
- if (GetRegisterInfo ().IsMTEEnabled ()) {
734
+ if (GetRegisterInfo ().IsMTEPresent ()) {
736
735
dst = AddSavedRegisters (dst, RegisterSetType::MTE, GetMTEControl (),
737
736
GetMTEControlSize ());
738
737
}
@@ -1411,7 +1410,7 @@ std::vector<uint32_t> NativeRegisterContextLinux_arm64::GetExpeditedRegisters(
1411
1410
expedited_reg_nums.push_back (GetRegisterInfo ().GetRegNumSVEVG ());
1412
1411
// SME, streaming vector length. This is used by the ZA register which is
1413
1412
// present even when streaming mode is not enabled.
1414
- if (GetRegisterInfo ().IsSSVEEnabled ())
1413
+ if (GetRegisterInfo ().IsSSVEPresent ())
1415
1414
expedited_reg_nums.push_back (GetRegisterInfo ().GetRegNumSMESVG ());
1416
1415
1417
1416
return expedited_reg_nums;
0 commit comments