rpms/gdb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import gdb-10.2-10.el9

Browse Source
This commit is contained in:
CentOS Sources 2022-09-27 07:45:10 -04:00 committed by Stepan Oksanichenko
parent 8a872322bf
commit ad0acebebe
5 changed files with 371 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SOURCES/_gdb.spec.Patch.include
View File

@ -455,3 +455,11 @@ Patch109: gdb-rhbz2012819-ibmz-update-4of5.patch
# (Andreas Krebbel, RHBZ 2012819)
Patch110: gdb-rhbz2012819-ibmz-update-5of5.patch
# Backport "Add Power 10 PLT instruction patterns"
# (Carl Love, RHBZ 1870017)
Patch111: gdb-rhbz1870017-p10-plt-prologue-skipping.patch
# Backport "fix logic of find_comp_unit and set_comp_unit"
# (Simon Marchi, RHBZ 2086761)
Patch112: gdb-rhbz2086761-unknown-cfa-rule.patch

2
SOURCES/_gdb.spec.patch.include
View File

@ -108,3 +108,5 @@
%patch108 -p1
%patch109 -p1
%patch110 -p1
%patch111 -p1
%patch112 -p1

298
SOURCES/gdb-rhbz1870017-p10-plt-prologue-skipping.patch Normal file
View File

