mgorny updated this revision to Diff 401364.
mgorny added a comment.
Cover more union members.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D117707/new/
https://reviews.llvm.org/D117707
Files:
lldb/bindings/interface/SBPlatform.i
lldb/include/lldb/API/SBPlatform.h
lldb/include/lldb/API/SBType.h
lldb/include/lldb/Target/Platform.h
lldb/source/API/SBPlatform.cpp
lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
lldb/source/Plugins/Platform/Linux/PlatformLinux.h
lldb/source/Target/Platform.cpp
Index: lldb/source/Target/Platform.cpp
===================================================================
--- lldb/source/Target/Platform.cpp
+++ lldb/source/Target/Platform.cpp
@@ -2003,3 +2003,7 @@
return 0;
}
+
+CompilerType Platform::GetSiginfoType(lldb_private::Target &target) {
+ return CompilerType();
+}
Index: lldb/source/Plugins/Platform/Linux/PlatformLinux.h
===================================================================
--- lldb/source/Plugins/Platform/Linux/PlatformLinux.h
+++ lldb/source/Plugins/Platform/Linux/PlatformLinux.h
@@ -58,6 +58,8 @@
unsigned flags, lldb::addr_t fd,
lldb::addr_t offset) override;
+ CompilerType GetSiginfoType(lldb_private::Target &target) override;
+
std::vector<ArchSpec> m_supported_architectures;
};
Index: lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
===================================================================
--- lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
+++ lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
@@ -14,6 +14,7 @@
#include <sys/utsname.h>
#endif
+#include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
#include "Utility/ARM64_DWARF_Registers.h"
#include "lldb/Core/Debugger.h"
#include "lldb/Core/PluginManager.h"
@@ -309,3 +310,126 @@
return args;
}
+CompilerType PlatformLinux::GetSiginfoType(lldb_private::Target &target) {
+ CompilerType type;
+ TypeSystemClang *ast = ScratchTypeSystemClang::GetForTarget(target);
+ if (!ast)
+ return type;
+ const ArchSpec &arch = target.GetArchitecture();
+
+ CompilerType int_type = ast->GetBasicType(eBasicTypeInt);
+ CompilerType uint_type = ast->GetBasicType(eBasicTypeUnsignedInt);
+ CompilerType long_type = ast->GetBasicType(eBasicTypeLong);
+ CompilerType voidp_type = ast->GetBasicType(eBasicTypeVoid).GetPointerType();
+
+ CompilerType &pid_type = int_type;
+ CompilerType &uid_type = uint_type;
+ CompilerType &clock_type = long_type;
+
+ CompilerType sigval_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_sigval_t",
+ clang::TTK_Union, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(sigval_type);
+ ast->AddFieldToRecordType(sigval_type, "sival_int", int_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sigval_type, "sival_ptr", voidp_type,
+ lldb::eAccessPublic, 0);
+ ast->CompleteTagDeclarationDefinition(sigval_type);
+
+ CompilerType siginfo_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "__lldb_siginfo_t",
+ clang::TTK_Struct, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(siginfo_type);
+ ast->AddFieldToRecordType(siginfo_type, "si_signo", int_type,
+ lldb::eAccessPublic, 0);
+
+ // mips has si_code and si_errno swapped
+ switch (arch.GetMachine()) {
+ case llvm::Triple::mips:
+ ast->AddFieldToRecordType(siginfo_type, "si_code", int_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type,
+ lldb::eAccessPublic, 0);
+ break;
+ default:
+ ast->AddFieldToRecordType(siginfo_type, "si_errno", int_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(siginfo_type, "si_code", int_type,
+ lldb::eAccessPublic, 0);
+ }
+
+ // the structure is padded on 64-bit arches to fix alignment
+ if (arch.GetAddressByteSize() == 8)
+ ast->AddFieldToRecordType(siginfo_type, "__pad0", int_type,
+ lldb::eAccessPublic, 0);
+
+ CompilerType union_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "",
+ clang::TTK_Union, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(union_type);
+
+ CompilerType sub_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "",
+ clang::TTK_Struct, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(sub_type, "si_pid", pid_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_uid", uid_type,
+ lldb::eAccessPublic, 0);
+ ast->CompleteTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(union_type, "_kill", sub_type,
+ lldb::eAccessPublic, 0);
+
+ sub_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "",
+ clang::TTK_Struct, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(sub_type, "si_tid", int_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_overrun", int_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_sigval", sigval_type,
+ lldb::eAccessPublic, 0);
+ ast->CompleteTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(union_type, "_timer", sub_type,
+ lldb::eAccessPublic, 0);
+
+ sub_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "",
+ clang::TTK_Struct, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(sub_type, "si_pid", pid_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_uid", uid_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_sigval", sigval_type,
+ lldb::eAccessPublic, 0);
+ ast->CompleteTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(union_type, "_rt", sub_type,
+ lldb::eAccessPublic, 0);
+
+ sub_type = ast->CreateRecordType(
+ nullptr, OptionalClangModuleID(), lldb::eAccessPublic, "",
+ clang::TTK_Struct, lldb::eLanguageTypeC);
+ ast->StartTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(sub_type, "si_pid", pid_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_uid", uid_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_status", int_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_utime", clock_type,
+ lldb::eAccessPublic, 0);
+ ast->AddFieldToRecordType(sub_type, "si_stime", clock_type,
+ lldb::eAccessPublic, 0);
+ ast->CompleteTagDeclarationDefinition(sub_type);
+ ast->AddFieldToRecordType(union_type, "_sigchld", sub_type,
+ lldb::eAccessPublic, 0);
+
+ ast->CompleteTagDeclarationDefinition(union_type);
+ ast->AddFieldToRecordType(siginfo_type, "_sifields", union_type,
+ lldb::eAccessPublic, 0);
+
+ ast->CompleteTagDeclarationDefinition(siginfo_type);
+ return siginfo_type;
+}
Index: lldb/source/API/SBPlatform.cpp
===================================================================
--- lldb/source/API/SBPlatform.cpp
+++ lldb/source/API/SBPlatform.cpp
@@ -13,6 +13,8 @@
#include "lldb/API/SBFileSpec.h"
#include "lldb/API/SBLaunchInfo.h"
#include "lldb/API/SBPlatform.h"
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBType.h"
#include "lldb/API/SBUnixSignals.h"
#include "lldb/Host/File.h"
#include "lldb/Target/Platform.h"
@@ -691,3 +693,17 @@
return SBEnvironment();
}
+
+SBType SBPlatform::GetSiginfoType(const lldb::SBTarget &target) {
+ LLDB_RECORD_METHOD(lldb::SBType, SBPlatform, GetSiginfoType,
+ (lldb::Target &), target);
+
+ PlatformSP platform_sp(GetSP());
+ TargetSP target_sp(target.GetSP());
+
+ if (platform_sp && target_sp)
+ return SBType(platform_sp->GetSiginfoType(*target_sp));
+
+ assert(target_sp);
+ return SBType();
+}
Index: lldb/include/lldb/Target/Platform.h
===================================================================
--- lldb/include/lldb/Target/Platform.h
+++ lldb/include/lldb/Target/Platform.h
@@ -863,6 +863,8 @@
return nullptr;
}
+ virtual CompilerType GetSiginfoType(lldb_private::Target &target);
+
protected:
/// Create a list of ArchSpecs with the given OS and a architectures. The
/// vendor field is left as an "unspecified unknown".
Index: lldb/include/lldb/API/SBType.h
===================================================================
--- lldb/include/lldb/API/SBType.h
+++ lldb/include/lldb/API/SBType.h
@@ -224,6 +224,7 @@
friend class SBFunction;
friend class SBModule;
+ friend class SBPlatform;
friend class SBTarget;
friend class SBTypeEnumMember;
friend class SBTypeEnumMemberList;
Index: lldb/include/lldb/API/SBPlatform.h
===================================================================
--- lldb/include/lldb/API/SBPlatform.h
+++ lldb/include/lldb/API/SBPlatform.h
@@ -169,6 +169,8 @@
/// environment.
SBEnvironment GetEnvironment();
+ SBType GetSiginfoType(const lldb::SBTarget &target);
+
protected:
friend class SBDebugger;
friend class SBTarget;
Index: lldb/bindings/interface/SBPlatform.i
===================================================================
--- lldb/bindings/interface/SBPlatform.i
+++ lldb/bindings/interface/SBPlatform.i
@@ -213,6 +213,9 @@
lldb::SBEnvironment
GetEnvironment();
+ lldb::SBType
+ GetSiginfoType(lldb::SBTarget &target);
+
};
} // namespace lldb
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
