Eliminate ARCH_NUM_REGS.

[deliverable/binutils-gdb.git] / gdb / inferior.h

diff --git a/gdb/inferior.h b/gdb/inferior.h
index e228fcec89105e7413bf993e03561a1b660419f8..5db89ee28710a5cbf680d4b980908d7f4b1d06cb 100644 (file)
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -1,22 +1,24 @@
 /* Variables that describe the inferior process running under GDB:
    Where it is, why it stopped, and how to step it.
 /* Variables that describe the inferior process running under GDB:
    Where it is, why it stopped, and how to step it.

-   Copyright 1986, 1989, 1992, 1996, 1998 Free Software Foundation, Inc.
+   Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+   1998, 1999, 2000, 2001 Free Software Foundation, Inc.

 
 

-This file is part of GDB.
+   This file is part of GDB.

 
 

-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 2 of the License, or
-(at your option) any later version.
+   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 2 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.
+   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, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 #if !defined (INFERIOR_H)
 #define INFERIOR_H 1
 
 #if !defined (INFERIOR_H)
 #define INFERIOR_H 1


@@ -27,61 +29,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* For enum target_signal.  */
 #include "target.h"
 
 /* For enum target_signal.  */
 #include "target.h"
 

-/* Structure in which to save the status of the inferior.  Save
+/* Structure in which to save the status of the inferior.  Create/Save

    through "save_inferior_status", restore through
    "restore_inferior_status".
    through "save_inferior_status", restore through
    "restore_inferior_status".

+

    This pair of routines should be called around any transfer of
    control to the inferior which you don't want showing up in your
    control variables.  */
 
    This pair of routines should be called around any transfer of
    control to the inferior which you don't want showing up in your
    control variables.  */
 

-struct inferior_status {
-  enum target_signal stop_signal;
-  CORE_ADDR stop_pc;
-  bpstat stop_bpstat;
-  int stop_step;
-  int stop_stack_dummy;
-  int stopped_by_random_signal;
-  int trap_expected;
-  CORE_ADDR step_range_start;
-  CORE_ADDR step_range_end;
-  CORE_ADDR step_frame_address;
-  int step_over_calls;
-  CORE_ADDR step_resume_break_address;
-  int stop_after_trap;
-  int stop_soon_quietly;
-  CORE_ADDR selected_frame_address;
-  char stop_registers[REGISTER_BYTES];
-
-  /* These are here because if call_function_by_hand has written some
-     registers and then decides to call error(), we better not have changed
-     any registers.  */
-  char registers[REGISTER_BYTES];
-
-  int selected_level;
-  int breakpoint_proceeded;
-  int restore_stack_info;
-  int proceed_to_finish;
-};
-
-/* This macro gives the number of registers actually in use by the
-   inferior.  This may be less than the total number of registers,
-   perhaps depending on the actual CPU in use or program being run.  */
-
-#ifndef ARCH_NUM_REGS
-#define ARCH_NUM_REGS NUM_REGS
-#endif
+struct inferior_status;
+
+extern struct inferior_status *save_inferior_status (int);
+
+extern void restore_inferior_status (struct inferior_status *);

 
 

-extern void save_inferior_status PARAMS ((struct inferior_status *, int));
+extern struct cleanup *make_cleanup_restore_inferior_status (struct inferior_status *);

 
 

-extern void restore_inferior_status PARAMS ((struct inferior_status *));
+extern void discard_inferior_status (struct inferior_status *);

 
 

-extern void set_sigint_trap PARAMS ((void));
+extern void write_inferior_status_register (struct inferior_status
+                                           *inf_status, int regno,
+                                           LONGEST val);

 
 

-extern void clear_sigint_trap PARAMS ((void));
+extern void set_sigint_trap (void);

 
 

-extern void set_sigio_trap PARAMS ((void));
+extern void clear_sigint_trap (void);

 
 

-extern void clear_sigio_trap PARAMS ((void));
+extern void set_sigio_trap (void);
+
+extern void clear_sigio_trap (void);

 
 /* File name for default use for standard in/out in the inferior.  */
 
 
 /* File name for default use for standard in/out in the inferior.  */
 


@@ -91,6 +67,17 @@ extern char *inferior_io_terminal;
 
 extern int inferior_pid;
 
 
 extern int inferior_pid;
 