@ -0,0 +1,298 @@
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
From: Carl Love <cel@us.ibm.com>
Date: Thu, 29 Apr 2021 17:19:13 -0500
Subject: gdb-rhbz1870017-p10-plt-prologue-skipping.patch
;; Backport "Add Power 10 PLT instruction patterns"
;; (Carl Love, RHBZ 1870017)
gdb/ChangeLog:
2021-06-07 Carl Love <cel@us.ibm.com>
* ppc-tdep.h (ppc_insn_prefix_dform): Declare.
* ppc64-tdep.c(insn_md, insn_x, insn_xo): New macros.
(ppc64_plt_pcrel_entry_point, ppc64_pcrel_linkage1_target,
ppc64_pcrel_linkage2_target): New functions.
(ppc64_standard_linkage9, ppc64_standard_linkage10,
ppc64_standard_linkage11, ppc64_standard_linkage12): New ppc
instruction patterns.
(ppc64_standard_linkage9, ppc64_standard_linkage10,
ppc64_standard_linkage11, ppc64_standard_linkage12): New variables
in define MAX expression.
(ppc64_skip_trampoline_code_1): Handle ppc64_standard_linkage9,
ppc64_standard_linkage10, ppc64_standard_linkage11,
ppc64_standard_linkage12.
* (ppc_insn_prefix_dform): New function.
diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h
--- a/gdb/ppc-tdep.h
+++ b/gdb/ppc-tdep.h
@@ -426,6 +426,8 @@ extern int ppc_insns_match_pattern (struct frame_info *frame, CORE_ADDR pc,
extern CORE_ADDR ppc_insn_d_field (unsigned int insn);
extern CORE_ADDR ppc_insn_ds_field (unsigned int insn);
+extern CORE_ADDR ppc_insn_prefix_dform (unsigned int insn1,
+ unsigned int insn2);
extern int ppc_process_record (struct gdbarch *gdbarch,
struct regcache *regcache, CORE_ADDR addr);
diff --git a/gdb/ppc64-tdep.c b/gdb/ppc64-tdep.c
--- a/gdb/ppc64-tdep.c
+++ b/gdb/ppc64-tdep.c
@@ -49,6 +49,38 @@
| (((unsigned (spr)) & 0x3e0) << 6) \
| (((unsigned (xo)) & 0x3ff) << 1))
+#define prefix(a, b, R, do) \
+ (((0x1) << 26) \
+ | (((unsigned (a)) & 0x3) << 24) \
+ | (((unsigned (b)) & 0x1) << 23) \
+ | (((unsigned (R)) & 0x1) << 20) \
+ | ((unsigned (do)) & 0x3ffff))
+
+#define insn_md(opcd, ra, rs, sh, me, rc) \
+ ((((unsigned (opcd)) & 0x3f) << 26) \
+ | (((unsigned (rs)) & 0x1f) << 21) \
+ | (((unsigned (ra)) & 0x1f) << 16) \
+ | (((unsigned (sh)) & 0x3e) << 11) \
+ | (((unsigned (me)) & 0x3f) << 25) \
+ | (((unsigned (sh)) & 0x1) << 1) \
+ | ((unsigned (rc)) & 0x1))
+
+#define insn_x(opcd, rt, ra, rb, opc2) \
+ ((((unsigned (opcd)) & 0x3f) << 26) \
+ | (((unsigned (rt)) & 0x1f) << 21) \
+ | (((unsigned (ra)) & 0x1f) << 16) \
+ | (((unsigned (rb)) & 0x3e) << 11) \
+ | (((unsigned (opc2)) & 0x3FF) << 1))
+
+#define insn_xo(opcd, rt, ra, rb, oe, rc, opc2) \
+ ((((unsigned (opcd)) & 0x3f) << 26) \
+ | (((unsigned (rt)) & 0x1f) << 21) \
+ | (((unsigned (ra)) & 0x1f) << 16) \
+ | (((unsigned (rb)) & 0x3e) << 11) \
+ | (((unsigned (oe)) & 0x1) << 10) \
+ | (((unsigned (opc2)) & 0x1FF) << 1) \
+ | (((unsigned (rc)))))
+
/* PLT_OFF is the TOC-relative offset of a 64-bit PowerPC PLT entry.
Return the function's entry point. */
@@ -75,6 +107,18 @@ ppc64_plt_entry_point (struct frame_info *frame, CORE_ADDR plt_off)
return read_memory_unsigned_integer (tocp + plt_off, 8, byte_order);
}
+static CORE_ADDR
+ppc64_plt_pcrel_entry_point (struct frame_info *frame, CORE_ADDR plt_off,
+ CORE_ADDR pc)
+{
+ struct gdbarch *gdbarch = get_frame_arch (frame);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+
+ /* Execution direction doesn't matter, entry is pc + plt_off either way.
+ The first word of the PLT entry is the function entry point. */
+ return read_memory_unsigned_integer (pc + plt_off, 8, byte_order);
+}
+
/* Patterns for the standard linkage functions. These are built by
build_plt_stub in bfd/elf64-ppc.c. */
@@ -342,6 +386,110 @@ static const struct ppc_insn_pattern ppc64_standard_linkage8[] =
{ 0, 0, 0 }
};
+/* Power 10 ELFv2 PLT call stubs */
+static const struct ppc_insn_pattern ppc64_standard_linkage9[] =
+ {
+ /* std %r2,0+40(%r1) <optional> */
+ { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
+
+ /* pld r12, <any> */
+ { prefix (-1, -1, 1, 0), prefix (0, 0, 1, 0), 0 },
+ { insn_d (-1, -1, -1, 0), insn_d (57, 12, 0, 0), 0 },
+
+ /* mtctr r12 */
+ { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
+
+ /* bctr */
+ { (unsigned) -1, 0x4e800420, 0 },
+
+ { 0, 0, 0 }
+ };
+
+static const struct ppc_insn_pattern ppc64_standard_linkage10[] =
+ {
+ /* std %r2,0+40(%r1) <optional> */
+ { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
+
+ /* paddi r12,<any> */
+ { prefix (-1, -1, 1, 0), prefix (2, 0, 1, 0), 0 },
+ { insn_d (-1, -1, -1, 0), insn_d (14, 12, 0, 0), 0 },
+
+ /* mtctr r12 <optional> */
+ { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
+
+ /* bctr */
+ { (unsigned) -1, 0x4e800420, 0 },
+
+ { 0, 0, 0 }
+ };
+
+static const struct ppc_insn_pattern ppc64_standard_linkage11[] =
+ {
+ /* std %r2,0+40(%r1) <optional> */
+ { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
+
+ /* li %r11,0 <optional> */
+ { insn_d (-1, -1, -1, 0), insn_d (14, 11, 0, 0), 1 },
+
+ /* sldi %r11,%r11,34 <eq to rldicr rx,ry,n, 63-n> <optional> */
+ { insn_md (-1, -1, -1, 0, 0, 1), insn_md (30, 11, 11, 34, 63-34, 0), 1 },
+
+ /* paddi r12, <any> */
+ { prefix (-1, -1, 1, 0), prefix (2, 0, 1, 0), 0 },
+ { insn_d (-1, -1, -1, 0), insn_d (14, 12, 0, 0), 0 },
+
+ /* ldx %r12,%r11,%r12 <optional> */
+ { (unsigned) -1, insn_x (31, 12, 11, 12, 21), 1 },
+
+ /* add %r12,%r11,%r12 <optional> */
+ { (unsigned) -1, insn_xo (31, 12, 11, 12, 0, 0, 40), 1 },
+
+ /* mtctr r12 */
+ { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
+
+ /* bctr */ // 13, 14, 15, 16
+ { (unsigned) -1, 0x4e800420, 0 },
+
+ { 0, 0, 0 }
+ };
+
+static const struct ppc_insn_pattern ppc64_standard_linkage12[] =
+ {
+ /* std %r2,0+40(%r1) <optional> */
+ { insn_ds (-1, -1, -1, 0, 1), insn_ds (62, 2, 1, 40, 0), 1 },
+
+ /* lis %r11,xxx@ha <equivalent addis rx, 0, val> */
+ /* addis r12, r2, <any> */
+ { insn_d (-1, -1, -1, 0), insn_d (15, 12, 2, 0), 0 },
+
+ /* ori %r11,%r11,xxx@l */
+ { insn_d (-1, -1, -1, 0), insn_d (24, 11, 11, 0), 0 },
+
+ /* sldi %r11,%r11,34 <optional> */
+ { (unsigned) -1, insn_md (30, 11, 11, 34, 63-34, 0), 1 },
+
+ /*paddi r12,<any> */
+ { prefix (-1, -1, 1, 0), prefix (2, 0, 1, 0), 0 },
+ { insn_d (-1, -1, -1, 0), insn_d (14, 12, 0, 0), 0 },
+
+ /* sldi %r11,%r11,34 <optional> */
+ { (unsigned) -1, insn_md (30, 11, 11, 34, 63-34, 0), 1 },
+
+ /* ldx %r12,%r11,%r12 <optional> */
+ { (unsigned) -1, insn_x (31, 12, 11, 12, 21), 1 },
+
+ /* add %r12,%r11,%r12 <optional> */
+ { (unsigned) -1, insn_xo (31, 12, 11, 12, 0, 0, 40), 1 },
+
+ /* mtctr r12 */
+ { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 12, 9, 467), 0 },
+
+ /* bctr */ // 17, 18, 19, 20
+ { (unsigned) -1, 0x4e800420, 0 },
+
+ { 0, 0, 0 }
+ };
+
/* When the dynamic linker is doing lazy symbol resolution, the first
call to a function in another object will go like this:
@@ -432,6 +580,29 @@ ppc64_standard_linkage4_target (struct frame_info *frame, unsigned int *insn)
return ppc64_plt_entry_point (frame, plt_off);
}
+static CORE_ADDR
+ppc64_pcrel_linkage1_target (struct frame_info *frame, unsigned int *insn,
+ CORE_ADDR pc)
+{
+ /* insn[0] is for the std instruction. */
+ CORE_ADDR plt_off = ppc_insn_prefix_dform (insn[1], insn[2]);
+
+ return ppc64_plt_pcrel_entry_point (frame, plt_off, pc);
+}
+
+static CORE_ADDR
+ppc64_pcrel_linkage2_target (struct frame_info *frame, unsigned int *insn,
+ CORE_ADDR pc)
+{
+ CORE_ADDR plt_off;
+
+ /* insn[0] is for the std instruction.
+ insn[1] is for the li r11 instruction */
+ plt_off = ppc_insn_prefix_dform (insn[2], insn[3]);
+
+ return ppc64_plt_pcrel_entry_point (frame, plt_off, pc);
+}
+
/* Given that we've begun executing a call trampoline at PC, return
the entry point of the function the trampoline will go to.
@@ -447,10 +618,15 @@ ppc64_skip_trampoline_code_1 (struct frame_info *frame, CORE_ADDR pc)
ARRAY_SIZE (ppc64_standard_linkage2)),
MAX (ARRAY_SIZE (ppc64_standard_linkage3),
ARRAY_SIZE (ppc64_standard_linkage4))),
- MAX (MAX (ARRAY_SIZE (ppc64_standard_linkage5),
+ MAX(MAX (MAX (ARRAY_SIZE (ppc64_standard_linkage5),
ARRAY_SIZE (ppc64_standard_linkage6)),
MAX (ARRAY_SIZE (ppc64_standard_linkage7),
- ARRAY_SIZE (ppc64_standard_linkage8))))
+ ARRAY_SIZE (ppc64_standard_linkage8))),
+ MAX (MAX (ARRAY_SIZE (ppc64_standard_linkage9),
+ ARRAY_SIZE (ppc64_standard_linkage10)),
+ MAX (ARRAY_SIZE (ppc64_standard_linkage11),
+ ARRAY_SIZE (ppc64_standard_linkage12)))))
+
- 1];
CORE_ADDR target;
int scan_limit, i;
@@ -463,7 +639,19 @@ ppc64_skip_trampoline_code_1 (struct frame_info *frame, CORE_ADDR pc)
for (i = 0; i < scan_limit; i++)
{
- if (i < ARRAY_SIZE (ppc64_standard_linkage8) - 1
+ if (i < ARRAY_SIZE (ppc64_standard_linkage12) - 1
+ && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage12, insns))
+ pc = ppc64_pcrel_linkage1_target (frame, insns, pc);
+ else if (i < ARRAY_SIZE (ppc64_standard_linkage11) - 1
+ && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage11, insns))
+ pc = ppc64_pcrel_linkage2_target (frame, insns, pc);
+ else if (i < ARRAY_SIZE (ppc64_standard_linkage10) - 1
+ && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage10, insns))
+ pc = ppc64_pcrel_linkage1_target (frame, insns, pc);
+ else if (i < ARRAY_SIZE (ppc64_standard_linkage9) - 1
+ && ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage9, insns))
+ pc = ppc64_pcrel_linkage1_target (frame, insns, pc);
+ else if (i < ARRAY_SIZE (ppc64_standard_linkage8) - 1
&& ppc_insns_match_pattern (frame, pc, ppc64_standard_linkage8, insns))
pc = ppc64_standard_linkage4_target (frame, insns);
else if (i < ARRAY_SIZE (ppc64_standard_linkage7) - 1
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -7361,6 +7361,14 @@ ppc_insn_ds_field (unsigned int insn)
return ((((CORE_ADDR) insn & 0xfffc) ^ 0x8000) - 0x8000);
}
+CORE_ADDR
+ppc_insn_prefix_dform (unsigned int insn1, unsigned int insn2)
+{
+ /* result is 34-bits */
+ return (CORE_ADDR) ((((insn1 & 0x3ffff) ^ 0x20000) - 0x20000) << 16)
+ | (CORE_ADDR)(insn2 & 0xffff);
+}
+
/* Initialization code. */
void _initialize_rs6000_tdep ();

54
SOURCES/gdb-rhbz2086761-unknown-cfa-rule.patch Normal file
View File

@ -0,0 +1,54 @@
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Tue, 24 May 2022 07:39:17 -0700
Subject: gdb-rhbz2086761-unknown-cfa-rule.patch
;; Backport "fix logic of find_comp_unit and set_comp_unit"
;; (Simon Marchi, RHBZ 2086761)
The logic in find_comp_unit and set_comp_unit is reversed. When the BFD
requires relocation, we want to put the comp_unit structure in the
map where the comp_unit objects are not shared, that is the one indexed
by objfile. If the BFD does not require relocation, then, we can share
a single comp_unit structure for all users of that BFD, so we want to
put it in the BFD-indexed map. The comments on top of
dwarf2_frame_bfd_data and dwarf2_frame_objfile_data make that clear.
Fix it by swapping the two in find_comp_unit and set_comp_unit.
I don't have a test for this, because I don't see how to write one in a
reasonable amount of time.
gdb/ChangeLog:
PR gdb/26876
* dwarf2/frame.c (find_comp_unit, set_comp_unit): Reverse use of
dwarf2_frame_bfd_data and dwarf2_frame_objfile_data.
diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c
--- a/gdb/dwarf2/frame.c
+++ b/gdb/dwarf2/frame.c
@@ -1640,8 +1640,9 @@ find_comp_unit (struct objfile *objfile)
{
bfd *abfd = objfile->obfd;
if (gdb_bfd_requires_relocations (abfd))
- return dwarf2_frame_bfd_data.get (abfd);
- return dwarf2_frame_objfile_data.get (objfile);
+ return dwarf2_frame_objfile_data.get (objfile);
+
+ return dwarf2_frame_bfd_data.get (abfd);
}
/* Store the comp_unit on OBJFILE, or the corresponding BFD, as
@@ -1652,8 +1653,9 @@ set_comp_unit (struct objfile *objfile, struct comp_unit *unit)
{
bfd *abfd = objfile->obfd;
if (gdb_bfd_requires_relocations (abfd))
- return dwarf2_frame_bfd_data.set (abfd, unit);
- return dwarf2_frame_objfile_data.set (objfile, unit);
+ return dwarf2_frame_objfile_data.set (objfile, unit);
+
+ return dwarf2_frame_bfd_data.set (abfd, unit);
}
/* Find the FDE for *PC. Return a pointer to the FDE, and store the

10
SPECS/gdb.spec
View File

@ -37,7 +37,7 @@ Version: 10.2
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 9%{?dist}
Release: 10%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
# Do not provide URL for snapshots as the file lasts there only for 2 days.
@ -1158,6 +1158,14 @@ fi
%endif
%changelog
* Tue May 24 2022 Keith Seitz <keiths@redhat.com> - 10.2-10.el9
- Backport "fix logic of find_comp_unit and set_comp_unit"
(Simon Marchi, RHBZ 2086761)
* Mon Apr 11 2022 Bruno Larsen <blarsen@redhat.com>
- Backport Add Power 10 PLT instruction patterns
(Carl Love, RHBZ 1870017)
* Mon Nov 1 2021 Keith Seitz <keiths@redhat.com> - 10.2-9.el9
- Backport IBM arch14 updates.
(Andreas Krebbel, RHBZ 2012819)