[Lldb-commits] [lldb] r186977 - elf-core: Remove now-unused compile-time FreeBSD support
Ed Maste
emaste at freebsd.org
Tue Jul 23 11:41:48 PDT 2013
Author: emaste
Date: Tue Jul 23 13:41:48 2013
New Revision: 186977
URL: http://llvm.org/viewvc/llvm-project?rev=186977&view=rev
Log:
elf-core: Remove now-unused compile-time FreeBSD support
This change removes the final instances of compile-time #ifdef magic
from the elf core plugin. Also rename the classes to ELFLinux... as
they're specific to Linux.
Modified:
lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp
lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.cpp
lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.h
Modified: lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp?rev=186977&r1=186976&r2=186977&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp (original)
+++ lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp Tue Jul 23 13:41:48 2013
@@ -486,8 +486,8 @@ ProcessElfCore::ParseThreadContextsFromN
bool have_prpsinfo = false;
ArchSpec arch = GetArchitecture();
- ELFPrPsInfo prpsinfo;
- ELFPrStatus prstatus;
+ ELFLinuxPrPsInfo prpsinfo;
+ ELFLinuxPrStatus prstatus;
size_t header_size;
size_t len;
@@ -548,7 +548,7 @@ ProcessElfCore::ParseThreadContextsFromN
have_prstatus = true;
prstatus.Parse(note_data, arch);
thread_data->signo = prstatus.pr_cursig;
- header_size = ELFPrStatus::GetSize(arch);
+ header_size = ELFLinuxPrStatus::GetSize(arch);
len = note_data.GetByteSize() - header_size;
thread_data->gpregset = DataExtractor(note_data, header_size, len);
break;
Modified: lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.cpp?rev=186977&r1=186976&r2=186977&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.cpp (original)
+++ lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.cpp Tue Jul 23 13:41:48 2013
@@ -131,21 +131,21 @@ ThreadElfCore::CalculateStopInfo ()
//----------------------------------------------------------------
// Parse PRSTATUS from NOTE entry
//----------------------------------------------------------------
-ELFPrStatus::ELFPrStatus()
+ELFLinuxPrStatus::ELFLinuxPrStatus()
{
- memset(this, 0, sizeof(ELFPrStatus));
+ memset(this, 0, sizeof(ELFLinuxPrStatus));
}
bool
-ELFPrStatus::Parse(DataExtractor &data, ArchSpec &arch)
+ELFLinuxPrStatus::Parse(DataExtractor &data, ArchSpec &arch)
{
ByteOrder byteorder = data.GetByteOrder();
size_t len;
switch(arch.GetCore())
{
case ArchSpec::eCore_x86_64_x86_64:
- len = data.ExtractBytes(0, ELFPRSTATUS64_SIZE, byteorder, this);
- return len == ELFPRSTATUS64_SIZE;
+ len = data.ExtractBytes(0, ELFLINUXPRSTATUS64_SIZE, byteorder, this);
+ return len == ELFLINUXPRSTATUS64_SIZE;
default:
return false;
}
@@ -154,21 +154,21 @@ ELFPrStatus::Parse(DataExtractor &data,
//----------------------------------------------------------------
// Parse PRPSINFO from NOTE entry
//----------------------------------------------------------------
-ELFPrPsInfo::ELFPrPsInfo()
+ELFLinuxPrPsInfo::ELFLinuxPrPsInfo()
{
- memset(this, 0, sizeof(ELFPrPsInfo));
+ memset(this, 0, sizeof(ELFLinuxPrPsInfo));
}
bool
-ELFPrPsInfo::Parse(DataExtractor &data, ArchSpec &arch)
+ELFLinuxPrPsInfo::Parse(DataExtractor &data, ArchSpec &arch)
{
ByteOrder byteorder = data.GetByteOrder();
size_t len;
switch(arch.GetCore())
{
case ArchSpec::eCore_x86_64_x86_64:
- len = data.ExtractBytes(0, ELFPRPSINFO64_SIZE, byteorder, this);
- return len == ELFPRPSINFO64_SIZE;
+ len = data.ExtractBytes(0, ELFLINUXPRPSINFO64_SIZE, byteorder, this);
+ return len == ELFLINUXPRPSINFO64_SIZE;
default:
return false;
}
Modified: lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.h?rev=186977&r1=186976&r2=186977&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.h (original)
+++ lldb/trunk/source/Plugins/Process/elf-core/ThreadElfCore.h Tue Jul 23 13:41:48 2013
@@ -26,25 +26,11 @@ struct compat_timeval
// simply reading data from the buffer.
// The following macros are used to specify the size.
// Calculating size using sizeof() wont work because of padding.
-#ifdef __FreeBSD__
-#define ELFPRSTATUS64_SIZE (48)
-#define ELFPRPSINFO64_SIZE (120)
-#else
-#define ELFPRSTATUS64_SIZE (112)
-#define ELFPRPSINFO64_SIZE (132)
-#endif
+#define ELFLINUXPRSTATUS64_SIZE (112)
+#define ELFLINUXPRPSINFO64_SIZE (132)
-struct ELFPrStatus
+struct ELFLinuxPrStatus
{
-#ifdef __FreeBSD__
- int32_t pr_version;
- uint64_t pr_statussz;
- uint64_t pr_gregsetsz;
- uint64_t pr_fpregsetsz;
- int32_t pr_osreldate;
- int32_t pr_cursig;
- uint32_t pr_pid;
-#else
int32_t si_signo;
int32_t si_code;
int32_t si_errno;
@@ -63,9 +49,8 @@ struct ELFPrStatus
compat_timeval pr_stime;
compat_timeval pr_cutime;
compat_timeval pr_cstime;
-#endif
- ELFPrStatus();
+ ELFLinuxPrStatus();
bool
Parse(lldb_private::DataExtractor &data, lldb_private::ArchSpec &arch);
@@ -76,21 +61,15 @@ struct ELFPrStatus
switch(arch.GetCore())
{
case lldb_private::ArchSpec::eCore_x86_64_x86_64:
- return ELFPRSTATUS64_SIZE;
+ return ELFLINUXPRSTATUS64_SIZE;
default:
return 0;
}
}
};
-struct ELFPrPsInfo
+struct ELFLinuxPrPsInfo
{
-#ifdef __FreeBSD__
- int32_t pr_version;
- uint64_t pr_psinfosz;
- char pr_fname[17];
- char pr_psargs[81];
-#else
char pr_state;
char pr_sname;
char pr_zomb;
@@ -104,9 +83,8 @@ struct ELFPrPsInfo
int32_t pr_sid;
char pr_fname[16];
char pr_psargs[80];
-#endif
- ELFPrPsInfo();
+ ELFLinuxPrPsInfo();
bool
Parse(lldb_private::DataExtractor &data, lldb_private::ArchSpec &arch);
@@ -117,7 +95,7 @@ struct ELFPrPsInfo
switch(arch.GetCore())
{
case lldb_private::ArchSpec::eCore_x86_64_x86_64:
- return ELFPRPSINFO64_SIZE;
+ return ELFLINUXPRPSINFO64_SIZE;
default:
return 0;
}
More information about the lldb-commits
mailing list