+/* Is the inferior running right now, as a result of a 'run&',
+   'continue&' etc command? This is used in asycn gdb to determine
+   whether a command that the user enters while the target is running
+   is allowed or not. */
+extern int target_executing;
+
+/* Are we simulating synchronous execution? This is used in async gdb
+   to implement the 'run', 'continue' etc commands, which will not
+   redisplay the prompt until the execution is actually over. */
+extern int sync_execution;
+

 /* This is only valid when inferior_pid is non-zero.
 
    If this is 0, then exec events should be noticed and responded to
 /* This is only valid when inferior_pid is non-zero.
 
    If this is 0, then exec events should be noticed and responded to


@@ -98,8 +85,8 @@ extern int inferior_pid;
 
    If this is > 0, then that many subsequent exec events should be
    ignored (i.e., not be reported to the user).
 
    If this is > 0, then that many subsequent exec events should be
    ignored (i.e., not be reported to the user).

-   */
-extern int  inferior_ignoring_startup_exec_events;
+ */
+extern int inferior_ignoring_startup_exec_events;

 
 /* This is only valid when inferior_ignoring_startup_exec_events is
    zero.
 
 /* This is only valid when inferior_ignoring_startup_exec_events is
    zero.


@@ -109,87 +96,106 @@ extern int  inferior_ignoring_startup_exec_events;
    need actually be noticed and responded to by the debugger (i.e.,
    be reported to the user), then this is the number of "leading"
    exec events which should be ignored.
    need actually be noticed and responded to by the debugger (i.e.,
    be reported to the user), then this is the number of "leading"
    exec events which should be ignored.

-   */
-extern int  inferior_ignoring_leading_exec_events;
+ */
+extern int inferior_ignoring_leading_exec_events;

 
 /* Inferior environment. */
 
 extern struct environ *inferior_environ;
 
 
 /* Inferior environment. */
 
 extern struct environ *inferior_environ;
 

-/* Character array containing an image of the inferior programs' registers.  */
+extern void clear_proceed_status (void);
+
+extern void proceed (CORE_ADDR, enum target_signal, int);
+
+/* When set, stop the 'step' command if we enter a function which has
+   no line number information.  The normal behavior is that we step
+   over such function.  */
+extern int step_stop_if_no_debug;
+
+extern void kill_inferior (void);

 
 

-extern char registers[];
+extern void generic_mourn_inferior (void);

 
 

-/* Array of validity bits (one per register).  Nonzero at position XXX_REGNUM
-   means that `registers' contains a valid copy of inferior register XXX.
-   -1 if register value is not available. */
+extern void terminal_ours (void);

 
 

-extern SIGNED char register_valid[NUM_REGS];
+extern int run_stack_dummy (CORE_ADDR, char *);

 
 

-extern void clear_proceed_status PARAMS ((void));
+extern CORE_ADDR read_pc (void);

 
 

-extern void proceed PARAMS ((CORE_ADDR, enum target_signal, int));
+extern CORE_ADDR read_pc_pid (int);

 
 

-extern void kill_inferior PARAMS ((void));
+extern CORE_ADDR generic_target_read_pc (int);

 
 

-extern void generic_mourn_inferior PARAMS ((void));
+extern void write_pc (CORE_ADDR);

 
 

-extern void terminal_ours PARAMS ((void));
+extern void write_pc_pid (CORE_ADDR, int);

 
 

-extern int run_stack_dummy PARAMS ((CORE_ADDR, char [REGISTER_BYTES]));
+extern void generic_target_write_pc (CORE_ADDR, int);

 
 

-extern CORE_ADDR read_pc PARAMS ((void));
+extern CORE_ADDR read_sp (void);

 
 

-extern CORE_ADDR read_pc_pid PARAMS ((int));
+extern CORE_ADDR generic_target_read_sp (void);

 
 

-extern void write_pc PARAMS ((CORE_ADDR));
+extern void write_sp (CORE_ADDR);

 
 

-extern void write_pc_pid PARAMS ((CORE_ADDR, int));
+extern void generic_target_write_sp (CORE_ADDR);

 
 

-extern CORE_ADDR read_sp PARAMS ((void));
+extern CORE_ADDR read_fp (void);

 
 

-extern void write_sp PARAMS ((CORE_ADDR));
+extern CORE_ADDR generic_target_read_fp (void);

 
 

