[Lldb-commits] [lldb] r211903 - Revert the debugserver part of r211868. While formally a fine change, debugserver
Todd Fiala
tfiala at google.com
Fri Jun 27 10:19:49 PDT 2014
> While formally a fine change, debugserver
doesn't depend on llvm (it really doesn't even depend on anything in lldb)
and this
nicety isn't worth adding that dependence.
And it broke the Xcode build.
Thanks for fixing, Jim!
On Fri, Jun 27, 2014 at 9:02 AM, Jim Ingham <jingham at apple.com> wrote:
> Author: jingham
> Date: Fri Jun 27 11:02:55 2014
> New Revision: 211903
>
> URL: http://llvm.org/viewvc/llvm-project?rev=211903&view=rev
> Log:
> Revert the debugserver part of r211868. While formally a fine change,
> debugserver
> doesn't depend on llvm (it really doesn't even depend on anything in lldb)
> and this
> nicety isn't worth adding that dependence.
>
>
> Modified:
> lldb/trunk/tools/debugserver/source/DNB.cpp
> lldb/trunk/tools/debugserver/source/MacOSX/MachThreadList.cpp
> lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
> lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
> lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
> lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp
> lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
> lldb/trunk/tools/debugserver/source/TTYState.h
>
> Modified: lldb/trunk/tools/debugserver/source/DNB.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/DNB.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/DNB.cpp (original)
> +++ lldb/trunk/tools/debugserver/source/DNB.cpp Fri Jun 27 11:02:55 2014
> @@ -47,7 +47,6 @@
> #include "DNBTimer.h"
> #include "CFBundle.h"
>
> -#include "llvm/ADT/STLExtras.h"
>
> typedef std::shared_ptr<MachProcess> MachProcessSP;
> typedef std::map<nub_process_t, MachProcessSP> ProcessMap;
> @@ -543,7 +542,7 @@ GetAllInfos (std::vector<struct kinfo_pr
> {
> size_t size = 0;
> int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
> - u_int namelen = llvm::array_lengthof(name);
> + u_int namelen = sizeof(name)/sizeof(int);
> int err;
>
> // Try to find out how many processes are around so we can
>
> Modified: lldb/trunk/tools/debugserver/source/MacOSX/MachThreadList.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/MachThreadList.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/MacOSX/MachThreadList.cpp
> (original)
> +++ lldb/trunk/tools/debugserver/source/MacOSX/MachThreadList.cpp Fri Jun
> 27 11:02:55 2014
> @@ -20,8 +20,6 @@
> #include "DNBThreadResumeActions.h"
> #include "MachProcess.h"
>
> -#include "llvm/ADT/STLExtras.h"
> -
> MachThreadList::MachThreadList() :
> m_threads(),
> m_threads_mutex(PTHREAD_MUTEX_RECURSIVE),
> @@ -315,7 +313,7 @@ MachThreadList::UpdateThreadList(MachPro
> int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID,
> process->ProcessID() };
> struct kinfo_proc processInfo;
> size_t bufsize = sizeof(processInfo);
> - if (sysctl(mib, llvm::array_lengthof(mib), &processInfo,
> &bufsize, NULL, 0) == 0 && bufsize > 0)
> + if (sysctl(mib, (unsigned)(sizeof(mib)/sizeof(int)),
> &processInfo, &bufsize, NULL, 0) == 0 && bufsize > 0)
> {
> if (processInfo.kp_proc.p_flag & P_LP64)
> m_is_64_bit = true;
>
> Modified: lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
> (original)
> +++ lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp Fri Jun
> 27 11:02:55 2014
> @@ -23,8 +23,6 @@
> #include "ARM_GCC_Registers.h"
> #include "ARM_DWARF_Registers.h"
>
> -#include "llvm/ADT/STLExtras.h"
> -
> #include <inttypes.h>
> #include <sys/sysctl.h>
>
> @@ -1557,9 +1555,9 @@ DNBArchMachARM::g_exc_registers[] =
> };
>
> // Number of registers in each register set
> -const size_t DNBArchMachARM::k_num_gpr_registers =
> llvm::array_lengthof(g_gpr_registers);
> -const size_t DNBArchMachARM::k_num_vfp_registers =
> llvm::array_lengthof(g_vfp_registers);
> -const size_t DNBArchMachARM::k_num_exc_registers =
> llvm::array_lengthof(g_exc_registers);
> +const size_t DNBArchMachARM::k_num_gpr_registers =
> sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchMachARM::k_num_vfp_registers =
> sizeof(g_vfp_registers)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchMachARM::k_num_exc_registers =
> sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
> const size_t DNBArchMachARM::k_num_all_registers = k_num_gpr_registers +
> k_num_vfp_registers + k_num_exc_registers;
>
> //----------------------------------------------------------------------
> @@ -1576,7 +1574,7 @@ DNBArchMachARM::g_reg_sets[] =
> { "Exception State Registers", g_exc_registers,
> k_num_exc_registers }
> };
> // Total number of register sets for this architecture
> -const size_t DNBArchMachARM::k_num_register_sets =
> llvm::array_lengthof(g_reg_sets);
> +const size_t DNBArchMachARM::k_num_register_sets =
> sizeof(g_reg_sets)/sizeof(DNBRegisterSetInfo);
>
>
> const DNBRegisterSetInfo *
>
> Modified:
> lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
> (original)
> +++ lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp
> Fri Jun 27 11:02:55 2014
> @@ -24,8 +24,6 @@
> #include "DNBRegisterInfo.h"
> #include "DNB.h"
>
> -#include "llvm/ADT/STLExtras.h"
> -
> #include <inttypes.h>
> #include <sys/sysctl.h>
>
> @@ -1646,9 +1644,9 @@ DNBArchMachARM64::g_exc_registers[] =
> };
>
> // Number of registers in each register set
> -const size_t DNBArchMachARM64::k_num_gpr_registers =
> llvm::array_lengthof(g_gpr_registers);
> -const size_t DNBArchMachARM64::k_num_vfp_registers =
> llvm::array_lengthof(g_vfp_registers);
> -const size_t DNBArchMachARM64::k_num_exc_registers =
> llvm::array_lengthof(g_exc_registers);
> +const size_t DNBArchMachARM64::k_num_gpr_registers =
> sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchMachARM64::k_num_vfp_registers =
> sizeof(g_vfp_registers)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchMachARM64::k_num_exc_registers =
> sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
> const size_t DNBArchMachARM64::k_num_all_registers = k_num_gpr_registers
> + k_num_vfp_registers + k_num_exc_registers;
>
> //----------------------------------------------------------------------
> @@ -1665,7 +1663,7 @@ DNBArchMachARM64::g_reg_sets[] =
> { "Exception State Registers", g_exc_registers,
> k_num_exc_registers }
> };
> // Total number of register sets for this architecture
> -const size_t DNBArchMachARM64::k_num_register_sets =
> llvm::array_lengthof(g_reg_sets);
> +const size_t DNBArchMachARM64::k_num_register_sets =
> sizeof(g_reg_sets)/sizeof(DNBRegisterSetInfo);
>
>
> const DNBRegisterSetInfo *
>
> Modified:
> lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
> (original)
> +++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
> Fri Jun 27 11:02:55 2014
> @@ -20,8 +20,6 @@
> #include "MachThread.h"
> #include "MachProcess.h"
>
> -#include "llvm/ADT/STLExtras.h"
> -
> extern "C" bool CPUHasAVX(); // Defined over in DNBArchImplX86_64.cpp
>
> #if defined (LLDB_DEBUGSERVER_RELEASE) || defined (LLDB_DEBUGSERVER_DEBUG)
> @@ -1203,10 +1201,10 @@ DNBArchImplI386::g_exc_registers[] =
> };
>
> // Number of registers in each register set
> -const size_t DNBArchImplI386::k_num_gpr_registers =
> llvm::array_lengthof(g_gpr_registers);
> -const size_t DNBArchImplI386::k_num_fpu_registers_no_avx =
> llvm::array_lengthof(g_fpu_registers_no_avx);
> -const size_t DNBArchImplI386::k_num_fpu_registers_avx =
> llvm::array_lengthof(g_fpu_registers_avx);
> -const size_t DNBArchImplI386::k_num_exc_registers =
> llvm::array_lengthof(g_exc_registers);
> +const size_t DNBArchImplI386::k_num_gpr_registers =
> sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchImplI386::k_num_fpu_registers_no_avx =
> sizeof(g_fpu_registers_no_avx)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchImplI386::k_num_fpu_registers_avx =
> sizeof(g_fpu_registers_avx)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchImplI386::k_num_exc_registers =
> sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
> const size_t DNBArchImplI386::k_num_all_registers_no_avx =
> k_num_gpr_registers + k_num_fpu_registers_no_avx + k_num_exc_registers;
> const size_t DNBArchImplI386::k_num_all_registers_avx =
> k_num_gpr_registers + k_num_fpu_registers_avx + k_num_exc_registers;
>
> @@ -1234,7 +1232,7 @@ DNBArchImplI386::g_reg_sets_avx[] =
> };
>
> // Total number of register sets for this architecture
> -const size_t DNBArchImplI386::k_num_register_sets =
> llvm::array_lengthof(g_reg_sets_no_avx);
> +const size_t DNBArchImplI386::k_num_register_sets =
> sizeof(g_reg_sets_no_avx)/sizeof(DNBRegisterSetInfo);
>
> DNBArchProtocol *
> DNBArchImplI386::Create (MachThread *thread)
>
> Modified: lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp
> (original)
> +++ lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp Fri Jun
> 27 11:02:55 2014
> @@ -25,8 +25,6 @@
> #include "DNBLog.h"
> #include "DNBRegisterInfo.h"
>
> -#include "llvm/ADT/STLExtras.h"
> -
> static const uint8_t g_breakpoint_opcode[] = { 0x7F, 0xC0, 0x00, 0x08 };
>
> const uint8_t * const
> @@ -388,10 +386,10 @@ static DNBRegisterInfo g_vec_registers[]
> };
>
> // Number of registers in each register set
> -const size_t k_num_gpr_registers = llvm::array_lengthof(g_gpr_registers);
> -const size_t k_num_fpr_registers = llvm::array_lengthof(g_fpr_registers);
> -const size_t k_num_exc_registers = llvm::array_lengthof(g_exc_registers);
> -const size_t k_num_vec_registers = llvm::array_lengthof(g_vec_registers);
> +const size_t k_num_gpr_registers =
> sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
> +const size_t k_num_fpr_registers =
> sizeof(g_fpr_registers)/sizeof(DNBRegisterInfo);
> +const size_t k_num_exc_registers =
> sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
> +const size_t k_num_vec_registers =
> sizeof(g_vec_registers)/sizeof(DNBRegisterInfo);
> // Total number of registers for this architecture
> const size_t k_num_ppc_registers = k_num_gpr_registers +
> k_num_fpr_registers + k_num_exc_registers + k_num_vec_registers;
>
> @@ -409,7 +407,7 @@ static const DNBRegisterSetInfo g_reg_se
> { "Altivec Registers", g_vec_registers,
> k_num_vec_registers }
> };
> // Total number of register sets for this architecture
> -const size_t k_num_register_sets = llvm::array_lengthof(g_reg_sets);
> +const size_t k_num_register_sets =
> sizeof(g_reg_sets)/sizeof(DNBRegisterSetInfo);
>
>
> const DNBRegisterSetInfo *
>
> Modified:
> lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> ---
> lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
> (original)
> +++
> lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Fri
> Jun 27 11:02:55 2014
> @@ -13,8 +13,6 @@
>
> #if defined (__i386__) || defined (__x86_64__)
>
> -#include "llvm/ADT/STLExtras.h"
> -
> #include <sys/cdefs.h>
> #include <sys/types.h>
> #include <sys/sysctl.h>
> @@ -1527,10 +1525,10 @@ DNBArchImplX86_64::g_exc_registers[] =
> };
>
> // Number of registers in each register set
> -const size_t DNBArchImplX86_64::k_num_gpr_registers =
> llvm::array_lengthof(g_gpr_registers);
> -const size_t DNBArchImplX86_64::k_num_fpu_registers_no_avx =
> llvm::array_lengthof(g_fpu_registers_no_avx);
> -const size_t DNBArchImplX86_64::k_num_fpu_registers_avx =
> llvm::array_lengthof(g_fpu_registers_avx);
> -const size_t DNBArchImplX86_64::k_num_exc_registers =
> llvm::array_lengthof(g_exc_registers);
> +const size_t DNBArchImplX86_64::k_num_gpr_registers =
> sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchImplX86_64::k_num_fpu_registers_no_avx =
> sizeof(g_fpu_registers_no_avx)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchImplX86_64::k_num_fpu_registers_avx =
> sizeof(g_fpu_registers_avx)/sizeof(DNBRegisterInfo);
> +const size_t DNBArchImplX86_64::k_num_exc_registers =
> sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
> const size_t DNBArchImplX86_64::k_num_all_registers_no_avx =
> k_num_gpr_registers + k_num_fpu_registers_no_avx + k_num_exc_registers;
> const size_t DNBArchImplX86_64::k_num_all_registers_avx =
> k_num_gpr_registers + k_num_fpu_registers_avx + k_num_exc_registers;
>
> @@ -1558,7 +1556,7 @@ DNBArchImplX86_64::g_reg_sets_avx[] =
> };
>
> // Total number of register sets for this architecture
> -const size_t DNBArchImplX86_64::k_num_register_sets =
> llvm::array_lengthof(g_reg_sets_avx);
> +const size_t DNBArchImplX86_64::k_num_register_sets =
> sizeof(g_reg_sets_avx)/sizeof(DNBRegisterSetInfo);
>
>
> DNBArchProtocol *
>
> Modified: lldb/trunk/tools/debugserver/source/TTYState.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/TTYState.h?rev=211903&r1=211902&r2=211903&view=diff
>
> ==============================================================================
> --- lldb/trunk/tools/debugserver/source/TTYState.h (original)
> +++ lldb/trunk/tools/debugserver/source/TTYState.h Fri Jun 27 11:02:55 2014
> @@ -17,8 +17,6 @@
> #include <termios.h>
> #include <stdint.h>
>
> -#include "llvm/ADT/STLExtras.h"
> -
> class TTYState
> {
> public:
> @@ -52,7 +50,7 @@ public:
>
> bool GetState(uint32_t idx, int fd, bool saveProcessGroup);
> bool SetState(uint32_t idx) const;
> - uint32_t NumStates() const { return
> llvm::array_lengthof(m_ttystates); }
> + uint32_t NumStates() const { return
> sizeof(m_ttystates)/sizeof(TTYState); }
> bool ValidStateIndex(uint32_t idx) const { return idx < NumStates(); }
>
> protected:
> @@ -60,4 +58,4 @@ protected:
> TTYState m_ttystates[2];
> };
>
> -#endif
> +#endif
> \ No newline at end of file
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
>
--
Todd Fiala | Software Engineer | tfiala at google.com | 650-943-3180
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20140627/0d254a7a/attachment.html>
More information about the lldb-commits
mailing list