+2020-09-18 Victor Collod <vcollod@nvidia.com>
+
+ PR gdb/26635
+ * i386-tdep.c (i386_skip_endbr): Add a helper function to skip endbr.
+ (i386_analyze_prologue): Call i386_skip_endbr.
+
2020-09-18 Tom Tromey <tromey@adacore.com>
* windows-nat.c (struct windows_nat_target) <wait>: Update.
{ 0 }
};
+/* Check whether PC points to an endbr32 instruction. */
+static CORE_ADDR
+i386_skip_endbr (CORE_ADDR pc)
+{
+ static const gdb_byte endbr32[] = { 0xf3, 0x0f, 0x1e, 0xfb };
+
+ gdb_byte buf[sizeof (endbr32)];
+
+ /* Stop there if we can't read the code */
+ if (target_read_code (pc, buf, sizeof (endbr32)))
+ return pc;
+
+ /* If the instruction isn't an endbr32, stop */
+ if (memcmp (buf, endbr32, sizeof (endbr32)) != 0)
+ return pc;
+
+ return pc + sizeof (endbr32);
+}
/* Check whether PC points to a no-op instruction. */
static CORE_ADDR
CORE_ADDR pc, CORE_ADDR current_pc,
struct i386_frame_cache *cache)
{
+ pc = i386_skip_endbr (pc);
pc = i386_skip_noop (pc);
pc = i386_follow_jump (gdbarch, pc);
pc = i386_analyze_struct_return (pc, current_pc, cache);
+2020-09-18 Victor Collod <vcollod@nvidia.com>
+
+ PR gdb/26635
+ * gdb.arch/amd64-prologue-skip-cf-protection.exp: Make the test
+ compatible with i386, and move it to...
+ * gdb.arch/i386-prologue-skip-cf-protection.exp: ... here.
+ * gdb.arch/amd64-prologue-skip-cf-protection.c: Move to...
+ * gdb.arch/i386-prologue-skip-cf-protection.c: ... here.
+
2020-09-18 Pedro Alves <pedro@palves.net>
PR gdb/26631
+++ /dev/null
-/* This testcase is part of GDB, the GNU debugger.
-
- Copyright 2020 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-int main (void)
-{
- return 0;
-}
+++ /dev/null
-# Copyright 2020 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test skipping a prologue that was generated with gcc's -fcf-protection=full
-# (control flow protection) option.
-#
-# This option places an `endbr64` instruction at the start of all functions,
-# which can interfere with prologue analysis.
-
-standard_testfile .c
-set binfile ${binfile}
-
-if { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
- verbose "Skipping ${testfile}."
- return
-}
-
-if { ![supports_fcf_protection] } {
- untested "-fcf-protection not supported"
- return
-}
-
-set opts {debug additional_flags=-fcf-protection=full}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
- untested "failed to compile"
- return
-}
-
-clean_restart ${binfile}
-
-# Get start address of function main.
-set main_addr [get_integer_valueof &main -1]
-gdb_assert {$main_addr != -1}
-
-set bp_addr -1
-
-# Put breakpoint on main, get the address where the breakpoint was installed.
-gdb_test_multiple "break main" "break on main, get address" {
- -re -wrap "Breakpoint $decimal at ($hex).*" {
- set bp_addr $expect_out(1,string)
-
- # Convert to decimal.
- set bp_addr [expr $bp_addr]
-
- pass $gdb_test_name
- }
-}
-
-if { $bp_addr != -1 } {
- # Make sure some prologue was skipped.
- gdb_assert {$bp_addr > $main_addr}
-}
--- /dev/null
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2020 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+int main (void)
+{
+ return 0;
+}
--- /dev/null
+# Copyright 2020 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test skipping a prologue that was generated with gcc's -fcf-protection=full
+# (control flow protection) option.
+#
+# This option places an `endbr32`/`endbr64` instruction at the start of
+# all functions, which can interfere with prologue analysis.
+
+standard_testfile .c
+set binfile ${binfile}
+
+if { ![istarget x86_64-*-*] && ![istarget i?86-*-*] } {
+ verbose "Skipping ${testfile}."
+ return
+}
+
+if { ![supports_fcf_protection] } {
+ untested "-fcf-protection not supported"
+ return
+}
+
+set opts {debug additional_flags=-fcf-protection=full}
+
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } {
+ untested "failed to compile"
+ return
+}
+
+clean_restart ${binfile}
+
+# Get start address of function main.
+set main_addr [get_integer_valueof &main -1]
+gdb_assert {$main_addr != -1}
+
+set bp_addr -1
+
+# Put breakpoint on main, get the address where the breakpoint was installed.
+gdb_test_multiple "break main" "break on main, get address" {
+ -re -wrap "Breakpoint $decimal at ($hex).*" {
+ set bp_addr $expect_out(1,string)
+
+ # Convert to decimal.
+ set bp_addr [expr $bp_addr]
+
+ pass $gdb_test_name
+ }
+}
+
+if { $bp_addr != -1 } {
+ # Make sure some prologue was skipped.
+ gdb_assert {$bp_addr > $main_addr}
+}
projects / binutils-gdb.git / commitdiff