-extern CORE_ADDR read_fp PARAMS ((void));
+extern void write_fp (CORE_ADDR);

 
 

-extern void write_fp PARAMS ((CORE_ADDR));
+extern void generic_target_write_fp (CORE_ADDR);

 
 

-extern void wait_for_inferior PARAMS ((void));
+extern CORE_ADDR unsigned_pointer_to_address (struct type *type, void *buf);

 
 

-extern void init_wait_for_inferior PARAMS ((void));
+extern void unsigned_address_to_pointer (struct type *type, void *buf,
+                                        CORE_ADDR addr);
+extern CORE_ADDR signed_pointer_to_address (struct type *type, void *buf);
+extern void address_to_signed_pointer (struct type *type, void *buf,
+                                      CORE_ADDR addr);

 
 

-extern void close_exec_file PARAMS ((void));
+extern void wait_for_inferior (void);

 
 

-extern void reopen_exec_file PARAMS ((void));
+extern void fetch_inferior_event (void *);
+
+extern void init_wait_for_inferior (void);
+
+extern void close_exec_file (void);
+
+extern void reopen_exec_file (void);

 
 /* The `resume' routine should only be called in special circumstances.
    Normally, use `proceed', which handles a lot of bookkeeping.  */
 
 
 /* The `resume' routine should only be called in special circumstances.
    Normally, use `proceed', which handles a lot of bookkeeping.  */
 

-extern void resume PARAMS ((int, enum target_signal));
+extern void resume (int, enum target_signal);

 
 /* From misc files */
 
 
 /* From misc files */
 

-extern void store_inferior_registers PARAMS ((int));
+extern void do_registers_info (int, int);
+
+extern void store_inferior_registers (int);

 
 

-extern void fetch_inferior_registers PARAMS ((int));
+extern void fetch_inferior_registers (int);

 
 

-extern void  solib_create_inferior_hook PARAMS ((void));
+extern void solib_create_inferior_hook (void);

 
 

-extern void child_terminal_info PARAMS ((char *, int));
+extern void child_terminal_info (char *, int);

 
 

-extern void term_info PARAMS ((char *, int));
+extern void term_info (char *, int);

 
 

-extern void terminal_ours_for_output PARAMS ((void));
+extern void terminal_ours_for_output (void);

 
 

-extern void terminal_inferior PARAMS ((void));
+extern void terminal_inferior (void);

 
 

-extern void terminal_init_inferior PARAMS ((void));
+extern void terminal_init_inferior (void);

 
 

-extern void terminal_init_inferior_with_pgrp PARAMS ((int pgrp));
+extern void terminal_init_inferior_with_pgrp (int pgrp);

 
 /* From infptrace.c or infttrace.c */
 
 
 /* From infptrace.c or infttrace.c */
 

-extern int attach PARAMS ((int));
+extern int attach (int);

 
 #if !defined(REQUIRE_ATTACH)
 #define REQUIRE_ATTACH attach
 
 #if !defined(REQUIRE_ATTACH)
 #define REQUIRE_ATTACH attach


@@ -199,65 +205,71 @@ extern int attach PARAMS ((int));
 #define REQUIRE_DETACH(pid,siggnal) detach (siggnal)
 #endif
 
 #define REQUIRE_DETACH(pid,siggnal) detach (siggnal)
 #endif
 

-extern void detach PARAMS ((int));
+extern void detach (int);

 
 

-int proc_wait PARAMS ((int, int *));
+/* PTRACE method of waiting for inferior process.  */
+int ptrace_wait (int, int *);

 
 

-extern void child_resume PARAMS ((int, int, enum target_signal));
+extern void child_resume (int, int, enum target_signal);

 
 #ifndef PTRACE_ARG3_TYPE
 #define PTRACE_ARG3_TYPE int   /* Correct definition for most systems. */
 #endif
 
 
 #ifndef PTRACE_ARG3_TYPE
 #define PTRACE_ARG3_TYPE int   /* Correct definition for most systems. */
 #endif
 

-extern int call_ptrace PARAMS ((int, int, PTRACE_ARG3_TYPE, int));
+extern int call_ptrace (int, int, PTRACE_ARG3_TYPE, int);

 
 

