llvm · DhruvSrivastavaX · Jan 9, 2025 · Jan 9, 2025 · Jan 9, 2025 · Jan 9, 2025
diff --git a/.github/workflows/pr-code-format.yml b/.github/workflows/pr-code-format.yml
@@ -7,6 +7,7 @@ on:
  pull_request:
  branches:
  - main
+ - gh-101657
  - 'users/**'
 
 jobs:
@@ -18,7 +19,7 @@ jobs:
  concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
  cancel-in-progress: true
- if: github.repository == 'llvm/llvm-project'
+ if: github.repository == 'DhruvSrivastavaX/lldb-for-aix'
  steps:
  - name: Fetch LLVM sources
  uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp
@@ -4950,10 +4950,14 @@ std::string CGObjCCommonMac::GetSectionName(StringRef Section,
  case llvm::Triple::COFF:
  assert(Section.starts_with("__") && "expected the name to begin with __");
  return ("." + Section.substr(2) + "$B").str();
+ case llvm::Triple::XCOFF:
+ // Hack to allow "p 10+1" on AIX for lldb
+ assert(Section.substr(0, 2) == "__" &&
+ "expected the name to begin with __");
+ return Section.substr(2).str();
  case llvm::Triple::Wasm:
  case llvm::Triple::GOFF:
  case llvm::Triple::SPIRV:
- case llvm::Triple::XCOFF:
  case llvm::Triple::DXContainer:
  llvm::report_fatal_error(
  "Objective-C support is unimplemented for object file format");

diff --git a/clang/test/SemaCXX/class-layout.cpp b/clang/test/SemaCXX/class-layout.cpp
@@ -639,7 +639,7 @@ namespace PR37275 {
 #pragma pack(pop)
 }
 
-#endif // !defined(__MVS__) && !defined(__AIX__)
+#endif // !defined(__MVS__) && !defined(_AIX)
 
 namespace non_pod {
 struct t1 {

@@ -198,6 +198,9 @@ class Module : public std::enable_shared_from_this<Module>,
  bool SetLoadAddress(Target &target, lldb::addr_t value, bool value_is_offset,
  bool &changed);
 
+ bool SetLoadAddressByType(Target &target, lldb::addr_t value,
+ bool value_is_offset, bool &changed, int type_id);
+
  /// \copydoc SymbolContextScope::CalculateSymbolContext(SymbolContext*)
  ///
  /// \see SymbolContextScope

@@ -23,6 +23,7 @@
 #include <memory>
 #include <mutex>
 #include <vector>
+#include <string.h>
 
 namespace lldb_private {
 
@@ -43,8 +44,26 @@ class ModuleSpec {
  }
 
  ModuleSpec(const FileSpec &file_spec, const ArchSpec &arch)
- : m_file(file_spec), m_arch(arch), m_object_offset(0),
- m_object_size(FileSystem::Instance().GetByteSize(file_spec)) {}
+ : m_arch(arch), m_object_offset(0) {
+ // parse object inside module format for example: /usr/ccs/lib/libc.a(shr_64.o)
+ llvm::SmallString<256> path_with_object;
+ file_spec.GetPath(path_with_object);
+ if (strstr(path_with_object.c_str(), "(") != nullptr) {
+ char *part;
+ char *str = (char *)path_with_object.c_str();
+ part = strtok(str, "()");
+ assert(part);
+ llvm::StringRef file_name(part);
+ part = strtok(nullptr, "()");
+ assert(part);
+ m_object_name = ConstString(part);
+ m_file = FileSpec(file_name);
+ m_object_size = FileSystem::Instance().GetByteSize(m_file);
+ } else {
+ m_file = file_spec;
+ m_object_size = FileSystem::Instance().GetByteSize(file_spec);
+ }
+ }
 
  FileSpec *GetFileSpecPtr() { return (m_file ? &m_file : nullptr); }
 
@@ -105,6 +124,8 @@ class ModuleSpec {
  ConstString &GetObjectName() { return m_object_name; }
 
  ConstString GetObjectName() const { return m_object_name; }
+
+ void SetObjectName(ConstString objName) { m_object_name = objName; }
 
  uint64_t GetObjectOffset() const { return m_object_offset; }
 

@@ -159,6 +159,7 @@ class HostInfoBase {
  return {};
  }
 
+ static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
  /// Returns the distribution id of the host
  ///
  /// This will be something like "ubuntu", "fedora", etc. on Linux.
@@ -168,7 +169,6 @@ class HostInfoBase {
  static llvm::StringRef GetDistributionId() { return llvm::StringRef(); }
 
 protected:
- static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
  static bool ComputeSupportExeDirectory(FileSpec &file_spec);
  static bool ComputeProcessTempFileDirectory(FileSpec &file_spec);
  static bool ComputeGlobalTempFileDirectory(FileSpec &file_spec);

@@ -11,6 +11,11 @@
 
 #include "lldb/Host/Config.h"
 
+#if defined(_AIX)
+//FIXME for AIX
+#undef LLDB_ENABLE_LIBXML2
+#endif
+
 #if LLDB_ENABLE_LIBXML2
 #include <libxml/xmlreader.h>
 #endif

@@ -0,0 +1,22 @@
+//===-- Host.h --------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_HOST_AIX_HOST_H
+#define LLDB_HOST_AIX_HOST_H
+
+#include "lldb/lldb-types.h"
+#include <optional>
+
+namespace lldb_private {
+
+// Get PID (i.e. the primary thread ID) corresponding to the specified TID.
+std::optional<lldb::pid_t> getPIDForTID(lldb::pid_t tid);
+
+} // namespace lldb_private
+
+#endif // #ifndef LLDB_HOST_AIX_HOST_H
@@ -0,0 +1,62 @@
+//===-- Ptrace.h ------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// This file defines ptrace functions & structures
+
+#ifndef liblldb_Host_aix_Ptrace_h_
+#define liblldb_Host_aix_Ptrace_h_
+
+#include <sys/ptrace.h>
+
+#define DEBUG_PTRACE_MAXBYTES 20
+
+// Support ptrace extensions even when compiled without required kernel support
+#ifndef PTRACE_GETREGS
+#define PTRACE_GETREGS (PT_COMMAND_MAX+1)
+#endif
+#ifndef PTRACE_SETREGS
+#define PTRACE_SETREGS (PT_COMMAND_MAX+2)
+#endif
+#ifndef PTRACE_GETFPREGS
+#define PTRACE_GETFPREGS (PT_COMMAND_MAX+3)
+#endif
+#ifndef PTRACE_SETFPREGS
+#define PTRACE_SETFPREGS (PT_COMMAND_MAX+4)
+#endif
+#ifndef PTRACE_GETREGSET
+#define PTRACE_GETREGSET 0x4204
+#endif
+#ifndef PTRACE_SETREGSET
+#define PTRACE_SETREGSET 0x4205
+#endif
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA (PT_COMMAND_MAX+5)
+#endif
+#ifndef PTRACE_ARCH_PRCTL
+#define PTRACE_ARCH_PRCTL (PT_COMMAND_MAX+6)
+#endif
+#ifndef ARCH_GET_FS
+#define ARCH_SET_GS 0x1001
+#define ARCH_SET_FS 0x1002
+#define ARCH_GET_FS 0x1003
+#define ARCH_GET_GS 0x1004
+#endif
+#ifndef PTRACE_PEEKMTETAGS
+#define PTRACE_PEEKMTETAGS (PT_COMMAND_MAX+7)
+#endif
+#ifndef PTRACE_POKEMTETAGS
+#define PTRACE_POKEMTETAGS (PT_COMMAND_MAX+8)
+#endif
+#ifndef PTRACE_GETVRREGS
+#define PTRACE_GETVRREGS (PT_COMMAND_MAX+9)
+#endif
+#ifndef PTRACE_GETVSRREGS
+#define PTRACE_GETVSRREGS (PT_COMMAND_MAX+10)
+#endif
+
+#endif // liblldb_Host_aix_Ptrace_h_
@@ -35,7 +35,7 @@ struct option {
  int val;
 };
 
-int getopt(int argc, char *const argv[], const char *optstring);
+int getopt(int argc, char *const argv[], const char *optstring) throw();
 
 // from getopt.h
 extern char *optarg;

@@ -408,6 +408,11 @@ class ObjectFile : public std::enable_shared_from_this<ObjectFile>,
  return false;
  }
 
+ virtual bool SetLoadAddressByType(Target &target, lldb::addr_t value,
+ bool value_is_offset, int type_id) {
+ return false;
+ }
+
  /// Gets whether endian swapping should occur when extracting data from this
  /// object file.
  ///

@@ -48,6 +48,12 @@ class ABI : public PluginInterface {
  lldb::addr_t returnAddress,
  llvm::ArrayRef<lldb::addr_t> args) const = 0;
 
+ virtual bool PrepareTrivialCall(lldb_private::Thread &thread, lldb::addr_t sp,
+ lldb::addr_t functionAddress,
+ lldb::addr_t tocAddress,
+ lldb::addr_t returnAddress,
+ llvm::ArrayRef<lldb::addr_t> args) const;
+
  // Prepare trivial call used from ThreadPlanFunctionCallUsingABI
  // AD:
  // . Because i don't want to change other ABI's this is not declared pure

@@ -372,6 +372,12 @@ class DynamicLoader : public PluginInterface {
  lldb::addr_t base_addr,
  bool base_addr_is_offset);
 
+ virtual void UpdateLoadedSectionsByType(lldb::ModuleSP module,
+ lldb::addr_t link_map_addr,
+ lldb::addr_t base_addr,
+ bool base_addr_is_offset,
+ int type_id);
+
  // Utility method so base classes can share implementation of
  // UpdateLoadedSections
  void UpdateLoadedSectionsCommon(lldb::ModuleSP module, lldb::addr_t base_addr,

@@ -65,6 +65,10 @@
 #include "llvm/Support/Threading.h"
 #include "llvm/Support/VersionTuple.h"
 
+#if defined(_AIX)
+struct ld_xinfo;
+#endif
+
 namespace lldb_private {
 
 template <typename B, typename S> struct Range;
@@ -1972,6 +1976,10 @@ class Process : public std::enable_shared_from_this<Process>,
  Status GetMemoryRegionInfo(lldb::addr_t load_addr,
  MemoryRegionInfo &range_info);
 
+#if defined(_AIX)
+ Status GetLDXINFO(struct ld_xinfo *info_ptr);
+#endif
+
  /// Obtain all the mapped memory regions within this process.
  ///
  /// \param[out] region_list
@@ -2967,6 +2975,12 @@ void PruneThreadPlans();
  "Process::DoGetMemoryRegionInfo() not supported");
  }
 
+#if defined(_AIX)
+ virtual Status DoGetLDXINFO(struct ld_xinfo *info_ptr) {
+ return Status("Process::DoGetLDXINFO() not supported");
+ }
+#endif
+
  /// Provide an override value in the subclass for lldb's
  /// CPU-based logic for whether watchpoint exceptions are
  /// received before or after an instruction executes.

@@ -68,6 +68,10 @@ class RegisterContextUnwind : public lldb_private::RegisterContext {
 
  bool ReadPC(lldb::addr_t &start_pc);
 
+#ifdef _AIX
+ bool ReadLR(lldb::addr_t &lr);
+#endif
+
  // Indicates whether this frame *behaves* like frame zero -- the currently
  // executing frame -- or not. This can be true in the middle of the stack
  // above asynchronous trap handlers (sigtramp) for instance.

@@ -541,6 +541,7 @@ class Target : public std::enable_shared_from_this<Target>,
  eBroadcastBitNewTargetCreated = (1 << 6),
  };
 
+
  // These two functions fill out the Broadcaster interface:
 
  static llvm::StringRef GetStaticBroadcasterClass();
@@ -1838,6 +1839,10 @@ class Target : public std::enable_shared_from_this<Target>,
 
  TargetStats &GetStatistics() { return m_stats; }
 
+public:
+ SectionLoadList &GetSectionLoadListPublic() {
+ return GetSectionLoadList();
+ }
 protected:
  /// Construct with optional file and arch.
  ///

@@ -27,6 +27,12 @@ class ThreadPlanCallFunction : public ThreadPlan {
  llvm::ArrayRef<lldb::addr_t> args,
  const EvaluateExpressionOptions &options);
 
+ ThreadPlanCallFunction(Thread &thread, const Address &function,
+ const Address &toc,
+ const CompilerType &return_type,
+ llvm::ArrayRef<lldb::addr_t> args,
+ const EvaluateExpressionOptions &options);
+
  ThreadPlanCallFunction(Thread &thread, const Address &function,
  const EvaluateExpressionOptions &options);
 

@@ -61,6 +61,7 @@ class StringExtractorGDBRemote : public StringExtractor {
  eServerPacketType_qQueryGDBServer,
  eServerPacketType_qKillSpawnedProcess,
  eServerPacketType_qLaunchSuccess,
+ eServerPacketType_qLDXINFO,
  eServerPacketType_qModuleInfo,
  eServerPacketType_qProcessInfoPID,
  eServerPacketType_qSpeedTest,