@@ -60,11 +60,7 @@ NativeRegisterContextLinux::CreateHostNativeRegisterContextLinux(
60
60
case llvm::Triple::aarch64: {
61
61
// Configure register sets supported by this AArch64 target.
62
62
// Read SVE header to check for SVE support.
63
- #if LLDB_HAVE_USER_SVE_HEADER
64
63
struct user_sve_header sve_header;
65
- #else
66
- struct user_sve_header sve_header {};
67
- #endif
68
64
struct iovec ioVec;
69
65
ioVec.iov_base = &sve_header;
70
66
ioVec.iov_len = sizeof (sve_header);
@@ -209,21 +205,13 @@ NativeRegisterContextLinux_arm64::ReadRegister(const RegisterInfo *reg_info,
209
205
if (reg == GetRegisterInfo ().GetRegNumFPSR ()) {
210
206
sve_reg_num = reg;
211
207
if (m_sve_state == SVEState::Full)
212
- #if LLDB_HAVE_USER_SVE_HEADER
213
208
offset = sve::PTraceFPSROffset (sve::vq_from_vl (m_sve_header.vl ));
214
- #else
215
- offset = 0 ;
216
- #endif
217
209
else if (m_sve_state == SVEState::FPSIMD)
218
210
offset = sve::ptrace_fpsimd_offset + (32 * 16 );
219
211
} else if (reg == GetRegisterInfo ().GetRegNumFPCR ()) {
220
212
sve_reg_num = reg;
221
213
if (m_sve_state == SVEState::Full)
222
- #if LLDB_HAVE_USER_SVE_HEADER
223
214
offset = sve::PTraceFPCROffset (sve::vq_from_vl (m_sve_header.vl ));
224
- #else
225
- offset = 0 ;
226
- #endif
227
215
else if (m_sve_state == SVEState::FPSIMD)
228
216
offset = sve::ptrace_fpsimd_offset + (32 * 16 ) + 4 ;
229
217
} else {
@@ -351,21 +339,13 @@ Status NativeRegisterContextLinux_arm64::WriteRegister(
351
339
if (reg == GetRegisterInfo ().GetRegNumFPSR ()) {
352
340
sve_reg_num = reg;
353
341
if (m_sve_state == SVEState::Full)
354
- #if LLDB_HAVE_USER_SVE_HEADER
355
342
offset = sve::PTraceFPSROffset (sve::vq_from_vl (m_sve_header.vl ));
356
- #else
357
- offset = 0 ;
358
- #endif
359
343
else if (m_sve_state == SVEState::FPSIMD)
360
344
offset = sve::ptrace_fpsimd_offset + (32 * 16 );
361
345
} else if (reg == GetRegisterInfo ().GetRegNumFPCR ()) {
362
346
sve_reg_num = reg;
363
347
if (m_sve_state == SVEState::Full)
364
- #if LLDB_HAVE_USER_SVE_HEADER
365
348
offset = sve::PTraceFPCROffset (sve::vq_from_vl (m_sve_header.vl ));
366
- #else
367
- offset = 0 ;
368
- #endif
369
349
else if (m_sve_state == SVEState::FPSIMD)
370
350
offset = sve::ptrace_fpsimd_offset + (32 * 16 ) + 4 ;
371
351
} else {
@@ -937,22 +917,18 @@ void NativeRegisterContextLinux_arm64::ConfigureRegisterContext() {
937
917
if (error.Success ()) {
938
918
// If SVE is enabled thread can switch between SVEState::FPSIMD and
939
919
// SVEState::Full on every stop.
940
- #if LLDB_HAVE_USER_SVE_HEADER
941
920
if ((m_sve_header.flags & sve::ptrace_regs_mask) ==
942
921
sve::ptrace_regs_fpsimd)
943
922
m_sve_state = SVEState::FPSIMD;
944
923
else if ((m_sve_header.flags & sve::ptrace_regs_mask) ==
945
924
sve::ptrace_regs_sve)
946
925
m_sve_state = SVEState::Full;
947
- #endif
948
926
949
927
// On every stop we configure SVE vector length by calling
950
928
// ConfigureVectorLength regardless of current SVEState of this thread.
951
929
uint32_t vq = RegisterInfoPOSIX_arm64::eVectorQuadwordAArch64SVE;
952
- #if LLDB_HAVE_USER_SVE_HEADER
953
930
if (sve_vl_valid (m_sve_header.vl ))
954
931
vq = sve::vq_from_vl (m_sve_header.vl );
955
- #endif
956
932
957
933
GetRegisterInfo ().ConfigureVectorLength (vq);
958
934
m_sve_ptrace_payload.resize (sve::PTraceSize (vq, sve::ptrace_regs_sve));
0 commit comments