-extern void pre_fork_inferior PARAMS ((void));
+extern void pre_fork_inferior (void);

 
 /* From procfs.c */
 
 
 /* From procfs.c */
 

-extern int proc_iterate_over_mappings PARAMS ((int (*) (int, CORE_ADDR)));
+extern int proc_iterate_over_mappings (int (*)(int, CORE_ADDR));

 
 

-extern int procfs_first_available PARAMS ((void));
-
-extern int procfs_get_pid_fd PARAMS ((int));
+extern int procfs_first_available (void);

 
 /* From fork-child.c */
 
 
 /* From fork-child.c */
 

-extern void fork_inferior PARAMS ((char *, char *, char **,
-                                  void (*) (void),
-                                  void (*) (int),
-                                  void (*) (void),
-                                  char *));
+extern void fork_inferior (char *, char *, char **,
+                          void (*)(void),
+                          void (*)(int), void (*)(void), char *);
+

 
 

- 
-extern void
-clone_and_follow_inferior PARAMS ((int, int *));
+extern void clone_and_follow_inferior (int, int *);

 
 

-extern void startup_inferior PARAMS ((int));
+extern void startup_inferior (int);

 
 /* From inflow.c */
 
 
 /* From inflow.c */
 

-extern void new_tty_prefork PARAMS ((char *));
+extern void new_tty_prefork (char *);

 
 

-extern int gdb_has_a_terminal PARAMS ((void));
+extern int gdb_has_a_terminal (void);

 
 /* From infrun.c */
 
 
 /* From infrun.c */
 

-extern void start_remote PARAMS ((void));
+extern void start_remote (void);
+
+extern void normal_stop (void);
+
+extern int signal_stop_state (int);

 
 

-extern void normal_stop PARAMS ((void));
+extern int signal_print_state (int);

 
 

-extern int signal_stop_state PARAMS ((int));
+extern int signal_pass_state (int);

 
 

-extern int signal_print_state PARAMS ((int));
+extern int signal_stop_update (int, int);

 
 

-extern int signal_pass_state PARAMS ((int));
+extern int signal_print_update (int, int);
+
+extern int signal_pass_update (int, int);

 
 /* From infcmd.c */
 
 
 /* From infcmd.c */
 

-extern void tty_command PARAMS ((char *, int));
+extern void tty_command (char *, int);
+
+extern void attach_command (char *, int);

 
 

-extern void attach_command PARAMS ((char *, int));
+extern char *get_inferior_arg (void);
+
+extern char *set_inferior_arg (char *);

 
 /* Last signal that the inferior received (why it stopped).  */
 
 
 /* Last signal that the inferior received (why it stopped).  */
 


@@ -298,8 +310,8 @@ extern int stopped_by_random_signal;
    minor way if this were changed to the address of the instruction and
    that address plus one.  But maybe not.).  */
 
    minor way if this were changed to the address of the instruction and
    that address plus one.  But maybe not.).  */
 

-extern CORE_ADDR step_range_start; /* Inclusive */
-extern CORE_ADDR step_range_end; /* Exclusive */
+extern CORE_ADDR step_range_start;     /* Inclusive */
+extern CORE_ADDR step_range_end;       /* Exclusive */

 
 /* Stack frame address as of when stepping command was issued.
    This is how we know when we step into a subroutine call,
 
 /* Stack frame address as of when stepping command was issued.
    This is how we know when we step into a subroutine call,


@@ -314,7 +326,14 @@ extern CORE_ADDR step_sp;
 /* 1 means step over all subroutine calls.
    -1 means step over calls to undebuggable functions.  */
 
 /* 1 means step over all subroutine calls.
    -1 means step over calls to undebuggable functions.  */
 

-extern int step_over_calls;
+enum step_over_calls_kind
+  {
+    STEP_OVER_NONE,
+    STEP_OVER_ALL,
+    STEP_OVER_UNDEBUGGABLE
+  };
+
+extern enum step_over_calls_kind step_over_calls;

 
 /* If stepping, nonzero means step count is > 1
    so don't print frame next time inferior stops
 
 /* If stepping, nonzero means step count is > 1
    so don't print frame next time inferior stops


@@ -339,7 +358,7 @@ extern int proceed_to_finish;
    Thus this contains the return value from the called function (assuming
    values are returned in a register).  */
 
    Thus this contains the return value from the called function (assuming
    values are returned in a register).  */
 

