Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a95b7db

Browse files
jiminghamjimingham
committedJun 27, 2014
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. git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@211903 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 4b6dc43 commit a95b7db

File tree

8 files changed

+27
-42
lines changed

8 files changed

+27
-42
lines changed
 

‎tools/debugserver/source/DNB.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#include "DNBTimer.h"
4848
#include "CFBundle.h"
4949

50-
#include "llvm/ADT/STLExtras.h"
5150

5251
typedef std::shared_ptr<MachProcess> MachProcessSP;
5352
typedef std::map<nub_process_t, MachProcessSP> ProcessMap;
@@ -543,7 +542,7 @@ GetAllInfos (std::vector<struct kinfo_proc>& proc_infos)
543542
{
544543
size_t size = 0;
545544
int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
546-
u_int namelen = llvm::array_lengthof(name);
545+
u_int namelen = sizeof(name)/sizeof(int);
547546
int err;
548547

549548
// Try to find out how many processes are around so we can

‎tools/debugserver/source/MacOSX/MachThreadList.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include "DNBThreadResumeActions.h"
2121
#include "MachProcess.h"
2222

23-
#include "llvm/ADT/STLExtras.h"
24-
2523
MachThreadList::MachThreadList() :
2624
m_threads(),
2725
m_threads_mutex(PTHREAD_MUTEX_RECURSIVE),
@@ -315,7 +313,7 @@ MachThreadList::UpdateThreadList(MachProcess *process, bool update, MachThreadLi
315313
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process->ProcessID() };
316314
struct kinfo_proc processInfo;
317315
size_t bufsize = sizeof(processInfo);
318-
if (sysctl(mib, llvm::array_lengthof(mib), &processInfo, &bufsize, NULL, 0) == 0 && bufsize > 0)
316+
if (sysctl(mib, (unsigned)(sizeof(mib)/sizeof(int)), &processInfo, &bufsize, NULL, 0) == 0 && bufsize > 0)
319317
{
320318
if (processInfo.kp_proc.p_flag & P_LP64)
321319
m_is_64_bit = true;

‎tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include "ARM_GCC_Registers.h"
2424
#include "ARM_DWARF_Registers.h"
2525

26-
#include "llvm/ADT/STLExtras.h"
27-
2826
#include <inttypes.h>
2927
#include <sys/sysctl.h>
3028

@@ -1557,9 +1555,9 @@ DNBArchMachARM::g_exc_registers[] =
15571555
};
15581556

15591557
// Number of registers in each register set
1560-
const size_t DNBArchMachARM::k_num_gpr_registers = llvm::array_lengthof(g_gpr_registers);
1561-
const size_t DNBArchMachARM::k_num_vfp_registers = llvm::array_lengthof(g_vfp_registers);
1562-
const size_t DNBArchMachARM::k_num_exc_registers = llvm::array_lengthof(g_exc_registers);
1558+
const size_t DNBArchMachARM::k_num_gpr_registers = sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
1559+
const size_t DNBArchMachARM::k_num_vfp_registers = sizeof(g_vfp_registers)/sizeof(DNBRegisterInfo);
1560+
const size_t DNBArchMachARM::k_num_exc_registers = sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
15631561
const size_t DNBArchMachARM::k_num_all_registers = k_num_gpr_registers + k_num_vfp_registers + k_num_exc_registers;
15641562

15651563
//----------------------------------------------------------------------
@@ -1576,7 +1574,7 @@ DNBArchMachARM::g_reg_sets[] =
15761574
{ "Exception State Registers", g_exc_registers, k_num_exc_registers }
15771575
};
15781576
// Total number of register sets for this architecture
1579-
const size_t DNBArchMachARM::k_num_register_sets = llvm::array_lengthof(g_reg_sets);
1577+
const size_t DNBArchMachARM::k_num_register_sets = sizeof(g_reg_sets)/sizeof(DNBRegisterSetInfo);
15801578

15811579

15821580
const DNBRegisterSetInfo *

‎tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
#include "DNBRegisterInfo.h"
2525
#include "DNB.h"
2626

27-
#include "llvm/ADT/STLExtras.h"
28-
2927
#include <inttypes.h>
3028
#include <sys/sysctl.h>
3129

@@ -1646,9 +1644,9 @@ DNBArchMachARM64::g_exc_registers[] =
16461644
};
16471645

