diff options
Diffstat (limited to 'lldb/tools/debugserver/source')
9 files changed, 32 insertions, 32 deletions
diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp index 4114aac4de2..abd1661af52 100644 --- a/lldb/tools/debugserver/source/DNB.cpp +++ b/lldb/tools/debugserver/source/DNB.cpp @@ -2309,7 +2309,7 @@ DNBInitialize() #if defined (__i386__) || defined (__x86_64__) DNBArchImplI386::Initialize(); DNBArchImplX86_64::Initialize(); -#elif defined (__arm__) || defined (__arm64__) +#elif defined (__arm__) || defined (__arm64__) || defined (__aarch64__) DNBArchMachARM::Initialize(); DNBArchMachARM64::Initialize(); #endif @@ -2329,7 +2329,7 @@ DNBSetArchitecture (const char *arch) return DNBArchProtocol::SetArchitecture (CPU_TYPE_I386); else if ((strcasecmp (arch, "x86_64") == 0) || (strcasecmp (arch, "x86_64h") == 0)) return DNBArchProtocol::SetArchitecture (CPU_TYPE_X86_64); - else if (strstr (arch, "arm64") == arch || strstr (arch, "armv8") == arch) + else if (strstr (arch, "arm64") == arch || strstr (arch, "armv8") == arch || strstr (arch, "aarch64") == arch) return DNBArchProtocol::SetArchitecture (CPU_TYPE_ARM64); else if (strstr (arch, "arm") == arch) return DNBArchProtocol::SetArchitecture (CPU_TYPE_ARM); diff --git a/lldb/tools/debugserver/source/DNBDefs.h b/lldb/tools/debugserver/source/DNBDefs.h index ad87c0f7438..a8c5fd91842 100644 --- a/lldb/tools/debugserver/source/DNBDefs.h +++ b/lldb/tools/debugserver/source/DNBDefs.h @@ -23,7 +23,7 @@ //---------------------------------------------------------------------- // Define nub_addr_t and the invalid address value from the architecture //---------------------------------------------------------------------- -#if defined (__x86_64__) || defined (__ppc64__) || defined (__arm64__) +#if defined (__x86_64__) || defined (__ppc64__) || defined (__arm64__) || defined (__aarch64__) //---------------------------------------------------------------------- // 64 bit address architectures diff --git a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp index 68b272a6bd7..d3c9a87a89a 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp +++ b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp @@ -323,7 +323,7 @@ MachThreadList::UpdateThreadList(MachProcess *process, bool update, MachThreadLi DNBArchProtocol::SetArchitecture(CPU_TYPE_X86_64); else DNBArchProtocol::SetArchitecture(CPU_TYPE_I386); -#elif defined (__arm__) || defined (__arm64__) +#elif defined (__arm__) || defined (__arm64__) || defined (__aarch64__) if (m_is_64_bit) DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM64); else diff --git a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp index 2cfdd648db1..da948e8a9fc 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#if defined (__arm__) || defined (__arm64__) +#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) #include "MacOSX/arm/DNBArchImpl.h" #include "MacOSX/MachProcess.h" @@ -286,7 +286,7 @@ DNBArchMachARM::GetDBGState(bool force) return KERN_SUCCESS; // Read the registers from our thread -#if defined (ARM_DEBUG_STATE32) && defined (__arm64__) +#if defined (ARM_DEBUG_STATE32) && (defined (__arm64__) || defined (__aarch64__)) mach_msg_type_number_t count = ARM_DEBUG_STATE32_COUNT; kern_return_t kret = ::thread_get_state(m_thread->MachPortNumber(), ARM_DEBUG_STATE32, (thread_state_t)&m_state.dbg, &count); #else @@ -332,7 +332,7 @@ kern_return_t DNBArchMachARM::SetDBGState(bool also_set_on_task) { int set = e_regSetDBG; -#if defined (ARM_DEBUG_STATE32) && defined (__arm64__) +#if defined (ARM_DEBUG_STATE32) && (defined (__arm64__) || defined (__aarch64__)) kern_return_t kret = ::thread_set_state (m_thread->MachPortNumber(), ARM_DEBUG_STATE32, (thread_state_t)&m_state.dbg, ARM_DEBUG_STATE32_COUNT); if (also_set_on_task) { @@ -549,7 +549,7 @@ DNBArchMachARM::EnableHardwareSingleStep (bool enable) // an armv8 device, regardless of whether it was built for arch arm or arch arm64, // it needs to use the MDSCR_EL1 SS bit to single instruction step. -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) if (enable) { DNBLogThreadedIf(LOG_STEP, "%s: Setting MDSCR_EL1 Single Step bit at pc 0x%llx", __FUNCTION__, (uint64_t) m_state.context.gpr.__pc); @@ -723,7 +723,7 @@ DNBArchMachARM::NumSupportedHardwareBreakpoints() } else { -#if !defined (__arm64__) +#if !defined (__arm64__) && !defined (__aarch64__) // Read the DBGDIDR to get the number of available hardware breakpoints // However, in some of our current armv7 processors, hardware // breakpoints/watchpoints were not properly connected. So detect those @@ -784,7 +784,7 @@ DNBArchMachARM::NumSupportedHardwareWatchpoints() } else { -#if !defined (__arm64__) +#if !defined (__arm64__) && !defined (__aarch64__) // Read the DBGDIDR to get the number of available hardware breakpoints // However, in some of our current armv7 processors, hardware // breakpoints/watchpoints were not properly connected. So detect those @@ -928,7 +928,7 @@ DNBArchMachARM::DisableHardwareBreakpoint (uint32_t hw_index) // armv8 device, armv7 processes can watch dwords. But on a genuine armv7 // device I tried, only word watchpoints are supported. -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) #define WATCHPOINTS_ARE_DWORD 1 #else #undef WATCHPOINTS_ARE_DWORD diff --git a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h index 4d4609184e8..0f7a466fad1 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h +++ b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h @@ -14,7 +14,7 @@ #ifndef __DebugNubArchMachARM_h__ #define __DebugNubArchMachARM_h__ -#if defined (__arm__) || defined (__arm64__) +#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) #include "DNBArch.h" @@ -89,7 +89,7 @@ public: virtual bool StepNotComplete (); virtual uint32_t GetHardwareWatchpointHit(nub_addr_t &addr); -#if defined (ARM_DEBUG_STATE32) && defined (__arm64__) +#if defined (ARM_DEBUG_STATE32) && (defined (__arm64__) || defined (__aarch64__)) typedef arm_debug_state32_t DBG; #else typedef arm_debug_state_t DBG; @@ -115,7 +115,7 @@ protected: e_regSetGPR = ARM_THREAD_STATE, e_regSetVFP = ARM_VFP_STATE, e_regSetEXC = ARM_EXCEPTION_STATE, -#if defined (ARM_DEBUG_STATE32) && defined (__arm64__) +#if defined (ARM_DEBUG_STATE32) && (defined (__arm64__) || defined (__aarch64__)) e_regSetDBG = ARM_DEBUG_STATE32, #else e_regSetDBG = ARM_DEBUG_STATE, diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp index e8a486fbeb2..04a51dce0e6 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#if defined (__arm__) || defined (__arm64__) +#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) #include "MacOSX/arm64/DNBArchImplARM64.h" @@ -233,7 +233,7 @@ DNBArchMachARM64::GetVFPState(bool force) kern_return_t kret = ::thread_get_state(m_thread->MachPortNumber(), ARM_NEON_STATE64, (thread_state_t)&m_state.context.vfp, &count); if (DNBLogEnabledForAny (LOG_THREAD)) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) DNBLogThreaded("thread_get_state(0x%4.4x, %u, &vfp, %u) => 0x%8.8x (count = %u) regs" "\n q0 = 0x%16.16llx%16.16llx" "\n q1 = 0x%16.16llx%16.16llx" @@ -1506,7 +1506,7 @@ const char *g_invalidate_v29[] {"v29", "d29", "s29", NULL }; const char *g_invalidate_v30[] {"v30", "d30", "s30", NULL }; const char *g_invalidate_v31[] {"v31", "d31", "s31", NULL }; -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) #define VFP_V_OFFSET_IDX(idx) (offsetof (DNBArchMachARM64::FPU, __v) + (idx * 16) + offsetof (DNBArchMachARM64::Context, vfp)) #else #define VFP_V_OFFSET_IDX(idx) (offsetof (DNBArchMachARM64::FPU, opaque) + (idx * 16) + offsetof (DNBArchMachARM64::Context, vfp)) @@ -1753,7 +1753,7 @@ DNBArchMachARM64::GetRegisterValue(int set, int reg, DNBRegisterValue *value) if (reg >= vfp_v0 && reg <= vfp_v31) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&value->value.v_uint8, &m_state.context.vfp.__v[reg - vfp_v0], 16); #else memcpy (&value->value.v_uint8, ((uint8_t *) &m_state.context.vfp.opaque) + ((reg - vfp_v0) * 16), 16); @@ -1762,7 +1762,7 @@ DNBArchMachARM64::GetRegisterValue(int set, int reg, DNBRegisterValue *value) } else if (reg == vfp_fpsr) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&value->value.uint32, &m_state.context.vfp.__fpsr, 4); #else memcpy (&value->value.uint32, ((uint8_t *) &m_state.context.vfp.opaque) + (32 * 16) + 0, 4); @@ -1771,7 +1771,7 @@ DNBArchMachARM64::GetRegisterValue(int set, int reg, DNBRegisterValue *value) } else if (reg == vfp_fpcr) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&value->value.uint32, &m_state.context.vfp.__fpcr, 4); #else memcpy (&value->value.uint32, ((uint8_t *) &m_state.context.vfp.opaque) + (32 * 16) + 4, 4); @@ -1780,7 +1780,7 @@ DNBArchMachARM64::GetRegisterValue(int set, int reg, DNBRegisterValue *value) } else if (reg >= vfp_s0 && reg <= vfp_s31) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&value->value.v_uint8, &m_state.context.vfp.__v[reg - vfp_s0], 4); #else memcpy (&value->value.v_uint8, ((uint8_t *) &m_state.context.vfp.opaque) + ((reg - vfp_s0) * 16), 4); @@ -1789,7 +1789,7 @@ DNBArchMachARM64::GetRegisterValue(int set, int reg, DNBRegisterValue *value) } else if (reg >= vfp_d0 && reg <= vfp_d31) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&value->value.v_uint8, &m_state.context.vfp.__v[reg - vfp_d0], 8); #else memcpy (&value->value.v_uint8, ((uint8_t *) &m_state.context.vfp.opaque) + ((reg - vfp_d0) * 16), 8); @@ -1851,7 +1851,7 @@ DNBArchMachARM64::SetRegisterValue(int set, int reg, const DNBRegisterValue *val case e_regSetVFP: if (reg >= vfp_v0 && reg <= vfp_v31) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&m_state.context.vfp.__v[reg - vfp_v0], &value->value.v_uint8, 16); #else memcpy (((uint8_t *) &m_state.context.vfp.opaque) + ((reg - vfp_v0) * 16), &value->value.v_uint8, 16); @@ -1860,7 +1860,7 @@ DNBArchMachARM64::SetRegisterValue(int set, int reg, const DNBRegisterValue *val } else if (reg == vfp_fpsr) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&m_state.context.vfp.__fpsr, &value->value.uint32, 4); #else memcpy (((uint8_t *) &m_state.context.vfp.opaque) + (32 * 16) + 0, &value->value.uint32, 4); @@ -1869,7 +1869,7 @@ DNBArchMachARM64::SetRegisterValue(int set, int reg, const DNBRegisterValue *val } else if (reg == vfp_fpcr) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&m_state.context.vfp.__fpcr, &value->value.uint32, 4); #else memcpy (((uint8_t *) m_state.context.vfp.opaque) + (32 * 16) + 4, &value->value.uint32, 4); @@ -1878,7 +1878,7 @@ DNBArchMachARM64::SetRegisterValue(int set, int reg, const DNBRegisterValue *val } else if (reg >= vfp_s0 && reg <= vfp_s31) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&m_state.context.vfp.__v[reg - vfp_s0], &value->value.v_uint8, 4); #else memcpy (((uint8_t *) &m_state.context.vfp.opaque) + ((reg - vfp_s0) * 16), &value->value.v_uint8, 4); @@ -1887,7 +1887,7 @@ DNBArchMachARM64::SetRegisterValue(int set, int reg, const DNBRegisterValue *val } else if (reg >= vfp_d0 && reg <= vfp_d31) { -#if defined (__arm64__) +#if defined (__arm64__) || defined (__aarch64__) memcpy (&m_state.context.vfp.__v[reg - vfp_d0], &value->value.v_uint8, 8); #else memcpy (((uint8_t *) &m_state.context.vfp.opaque) + ((reg - vfp_d0) * 16), &value->value.v_uint8, 8); @@ -2090,4 +2090,4 @@ DNBArchMachARM64::RestoreRegisterState (uint32_t save_id) #endif // #if defined (ARM_THREAD_STATE64_COUNT) -#endif // #if defined (__arm__) +#endif // #if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h index 0d2a998265f..8f09659c878 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h @@ -11,7 +11,7 @@ #ifndef __DNBArchImplARM64_h__ #define __DNBArchImplARM64_h__ -#if defined (__arm__) || defined (__arm64__) +#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) #include <map> #include <mach/thread_status.h> diff --git a/lldb/tools/debugserver/source/RNBDefs.h b/lldb/tools/debugserver/source/RNBDefs.h index 0d94004ca1f..984b9115241 100644 --- a/lldb/tools/debugserver/source/RNBDefs.h +++ b/lldb/tools/debugserver/source/RNBDefs.h @@ -45,7 +45,7 @@ extern "C" const double debugserverVersionNumber; #define RNB_ARCH "ppc" -#elif defined (__arm64__) +#elif defined (__arm64__) || defined (__aarch64__) #define RNB_ARCH "arm64" diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp index 407f2e781e9..c731fbea02b 100644 --- a/lldb/tools/debugserver/source/RNBRemote.cpp +++ b/lldb/tools/debugserver/source/RNBRemote.cpp @@ -798,7 +798,7 @@ RNBRemote::ThreadFunctionReadRemoteData(void *arg) static cpu_type_t best_guess_cpu_type () { -#if defined (__arm__) || defined (__arm64__) +#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) if (sizeof (char *) == 8) { return CPU_TYPE_ARM64; @@ -4488,7 +4488,7 @@ RNBRemote::HandlePacket_qProcessInfo (const char *p) } #elif defined (__arm__) rep << "ptrsize:4;"; -#elif defined (__arm64__) && defined (ARM_UNIFIED_THREAD_STATE) +#elif (defined (__arm64__) || defined (__aarch64__)) && defined (ARM_UNIFIED_THREAD_STATE) nub_thread_t thread = DNBProcessGetCurrentThreadMachPort (pid); kern_return_t kr; arm_unified_thread_state_t gp_regs; |