-extern char stop_registers[REGISTER_BYTES];
+extern char *stop_registers;

 
 /* Nonzero if the child process in inferior_pid was attached rather
    than forked.  */
 
 /* Nonzero if the child process in inferior_pid was attached rather
    than forked.  */


@@ -358,15 +377,15 @@ extern int attach_flag;
    On most machines just see if the name is sigtramp (and if we have
    no name, assume we are not in sigtramp).  */
 #if !defined (IN_SIGTRAMP)
    On most machines just see if the name is sigtramp (and if we have
    no name, assume we are not in sigtramp).  */
 #if !defined (IN_SIGTRAMP)

-#  if defined (SIGTRAMP_START)
-#    define IN_SIGTRAMP(pc, name) \
+#if defined (SIGTRAMP_START)
+#define IN_SIGTRAMP(pc, name) \

        ((pc) >= SIGTRAMP_START(pc)   \
         && (pc) < SIGTRAMP_END(pc) \
         )
        ((pc) >= SIGTRAMP_START(pc)   \
         && (pc) < SIGTRAMP_END(pc) \
         )

-#  else
-#    define IN_SIGTRAMP(pc, name) \
+#else
+#define IN_SIGTRAMP(pc, name) \

        (name && STREQ ("_sigtramp", name))
        (name && STREQ ("_sigtramp", name))

-#  endif
+#endif

 #endif
 \f
 /* Possible values for CALL_DUMMY_LOCATION.  */
 #endif
 \f
 /* Possible values for CALL_DUMMY_LOCATION.  */


@@ -375,57 +394,100 @@ extern int attach_flag;
 #define AFTER_TEXT_END 3
 #define AT_ENTRY_POINT 4
 
 #define AFTER_TEXT_END 3
 #define AT_ENTRY_POINT 4
 

+#if !defined (USE_GENERIC_DUMMY_FRAMES)
+#define USE_GENERIC_DUMMY_FRAMES 0
+#endif
+

 #if !defined (CALL_DUMMY_LOCATION)
 #define CALL_DUMMY_LOCATION ON_STACK
 #endif /* No CALL_DUMMY_LOCATION.  */
 
 #if !defined (CALL_DUMMY_LOCATION)
 #define CALL_DUMMY_LOCATION ON_STACK
 #endif /* No CALL_DUMMY_LOCATION.  */
 