16481646
// Number of registers in each register set
1649-
const size_t DNBArchMachARM64::k_num_gpr_registers = llvm::array_lengthof(g_gpr_registers);
1650-
const size_t DNBArchMachARM64::k_num_vfp_registers = llvm::array_lengthof(g_vfp_registers);
1651-
const size_t DNBArchMachARM64::k_num_exc_registers = llvm::array_lengthof(g_exc_registers);
1647+
const size_t DNBArchMachARM64::k_num_gpr_registers = sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
1648+
const size_t DNBArchMachARM64::k_num_vfp_registers = sizeof(g_vfp_registers)/sizeof(DNBRegisterInfo);
1649+
const size_t DNBArchMachARM64::k_num_exc_registers = sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
16521650
const size_t DNBArchMachARM64::k_num_all_registers = k_num_gpr_registers + k_num_vfp_registers + k_num_exc_registers;
16531651

16541652
//----------------------------------------------------------------------
@@ -1665,7 +1663,7 @@ DNBArchMachARM64::g_reg_sets[] =
16651663
{ "Exception State Registers", g_exc_registers, k_num_exc_registers }
16661664
};
16671665
// Total number of register sets for this architecture
1668-
const size_t DNBArchMachARM64::k_num_register_sets = llvm::array_lengthof(g_reg_sets);
1666+
const size_t DNBArchMachARM64::k_num_register_sets = sizeof(g_reg_sets)/sizeof(DNBRegisterSetInfo);
16691667

16701668

16711669
const DNBRegisterSetInfo *

‎tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include "MachThread.h"
2121
#include "MachProcess.h"
2222

23-
#include "llvm/ADT/STLExtras.h"
24-
2523
extern "C" bool CPUHasAVX(); // Defined over in DNBArchImplX86_64.cpp
2624

2725
#if defined (LLDB_DEBUGSERVER_RELEASE) || defined (LLDB_DEBUGSERVER_DEBUG)
@@ -1203,10 +1201,10 @@ DNBArchImplI386::g_exc_registers[] =
12031201
};
12041202

12051203
// Number of registers in each register set
1206-
const size_t DNBArchImplI386::k_num_gpr_registers = llvm::array_lengthof(g_gpr_registers);
1207-
const size_t DNBArchImplI386::k_num_fpu_registers_no_avx = llvm::array_lengthof(g_fpu_registers_no_avx);
1208-
const size_t DNBArchImplI386::k_num_fpu_registers_avx = llvm::array_lengthof(g_fpu_registers_avx);
1209-
const size_t DNBArchImplI386::k_num_exc_registers = llvm::array_lengthof(g_exc_registers);
1204+
const size_t DNBArchImplI386::k_num_gpr_registers = sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
1205+
const size_t DNBArchImplI386::k_num_fpu_registers_no_avx = sizeof(g_fpu_registers_no_avx)/sizeof(DNBRegisterInfo);
1206+
const size_t DNBArchImplI386::k_num_fpu_registers_avx = sizeof(g_fpu_registers_avx)/sizeof(DNBRegisterInfo);
1207+
const size_t DNBArchImplI386::k_num_exc_registers = sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
12101208
const size_t DNBArchImplI386::k_num_all_registers_no_avx = k_num_gpr_registers + k_num_fpu_registers_no_avx + k_num_exc_registers;
12111209
const size_t DNBArchImplI386::k_num_all_registers_avx = k_num_gpr_registers + k_num_fpu_registers_avx + k_num_exc_registers;
12121210

@@ -1234,7 +1232,7 @@ DNBArchImplI386::g_reg_sets_avx[] =
12341232
};
12351233

12361234
// Total number of register sets for this architecture
1237-
const size_t DNBArchImplI386::k_num_register_sets = llvm::array_lengthof(g_reg_sets_no_avx);
1235+
const size_t DNBArchImplI386::k_num_register_sets = sizeof(g_reg_sets_no_avx)/sizeof(DNBRegisterSetInfo);
12381236

12391237
DNBArchProtocol *
12401238
DNBArchImplI386::Create (MachThread *thread)

‎tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
#include "DNBLog.h"
2626
#include "DNBRegisterInfo.h"
2727

28-
#include "llvm/ADT/STLExtras.h"
29-
3028
static const uint8_t g_breakpoint_opcode[] = { 0x7F, 0xC0, 0x00, 0x08 };
3129

3230
const uint8_t * const
@@ -388,10 +386,10 @@ static DNBRegisterInfo g_vec_registers[] =
388386
};
389387

