From 2acf3cd06577b80adb96df754f910da8b754c7dc Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Tue, 24 Jun 2014 10:07:12 +0100 Subject: [PATCH] Rename identical functions amd64-linux-nat.c and i386-linux-nat.c contain a number of functions which are identical but for prefix on their names. This commit renames all such functions to have the prefix x86_ instead of the prefixes amd64_ or i386_ and updates all uses of those functions. The now-identical x86_ functions will be pulled out to a separate shared file in a later commit. gdb/ 2014-07-11 Gary Benson * amd64-linux-nat.c (amd64_linux_dr_get): Renamed to x86_linux_dr_get. All uses updated. (amd64_linux_dr_set): Renamed to x86_linux_dr_set. All uses updated. (amd64_linux_dr_get_addr): Renamed to x86_linux_dr_get_addr. All uses updated. (amd64_linux_dr_get_control): Renamed to x86_linux_dr_get_control. All uses updated. (amd64_linux_dr_get_status): Renamed to x86_linux_dr_get_status. All uses updated. (amd64_linux_dr_set_control): Renamed to x86_linux_dr_set_control. All uses updated. (amd64_linux_dr_set_addr): Renamed to x86_linux_dr_set_addr. All uses updated. (amd64_linux_prepare_to_resume): Renamed to x86_linux_prepare_to_resume. All uses updated. (amd64_linux_new_thread): Renamed to x86_linux_new_thread. All uses updated. (amd64_linux_new_fork): Renamed to x86_linux_new_fork. All uses updated. (amd64_linux_child_post_startup_inferior): Renamed to x86_linux_child_post_startup_inferior. All uses updated. (amd64_linux_enable_btrace): Renamed to x86_linux_enable_btrace. All uses updated. (amd64_linux_disable_btrace): Renamed to x86_linux_disable_btrace. All uses updated. (amd64_linux_teardown_btrace): Renamed to x86_linux_teardown_btrace. All uses updated. (amd64_linux_read_btrace): Renamed to x86_linux_read_btrace. All uses updated. * i386-linux-nat.c (i386_linux_dr_get): Renamed to x86_linux_dr_get. All uses updated. (i386_linux_dr_set): Renamed to x86_linux_dr_set. All uses updated. (i386_linux_dr_get_addr): Renamed to x86_linux_dr_get_addr. All uses updated. (i386_linux_dr_get_control): Renamed to x86_linux_dr_get_control. All uses updated. (i386_linux_dr_get_status): Renamed to x86_linux_dr_get_status. All uses updated. (i386_linux_dr_set_control): Renamed to x86_linux_dr_set_control. All uses updated. (i386_linux_dr_set_addr): Renamed to x86_linux_dr_set_addr. All uses updated. (i386_linux_prepare_to_resume): Renamed to x86_linux_prepare_to_resume. All uses updated. (i386_linux_new_thread): Renamed to x86_linux_new_thread. All uses updated. (i386_linux_new_fork): Renamed to x86_linux_new_fork. All uses updated. (i386_linux_child_post_startup_inferior): Renamed to x86_linux_child_post_startup_inferior. All uses updated. (i386_linux_enable_btrace): Renamed to x86_linux_enable_btrace. All uses updated. (i386_linux_disable_btrace): Renamed to x86_linux_disable_btrace. All uses updated. (i386_linux_teardown_btrace): Renamed to x86_linux_teardown_btrace. All uses updated. (i386_linux_read_btrace): Renamed to x86_linux_read_btrace. All uses updated. --- gdb/ChangeLog | 63 ++++++++++++++++++++++++++++++++++ gdb/amd64-linux-nat.c | 80 +++++++++++++++++++++---------------------- gdb/i386-linux-nat.c | 80 +++++++++++++++++++++---------------------- 3 files changed, 143 insertions(+), 80 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9aea5a9ab55..b0059271fb6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,66 @@ +2014-07-11 Gary Benson + + * amd64-linux-nat.c (amd64_linux_dr_get): Renamed to + x86_linux_dr_get. All uses updated. + (amd64_linux_dr_set): Renamed to + x86_linux_dr_set. All uses updated. + (amd64_linux_dr_get_addr): Renamed to + x86_linux_dr_get_addr. All uses updated. + (amd64_linux_dr_get_control): Renamed to + x86_linux_dr_get_control. All uses updated. + (amd64_linux_dr_get_status): Renamed to + x86_linux_dr_get_status. All uses updated. + (amd64_linux_dr_set_control): Renamed to + x86_linux_dr_set_control. All uses updated. + (amd64_linux_dr_set_addr): Renamed to + x86_linux_dr_set_addr. All uses updated. + (amd64_linux_prepare_to_resume): Renamed to + x86_linux_prepare_to_resume. All uses updated. + (amd64_linux_new_thread): Renamed to + x86_linux_new_thread. All uses updated. + (amd64_linux_new_fork): Renamed to + x86_linux_new_fork. All uses updated. + (amd64_linux_child_post_startup_inferior): Renamed to + x86_linux_child_post_startup_inferior. All uses updated. + (amd64_linux_enable_btrace): Renamed to + x86_linux_enable_btrace. All uses updated. + (amd64_linux_disable_btrace): Renamed to + x86_linux_disable_btrace. All uses updated. + (amd64_linux_teardown_btrace): Renamed to + x86_linux_teardown_btrace. All uses updated. + (amd64_linux_read_btrace): Renamed to + x86_linux_read_btrace. All uses updated. + * i386-linux-nat.c (i386_linux_dr_get): Renamed to + x86_linux_dr_get. All uses updated. + (i386_linux_dr_set): Renamed to + x86_linux_dr_set. All uses updated. + (i386_linux_dr_get_addr): Renamed to + x86_linux_dr_get_addr. All uses updated. + (i386_linux_dr_get_control): Renamed to + x86_linux_dr_get_control. All uses updated. + (i386_linux_dr_get_status): Renamed to + x86_linux_dr_get_status. All uses updated. + (i386_linux_dr_set_control): Renamed to + x86_linux_dr_set_control. All uses updated. + (i386_linux_dr_set_addr): Renamed to + x86_linux_dr_set_addr. All uses updated. + (i386_linux_prepare_to_resume): Renamed to + x86_linux_prepare_to_resume. All uses updated. + (i386_linux_new_thread): Renamed to + x86_linux_new_thread. All uses updated. + (i386_linux_new_fork): Renamed to + x86_linux_new_fork. All uses updated. + (i386_linux_child_post_startup_inferior): Renamed to + x86_linux_child_post_startup_inferior. All uses updated. + (i386_linux_enable_btrace): Renamed to + x86_linux_enable_btrace. All uses updated. + (i386_linux_disable_btrace): Renamed to + x86_linux_disable_btrace. All uses updated. + (i386_linux_teardown_btrace): Renamed to + x86_linux_teardown_btrace. All uses updated. + (i386_linux_read_btrace): Renamed to + x86_linux_read_btrace. All uses updated. + 2014-07-11 Adrian Sendroiu * remote.c (extended_remote_post_attach): New function. diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index fa677c80f75..d8e424a303d 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -280,7 +280,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, /* Support for debug registers. */ static unsigned long -amd64_linux_dr_get (ptid_t ptid, int regnum) +x86_linux_dr_get (ptid_t ptid, int regnum) { int tid; unsigned long value; @@ -301,7 +301,7 @@ amd64_linux_dr_get (ptid_t ptid, int regnum) /* Set debug register REGNUM to VALUE in only the one LWP of PTID. */ static void -amd64_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) +x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) { int tid; @@ -319,28 +319,28 @@ amd64_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) /* Return the inferior's debug register REGNUM. */ static CORE_ADDR -amd64_linux_dr_get_addr (int regnum) +x86_linux_dr_get_addr (int regnum) { /* DR6 and DR7 are retrieved with some other way. */ gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); - return amd64_linux_dr_get (inferior_ptid, regnum); + return x86_linux_dr_get (inferior_ptid, regnum); } /* Return the inferior's DR7 debug control register. */ static unsigned long -amd64_linux_dr_get_control (void) +x86_linux_dr_get_control (void) { - return amd64_linux_dr_get (inferior_ptid, DR_CONTROL); + return x86_linux_dr_get (inferior_ptid, DR_CONTROL); } /* Get DR_STATUS from only the one LWP of INFERIOR_PTID. */ static unsigned long -amd64_linux_dr_get_status (void) +x86_linux_dr_get_status (void) { - return amd64_linux_dr_get (inferior_ptid, DR_STATUS); + return x86_linux_dr_get (inferior_ptid, DR_STATUS); } /* Callback for iterate_over_lwps. Update the debug registers of @@ -368,7 +368,7 @@ update_debug_registers_callback (struct lwp_info *lwp, void *arg) /* Set DR_CONTROL to CONTROL in all LWPs of the current inferior. */ static void -amd64_linux_dr_set_control (unsigned long control) +x86_linux_dr_set_control (unsigned long control) { ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); @@ -379,7 +379,7 @@ amd64_linux_dr_set_control (unsigned long control) inferior. */ static void -amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr) +x86_linux_dr_set_addr (int regnum, CORE_ADDR addr) { ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); @@ -392,7 +392,7 @@ amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr) If the debug regs have changed, update the thread's copies. */ static void -amd64_linux_prepare_to_resume (struct lwp_info *lwp) +x86_linux_prepare_to_resume (struct lwp_info *lwp) { int clear_status = 0; @@ -418,12 +418,12 @@ amd64_linux_prepare_to_resume (struct lwp_info *lwp) /* Clear DR_CONTROL first. In some cases, setting DR0-3 to a value that doesn't match what is enabled in DR_CONTROL results in EINVAL. */ - amd64_linux_dr_set (lwp->ptid, DR_CONTROL, 0); + x86_linux_dr_set (lwp->ptid, DR_CONTROL, 0); for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++) if (state->dr_ref_count[i] > 0) { - amd64_linux_dr_set (lwp->ptid, i, state->dr_mirror[i]); + x86_linux_dr_set (lwp->ptid, i, state->dr_mirror[i]); /* If we're setting a watchpoint, any change the inferior had done itself to the debug registers needs to be @@ -435,17 +435,17 @@ amd64_linux_prepare_to_resume (struct lwp_info *lwp) /* If DR_CONTROL is supposed to be zero, we've already set it above. */ if (state->dr_control_mirror != 0) - amd64_linux_dr_set (lwp->ptid, DR_CONTROL, state->dr_control_mirror); + x86_linux_dr_set (lwp->ptid, DR_CONTROL, state->dr_control_mirror); lwp->arch_private->debug_registers_changed = 0; } if (clear_status || lwp->stopped_by_watchpoint) - amd64_linux_dr_set (lwp->ptid, DR_STATUS, 0); + x86_linux_dr_set (lwp->ptid, DR_STATUS, 0); } static void -amd64_linux_new_thread (struct lwp_info *lp) +x86_linux_new_thread (struct lwp_info *lp) { struct arch_lwp_info *info = XCNEW (struct arch_lwp_info); @@ -457,7 +457,7 @@ amd64_linux_new_thread (struct lwp_info *lp) /* linux_nat_new_fork hook. */ static void -amd64_linux_new_fork (struct lwp_info *parent, pid_t child_pid) +x86_linux_new_fork (struct lwp_info *parent, pid_t child_pid) { pid_t parent_pid; struct i386_debug_reg_state *parent_state; @@ -582,7 +582,7 @@ static void (*super_post_startup_inferior) (struct target_ops *self, ptid_t ptid); static void -amd64_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid) +x86_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid) { i386_cleanup_dregs (); super_post_startup_inferior (self, ptid); @@ -1171,7 +1171,7 @@ amd64_linux_read_description (struct target_ops *ops) /* Enable branch tracing. */ static struct btrace_target_info * -amd64_linux_enable_btrace (struct target_ops *self, ptid_t ptid) +x86_linux_enable_btrace (struct target_ops *self, ptid_t ptid) { struct btrace_target_info *tinfo; struct gdbarch *gdbarch; @@ -1193,8 +1193,8 @@ amd64_linux_enable_btrace (struct target_ops *self, ptid_t ptid) /* Disable branch tracing. */ static void -amd64_linux_disable_btrace (struct target_ops *self, - struct btrace_target_info *tinfo) +x86_linux_disable_btrace (struct target_ops *self, + struct btrace_target_info *tinfo) { enum btrace_error errcode = linux_disable_btrace (tinfo); @@ -1205,18 +1205,18 @@ amd64_linux_disable_btrace (struct target_ops *self, /* Teardown branch tracing. */ static void -amd64_linux_teardown_btrace (struct target_ops *self, - struct btrace_target_info *tinfo) +x86_linux_teardown_btrace (struct target_ops *self, + struct btrace_target_info *tinfo) { /* Ignore errors. */ linux_disable_btrace (tinfo); } static enum btrace_error -amd64_linux_read_btrace (struct target_ops *self, - VEC (btrace_block_s) **data, - struct btrace_target_info *btinfo, - enum btrace_read_type type) +x86_linux_read_btrace (struct target_ops *self, + VEC (btrace_block_s) **data, + struct btrace_target_info *btinfo, + enum btrace_read_type type) { return linux_read_btrace (data, btinfo, type); } @@ -1242,16 +1242,16 @@ _initialize_amd64_linux_nat (void) i386_use_watchpoints (t); - i386_dr_low.set_control = amd64_linux_dr_set_control; - i386_dr_low.set_addr = amd64_linux_dr_set_addr; - i386_dr_low.get_addr = amd64_linux_dr_get_addr; - i386_dr_low.get_status = amd64_linux_dr_get_status; - i386_dr_low.get_control = amd64_linux_dr_get_control; + i386_dr_low.set_control = x86_linux_dr_set_control; + i386_dr_low.set_addr = x86_linux_dr_set_addr; + i386_dr_low.get_addr = x86_linux_dr_get_addr; + i386_dr_low.get_status = x86_linux_dr_get_status; + i386_dr_low.get_control = x86_linux_dr_get_control; i386_set_debug_register_length (8); /* Override the GNU/Linux inferior startup hook. */ super_post_startup_inferior = t->to_post_startup_inferior; - t->to_post_startup_inferior = amd64_linux_child_post_startup_inferior; + t->to_post_startup_inferior = x86_linux_child_post_startup_inferior; /* Add our register access methods. */ t->to_fetch_registers = amd64_linux_fetch_inferior_registers; @@ -1261,16 +1261,16 @@ _initialize_amd64_linux_nat (void) /* Add btrace methods. */ t->to_supports_btrace = linux_supports_btrace; - t->to_enable_btrace = amd64_linux_enable_btrace; - t->to_disable_btrace = amd64_linux_disable_btrace; - t->to_teardown_btrace = amd64_linux_teardown_btrace; - t->to_read_btrace = amd64_linux_read_btrace; + t->to_enable_btrace = x86_linux_enable_btrace; + t->to_disable_btrace = x86_linux_disable_btrace; + t->to_teardown_btrace = x86_linux_teardown_btrace; + t->to_read_btrace = x86_linux_read_btrace; /* Register the target. */ linux_nat_add_target (t); - linux_nat_set_new_thread (t, amd64_linux_new_thread); - linux_nat_set_new_fork (t, amd64_linux_new_fork); + linux_nat_set_new_thread (t, x86_linux_new_thread); + linux_nat_set_new_fork (t, x86_linux_new_fork); linux_nat_set_forget_process (t, i386_forget_process); linux_nat_set_siginfo_fixup (t, amd64_linux_siginfo_fixup); - linux_nat_set_prepare_to_resume (t, amd64_linux_prepare_to_resume); + linux_nat_set_prepare_to_resume (t, x86_linux_prepare_to_resume); } diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index ff96501d4d5..24f94071572 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -647,7 +647,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops, /* Get debug register REGNUM value from only the one LWP of PTID. */ static unsigned long -i386_linux_dr_get (ptid_t ptid, int regnum) +x86_linux_dr_get (ptid_t ptid, int regnum) { int tid; unsigned long value; @@ -668,7 +668,7 @@ i386_linux_dr_get (ptid_t ptid, int regnum) /* Set debug register REGNUM to VALUE in only the one LWP of PTID. */ static void -i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) +x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) { int tid; @@ -686,28 +686,28 @@ i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) /* Return the inferior's debug register REGNUM. */ static CORE_ADDR -i386_linux_dr_get_addr (int regnum) +x86_linux_dr_get_addr (int regnum) { /* DR6 and DR7 are retrieved with some other way. */ gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); - return i386_linux_dr_get (inferior_ptid, regnum); + return x86_linux_dr_get (inferior_ptid, regnum); } /* Return the inferior's DR7 debug control register. */ static unsigned long -i386_linux_dr_get_control (void) +x86_linux_dr_get_control (void) { - return i386_linux_dr_get (inferior_ptid, DR_CONTROL); + return x86_linux_dr_get (inferior_ptid, DR_CONTROL); } /* Get DR_STATUS from only the one LWP of INFERIOR_PTID. */ static unsigned long -i386_linux_dr_get_status (void) +x86_linux_dr_get_status (void) { - return i386_linux_dr_get (inferior_ptid, DR_STATUS); + return x86_linux_dr_get (inferior_ptid, DR_STATUS); } /* Callback for iterate_over_lwps. Update the debug registers of @@ -735,7 +735,7 @@ update_debug_registers_callback (struct lwp_info *lwp, void *arg) /* Set DR_CONTROL to ADDR in all LWPs of the current inferior. */ static void -i386_linux_dr_set_control (unsigned long control) +x86_linux_dr_set_control (unsigned long control) { ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); @@ -746,7 +746,7 @@ i386_linux_dr_set_control (unsigned long control) inferior. */ static void -i386_linux_dr_set_addr (int regnum, CORE_ADDR addr) +x86_linux_dr_set_addr (int regnum, CORE_ADDR addr) { ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid)); @@ -759,7 +759,7 @@ i386_linux_dr_set_addr (int regnum, CORE_ADDR addr) If the debug regs have changed, update the thread's copies. */ static void -i386_linux_prepare_to_resume (struct lwp_info *lwp) +x86_linux_prepare_to_resume (struct lwp_info *lwp) { int clear_status = 0; @@ -778,12 +778,12 @@ i386_linux_prepare_to_resume (struct lwp_info *lwp) /* See amd64_linux_prepare_to_resume for Linux kernel note on i386_linux_dr_set calls ordering. */ - i386_linux_dr_set (lwp->ptid, DR_CONTROL, 0); + x86_linux_dr_set (lwp->ptid, DR_CONTROL, 0); for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++) if (state->dr_ref_count[i] > 0) { - i386_linux_dr_set (lwp->ptid, i, state->dr_mirror[i]); + x86_linux_dr_set (lwp->ptid, i, state->dr_mirror[i]); /* If we're setting a watchpoint, any change the inferior had done itself to the debug registers needs to be @@ -793,17 +793,17 @@ i386_linux_prepare_to_resume (struct lwp_info *lwp) } if (state->dr_control_mirror != 0) - i386_linux_dr_set (lwp->ptid, DR_CONTROL, state->dr_control_mirror); + x86_linux_dr_set (lwp->ptid, DR_CONTROL, state->dr_control_mirror); lwp->arch_private->debug_registers_changed = 0; } if (clear_status || lwp->stopped_by_watchpoint) - i386_linux_dr_set (lwp->ptid, DR_STATUS, 0); + x86_linux_dr_set (lwp->ptid, DR_STATUS, 0); } static void -i386_linux_new_thread (struct lwp_info *lp) +x86_linux_new_thread (struct lwp_info *lp) { struct arch_lwp_info *info = XCNEW (struct arch_lwp_info); @@ -815,7 +815,7 @@ i386_linux_new_thread (struct lwp_info *lp) /* linux_nat_new_fork hook. */ static void -i386_linux_new_fork (struct lwp_info *parent, pid_t child_pid) +x86_linux_new_fork (struct lwp_info *parent, pid_t child_pid) { pid_t parent_pid; struct i386_debug_reg_state *parent_state; @@ -989,7 +989,7 @@ static void (*super_post_startup_inferior) (struct target_ops *self, ptid_t ptid); static void -i386_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid) +x86_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid) { i386_cleanup_dregs (); super_post_startup_inferior (self, ptid); @@ -1067,7 +1067,7 @@ i386_linux_read_description (struct target_ops *ops) /* Enable branch tracing. */ static struct btrace_target_info * -i386_linux_enable_btrace (struct target_ops *self, ptid_t ptid) +x86_linux_enable_btrace (struct target_ops *self, ptid_t ptid) { struct btrace_target_info *tinfo; struct gdbarch *gdbarch; @@ -1089,8 +1089,8 @@ i386_linux_enable_btrace (struct target_ops *self, ptid_t ptid) /* Disable branch tracing. */ static void -i386_linux_disable_btrace (struct target_ops *self, - struct btrace_target_info *tinfo) +x86_linux_disable_btrace (struct target_ops *self, + struct btrace_target_info *tinfo) { enum btrace_error errcode = linux_disable_btrace (tinfo); @@ -1101,18 +1101,18 @@ i386_linux_disable_btrace (struct target_ops *self, /* Teardown branch tracing. */ static void -i386_linux_teardown_btrace (struct target_ops *self, - struct btrace_target_info *tinfo) +x86_linux_teardown_btrace (struct target_ops *self, + struct btrace_target_info *tinfo) { /* Ignore errors. */ linux_disable_btrace (tinfo); } static enum btrace_error -i386_linux_read_btrace (struct target_ops *self, - VEC (btrace_block_s) **data, - struct btrace_target_info *btinfo, - enum btrace_read_type type) +x86_linux_read_btrace (struct target_ops *self, + VEC (btrace_block_s) **data, + struct btrace_target_info *btinfo, + enum btrace_read_type type) { return linux_read_btrace (data, btinfo, type); } @@ -1130,11 +1130,11 @@ _initialize_i386_linux_nat (void) i386_use_watchpoints (t); - i386_dr_low.set_control = i386_linux_dr_set_control; - i386_dr_low.set_addr = i386_linux_dr_set_addr; - i386_dr_low.get_addr = i386_linux_dr_get_addr; - i386_dr_low.get_status = i386_linux_dr_get_status; - i386_dr_low.get_control = i386_linux_dr_get_control; + i386_dr_low.set_control = x86_linux_dr_set_control; + i386_dr_low.set_addr = x86_linux_dr_set_addr; + i386_dr_low.get_addr = x86_linux_dr_get_addr; + i386_dr_low.get_status = x86_linux_dr_get_status; + i386_dr_low.get_control = x86_linux_dr_get_control; i386_set_debug_register_length (4); /* Override the default ptrace resume method. */ @@ -1142,7 +1142,7 @@ _initialize_i386_linux_nat (void) /* Override the GNU/Linux inferior startup hook. */ super_post_startup_inferior = t->to_post_startup_inferior; - t->to_post_startup_inferior = i386_linux_child_post_startup_inferior; + t->to_post_startup_inferior = x86_linux_child_post_startup_inferior; /* Add our register access methods. */ t->to_fetch_registers = i386_linux_fetch_inferior_registers; @@ -1152,15 +1152,15 @@ _initialize_i386_linux_nat (void) /* Add btrace methods. */ t->to_supports_btrace = linux_supports_btrace; - t->to_enable_btrace = i386_linux_enable_btrace; - t->to_disable_btrace = i386_linux_disable_btrace; - t->to_teardown_btrace = i386_linux_teardown_btrace; - t->to_read_btrace = i386_linux_read_btrace; + t->to_enable_btrace = x86_linux_enable_btrace; + t->to_disable_btrace = x86_linux_disable_btrace; + t->to_teardown_btrace = x86_linux_teardown_btrace; + t->to_read_btrace = x86_linux_read_btrace; /* Register the target. */ linux_nat_add_target (t); - linux_nat_set_new_thread (t, i386_linux_new_thread); - linux_nat_set_new_fork (t, i386_linux_new_fork); + linux_nat_set_new_thread (t, x86_linux_new_thread); + linux_nat_set_new_fork (t, x86_linux_new_fork); linux_nat_set_forget_process (t, i386_forget_process); - linux_nat_set_prepare_to_resume (t, i386_linux_prepare_to_resume); + linux_nat_set_prepare_to_resume (t, x86_linux_prepare_to_resume); } -- 2.30.2