From a1cf154dd476e021a4c7924e49fac85da01cecf8 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 20 May 2022 09:27:44 -0700 Subject: [PATCH] [lldb] Set correct register number for cpsr (GENERIC_REGNUM_FLAGS) Report the correct register number (GENERIC_REGNUM_FLAGS) for cpsr. This fixes TestLldbGdbServer.py on Apple Silicon. Differential revision: https://reviews.llvm.org/D126076 --- lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp index e065718c7df9..fa4ba5f67263 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -1643,7 +1643,7 @@ const DNBRegisterInfo DNBArchMachARM64::g_gpr_registers[] = { // used for // userland debugging. {e_regSetGPR, gpr_cpsr, "cpsr", "flags", Uint, Hex, 4, - GPR_OFFSET_NAME(cpsr), dwarf_elr_mode, dwarf_elr_mode, INVALID_NUB_REGNUM, + GPR_OFFSET_NAME(cpsr), dwarf_elr_mode, dwarf_elr_mode, GENERIC_REGNUM_FLAGS, debugserver_gpr_cpsr, NULL, NULL}, DEFINE_PSEUDO_GPR_IDX(0, w0),