From 46905b8e9c6692d3df4e979f8d390dd911910b77 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 11 Jan 2022 13:11:19 -0500 Subject: [PATCH] import dyninst-11.0.0-5.el9 --- SOURCES/dyninst-11.0.0-aarch64.patch | 65 ++++++++++++++++++++++++++++ SPECS/dyninst.spec | 7 ++- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 SOURCES/dyninst-11.0.0-aarch64.patch diff --git a/SOURCES/dyninst-11.0.0-aarch64.patch b/SOURCES/dyninst-11.0.0-aarch64.patch new file mode 100644 index 0000000..2783417 --- /dev/null +++ b/SOURCES/dyninst-11.0.0-aarch64.patch @@ -0,0 +1,65 @@ +rhbz1993578 + +commit 874a73ea4 (HEAD -> master, upstream/master) +Author: Stan Cox +Date: Mon Nov 1 14:24:07 2021 -0400 + + Don't overflow aarch64 float register vector when setting used regs. (#1127) + + Do not include the subtype when setting a float register as a used register if the registerSlot vector would be exceeded, e.g. for a value like 0x400 (Q_REG/register 0). + +--- dyninst-11.0.0/dyninstAPI/src/inst-aarch64.C.orig ++++ dyninst-11.0.0/dyninstAPI/src/inst-aarch64.C +@@ -551,8 +551,13 @@ bool EmitterAARCH64::clobberAllFuncCall(registerSpace *rs, + rs->GPRs()[*itr]->beenUsed = true; + + std::set *fpRegs = callee->ifunc()->usedFPRs(); +- for(std::set::iterator itr = fpRegs->begin(); itr != fpRegs->end(); itr++) +- rs->FPRs()[*itr]->beenUsed = true; ++ for(std::set::iterator itr = fpRegs->begin(); itr != fpRegs->end(); itr++) { ++ if (*itr <= rs->FPRs().size()) ++ rs->FPRs()[*itr]->beenUsed = true; ++ else ++ // parse_func::calcUsedRegs includes the subtype; we only want the regno ++ rs->FPRs()[*itr & 0xff]->beenUsed = true; ++ } + } else { + for(int idx = 0; idx < rs->numGPRs(); idx++) + rs->GPRs()[idx]->beenUsed = true; +commit b2c892f55 +Author: Stan Cox +Date: Tue Oct 26 17:43:14 2021 -0400 + + Load callee's address when the callee and caller are in the same module (#1056) + + If the callee and caller are in the same module and pic is not + required then the callee's address can be loaded directly without + using a relocation. + +--- dyninst-11.0.0/dyninstAPI/src/inst-aarch64.C.orig ++++ dyninst-11.0.0/dyninstAPI/src/inst-aarch64.C +@@ -651,12 +651,14 @@ Register EmitterAARCH64::emitCall(opCode op, + + assert(gen.rs()); + +- //Address of function to call in scratch register ++ // Address of function to call in scratch register + Register scratch = gen.rs()->getScratchRegister(gen); + assert(scratch != REG_NULL && "cannot get a scratch register"); + gen.markRegDefined(scratch); + +- if (gen.addrSpace()->edit() != NULL) { ++ if (gen.addrSpace()->edit() != NULL ++ && (gen.func()->obj() != callee->obj() ++ || gen.addrSpace()->needsPIC())) { + // gen.as.edit() checks if we are in rewriter mode + Address dest = getInterModuleFuncAddr(callee, gen); + +@@ -666,7 +668,6 @@ Register EmitterAARCH64::emitCall(opCode op, + instruction insn; + insn.clear(); + INSN_SET(insn, 31, 31, 0); +- //INSN_SET(insn, 29, 30, disp & 0x3); + INSN_SET(insn, 28, 28, 1); + INSN_SET(insn, 5, 23, disp >> 2); + INSN_SET(insn, 0, 4, scratch); diff --git a/SPECS/dyninst.spec b/SPECS/dyninst.spec index 74e855f..8ff058b 100644 --- a/SPECS/dyninst.spec +++ b/SPECS/dyninst.spec @@ -1,7 +1,7 @@ Summary: An API for Run-time Code Generation License: LGPLv2+ Name: dyninst -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.dyninst.org Version: 11.0.0 ExclusiveArch: %{ix86} x86_64 ppc64le aarch64 @@ -14,6 +14,7 @@ Patch2: testsuite-11.0.0-386.patch Patch3: dyninst-11.0.0-dwarf.patch Patch4: dyninst-11.0.0-rosebc.patch Patch5: dyninst-11.0.0-nullbuf.patch +Patch6: dyninst-11.0.0-aarch64.patch %global dyninst_base dyninst-%{version} %global testsuite_base testsuite-%{version} @@ -87,6 +88,7 @@ pushd %{dyninst_base} %patch3 -p1 -b .dwarf %patch4 -p1 -b .rosebc %patch5 -p1 -b .nullbuf +%patch6 -p1 -b .aarch64 popd # cotire seems to cause non-deterministic gcc errors @@ -191,6 +193,9 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \ %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a %changelog +* Mon Nov 01 2021 Stan Cox - 11.0.0-5 +- Related: rhbz1993578 + * Tue Aug 10 2021 Stan Cox - 11.0.0-4 - Related: rhbz1991997