-/* Are we in a call dummy?  The code below which allows DECR_PC_AFTER_BREAK
-   below is for infrun.c, which may give the macro a pc without that
-   subtracted out.  */
-#if !defined (PC_IN_CALL_DUMMY)
-#if CALL_DUMMY_LOCATION == BEFORE_TEXT_END
-extern CORE_ADDR text_end;
-#define PC_IN_CALL_DUMMY(pc, sp, frame_address) \
-  ((pc) >= text_end - CALL_DUMMY_LENGTH         \
-   && (pc) <= text_end + DECR_PC_AFTER_BREAK)
+#if !defined (CALL_DUMMY_ADDRESS)
+#define CALL_DUMMY_ADDRESS() (internal_error (__FILE__, __LINE__, "CALL_DUMMY_ADDRESS"), 0)
+#endif
+#if !defined (CALL_DUMMY_START_OFFSET)
+#define CALL_DUMMY_START_OFFSET (internal_error (__FILE__, __LINE__, "CALL_DUMMY_START_OFFSET"), 0)
+#endif
+#if !defined (CALL_DUMMY_BREAKPOINT_OFFSET)
+#define CALL_DUMMY_BREAKPOINT_OFFSET_P (0)
+#define CALL_DUMMY_BREAKPOINT_OFFSET (internal_error (__FILE__, __LINE__, "CALL_DUMMY_BREAKPOINT_OFFSET"), 0)
+#endif
+#if !defined CALL_DUMMY_BREAKPOINT_OFFSET_P
+#define CALL_DUMMY_BREAKPOINT_OFFSET_P (1)
+#endif
+#if !defined (CALL_DUMMY_LENGTH)
+#define CALL_DUMMY_LENGTH (internal_error (__FILE__, __LINE__, "CALL_DUMMY_LENGTH"), 0)
+#endif
+
+#if defined (CALL_DUMMY_STACK_ADJUST)
+#if !defined (CALL_DUMMY_STACK_ADJUST_P)
+#define CALL_DUMMY_STACK_ADJUST_P (1)
+#endif
+#endif
+#if !defined (CALL_DUMMY_STACK_ADJUST)
+#define CALL_DUMMY_STACK_ADJUST (internal_error (__FILE__, __LINE__, "CALL_DUMMY_STACK_ADJUST"), 0)
+#endif
+#if !defined (CALL_DUMMY_STACK_ADJUST_P)
+#define CALL_DUMMY_STACK_ADJUST_P (0)
+#endif
+
+/* FIXME: cagney/2000-04-17: gdbarch should manage this.  The default
+   shouldn't be necessary. */
+
+#if !defined (CALL_DUMMY_P)
+#if defined (CALL_DUMMY)
+#define CALL_DUMMY_P 1
+#else
+#define CALL_DUMMY_P 0
+#endif
+#endif
+
+#if !defined PUSH_DUMMY_FRAME
+#define PUSH_DUMMY_FRAME (internal_error (__FILE__, __LINE__, "PUSH_DUMMY_FRAME"), 0)
+#endif
+
+#if !defined FIX_CALL_DUMMY
+#define FIX_CALL_DUMMY(a1,a2,a3,a4,a5,a6,a7) (internal_error (__FILE__, __LINE__, "FIX_CALL_DUMMY"), 0)
+#endif
+
+#if !defined STORE_STRUCT_RETURN
+#define STORE_STRUCT_RETURN(a1,a2) (internal_error (__FILE__, __LINE__, "STORE_STRUCT_RETURN"), 0)
+#endif
+
+
+/* Are we in a call dummy? */
+
+extern int pc_in_call_dummy_before_text_end (CORE_ADDR pc, CORE_ADDR sp,
+                                            CORE_ADDR frame_address);
+#if !GDB_MULTI_ARCH
+#if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == BEFORE_TEXT_END
+#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_before_text_end (pc, sp, frame_address)

 #endif /* Before text_end.  */
 #endif /* Before text_end.  */

+#endif
+
+extern int pc_in_call_dummy_after_text_end (CORE_ADDR pc, CORE_ADDR sp,
+                                           CORE_ADDR frame_address);
+#if !GDB_MULTI_ARCH
+#if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == AFTER_TEXT_END
+#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_after_text_end (pc, sp, frame_address)
+#endif
+#endif
+
+extern int pc_in_call_dummy_on_stack (CORE_ADDR pc, CORE_ADDR sp,
+                                     CORE_ADDR frame_address);
+#if !GDB_MULTI_ARCH
+#if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == ON_STACK
+#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_on_stack (pc, sp, frame_address)
+#endif
+#endif

 
 