390388
// Number of registers in each register set
391-
const size_t k_num_gpr_registers = llvm::array_lengthof(g_gpr_registers);
392-
const size_t k_num_fpr_registers = llvm::array_lengthof(g_fpr_registers);
393-
const size_t k_num_exc_registers = llvm::array_lengthof(g_exc_registers);
394-
const size_t k_num_vec_registers = llvm::array_lengthof(g_vec_registers);
389+
const size_t k_num_gpr_registers = sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
390+
const size_t k_num_fpr_registers = sizeof(g_fpr_registers)/sizeof(DNBRegisterInfo);
391+
const size_t k_num_exc_registers = sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
392+
const size_t k_num_vec_registers = sizeof(g_vec_registers)/sizeof(DNBRegisterInfo);
395393
// Total number of registers for this architecture
396394
const size_t k_num_ppc_registers = k_num_gpr_registers + k_num_fpr_registers + k_num_exc_registers + k_num_vec_registers;
397395

@@ -409,7 +407,7 @@ static const DNBRegisterSetInfo g_reg_sets[] =
409407
{ "Altivec Registers", g_vec_registers, k_num_vec_registers }
410408
};
411409
// Total number of register sets for this architecture
412-
const size_t k_num_register_sets = llvm::array_lengthof(g_reg_sets);
410+
const size_t k_num_register_sets = sizeof(g_reg_sets)/sizeof(DNBRegisterSetInfo);
413411

414412

415413
const DNBRegisterSetInfo *

‎tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
#if defined (__i386__) || defined (__x86_64__)
1515

16-
#include "llvm/ADT/STLExtras.h"
17-
1816
#include <sys/cdefs.h>
1917
#include <sys/types.h>
2018
#include <sys/sysctl.h>
@@ -1527,10 +1525,10 @@ DNBArchImplX86_64::g_exc_registers[] =
15271525
};
15281526

15291527
// Number of registers in each register set
1530-
const size_t DNBArchImplX86_64::k_num_gpr_registers = llvm::array_lengthof(g_gpr_registers);
1531-
const size_t DNBArchImplX86_64::k_num_fpu_registers_no_avx = llvm::array_lengthof(g_fpu_registers_no_avx);
1532-
const size_t DNBArchImplX86_64::k_num_fpu_registers_avx = llvm::array_lengthof(g_fpu_registers_avx);
1533-
const size_t DNBArchImplX86_64::k_num_exc_registers = llvm::array_lengthof(g_exc_registers);
1528+
const size_t DNBArchImplX86_64::k_num_gpr_registers = sizeof(g_gpr_registers)/sizeof(DNBRegisterInfo);
1529+
const size_t DNBArchImplX86_64::k_num_fpu_registers_no_avx = sizeof(g_fpu_registers_no_avx)/sizeof(DNBRegisterInfo);
1530+
const size_t DNBArchImplX86_64::k_num_fpu_registers_avx = sizeof(g_fpu_registers_avx)/sizeof(DNBRegisterInfo);
1531+
const size_t DNBArchImplX86_64::k_num_exc_registers = sizeof(g_exc_registers)/sizeof(DNBRegisterInfo);
15341532
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;
15351533
const size_t DNBArchImplX86_64::k_num_all_registers_avx = k_num_gpr_registers + k_num_fpu_registers_avx + k_num_exc_registers;
15361534

@@ -1558,7 +1556,7 @@ DNBArchImplX86_64::g_reg_sets_avx[] =
15581556
};
15591557

15601558
// Total number of register sets for this architecture
1561-
const size_t DNBArchImplX86_64::k_num_register_sets = llvm::array_lengthof(g_reg_sets_avx);
1559+
const size_t DNBArchImplX86_64::k_num_register_sets = sizeof(g_reg_sets_avx)/sizeof(DNBRegisterSetInfo);
15621560

15631561

15641562
DNBArchProtocol *

‎tools/debugserver/source/TTYState.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#include <termios.h>
1818
#include <stdint.h>
1919

20-
#include "llvm/ADT/STLExtras.h"
21-
2220
class TTYState
2321
{
2422
public:
@@ -52,12 +50,12 @@ class TTYStateSwitcher
5250

5351
bool GetState(uint32_t idx, int fd, bool saveProcessGroup);
5452
bool SetState(uint32_t idx) const;
55-
uint32_t NumStates() const { return llvm::array_lengthof(m_ttystates); }
53+
uint32_t NumStates() const { return sizeof(m_ttystates)/sizeof(TTYState); }
5654
bool ValidStateIndex(uint32_t idx) const { return idx < NumStates(); }
5755

5856
protected:
5957
mutable uint32_t m_currentState;
6058
TTYState m_ttystates[2];
6159
};
6260

63-
#endif
61+
#endif

0 commit comments

Comments
 (0)
This repository has been archived.