Compare commits

...
Sign in to create a new pull request.

34 commits

Author SHA1 Message Date
Jonathan Wakely
238a2d5e59 Rebuilt for Boost 1.90 2026-01-12 17:11:49 +00:00
Jerry James
2c3bf3ff72 Rebuild for tbb 2022.2.0 2025-08-20 13:21:18 -06:00
Fedora Release Engineering
1aaacf00c0 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 19:38:49 +00:00
Frank Ch. Eigler
4d320a0508 update .spec to remove deprecated project web site url 2025-07-14 17:07:51 -04:00
Frank Ch. Eigler
75a479c9cc Backport https://github.com/dyninst/dyninst/issues/1730 for ctor ordering 2025-02-06 08:48:17 -05:00
Frank Ch. Eigler
e8cdcd672a disable i686 again, ftbfs 2025-01-24 18:53:01 -05:00
Frank Ch. Eigler
6600f8b882 try with i686++ 2025-01-24 18:43:11 -05:00
Frank Ch. Eigler
1e4aa1f8f9 chain-build prep 2025-01-24 17:20:25 -05:00
Frank Ch. Eigler
05fb71cf62 add another cstdint 2025-01-24 14:08:51 -05:00
Frank Ch. Eigler
9dde4656ab more cstdint 2025-01-23 21:51:33 -05:00
Frank Ch. Eigler
1a6e35086a one more <cstdint> patch 2025-01-23 21:38:27 -05:00
Frank Ch. Eigler
ba863fce9d Add PR1880 patch too. 2025-01-23 21:12:48 -05:00
Frank Ch. Eigler
a0b8b3efb5
rebase to 13.0.0 + fedora-cmake patch 2025-01-23 20:59:46 -05:00
Frank Ch. Eigler
83283f30bb exclude i686 2025-01-23 15:48:44 -05:00
Frank Ch. Eigler
bd527a689e cont'd 2025-01-23 15:05:18 -05:00
Frank Ch. Eigler
15cf32d088 rhbz2339725: work around dyninst ftbfs on rawhide
- switch to a recent git/master snapshot, after v13.0
- also: eliminating dyninst-testsuite
2025-01-23 14:55:53 -05:00
Fedora Release Engineering
0139cfdb77 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 16:29:54 +00:00
Fedora Release Engineering
407d316605 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 21:35:55 +00:00
William Eden Cohen
4415a5d270 Merge #6 Fix CI gating plan 2024-02-08 15:10:54 +00:00
Fedora Release Engineering
7262c85591 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 10:01:19 +00:00
Fedora Release Engineering
a4ccd30890 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 17:44:17 +00:00
Jonathan Wakely
6b692d8ea3 Fix CI gating plan
Remove obsolete options.
2024-01-19 00:15:32 +00:00
Jonathan Wakely
b958d1d861 Rebuilt for Boost 1.83 2024-01-17 22:41:15 +00:00
Fedora Release Engineering
6fd6035841 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 18:05:53 +00:00
Frank Ch. Eigler
8c06128c9f release bump 2023-07-11 19:29:04 -04:00
Frank Ch. Eigler
3c9bcecebd
dyninst.spec: approximate SPDX License tag migration 2023-07-04 17:24:24 -04:00
Orion Poplawski
5613a7798b Update to 12.3.0
Add patch for cmake 3.27 support
2023-07-04 17:07:45 -04:00
Jonathan Wakely
afaa35c98c Patch for oneTBB (#2036372)
Update FindTBB.cmake to look in the new version.h header.

Fix the incorrect allocator used with tbb::concurrent_hash_map.  Define
a tbb_hash_compare specialization for std::pair to cope with the
deprecated tbb_hasher function being removed.

Adjust tbb_hash_compare specialization to account for TBB 2021.x
defining it in a different namespace.
2023-06-28 11:29:09 +01:00
Orion Poplawski
05e041c920 Update to 12.3.0
Add patch for cmake 3.27 support
2023-06-09 20:11:41 -06:00
Frank Ch. Eigler
df818674e3 rhbz2173030 cont'd
- backport dyninst upstream commits 0cd2b8b7858 358db4610e49 2e3bf92eedf575
2023-02-23 15:53:39 -05:00
Frank Ch. Eigler
765f434830 rhbz2173030 2023-02-23 15:26:31 -05:00
Jonathan Wakely
511a74a18b Rebuilt for Boost 1.81 2023-02-20 21:53:20 +00:00
Fedora Release Engineering
7ff5c1b1b5 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 01:58:54 +00:00
William Cohen
6f56eaefa4 Update to 12.2.0 2022-10-04 09:56:25 -04:00
10 changed files with 367 additions and 107 deletions

6
.gitignore vendored
View file

@ -31,3 +31,9 @@
/testsuite-12.0.0.tar.gz
/dyninst-12.1.0.tar.gz
/testsuite-12.1.0.tar.gz
/dyninst-12.2.0.tar.gz
/testsuite-12.2.0.tar.gz
/dyninst-12.3.0.tar.gz
/testsuite-12.3.0.tar.gz
/dyninst-13.snap.20250123.g80e1adaf.tar.gz
/dyninst-13.0.0.tar.gz

View file

@ -1,12 +0,0 @@
# c++/12/bits/basic_string.h in libstdc++-devel-12.1.1-3 no longer includes <ext/atomicity.h>
# atomicity.h includes gthr -> gthr-default -> pthread .h -> time.h -> struct-tm.h
# so explicitly include time.h
--- testsuite-12.1.0/src/CmdLine.C
+++ testsuite-12.1.0/src/CmdLine.C
@@ -38,5 +38,3 @@
-#if defined(os_windows_test)
#include <time.h>
-#endif

View file

@ -1,11 +0,0 @@
Remove extraneous error messages of the form:
err message: .debug_loclists section missing
err message: invalid DWARF
which are repeated in some circumstances without adding useful context
--- dyninst-12.1.0/symtabAPI/src/dwarfWalker.C
+++ dyninst-12.1.0/symtabAPI/src/dwarfWalker.C
@@ -1858,1 +1858,1 @@
- cerr << "err message: " << dwarf_errmsg(dwarf_errno()) << endl;
+ dwarf_printf("(0x%lx) Error while decoding location: %s\n", id(), dwarf_errmsg(dwarf_errno()));

View file

@ -1,21 +1,19 @@
Summary: An API for Run-time Code Generation
License: LGPLv2+
License: LGPL-2.1-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LicenseRef-Fedora-Public-Domain AND BSD-3-Clause
Name: dyninst
Group: Development/Libraries
Release: 4%{?dist}
URL: http://www.dyninst.org
Version: 12.1.0
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
Release: 8%{?dist}
URL: https://www.paradyn.org
Version: 13.0.0
ExclusiveArch: x86_64 ppc64le aarch64
%define __testsuite_version 12.1.0
Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{version}.tar.gz
Source1: https://github.com/dyninst/testsuite/archive/%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz
Patch1: dwarf-error.patch
Patch2: cmdline.patch
Source0: dyninst-13.0.0.tar.gz
Patch1: github-pr1721.patch
Patch2: github-pr1880.patch
Patch3: github-pr1880-ish.patch
Patch4: github-pr1730.patch
%global dyninst_base dyninst-%{version}
%global testsuite_base testsuite-%{__testsuite_version}
BuildRequires: gcc-c++
BuildRequires: elfutils-devel
@ -27,17 +25,11 @@ BuildRequires: cmake
BuildRequires: libtirpc-devel
BuildRequires: tbb tbb-devel
BuildRequires: tex-latex
# Extra requires just for the testsuite
BuildRequires: gcc-gfortran libxml2-devel
BuildRequires: make
# Testsuite files should not provide/require anything
%{?filter_setup:
%filter_provides_in %{_libdir}/dyninst/testsuite/
%filter_requires_in %{_libdir}/dyninst/testsuite/
%filter_setup
}
# https://fedoraproject.org/wiki/Changes/Linker_Error_On_Security_Issues
# may impact the RT library
%undefine _hardened_linker_errors
%description
@ -54,6 +46,7 @@ Summary: Documentation for using the Dyninst API
Group: Documentation
%description doc
dyninst-doc contains API documentation for the Dyninst libraries.
License: LGPL-2.1-or-later
%package devel
Summary: Header files for compiling programs with Dyninst
@ -61,37 +54,29 @@ Group: Development/System
Requires: dyninst = %{version}-%{release}
Requires: boost-devel
Requires: tbb-devel
License: LGPL-2.1-or-later AND BSD-3-Clause AND MIT
# FindTBB.cmake: presumed MIT, removed in next version of dyninst
%description devel
dyninst-devel includes the C header files that specify the Dyninst user-space
libraries and interfaces. This is required for rebuilding any program
that uses Dyninst.
%package testsuite
Summary: Programs for testing Dyninst
Group: Development/System
Requires: dyninst = %{version}-%{release}
Requires: dyninst-devel = %{version}-%{release}
%description testsuite
dyninst-testsuite includes the test harness and target programs for
making sure that dyninst works properly.
%prep
%setup -q -n %{name}-%{version} -c
%setup -q -T -D -a 1
# %setup -q -T -D -a 1
pushd %{dyninst_base}
%patch1 -p1 -b .dwerr
popd
pushd %{testsuite_base}
%patch2 -p1 -b .cmdline
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
popd
# cotire seems to cause non-deterministic gcc errors
# https://bugzilla.redhat.com/show_bug.cgi?id=1420551
sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \
%{dyninst_base}/cmake/shared.cmake
# sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \
# %{dyninst_base}/cmake/shared.cmake
%build
@ -106,54 +91,31 @@ LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
CXXFLAGS="$CFLAGS"
export CFLAGS CXXFLAGS LDFLAGS
%cmake \
%cmake --log-level=DEBUG \
-DENABLE_DEBUGINFOD=1 \
-DINSTALL_LIB_DIR:PATH=%{_libdir}/dyninst \
-DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \
-DINSTALL_CMAKE_DIR:PATH=%{_libdir}/cmake/Dyninst \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_SKIP_RPATH:BOOL=YES
%cmake_build
# Hack to install dyninst nearby, so the testsuite can use it
DESTDIR="../install" %__cmake --install "%{__cmake_builddir}"
find ../install -name '*.cmake' -execdir \
sed -i -e "s!%{_prefix}!$PWD/../install&!" '{}' '+'
# cmake mistakenly looks for libtbb.so in the dyninst install dir
sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake
cd ../%{testsuite_base}
# testsuite build sometimes encounters dependency issues with -jN
%define _smp_mflags -j1
%cmake \
-DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
-DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
-DCMAKE_BUILD_TYPE:STRING=Debug \
-DCMAKE_SKIP_RPATH:BOOL=YES
%cmake_build
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DINSTALL_CMAKE_DIR:PATH=/usr/lib64/cmake/Dyninst \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_INSTALL_INCLUDEDIR:PATH=/usr/include/dyninst \
-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib64/dyninst
%cmake_build -v -v -v
%install
cd %{dyninst_base}
%cmake_install
%cmake_install -v -v -v
# It doesn't install docs the way we want, so remove them.
# We'll just grab the pdfs later, directly from the build dir.
rm -v %{buildroot}%{_docdir}/*-%{version}.pdf
# move /usr/lib64//dyninst/cmake/Dyninst to /usr/lib64/cmake/Dyninst
mkdir -p %{buildroot}/%{_libdir}/cmake
mv %{buildroot}/%{_libdir}/dyninst/cmake/Dyninst %{buildroot}/%{_libdir}/cmake/Dyninst
cd ../%{testsuite_base}
%cmake_install
# this is a testsuite-like binary, not needed in main package
rm -f "%{buildroot}%{_bindir}/parseThat"
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
# Ugly hack to mask testsuite files from debuginfo extraction. Running the
# testsuite requires debuginfo, so extraction is useless. However, debuginfo
# extraction is still nice for the main libraries, so we don't want to disable
# it package-wide. The permissions are restored by attr(755,-,-) in files.
find %{buildroot}%{_libdir}/dyninst/testsuite/ \
-type f '!' -name '*.a' -execdir chmod 644 '{}' '+'
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -185,13 +147,65 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
%{_libdir}/dyninst/*.so
%{_libdir}/cmake/Dyninst
%files testsuite
%{_bindir}/parseThat
%dir %{_libdir}/dyninst/testsuite/
%attr(755,root,root) %{_libdir}/dyninst/testsuite/*[!a]
%attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
%changelog
* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 13.0.0-8
- Rebuilt for Boost 1.90
* Wed Aug 20 2025 Jerry James <loganjerry@gmail.com> - 13.0.0-7
- Rebuild for tbb 2022.2.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Feb 06 2025 Frank Ch. Eigler <fche@redhat.com> - 13.0.0-5
- Backported github PR/1370 for constructor ordering.
* Thu Jan 23 2025 Frank Ch. Eigler <fche@redhat.com> - 13.0.0-4
- Rebuilt for F42 FTBFS with 13.0.0 + backported fixes + sans i686
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 12.3.0-4
- Rebuilt for Boost 1.83
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Frank Ch. Eigler <fche@redhat.com> - 12.3.0-2
- side-tag respin
* Tue Jul 04 2023 Frank Ch. Eigler <fche@redhat.com> - 12.3.0-1
- migrated to SPDX license
* Tue Jul 04 2023 Orion Poplawski <orion@nwra.com> - 12.3.0-1
- Update to 12.3.0
- Add patch for cmake 3.27 support
* Tue Jun 27 2023 Jonathan Wakely <jwakely@fedoraproject.org> - 12.2.0-5
- Patch for oneTBB (#2036372)
* Thu Feb 23 2023 Frank Ch. Eigler <fche@redhat.com> - 12.2.0-4
- rhbz2173030: ftbfs with gcc 13
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 12.2.0-3
- Rebuilt for Boost 1.81
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Oct 4 2022 William Cohen <wcohen@redhat.com> - 12.2.0-1
- Update to 12.2.0
* Wed Aug 03 2022 Stan Cox <scox@redhat.com> - 12.1.0-4
- Explicitly include time.h as <string> no longer pulls it in

55
github-pr1721.patch Normal file
View file

@ -0,0 +1,55 @@
commit e70b1001eb5082bb0204b602e3ca1cfccd67fc94
gpg: Signature made Tue 09 Apr 2024 11:21:17 AM EDT
gpg: using RSA key B5690EEEBB952194
gpg: Can't check signature: No public key
Author: kupsch <kupsch@cs.wisc.edu>
Date: Tue Apr 9 10:21:17 2024 -0500
improve cmake install dirs (#1721)
* Use cmake's GNUInstallDirs to get the lib, bin and include directory
names instead of always using 'lib', 'bin', and 'include'. This
results in two changes to the installation:
- lib directory becomes 'lib64' on platforms where this is the
convention
- the lib, bin and include may be overwritten using the cmake
variables CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and
CMAKE_INSTALL_INCLUDEDIR respectively
* Update github workflows to handle the lib install dir lib64:
- use Dyninst_ROOT instead of Dyninst_DIR as it searches for the
directory used
- for non-cmake uses search for lib* to find either lib or lib64
diff --git a/cmake/DyninstLibrarySettings.cmake b/cmake/DyninstLibrarySettings.cmake
index d3627f8789f2..e8cb26b95c39 100644
--- a/cmake/DyninstLibrarySettings.cmake
+++ b/cmake/DyninstLibrarySettings.cmake
@@ -25,9 +25,10 @@ else()
set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
endif()
-set(DYNINST_INSTALL_BINDIR "bin")
-set(DYNINST_INSTALL_LIBDIR "lib")
-set(DYNINST_INSTALL_INCLUDEDIR "include")
+include(GNUInstallDirs)
+set(DYNINST_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
+set(DYNINST_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+set(DYNINST_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
set(DYNINST_INSTALL_CMAKEDIR "${DYNINST_INSTALL_LIBDIR}/cmake/Dyninst")
# -- Set up the RPATH ---
diff --git a/parseThat/CMakeLists.txt b/parseThat/CMakeLists.txt
index ffe4b7aea29c..d4697a8a1d99 100644
--- a/parseThat/CMakeLists.txt
+++ b/parseThat/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries(parseThat PRIVATE dyninstAPI)
target_include_directories(parseThat BEFORE
PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/common/h>")
-install(TARGETS parseThat RUNTIME DESTINATION bin)
+install(TARGETS parseThat RUNTIME DESTINATION "${DYNINST_INSTALL_BINDIR}")

151
github-pr1730.patch Normal file
View file

@ -0,0 +1,151 @@
commit eae798d4e5f938cb85758571dbab9afbbea7b5d2 (HEAD -> v13.0.0)
Author: Frank Ch. Eigler <fche@redhat.com>
Date: Thu Feb 6 08:35:33 2025 -0500
MachRegister: fix initialization order bug (#1731)
Backported upstream commit to 13.0.0 base.
commit a29f32ac87c4483b97a2c5cb9beed5642124ae8f
Author: Tim Haines <thaines.astro@gmail.com>
Date: Mon Apr 22 15:32:12 2024 -0500
MachRegister: fix initialization order bug (#1731)
This fixes the static initialization ordering issue reported in https://github.com/dyninst/dyninst/issues/1730.
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 669659e44c76..b6507772858c 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -39,7 +39,6 @@ set(_public_headers
h/registers/AMDGPU/amdgpu_gfx90a_regs.h
h/registers/AMDGPU/amdgpu_gfx940_regs.h
h/registers/cuda_regs.h
- h/registers/MachRegister.h
h/registers/ppc32_regs.h
h/registers/ppc64_regs.h
h/registers/reg_def.h
@@ -72,12 +71,12 @@ set(_private_headers
src/lprintf.h
src/lru_cache.h
src/MappedFile.h
+ src/registers/MachRegisterCache.h
src/NodeIterator.h
src/ntHeaders.h
src/parseauxv.h
src/pathName.h
src/pool_allocators.h
- src/registers/MachRegister.C
src/sha1.h
src/singleton_object_pool.h
src/stats.h
@@ -111,6 +110,7 @@ set(_sources
src/debug_common.C
src/VariableLocation.C
src/Buffer.C
+ src/registers/MachRegister.C
src/MachSyscall.C)
if(DYNINST_OS_UNIX)
diff --git a/common/src/dyn_regs.C b/common/src/dyn_regs.C
index 3fcd194a71dd..7951dbe753bc 100644
--- a/common/src/dyn_regs.C
+++ b/common/src/dyn_regs.C
@@ -28,8 +28,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "registers/MachRegisterCache.h"
+
+namespace Dyninst { namespace registers {
+ // These are used in MachRegister.C
+ name_cache names;
+}}
+
//clang-format: off
#define DYN_DEFINE_REGS
#include "dyn_regs.h"
#undef DYN_DEFINE_REGS
//clang-format: on
+
diff --git a/common/src/registers/MachRegister.C b/common/src/registers/MachRegister.C
index ccd01abc1811..93c020c04415 100644
--- a/common/src/registers/MachRegister.C
+++ b/common/src/registers/MachRegister.C
@@ -1,4 +1,5 @@
#include "common/h/registers/MachRegister.h"
+#include "registers/MachRegisterCache.h"
#include "debug_common.h"
#include "dyn_regs.h"
#include "external/rose/amdgpuInstructionEnum.h"
@@ -10,17 +11,24 @@
#include <unordered_map>
namespace {
- std::unordered_map<signed int, std::string> names;
const std::string invalid_reg_name{"<INVALID_REG>"};
}
+namespace Dyninst { namespace registers {
+ // These are defined in dyn_regs.C to ensure global constructor initialization ordering
+ extern name_cache names;
+ }
+}
+
+
namespace Dyninst {
MachRegister::MachRegister() : reg(0) {}
MachRegister::MachRegister(signed int r) : reg(r) {}
- MachRegister::MachRegister(signed int r, std::string n) : reg(r) { names.emplace(r, std::move(n)); }
+ MachRegister::MachRegister(signed int r, std::string n) : reg(r) {
+ registers::names.emplace(r, std::move(n)); }
unsigned int MachRegister::regClass() const { return reg & 0x00ff0000; }
@@ -106,8 +114,8 @@ namespace Dyninst {
bool MachRegister::isValid() const { return (reg != InvalidReg.reg); }
std::string const& MachRegister::name() const {
- auto iter = names.find(reg);
- if(iter != names.end()) {
+ auto iter = registers::names.find(reg);
+ if(iter != registers::names.end()) {
return iter->second;
}
common_parsing_printf("No MachRegister found with value %x\n", static_cast<unsigned int>(reg));
diff --git a/common/src/dyn_regs.C b/common/src/registers/MachRegisterCache.h
similarity index 80%
copy from common/src/dyn_regs.C
copy to common/src/registers/MachRegisterCache.h
index 3fcd194a71dd..2a74bbde821a 100644
--- a/common/src/dyn_regs.C
+++ b/common/src/registers/MachRegisterCache.h
@@ -28,8 +28,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//clang-format: off
-#define DYN_DEFINE_REGS
-#include "dyn_regs.h"
-#undef DYN_DEFINE_REGS
-//clang-format: on
+#ifndef DYNINST_COMMON_REGISTERS_MACHREGISTERCACHE_H
+#define DYNINST_COMMON_REGISTERS_MACHREGISTERCACHE_H
+
+#include "registers/MachRegister.h"
+
+#include <unordered_map>
+#include <map>
+#include <vector>
+#include <string>
+
+namespace Dyninst { namespace registers {
+ typedef std::unordered_map<signed int, std::string> name_cache;
+}}
+
+
+#endif

36
github-pr1880-ish.patch Normal file
View file

@ -0,0 +1,36 @@
diff --git a/common/h/Annotatable.h b/common/h/Annotatable.h
index 6588e3dd36da..262a193ffbb8 100644
--- a/common/h/Annotatable.h
+++ b/common/h/Annotatable.h
@@ -44,6 +44,7 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
+#include <cstdint>
#include "util.h"
#include "compiler_annotations.h"
diff --git a/instructionAPI/h/ArchSpecificFormatters.h b/instructionAPI/h/ArchSpecificFormatters.h
index b32d4cc14e03..145c604f9619 100644
--- a/instructionAPI/h/ArchSpecificFormatters.h
+++ b/instructionAPI/h/ArchSpecificFormatters.h
@@ -34,6 +34,7 @@
#include <map>
#include <vector>
#include <string>
+#include <cstdint>
#include "Architecture.h"
#include "registers/MachRegister.h"
diff --git a/common/src/arch-x86.h b/common/src/arch-x86.h
index ecdc3dc13..7745306d3 100644
--- a/common/src/arch-x86.h
+++ b/common/src/arch-x86.h
@@ -40,6 +40,7 @@
#include <set>
#include <map>
#include <vector>
+#include <cstdint>
#include "entryIDs.h"
#include "registers/MachRegister.h"
#include "common/src/ia32_locations.h"

23
github-pr1880.patch Normal file
View file

@ -0,0 +1,23 @@
commit 165402aa1640afb394b11a096b38c6bc3a5bf9d0 (github-fche/patch-1)
gpg: Signature made Wed 22 Jan 2025 03:35:55 PM EST
gpg: using RSA key B5690EEEBB952194
gpg: Can't check signature: No public key
Author: Frank Ch. Eigler <fche@elastic.org>
Date: Wed Jan 22 15:35:55 2025 -0500
Update sha1.C: #include <cstdint>
Subject header is needed on gcc15 to compile sha1.C, supplying declaration of types like uint32_t.
diff --git a/common/src/sha1.C b/common/src/sha1.C
index 91e9ad291561..d6e76c5727ac 100644
--- a/common/src/sha1.C
+++ b/common/src/sha1.C
@@ -102,6 +102,7 @@ A million repetitions of "a"
#include <stdio.h>
#include <string.h>
+#include <cstdint>
#include "dyntypes.h"
#include "common/src/sha1.h"

View file

@ -1,6 +1,5 @@
summary: CI Gating Plan
discover:
how: fmf
directory: tests
execute:
how: beakerlib
how: tmt

View file

@ -1,2 +1 @@
SHA512 (dyninst-12.1.0.tar.gz) = ec09b83f288afefd6a30a3253c91554d421305a43c2f2384435207dcabf523d5498d64873f876817c3108c3fc0a43fd4c48ce2c1ca873c73fb98a2d823446549
SHA512 (testsuite-12.1.0.tar.gz) = 884a33c5b912249166acc0c52bd0ab02b578dcea2a24fbfa2abc7887b6a9c4f3a113934b96079653d60d9dba34c8870eff7d08388c906111a024ec92e629798a
SHA512 (dyninst-13.0.0.tar.gz) = efa09018c411f6138e6e2cf6510007b29b00ed9e0d643df702303ee0ccb39b1ea1640bba18555f4cb0a7dbab677362c88ffe0eccace62b57860daee9350a4eee