-#if CALL_DUMMY_LOCATION == AFTER_TEXT_END
-extern CORE_ADDR text_end;
-#define PC_IN_CALL_DUMMY(pc, sp, frame_address) \
-  ((pc) >= text_end   \
-   && (pc) <= text_end + CALL_DUMMY_LENGTH + DECR_PC_AFTER_BREAK)
-#endif /* After text_end.  */
-
-#if CALL_DUMMY_LOCATION == ON_STACK
-/* Is the PC in a call dummy?  SP and FRAME_ADDRESS are the bottom and
-   top of the stack frame which we are checking, where "bottom" and
-   "top" refer to some section of memory which contains the code for
-   the call dummy.  Calls to this macro assume that the contents of
-   SP_REGNUM and FP_REGNUM (or the saved values thereof), respectively,
-   are the things to pass.
-
-   This won't work on the 29k, where SP_REGNUM and FP_REGNUM don't
-   have that meaning, but the 29k doesn't use ON_STACK.  This could be
-   fixed by generalizing this scheme, perhaps by passing in a frame
-   and adding a few fields, at least on machines which need them for
-   PC_IN_CALL_DUMMY.
-
-   Something simpler, like checking for the stack segment, doesn't work,
-   since various programs (threads implementations, gcc nested function
-   stubs, etc) may either allocate stack frames in another segment, or
-   allocate other kinds of code on the stack.  */
-
-#define PC_IN_CALL_DUMMY(pc, sp, frame_address) \
-  (INNER_THAN ((sp), (pc)) && (frame_address != 0) && INNER_THAN ((pc), (frame_address)))
-#endif /* On stack.  */
-
-#if CALL_DUMMY_LOCATION == AT_ENTRY_POINT
-#define PC_IN_CALL_DUMMY(pc, sp, frame_address)                        \
-  ((pc) >= CALL_DUMMY_ADDRESS ()                               \
-   && (pc) <= (CALL_DUMMY_ADDRESS () + DECR_PC_AFTER_BREAK))
-#endif /* At entry point.  */
-#endif /* No PC_IN_CALL_DUMMY.  */
+extern int pc_in_call_dummy_at_entry_point (CORE_ADDR pc, CORE_ADDR sp,
+                                           CORE_ADDR frame_address);
+#if !GDB_MULTI_ARCH
+#if !defined (PC_IN_CALL_DUMMY) && CALL_DUMMY_LOCATION == AT_ENTRY_POINT
+#define PC_IN_CALL_DUMMY(pc, sp, frame_address) pc_in_call_dummy_at_entry_point (pc, sp, frame_address)
+#endif
+#endif

 
 /* It's often not enough for our clients to know whether the PC is merely
    somewhere within the call dummy.  They may need to know whether the
 
 /* It's often not enough for our clients to know whether the PC is merely
    somewhere within the call dummy.  They may need to know whether the


@@ -443,29 +505,30 @@ extern CORE_ADDR text_end;
    default implementation of CALL_DUMMY_HAS_COMPLETED is sufficient.
    Else, a target may wish to supply an implementation that works in
    the presense of multiple breakpoints in its call dummy.
    default implementation of CALL_DUMMY_HAS_COMPLETED is sufficient.
    Else, a target may wish to supply an implementation that works in
    the presense of multiple breakpoints in its call dummy.

-   */
+ */

 #if !defined(CALL_DUMMY_HAS_COMPLETED)
 #define CALL_DUMMY_HAS_COMPLETED(pc, sp, frame_address) \
   PC_IN_CALL_DUMMY((pc), (sp), (frame_address))
 #endif
 
 #if !defined(CALL_DUMMY_HAS_COMPLETED)
 #define CALL_DUMMY_HAS_COMPLETED(pc, sp, frame_address) \
   PC_IN_CALL_DUMMY((pc), (sp), (frame_address))
 #endif
 

-/* If STARTUP_WITH_SHELL is set, GDB's "run" 
- * will attempts to start up the debugee under a shell.
- * This is in order for argument-expansion to occur. E.g.,
- * (gdb) run *
- * The "*" gets expanded by the shell into a list of files.
- * While this is a nice feature, it turns out to interact badly
- * with some of the catch-fork/catch-exec features we have added.
- * In particular, if the shell does any fork/exec's before
- * the exec of the target program, that can confuse GDB.
- * To disable this feature, set STARTUP_WITH_SHELL to 0.
- * To enable this feature, set STARTUP_WITH_SHELL to 1.
- * The catch-exec traps expected during start-up will 
- * be 1 if target is not started up with a shell, 2 if it is.
- * - RT
- */
+/* If STARTUP_WITH_SHELL is set, GDB's "run"
+   will attempts to start up the debugee under a shell.
+   This is in order for argument-expansion to occur. E.g.,
+   (gdb) run *
+   The "*" gets expanded by the shell into a list of files.
+   While this is a nice feature, it turns out to interact badly
+   with some of the catch-fork/catch-exec features we have added.
+   In particular, if the shell does any fork/exec's before
+   the exec of the target program, that can confuse GDB.
+   To disable this feature, set STARTUP_WITH_SHELL to 0.
+   To enable this feature, set STARTUP_WITH_SHELL to 1.
+   The catch-exec traps expected during start-up will
+   be 1 if target is not started up with a shell, 2 if it is.
+   - RT
+   If you disable this, you need to decrement
+   START_INFERIOR_TRAPS_EXPECTED in tm.h. */

 #define STARTUP_WITH_SHELL 1
 #define STARTUP_WITH_SHELL 1

-#define START_INFERIOR_TRAPS_EXPECTED (STARTUP_WITH_SHELL + 1)
-
-#endif /* !defined (INFERIOR_H) */
-
+#if !defined(START_INFERIOR_TRAPS_EXPECTED)
+#define START_INFERIOR_TRAPS_EXPECTED  2
+#endif
+#endif /* !defined (INFERIOR_H) */