This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 01/15] gdbarch: add instruction predicate methods
- From: Markus Metzger <markus dot t dot metzger at intel dot com>
- To: jan dot kratochvil at redhat dot com
- Cc: gdb-patches at sourceware dot org
- Date: Thu, 2 May 2013 14:03:22 +0200
- Subject: [PATCH 01/15] gdbarch: add instruction predicate methods
- References: <1367496216-21217-1-git-send-email-markus dot t dot metzger at intel dot com>
Add new methods to gdbarch for analyzing the instruction at a given address.
Implement those methods for i386 and amd64 architectures.
2013-05-02 Markus Metzger <markus.t.metzger@intel.com>
* amd64-tdep.c (amd64_classify_insn_at, amd64_insn_call_p,
amd64_insn_ret_p, amd64_insn_jump_p, amd64_jmp_p): New.
(amd64_init_abi): Add insn_call_p, insn_ret_p, and insn_jump_p
to gdbarch.
* i386-tdep.c (i386_insn_call_p, i386_insn_ret_p,
i386_insn_jump_p, i386_jmp_p): New.
(i386_gdbarch_init): Add insn_call_p, insn_ret_p, and
insn_jump_p to gdbarch.
* gdbarch.sh (insn_call_p, insn_ret_p, insn_jump_p): New.
* gdbarch.h: Regenerated.
* gdbarch.c: Regenerated.
---
gdb/amd64-tdep.c | 66 ++++++++++++++++++++++++++++++++++++
gdb/gdbarch.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/gdbarch.h | 24 +++++++++++++
gdb/gdbarch.sh | 9 +++++
gdb/i386-tdep.c | 57 +++++++++++++++++++++++++++++++
5 files changed, 255 insertions(+), 0 deletions(-)
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 3ab74f0..30013b3 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -1365,6 +1365,22 @@ amd64_absolute_jmp_p (const struct amd64_insn *details)
}
static int
+amd64_jmp_p (const struct amd64_insn *details)
+{
+ const gdb_byte *insn = &details->raw_insn[details->opcode_offset];
+
+ /* jump short, relative. */
+ if (insn[0] == 0xeb)
+ return 1;
+
+ /* jump near, relative. */
+ if (insn[0] == 0xe9)
+ return 1;
+
+ return amd64_absolute_jmp_p (details);
+}
+
+static int
amd64_absolute_call_p (const struct amd64_insn *details)
{
const gdb_byte *insn = &details->raw_insn[details->opcode_offset];
@@ -1435,6 +1451,53 @@ amd64_syscall_p (const struct amd64_insn *details, int *lengthp)
return 0;
}
+/* Classify the instruction at ADDR using PRED. */
+
+static int
+amd64_classify_insn_at (struct gdbarch *gdbarch, CORE_ADDR addr,
+ int (*pred) (const struct amd64_insn *))
+{
+ struct amd64_insn details;
+ gdb_byte *buf;
+ int len, classification;
+
+ len = gdbarch_max_insn_length (gdbarch);
+ buf = xzalloc (len);
+
+ read_memory (addr, buf, len);
+ amd64_get_insn_details (buf, &details);
+
+ classification = pred (&details);
+
+ xfree (buf);
+
+ return classification;
+}
+
+/* The gdbarch insn_call_p method. */
+
+static int
+amd64_insn_call_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ return amd64_classify_insn_at (gdbarch, addr, amd64_call_p);
+}
+
+/* The gdbarch insn_ret_p method. */
+
+static int
+amd64_insn_ret_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ return amd64_classify_insn_at (gdbarch, addr, amd64_ret_p);
+}
+
+/* The gdbarch insn_jump_p method. */
+
+static int
+amd64_insn_jump_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ return amd64_classify_insn_at (gdbarch, addr, amd64_jmp_p);
+}
+
/* Fix up the state of registers and memory after having single-stepped
a displaced instruction. */
@@ -2968,6 +3031,9 @@ amd64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
i386_stap_is_single_operand);
set_gdbarch_stap_parse_special_token (gdbarch,
i386_stap_parse_special_token);
+ set_gdbarch_insn_call_p (gdbarch, amd64_insn_call_p);
+ set_gdbarch_insn_ret_p (gdbarch, amd64_insn_ret_p);
+ set_gdbarch_insn_jump_p (gdbarch, amd64_insn_jump_p);
}
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 129268f..cf7b82e 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -286,6 +286,9 @@ struct gdbarch
gdbarch_core_info_proc_ftype *core_info_proc;
gdbarch_iterate_over_objfiles_in_search_order_ftype *iterate_over_objfiles_in_search_order;
struct ravenscar_arch_ops * ravenscar_ops;
+ gdbarch_insn_call_p_ftype *insn_call_p;
+ gdbarch_insn_ret_p_ftype *insn_ret_p;
+ gdbarch_insn_jump_p_ftype *insn_jump_p;
};
@@ -457,6 +460,9 @@ struct gdbarch startup_gdbarch =
0, /* core_info_proc */
default_iterate_over_objfiles_in_search_order, /* iterate_over_objfiles_in_search_order */
NULL, /* ravenscar_ops */
+ 0, /* insn_call_p */
+ 0, /* insn_ret_p */
+ 0, /* insn_jump_p */
/* startup_gdbarch() */
};
@@ -760,6 +766,9 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of core_info_proc, has predicate. */
/* Skip verify of iterate_over_objfiles_in_search_order, invalid_p == 0 */
/* Skip verify of ravenscar_ops, invalid_p == 0 */
+ /* Skip verify of insn_call_p, has predicate. */
+ /* Skip verify of insn_ret_p, has predicate. */
+ /* Skip verify of insn_jump_p, has predicate. */
buf = ui_file_xstrdup (log, &length);
make_cleanup (xfree, buf);
if (length > 0)
@@ -1081,6 +1090,24 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
"gdbarch_dump: inner_than = <%s>\n",
host_address_to_string (gdbarch->inner_than));
fprintf_unfiltered (file,
+ "gdbarch_dump: gdbarch_insn_call_p_p() = %d\n",
+ gdbarch_insn_call_p_p (gdbarch));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: insn_call_p = <%s>\n",
+ host_address_to_string (gdbarch->insn_call_p));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: gdbarch_insn_jump_p_p() = %d\n",
+ gdbarch_insn_jump_p_p (gdbarch));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: insn_jump_p = <%s>\n",
+ host_address_to_string (gdbarch->insn_jump_p));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: gdbarch_insn_ret_p_p() = %d\n",
+ gdbarch_insn_ret_p_p (gdbarch));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: insn_ret_p = <%s>\n",
+ host_address_to_string (gdbarch->insn_ret_p));
+ fprintf_unfiltered (file,
"gdbarch_dump: int_bit = %s\n",
plongest (gdbarch->int_bit));
fprintf_unfiltered (file,
@@ -4356,6 +4383,78 @@ set_gdbarch_ravenscar_ops (struct gdbarch *gdbarch,
gdbarch->ravenscar_ops = ravenscar_ops;
}
+int
+gdbarch_insn_call_p_p (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ return gdbarch->insn_call_p != NULL;
+}
+
+int
+gdbarch_insn_call_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ gdb_assert (gdbarch != NULL);
+ gdb_assert (gdbarch->insn_call_p != NULL);
+ if (gdbarch_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_insn_call_p called\n");
+ return gdbarch->insn_call_p (gdbarch, addr);
+}
+
+void
+set_gdbarch_insn_call_p (struct gdbarch *gdbarch,
+ gdbarch_insn_call_p_ftype insn_call_p)
+{
+ gdbarch->insn_call_p = insn_call_p;
+}
+
+int
+gdbarch_insn_ret_p_p (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ return gdbarch->insn_ret_p != NULL;
+}
+
+int
+gdbarch_insn_ret_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ gdb_assert (gdbarch != NULL);
+ gdb_assert (gdbarch->insn_ret_p != NULL);
+ if (gdbarch_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_insn_ret_p called\n");
+ return gdbarch->insn_ret_p (gdbarch, addr);
+}
+
+void
+set_gdbarch_insn_ret_p (struct gdbarch *gdbarch,
+ gdbarch_insn_ret_p_ftype insn_ret_p)
+{
+ gdbarch->insn_ret_p = insn_ret_p;
+}
+
+int
+gdbarch_insn_jump_p_p (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ return gdbarch->insn_jump_p != NULL;
+}
+
+int
+gdbarch_insn_jump_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ gdb_assert (gdbarch != NULL);
+ gdb_assert (gdbarch->insn_jump_p != NULL);
+ if (gdbarch_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_insn_jump_p called\n");
+ return gdbarch->insn_jump_p (gdbarch, addr);
+}
+
+void
+set_gdbarch_insn_jump_p (struct gdbarch *gdbarch,
+ gdbarch_insn_jump_p_ftype insn_jump_p)
+{
+ gdbarch->insn_jump_p = insn_jump_p;
+}
+
/* Keep a registry of per-architecture data-pointers required by GDB
modules. */
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 464c4b6..6540d37 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1239,6 +1239,30 @@ extern void set_gdbarch_iterate_over_objfiles_in_search_order (struct gdbarch *g
extern struct ravenscar_arch_ops * gdbarch_ravenscar_ops (struct gdbarch *gdbarch);
extern void set_gdbarch_ravenscar_ops (struct gdbarch *gdbarch, struct ravenscar_arch_ops * ravenscar_ops);
+/* Return non-zero if the instruction at ADDR is a call; zero otherwise. */
+
+extern int gdbarch_insn_call_p_p (struct gdbarch *gdbarch);
+
+typedef int (gdbarch_insn_call_p_ftype) (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern int gdbarch_insn_call_p (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern void set_gdbarch_insn_call_p (struct gdbarch *gdbarch, gdbarch_insn_call_p_ftype *insn_call_p);
+
+/* Return non-zero if the instruction at ADDR is a return; zero otherwise. */
+
+extern int gdbarch_insn_ret_p_p (struct gdbarch *gdbarch);
+
+typedef int (gdbarch_insn_ret_p_ftype) (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern int gdbarch_insn_ret_p (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern void set_gdbarch_insn_ret_p (struct gdbarch *gdbarch, gdbarch_insn_ret_p_ftype *insn_ret_p);
+
+/* Return non-zero if the instruction at ADDR is a jump; zero otherwise. */
+
+extern int gdbarch_insn_jump_p_p (struct gdbarch *gdbarch);
+
+typedef int (gdbarch_insn_jump_p_ftype) (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern int gdbarch_insn_jump_p (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern void set_gdbarch_insn_jump_p (struct gdbarch *gdbarch, gdbarch_insn_jump_p_ftype *insn_jump_p);
+
/* Definition for an unknown syscall, used basically in error-cases. */
#define UNKNOWN_SYSCALL (-1)
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 92d4f0f..5464ff5 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -972,6 +972,15 @@ m:void:iterate_over_objfiles_in_search_order:iterate_over_objfiles_in_search_ord
# Ravenscar arch-dependent ops.
v:struct ravenscar_arch_ops *:ravenscar_ops:::NULL:NULL::0:host_address_to_string (gdbarch->ravenscar_ops)
+
+# Return non-zero if the instruction at ADDR is a call; zero otherwise.
+M:int:insn_call_p:CORE_ADDR addr:addr
+
+# Return non-zero if the instruction at ADDR is a return; zero otherwise.
+M:int:insn_ret_p:CORE_ADDR addr:addr
+
+# Return non-zero if the instruction at ADDR is a jump; zero otherwise.
+M:int:insn_jump_p:CORE_ADDR addr:addr
EOF
}
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 930d6fc..1d011de 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -473,6 +473,20 @@ i386_absolute_jmp_p (const gdb_byte *insn)
}
static int
+i386_jmp_p (const gdb_byte *insn)
+{
+ /* jump short, relative. */
+ if (insn[0] == 0xeb)
+ return 1;
+
+ /* jump near, relative. */
+ if (insn[0] == 0xe9)
+ return 1;
+
+ return i386_absolute_jmp_p (insn);
+}
+
+static int
i386_absolute_call_p (const gdb_byte *insn)
{
/* call far, absolute. */
@@ -543,6 +557,45 @@ i386_syscall_p (const gdb_byte *insn, int *lengthp)
return 0;
}
+/* The gdbarch insn_call_p method. */
+
+static int
+i386_insn_call_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ gdb_byte buf[I386_MAX_INSN_LEN], *insn;
+
+ read_memory (addr, buf, I386_MAX_INSN_LEN);
+ insn = i386_skip_prefixes (buf, I386_MAX_INSN_LEN);
+
+ return i386_call_p (insn);
+}
+
+/* The gdbarch insn_ret_p method. */
+
+static int
+i386_insn_ret_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ gdb_byte buf[I386_MAX_INSN_LEN], *insn;
+
+ read_memory (addr, buf, I386_MAX_INSN_LEN);
+ insn = i386_skip_prefixes (buf, I386_MAX_INSN_LEN);
+
+ return i386_ret_p (insn);
+}
+
+/* The gdbarch insn_jump_p method. */
+
+static int
+i386_insn_jump_p (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+ gdb_byte buf[I386_MAX_INSN_LEN], *insn;
+
+ read_memory (addr, buf, I386_MAX_INSN_LEN);
+ insn = i386_skip_prefixes (buf, I386_MAX_INSN_LEN);
+
+ return i386_jmp_p (insn);
+}
+
/* Some kernels may run one past a syscall insn, so we have to cope.
Otherwise this is just simple_displaced_step_copy_insn. */
@@ -7774,6 +7827,10 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_gen_return_address (gdbarch, i386_gen_return_address);
+ set_gdbarch_insn_call_p (gdbarch, i386_insn_call_p);
+ set_gdbarch_insn_ret_p (gdbarch, i386_insn_ret_p);
+ set_gdbarch_insn_jump_p (gdbarch, i386_insn_jump_p);
+
/* Hook in ABI-specific overrides, if they have been registered. */
info.tdep_info = (void *) tdesc_data;
gdbarch_init_osabi (info, gdbarch);
--
1.7.1