From: Andrew Cagney Date: Sun, 9 Jun 2002 15:45:54 +0000 (+0000) Subject: Move include/callback.h and include/remote-sim.h to include/gdb/. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3c25f8c7b071182238e0833c72552ee0e72fd2ae;p=binutils-gdb.git Move include/callback.h and include/remote-sim.h to include/gdb/. Update accordingly. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dec4058956c..ecc6213d130 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (callback_h): Define. + (remote_sim_h): Update path to remote-sim.h. + (remote-rdp.o): Add $(callback_h). + (remote-sim.o): Use $(callback_h). + * remote-sim.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * remote-rdp.c: Include "gdb/callback.h". + 2002-06-09 Mark Kettenis * osabi.h (gdb_osabi): Add GDB_OSABI_GO32 and GDB_OSABI_NETWARE. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 19194228445..0f8f7b41f64 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -568,8 +568,9 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c getopt_h = $(INCLUDE_DIR)/getopt.h floatformat_h = $(INCLUDE_DIR)/floatformat.h bfd_h = $(BFD_DIR)/bfd.h +callback_h = $(INCLUDE_DIR)/gdb/callback.h dis_asm_h = $(INCLUDE_DIR)/dis-asm.h -remote_sim_h = $(INCLUDE_DIR)/remote-sim.h +remote_sim_h = $(INCLUDE_DIR)/gdb/remote-sim.h demangle_h = $(INCLUDE_DIR)/demangle.h obstack_h = $(INCLUDE_DIR)/obstack.h sim_d10v_h = $(INCLUDE_DIR)/gdb/sim-d10v.h @@ -1975,7 +1976,7 @@ rdi-share/libangsd.a: force fi remote-rdp.o: remote-rdp.c $(defs_h) $(gdbcore_h) \ - $(inferior_h) $(gdb_string_h) $(arm_tdep_h) + $(inferior_h) $(gdb_string_h) $(arm_tdep_h) $(callback_h) remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) $(serial_h) \ $(inferior_h) $(target_h) $(terminal_h) $(remote_utils_h) \ @@ -2012,7 +2013,7 @@ remote-sds.o: remote-sds.c $(bfd_h) $(defs_h) $(gdbcmd_h) \ $(gdb_string_h) $(regcache_h) remote-sim.o: remote-sim.c $(defs_h) $(inferior_h) $(value_h) $(gdb_string_h) \ - $(terminal_h) $(target_h) $(gdbcore_h) $(INCLUDE_DIR)/callback.h \ + $(terminal_h) $(target_h) $(gdbcore_h) $(callback_h) \ $(remote_sim_h) $(remote_utils_h) $(command_h) $(regcache_h) \ $(sim_regno_h) diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c index 280e79cdad4..34a42abb1fa 100644 --- a/gdb/remote-rdp.c +++ b/gdb/remote-rdp.c @@ -41,7 +41,7 @@ #include "defs.h" #include "inferior.h" #include "value.h" -#include "callback.h" +#include "gdb/callback.h" #include "command.h" #include #include diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 4096d7de62e..221efe45674 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -35,8 +35,8 @@ #include "terminal.h" #include "target.h" #include "gdbcore.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "remote-utils.h" #include "command.h" #include "regcache.h" diff --git a/include/ChangeLog b/include/ChangeLog index 55bd90d0709..1f04e1b1e6e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * remote-sim.h: Move to directory gdb/. + * callback.h: Move to directory gdb/. + 2002-06-07 Charles Wilson * bfdlink.h (struct bfd_link_info): Change type of diff --git a/include/callback.h b/include/callback.h deleted file mode 100644 index 30752842ed9..00000000000 --- a/include/callback.h +++ /dev/null @@ -1,270 +0,0 @@ -/* Remote target system call callback support. - Copyright 1997 Free Software Foundation, Inc. - Contributed by Cygnus Solutions. - -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 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. */ - -/* This interface isn't intended to be specific to any particular kind - of remote (hardware, simulator, whatever). As such, support for it - (e.g. sim/common/callback.c) should *not* live in the simulator source - tree, nor should it live in the gdb source tree. */ - -/* There are various ways to handle system calls: - - 1) Have a simulator intercept the appropriate trap instruction and - directly perform the system call on behalf of the target program. - This is the typical way of handling system calls for embedded targets. - [Handling system calls for embedded targets isn't that much of an - oxymoron as running compiler testsuites make use of the capability.] - - This method of system call handling is done when STATE_ENVIRONMENT - is ENVIRONMENT_USER. - - 2) Have a simulator emulate the hardware as much as possible. - If the program running on the real hardware communicates with some sort - of target manager, one would want to be able to run this program on the - simulator as well. - - This method of system call handling is done when STATE_ENVIRONMENT - is ENVIRONMENT_OPERATING. -*/ - -#ifndef CALLBACK_H -#define CALLBACK_H - -/* ??? The reason why we check for va_start here should be documented. */ - -#ifndef va_start -#include -#ifdef ANSI_PROTOTYPES -#include -#else -#include -#endif -#endif - -/* Mapping of host/target values. */ -/* ??? For debugging purposes, one might want to add a string of the - name of the symbol. */ - -typedef struct { - int host_val; - int target_val; -} CB_TARGET_DEFS_MAP; - -#define MAX_CALLBACK_FDS 10 - -/* Forward decl for stat/fstat. */ -struct stat; - -typedef struct host_callback_struct host_callback; - -struct host_callback_struct -{ - int (*close) PARAMS ((host_callback *,int)); - int (*get_errno) PARAMS ((host_callback *)); - int (*isatty) PARAMS ((host_callback *, int)); - int (*lseek) PARAMS ((host_callback *, int, long , int)); - int (*open) PARAMS ((host_callback *, const char*, int mode)); - int (*read) PARAMS ((host_callback *,int, char *, int)); - int (*read_stdin) PARAMS (( host_callback *, char *, int)); - int (*rename) PARAMS ((host_callback *, const char *, const char *)); - int (*system) PARAMS ((host_callback *, const char *)); - long (*time) PARAMS ((host_callback *, long *)); - int (*unlink) PARAMS ((host_callback *, const char *)); - int (*write) PARAMS ((host_callback *,int, const char *, int)); - int (*write_stdout) PARAMS ((host_callback *, const char *, int)); - void (*flush_stdout) PARAMS ((host_callback *)); - int (*write_stderr) PARAMS ((host_callback *, const char *, int)); - void (*flush_stderr) PARAMS ((host_callback *)); - int (*stat) PARAMS ((host_callback *, const char *, struct stat *)); - int (*fstat) PARAMS ((host_callback *, int, struct stat *)); - - /* When present, call to the client to give it the oportunity to - poll any io devices for a request to quit (indicated by a nonzero - return value). */ - int (*poll_quit) PARAMS ((host_callback *)); - - /* Used when the target has gone away, so we can close open - handles and free memory etc etc. */ - int (*shutdown) PARAMS ((host_callback *)); - int (*init) PARAMS ((host_callback *)); - - /* depreciated, use vprintf_filtered - Talk to the user on a console. */ - void (*printf_filtered) PARAMS ((host_callback *, const char *, ...)); - - /* Talk to the user on a console. */ - void (*vprintf_filtered) PARAMS ((host_callback *, const char *, va_list)); - - /* Same as vprintf_filtered but to stderr. */ - void (*evprintf_filtered) PARAMS ((host_callback *, const char *, va_list)); - - /* Print an error message and "exit". - In the case of gdb "exiting" means doing a longjmp back to the main - command loop. */ - void (*error) PARAMS ((host_callback *, const char *, ...)); - - int last_errno; /* host format */ - - int fdmap[MAX_CALLBACK_FDS]; - char fdopen[MAX_CALLBACK_FDS]; - char alwaysopen[MAX_CALLBACK_FDS]; - - /* System call numbers. */ - CB_TARGET_DEFS_MAP *syscall_map; - /* Errno values. */ - CB_TARGET_DEFS_MAP *errno_map; - /* Flags to the open system call. */ - CB_TARGET_DEFS_MAP *open_map; - /* Signal numbers. */ - CB_TARGET_DEFS_MAP *signal_map; - /* Layout of `stat' struct. - The format is a series of "name,length" pairs separated by colons. - Empty space is indicated with a `name' of "space". - All padding must be explicitly mentioned. - Lengths are in bytes. If this needs to be extended to bits, - use "name.bits". - Example: "st_dev,4:st_ino,4:st_mode,4:..." */ - const char *stat_map; - - /* Marker for those wanting to do sanity checks. - This should remain the last member of this struct to help catch - miscompilation errors. */ -#define HOST_CALLBACK_MAGIC 4705 /* teds constant */ - int magic; -}; - -extern host_callback default_callback; - -/* Canonical versions of system call numbers. - It's not intended to willy-nilly throw every system call ever heard - of in here. Only include those that have an important use. - ??? One can certainly start a discussion over the ones that are currently - here, but that will always be true. */ - -/* These are used by the ANSI C support of libc. */ -#define CB_SYS_exit 1 -#define CB_SYS_open 2 -#define CB_SYS_close 3 -#define CB_SYS_read 4 -#define CB_SYS_write 5 -#define CB_SYS_lseek 6 -#define CB_SYS_unlink 7 -#define CB_SYS_getpid 8 -#define CB_SYS_kill 9 -#define CB_SYS_fstat 10 -/*#define CB_SYS_sbrk 11 - not currently a system call, but reserved. */ - -/* ARGV support. */ -#define CB_SYS_argvlen 12 -#define CB_SYS_argv 13 - -/* These are extras added for one reason or another. */ -#define CB_SYS_chdir 14 -#define CB_SYS_stat 15 -#define CB_SYS_chmod 16 -#define CB_SYS_utime 17 -#define CB_SYS_time 18 - -/* Struct use to pass and return information necessary to perform a - system call. */ -/* FIXME: Need to consider target word size. */ - -typedef struct cb_syscall { - /* The target's value of what system call to perform. */ - int func; - /* The arguments to the syscall. */ - long arg1, arg2, arg3, arg4; - - /* The result. */ - long result; - /* Some system calls have two results. */ - long result2; - /* The target's errno value, or 0 if success. - This is converted to the target's value with host_to_target_errno. */ - int errcode; - - /* Working space to be used by memory read/write callbacks. */ - PTR p1; - PTR p2; - long x1,x2; - - /* Callbacks for reading/writing memory (e.g. for read/write syscalls). - ??? long or unsigned long might be better to use for the `count' - argument here. We mimic sim_{read,write} for now. Be careful to - test any changes with -Wall -Werror, mixed signed comparisons - will get you. */ - int (*read_mem) PARAMS ((host_callback * /*cb*/, struct cb_syscall * /*sc*/, - unsigned long /*taddr*/, char * /*buf*/, - int /*bytes*/)); - int (*write_mem) PARAMS ((host_callback * /*cb*/, struct cb_syscall * /*sc*/, - unsigned long /*taddr*/, const char * /*buf*/, - int /*bytes*/)); - - /* For sanity checking, should be last entry. */ - int magic; -} CB_SYSCALL; - -/* Magic number sanity checker. */ -#define CB_SYSCALL_MAGIC 0x12344321 - -/* Macro to initialize CB_SYSCALL. Called first, before filling in - any fields. */ -#define CB_SYSCALL_INIT(sc) \ -do { \ - memset ((sc), 0, sizeof (*(sc))); \ - (sc)->magic = CB_SYSCALL_MAGIC; \ -} while (0) - -/* Return codes for various interface routines. */ - -typedef enum { - CB_RC_OK = 0, - /* generic error */ - CB_RC_ERR, - /* either file not found or no read access */ - CB_RC_ACCESS, - CB_RC_NO_MEM -} CB_RC; - -/* Read in target values for system call numbers, errno values, signals. */ -CB_RC cb_read_target_syscall_maps PARAMS ((host_callback *, const char *)); - -/* Translate target to host syscall function numbers. */ -int cb_target_to_host_syscall PARAMS ((host_callback *, int)); - -/* Translate host to target errno value. */ -int cb_host_to_target_errno PARAMS ((host_callback *, int)); - -/* Translate target to host open flags. */ -int cb_target_to_host_open PARAMS ((host_callback *, int)); - -/* Translate target signal number to host. */ -int cb_target_to_host_signal PARAMS ((host_callback *, int)); - -/* Translate host signal number to target. */ -int cb_host_to_target_signal PARAMS ((host_callback *, int)); - -/* Translate host stat struct to target. - If stat struct ptr is NULL, just compute target stat struct size. - Result is size of target stat struct or 0 if error. */ -int cb_host_to_target_stat PARAMS ((host_callback *, const struct stat *, PTR)); - -/* Perform a system call. */ -CB_RC cb_syscall PARAMS ((host_callback *, CB_SYSCALL *)); - -#endif diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog index 44e358222b9..571861b75cf 100644 --- a/include/gdb/ChangeLog +++ b/include/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Andrew Cagney + + * callback.h: Copy to here from directory above. + * remote-sim.h: Copy to here from directory above. + 2002-06-01 Andrew Cagney * sim-d10v.h (sim_d10v_regs): Expand to include all registers. diff --git a/include/gdb/callback.h b/include/gdb/callback.h new file mode 100644 index 00000000000..30752842ed9 --- /dev/null +++ b/include/gdb/callback.h @@ -0,0 +1,270 @@ +/* Remote target system call callback support. + Copyright 1997 Free Software Foundation, Inc. + Contributed by Cygnus Solutions. + +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 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. */ + +/* This interface isn't intended to be specific to any particular kind + of remote (hardware, simulator, whatever). As such, support for it + (e.g. sim/common/callback.c) should *not* live in the simulator source + tree, nor should it live in the gdb source tree. */ + +/* There are various ways to handle system calls: + + 1) Have a simulator intercept the appropriate trap instruction and + directly perform the system call on behalf of the target program. + This is the typical way of handling system calls for embedded targets. + [Handling system calls for embedded targets isn't that much of an + oxymoron as running compiler testsuites make use of the capability.] + + This method of system call handling is done when STATE_ENVIRONMENT + is ENVIRONMENT_USER. + + 2) Have a simulator emulate the hardware as much as possible. + If the program running on the real hardware communicates with some sort + of target manager, one would want to be able to run this program on the + simulator as well. + + This method of system call handling is done when STATE_ENVIRONMENT + is ENVIRONMENT_OPERATING. +*/ + +#ifndef CALLBACK_H +#define CALLBACK_H + +/* ??? The reason why we check for va_start here should be documented. */ + +#ifndef va_start +#include +#ifdef ANSI_PROTOTYPES +#include +#else +#include +#endif +#endif + +/* Mapping of host/target values. */ +/* ??? For debugging purposes, one might want to add a string of the + name of the symbol. */ + +typedef struct { + int host_val; + int target_val; +} CB_TARGET_DEFS_MAP; + +#define MAX_CALLBACK_FDS 10 + +/* Forward decl for stat/fstat. */ +struct stat; + +typedef struct host_callback_struct host_callback; + +struct host_callback_struct +{ + int (*close) PARAMS ((host_callback *,int)); + int (*get_errno) PARAMS ((host_callback *)); + int (*isatty) PARAMS ((host_callback *, int)); + int (*lseek) PARAMS ((host_callback *, int, long , int)); + int (*open) PARAMS ((host_callback *, const char*, int mode)); + int (*read) PARAMS ((host_callback *,int, char *, int)); + int (*read_stdin) PARAMS (( host_callback *, char *, int)); + int (*rename) PARAMS ((host_callback *, const char *, const char *)); + int (*system) PARAMS ((host_callback *, const char *)); + long (*time) PARAMS ((host_callback *, long *)); + int (*unlink) PARAMS ((host_callback *, const char *)); + int (*write) PARAMS ((host_callback *,int, const char *, int)); + int (*write_stdout) PARAMS ((host_callback *, const char *, int)); + void (*flush_stdout) PARAMS ((host_callback *)); + int (*write_stderr) PARAMS ((host_callback *, const char *, int)); + void (*flush_stderr) PARAMS ((host_callback *)); + int (*stat) PARAMS ((host_callback *, const char *, struct stat *)); + int (*fstat) PARAMS ((host_callback *, int, struct stat *)); + + /* When present, call to the client to give it the oportunity to + poll any io devices for a request to quit (indicated by a nonzero + return value). */ + int (*poll_quit) PARAMS ((host_callback *)); + + /* Used when the target has gone away, so we can close open + handles and free memory etc etc. */ + int (*shutdown) PARAMS ((host_callback *)); + int (*init) PARAMS ((host_callback *)); + + /* depreciated, use vprintf_filtered - Talk to the user on a console. */ + void (*printf_filtered) PARAMS ((host_callback *, const char *, ...)); + + /* Talk to the user on a console. */ + void (*vprintf_filtered) PARAMS ((host_callback *, const char *, va_list)); + + /* Same as vprintf_filtered but to stderr. */ + void (*evprintf_filtered) PARAMS ((host_callback *, const char *, va_list)); + + /* Print an error message and "exit". + In the case of gdb "exiting" means doing a longjmp back to the main + command loop. */ + void (*error) PARAMS ((host_callback *, const char *, ...)); + + int last_errno; /* host format */ + + int fdmap[MAX_CALLBACK_FDS]; + char fdopen[MAX_CALLBACK_FDS]; + char alwaysopen[MAX_CALLBACK_FDS]; + + /* System call numbers. */ + CB_TARGET_DEFS_MAP *syscall_map; + /* Errno values. */ + CB_TARGET_DEFS_MAP *errno_map; + /* Flags to the open system call. */ + CB_TARGET_DEFS_MAP *open_map; + /* Signal numbers. */ + CB_TARGET_DEFS_MAP *signal_map; + /* Layout of `stat' struct. + The format is a series of "name,length" pairs separated by colons. + Empty space is indicated with a `name' of "space". + All padding must be explicitly mentioned. + Lengths are in bytes. If this needs to be extended to bits, + use "name.bits". + Example: "st_dev,4:st_ino,4:st_mode,4:..." */ + const char *stat_map; + + /* Marker for those wanting to do sanity checks. + This should remain the last member of this struct to help catch + miscompilation errors. */ +#define HOST_CALLBACK_MAGIC 4705 /* teds constant */ + int magic; +}; + +extern host_callback default_callback; + +/* Canonical versions of system call numbers. + It's not intended to willy-nilly throw every system call ever heard + of in here. Only include those that have an important use. + ??? One can certainly start a discussion over the ones that are currently + here, but that will always be true. */ + +/* These are used by the ANSI C support of libc. */ +#define CB_SYS_exit 1 +#define CB_SYS_open 2 +#define CB_SYS_close 3 +#define CB_SYS_read 4 +#define CB_SYS_write 5 +#define CB_SYS_lseek 6 +#define CB_SYS_unlink 7 +#define CB_SYS_getpid 8 +#define CB_SYS_kill 9 +#define CB_SYS_fstat 10 +/*#define CB_SYS_sbrk 11 - not currently a system call, but reserved. */ + +/* ARGV support. */ +#define CB_SYS_argvlen 12 +#define CB_SYS_argv 13 + +/* These are extras added for one reason or another. */ +#define CB_SYS_chdir 14 +#define CB_SYS_stat 15 +#define CB_SYS_chmod 16 +#define CB_SYS_utime 17 +#define CB_SYS_time 18 + +/* Struct use to pass and return information necessary to perform a + system call. */ +/* FIXME: Need to consider target word size. */ + +typedef struct cb_syscall { + /* The target's value of what system call to perform. */ + int func; + /* The arguments to the syscall. */ + long arg1, arg2, arg3, arg4; + + /* The result. */ + long result; + /* Some system calls have two results. */ + long result2; + /* The target's errno value, or 0 if success. + This is converted to the target's value with host_to_target_errno. */ + int errcode; + + /* Working space to be used by memory read/write callbacks. */ + PTR p1; + PTR p2; + long x1,x2; + + /* Callbacks for reading/writing memory (e.g. for read/write syscalls). + ??? long or unsigned long might be better to use for the `count' + argument here. We mimic sim_{read,write} for now. Be careful to + test any changes with -Wall -Werror, mixed signed comparisons + will get you. */ + int (*read_mem) PARAMS ((host_callback * /*cb*/, struct cb_syscall * /*sc*/, + unsigned long /*taddr*/, char * /*buf*/, + int /*bytes*/)); + int (*write_mem) PARAMS ((host_callback * /*cb*/, struct cb_syscall * /*sc*/, + unsigned long /*taddr*/, const char * /*buf*/, + int /*bytes*/)); + + /* For sanity checking, should be last entry. */ + int magic; +} CB_SYSCALL; + +/* Magic number sanity checker. */ +#define CB_SYSCALL_MAGIC 0x12344321 + +/* Macro to initialize CB_SYSCALL. Called first, before filling in + any fields. */ +#define CB_SYSCALL_INIT(sc) \ +do { \ + memset ((sc), 0, sizeof (*(sc))); \ + (sc)->magic = CB_SYSCALL_MAGIC; \ +} while (0) + +/* Return codes for various interface routines. */ + +typedef enum { + CB_RC_OK = 0, + /* generic error */ + CB_RC_ERR, + /* either file not found or no read access */ + CB_RC_ACCESS, + CB_RC_NO_MEM +} CB_RC; + +/* Read in target values for system call numbers, errno values, signals. */ +CB_RC cb_read_target_syscall_maps PARAMS ((host_callback *, const char *)); + +/* Translate target to host syscall function numbers. */ +int cb_target_to_host_syscall PARAMS ((host_callback *, int)); + +/* Translate host to target errno value. */ +int cb_host_to_target_errno PARAMS ((host_callback *, int)); + +/* Translate target to host open flags. */ +int cb_target_to_host_open PARAMS ((host_callback *, int)); + +/* Translate target signal number to host. */ +int cb_target_to_host_signal PARAMS ((host_callback *, int)); + +/* Translate host signal number to target. */ +int cb_host_to_target_signal PARAMS ((host_callback *, int)); + +/* Translate host stat struct to target. + If stat struct ptr is NULL, just compute target stat struct size. + Result is size of target stat struct or 0 if error. */ +int cb_host_to_target_stat PARAMS ((host_callback *, const struct stat *, PTR)); + +/* Perform a system call. */ +CB_RC cb_syscall PARAMS ((host_callback *, CB_SYSCALL *)); + +#endif diff --git a/include/gdb/remote-sim.h b/include/gdb/remote-sim.h new file mode 100644 index 00000000000..726ec623fbd --- /dev/null +++ b/include/gdb/remote-sim.h @@ -0,0 +1,354 @@ +/* This file defines the interface between the simulator and gdb. + Copyright 1993, 1994, 1996, 1997, 1998, 2000 + Free Software Foundation, Inc. + +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 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. */ + +#if !defined (REMOTE_SIM_H) +#define REMOTE_SIM_H 1 + +#ifdef __cplusplus +extern "C" { +#endif + +/* This file is used when building stand-alone simulators, so isolate this + file from gdb. */ + +/* Pick up CORE_ADDR_TYPE if defined (from gdb), otherwise use same value as + gdb does (unsigned int - from defs.h). */ + +#ifndef CORE_ADDR_TYPE +typedef unsigned int SIM_ADDR; +#else +typedef CORE_ADDR_TYPE SIM_ADDR; +#endif + + +/* Semi-opaque type used as result of sim_open and passed back to all + other routines. "desc" is short for "descriptor". + It is up to each simulator to define `sim_state'. */ + +typedef struct sim_state *SIM_DESC; + + +/* Values for `kind' arg to sim_open. */ + +typedef enum { + SIM_OPEN_STANDALONE, /* simulator used standalone (run.c) */ + SIM_OPEN_DEBUG /* simulator used by debugger (gdb) */ +} SIM_OPEN_KIND; + + +/* Return codes from various functions. */ + +typedef enum { + SIM_RC_FAIL = 0, + SIM_RC_OK = 1, + SIM_RC_UNKNOWN_BREAKPOINT = 2, + SIM_RC_INSUFFICIENT_RESOURCES = 3, + SIM_RC_DUPLICATE_BREAKPOINT = 4 +} SIM_RC; + + +/* The bfd struct, as an opaque type. */ + +struct _bfd; + + +/* Main simulator entry points. */ + + +/* Create a fully initialized simulator instance. + + (This function is called when the simulator is selected from the + gdb command line.) + + KIND specifies how the simulator shall be used. Currently there + are only two kinds: stand-alone and debug. + + CALLBACK specifies a standard host callback (defined in callback.h). + + ABFD, when non NULL, designates a target program. The program is + not loaded. + + ARGV is a standard ARGV pointer such as that passed from the + command line. The syntax of the argument list is is assumed to be + ``SIM-PROG { SIM-OPTION } [ TARGET-PROGRAM { TARGET-OPTION } ]''. + The trailing TARGET-PROGRAM and args are only valid for a + stand-alone simulator. + + On success, the result is a non NULL descriptor that shall be + passed to the other sim_foo functions. While the simulator + configuration can be parameterized by (in decreasing precedence) + ARGV's SIM-OPTION, ARGV's TARGET-PROGRAM and the ABFD argument, the + successful creation of the simulator shall not dependent on the + presence of any of these arguments/options. + + Hardware simulator: The created simulator shall be sufficiently + initialized to handle, with out restrictions any client requests + (including memory reads/writes, register fetch/stores and a + resume). + + Process simulator: that process is not created until a call to + sim_create_inferior. FIXME: What should the state of the simulator + be? */ + +SIM_DESC sim_open PARAMS ((SIM_OPEN_KIND kind, struct host_callback_struct *callback, struct _bfd *abfd, char **argv)); + + +/* Destory a simulator instance. + + QUITTING is non-zero if we cannot hang on errors. + + This may involve freeing target memory and closing any open files + and mmap'd areas. You cannot assume sim_kill has already been + called. */ + +void sim_close PARAMS ((SIM_DESC sd, int quitting)); + + +/* Load program PROG into the simulators memory. + + If ABFD is non-NULL, the bfd for the file has already been opened. + The result is a return code indicating success. + + Hardware simulator: Normally, each program section is written into + memory according to that sections LMA using physical (direct) + addressing. The exception being systems, such as PPC/CHRP, which + support more complicated program loaders. A call to this function + should not effect the state of the processor registers. Multiple + calls to this function are permitted and have an accumulative + effect. + + Process simulator: Calls to this function may be ignored. + + FIXME: Most hardware simulators load the image at the VMA using + virtual addressing. + + FIXME: For some hardware targets, before a loaded program can be + executed, it requires the manipulation of VM registers and tables. + Such manipulation should probably (?) occure in + sim_create_inferior. */ + +SIM_RC sim_load PARAMS ((SIM_DESC sd, char *prog, struct _bfd *abfd, int from_tty)); + + +/* Prepare to run the simulated program. + + ABFD, if not NULL, provides initial processor state information. + ARGV and ENV, if non NULL, are NULL terminated lists of pointers. + + Hardware simulator: This function shall initialize the processor + registers to a known value. The program counter and possibly stack + pointer shall be set using information obtained from ABFD (or + hardware reset defaults). ARGV and ENV, dependant on the target + ABI, may be written to memory. + + Process simulator: After a call to this function, a new process + instance shall exist. The TEXT, DATA, BSS and stack regions shall + all be initialized, ARGV and ENV shall be written to process + address space (according to the applicable ABI) and the program + counter and stack pointer set accordingly. */ + +SIM_RC sim_create_inferior PARAMS ((SIM_DESC sd, struct _bfd *abfd, char **argv, char **env)); + + +/* Fetch LENGTH bytes of the simulated program's memory. Start fetch + at virtual address MEM and store in BUF. Result is number of bytes + read, or zero if error. */ + +int sim_read PARAMS ((SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)); + + +/* Store LENGTH bytes from BUF into the simulated program's + memory. Store bytes starting at virtual address MEM. Result is + number of bytes write, or zero if error. */ + +int sim_write PARAMS ((SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)); + + +/* Fetch register REGNO storing its raw (target endian) value in the + LENGTH byte buffer BUF. Return the actual size of the register or + zero if REGNO is not applicable. + + Legacy implementations ignore LENGTH and always return -1. + + If LENGTH does not match the size of REGNO no data is transfered + (the actual register size is still returned). */ + +int sim_fetch_register PARAMS ((SIM_DESC sd, int regno, unsigned char *buf, int length)); + + +/* Store register REGNO from the raw (target endian) value in BUF. + Return the actual size of the register or zero if REGNO is not + applicable. + + Legacy implementations ignore LENGTH and always return -1. + + If LENGTH does not match the size of REGNO no data is transfered + (the actual register size is still returned). */ + +int sim_store_register PARAMS ((SIM_DESC sd, int regno, unsigned char *buf, int length)); + + +/* Print whatever statistics the simulator has collected. + + VERBOSE is currently unused and must always be zero. */ + +void sim_info PARAMS ((SIM_DESC sd, int verbose)); + + +/* Run (or resume) the simulated program. + + STEP, when non-zero indicates that only a single simulator cycle + should be emulated. + + SIGGNAL, if non-zero is a (HOST) SIGRC value indicating the type of + event (hardware interrupt, signal) to be delivered to the simulated + program. + + Hardware simulator: If the SIGRC value returned by + sim_stop_reason() is passed back to the simulator via SIGGNAL then + the hardware simulator shall correctly deliver the hardware event + indicated by that signal. If a value of zero is passed in then the + simulation will continue as if there were no outstanding signal. + The effect of any other SIGGNAL value is is implementation + dependant. + + Process simulator: If SIGRC is non-zero then the corresponding + signal is delivered to the simulated program and execution is then + continued. A zero SIGRC value indicates that the program should + continue as normal. */ + +void sim_resume PARAMS ((SIM_DESC sd, int step, int siggnal)); + + +/* Asynchronous request to stop the simulation. + A nonzero return indicates that the simulator is able to handle + the request */ + +int sim_stop PARAMS ((SIM_DESC sd)); + + +/* Fetch the REASON why the program stopped. + + SIM_EXITED: The program has terminated. SIGRC indicates the target + dependant exit status. + + SIM_STOPPED: The program has stopped. SIGRC uses the host's signal + numbering as a way of identifying the reaon: program interrupted by + user via a sim_stop request (SIGINT); a breakpoint instruction + (SIGTRAP); a completed single step (SIGTRAP); an internal error + condition (SIGABRT); an illegal instruction (SIGILL); Access to an + undefined memory region (SIGSEGV); Mis-aligned memory access + (SIGBUS). For some signals information in addition to the signal + number may be retained by the simulator (e.g. offending address), + that information is not directly accessable via this interface. + + SIM_SIGNALLED: The program has been terminated by a signal. The + simulator has encountered target code that causes the the program + to exit with signal SIGRC. + + SIM_RUNNING, SIM_POLLING: The return of one of these values + indicates a problem internal to the simulator. */ + +enum sim_stop { sim_running, sim_polling, sim_exited, sim_stopped, sim_signalled }; + +void sim_stop_reason PARAMS ((SIM_DESC sd, enum sim_stop *reason, int *sigrc)); + + +/* Passthru for other commands that the simulator might support. + Simulators should be prepared to deal with any combination of NULL + or empty CMD. */ + +void sim_do_command PARAMS ((SIM_DESC sd, char *cmd)); + +/* Call these functions to set and clear breakpoints at ADDR. */ + +SIM_RC sim_set_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); +SIM_RC sim_clear_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); +SIM_RC sim_clear_all_breakpoints PARAMS ((SIM_DESC sd)); + +/* These functions are used to enable and disable breakpoints. */ + +SIM_RC sim_enable_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); +SIM_RC sim_disable_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); +SIM_RC sim_enable_all_breakpoints PARAMS ((SIM_DESC sd)); +SIM_RC sim_disable_all_breakpoints PARAMS ((SIM_DESC sd)); + + +/* Provide simulator with a default (global) host_callback_struct. + THIS PROCEDURE IS DEPRECIATED. + GDB and NRUN do not use this interface. + This procedure does not take a SIM_DESC argument as it is + used before sim_open. */ + +void sim_set_callbacks PARAMS ((struct host_callback_struct *)); + + +/* Set the size of the simulator memory array. + THIS PROCEDURE IS DEPRECIATED. + GDB and NRUN do not use this interface. + This procedure does not take a SIM_DESC argument as it is + used before sim_open. */ + +void sim_size PARAMS ((int i)); + + +/* Single-step simulator with tracing enabled. + THIS PROCEDURE IS DEPRECIATED. + THIS PROCEDURE IS EVEN MORE DEPRECATED THAN SIM_SET_TRACE + GDB and NRUN do not use this interface. + This procedure returns: ``0'' indicating that the simulator should + be continued using sim_trace() calls; ``1'' indicating that the + simulation has finished. */ + +int sim_trace PARAMS ((SIM_DESC sd)); + + +/* Enable tracing. + THIS PROCEDURE IS DEPRECIATED. + GDB and NRUN do not use this interface. + This procedure returns: ``0'' indicating that the simulator should + be continued using sim_trace() calls; ``1'' indicating that the + simulation has finished. */ + +void sim_set_trace PARAMS ((void)); + + +/* Configure the size of the profile buffer. + THIS PROCEDURE IS DEPRECIATED. + GDB and NRUN do not use this interface. + This procedure does not take a SIM_DESC argument as it is + used before sim_open. */ + +void sim_set_profile_size PARAMS ((int n)); + + +/* Kill the running program. + THIS PROCEDURE IS DEPRECIATED. + GDB and NRUN do not use this interface. + This procedure will be replaced as part of the introduction of + multi-cpu simulators. */ + +void sim_kill PARAMS ((SIM_DESC sd)); + +#ifdef __cplusplus +} +#endif + +#endif /* !defined (REMOTE_SIM_H) */ diff --git a/include/remote-sim.h b/include/remote-sim.h deleted file mode 100644 index 726ec623fbd..00000000000 --- a/include/remote-sim.h +++ /dev/null @@ -1,354 +0,0 @@ -/* This file defines the interface between the simulator and gdb. - Copyright 1993, 1994, 1996, 1997, 1998, 2000 - Free Software Foundation, Inc. - -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 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. */ - -#if !defined (REMOTE_SIM_H) -#define REMOTE_SIM_H 1 - -#ifdef __cplusplus -extern "C" { -#endif - -/* This file is used when building stand-alone simulators, so isolate this - file from gdb. */ - -/* Pick up CORE_ADDR_TYPE if defined (from gdb), otherwise use same value as - gdb does (unsigned int - from defs.h). */ - -#ifndef CORE_ADDR_TYPE -typedef unsigned int SIM_ADDR; -#else -typedef CORE_ADDR_TYPE SIM_ADDR; -#endif - - -/* Semi-opaque type used as result of sim_open and passed back to all - other routines. "desc" is short for "descriptor". - It is up to each simulator to define `sim_state'. */ - -typedef struct sim_state *SIM_DESC; - - -/* Values for `kind' arg to sim_open. */ - -typedef enum { - SIM_OPEN_STANDALONE, /* simulator used standalone (run.c) */ - SIM_OPEN_DEBUG /* simulator used by debugger (gdb) */ -} SIM_OPEN_KIND; - - -/* Return codes from various functions. */ - -typedef enum { - SIM_RC_FAIL = 0, - SIM_RC_OK = 1, - SIM_RC_UNKNOWN_BREAKPOINT = 2, - SIM_RC_INSUFFICIENT_RESOURCES = 3, - SIM_RC_DUPLICATE_BREAKPOINT = 4 -} SIM_RC; - - -/* The bfd struct, as an opaque type. */ - -struct _bfd; - - -/* Main simulator entry points. */ - - -/* Create a fully initialized simulator instance. - - (This function is called when the simulator is selected from the - gdb command line.) - - KIND specifies how the simulator shall be used. Currently there - are only two kinds: stand-alone and debug. - - CALLBACK specifies a standard host callback (defined in callback.h). - - ABFD, when non NULL, designates a target program. The program is - not loaded. - - ARGV is a standard ARGV pointer such as that passed from the - command line. The syntax of the argument list is is assumed to be - ``SIM-PROG { SIM-OPTION } [ TARGET-PROGRAM { TARGET-OPTION } ]''. - The trailing TARGET-PROGRAM and args are only valid for a - stand-alone simulator. - - On success, the result is a non NULL descriptor that shall be - passed to the other sim_foo functions. While the simulator - configuration can be parameterized by (in decreasing precedence) - ARGV's SIM-OPTION, ARGV's TARGET-PROGRAM and the ABFD argument, the - successful creation of the simulator shall not dependent on the - presence of any of these arguments/options. - - Hardware simulator: The created simulator shall be sufficiently - initialized to handle, with out restrictions any client requests - (including memory reads/writes, register fetch/stores and a - resume). - - Process simulator: that process is not created until a call to - sim_create_inferior. FIXME: What should the state of the simulator - be? */ - -SIM_DESC sim_open PARAMS ((SIM_OPEN_KIND kind, struct host_callback_struct *callback, struct _bfd *abfd, char **argv)); - - -/* Destory a simulator instance. - - QUITTING is non-zero if we cannot hang on errors. - - This may involve freeing target memory and closing any open files - and mmap'd areas. You cannot assume sim_kill has already been - called. */ - -void sim_close PARAMS ((SIM_DESC sd, int quitting)); - - -/* Load program PROG into the simulators memory. - - If ABFD is non-NULL, the bfd for the file has already been opened. - The result is a return code indicating success. - - Hardware simulator: Normally, each program section is written into - memory according to that sections LMA using physical (direct) - addressing. The exception being systems, such as PPC/CHRP, which - support more complicated program loaders. A call to this function - should not effect the state of the processor registers. Multiple - calls to this function are permitted and have an accumulative - effect. - - Process simulator: Calls to this function may be ignored. - - FIXME: Most hardware simulators load the image at the VMA using - virtual addressing. - - FIXME: For some hardware targets, before a loaded program can be - executed, it requires the manipulation of VM registers and tables. - Such manipulation should probably (?) occure in - sim_create_inferior. */ - -SIM_RC sim_load PARAMS ((SIM_DESC sd, char *prog, struct _bfd *abfd, int from_tty)); - - -/* Prepare to run the simulated program. - - ABFD, if not NULL, provides initial processor state information. - ARGV and ENV, if non NULL, are NULL terminated lists of pointers. - - Hardware simulator: This function shall initialize the processor - registers to a known value. The program counter and possibly stack - pointer shall be set using information obtained from ABFD (or - hardware reset defaults). ARGV and ENV, dependant on the target - ABI, may be written to memory. - - Process simulator: After a call to this function, a new process - instance shall exist. The TEXT, DATA, BSS and stack regions shall - all be initialized, ARGV and ENV shall be written to process - address space (according to the applicable ABI) and the program - counter and stack pointer set accordingly. */ - -SIM_RC sim_create_inferior PARAMS ((SIM_DESC sd, struct _bfd *abfd, char **argv, char **env)); - - -/* Fetch LENGTH bytes of the simulated program's memory. Start fetch - at virtual address MEM and store in BUF. Result is number of bytes - read, or zero if error. */ - -int sim_read PARAMS ((SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)); - - -/* Store LENGTH bytes from BUF into the simulated program's - memory. Store bytes starting at virtual address MEM. Result is - number of bytes write, or zero if error. */ - -int sim_write PARAMS ((SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)); - - -/* Fetch register REGNO storing its raw (target endian) value in the - LENGTH byte buffer BUF. Return the actual size of the register or - zero if REGNO is not applicable. - - Legacy implementations ignore LENGTH and always return -1. - - If LENGTH does not match the size of REGNO no data is transfered - (the actual register size is still returned). */ - -int sim_fetch_register PARAMS ((SIM_DESC sd, int regno, unsigned char *buf, int length)); - - -/* Store register REGNO from the raw (target endian) value in BUF. - Return the actual size of the register or zero if REGNO is not - applicable. - - Legacy implementations ignore LENGTH and always return -1. - - If LENGTH does not match the size of REGNO no data is transfered - (the actual register size is still returned). */ - -int sim_store_register PARAMS ((SIM_DESC sd, int regno, unsigned char *buf, int length)); - - -/* Print whatever statistics the simulator has collected. - - VERBOSE is currently unused and must always be zero. */ - -void sim_info PARAMS ((SIM_DESC sd, int verbose)); - - -/* Run (or resume) the simulated program. - - STEP, when non-zero indicates that only a single simulator cycle - should be emulated. - - SIGGNAL, if non-zero is a (HOST) SIGRC value indicating the type of - event (hardware interrupt, signal) to be delivered to the simulated - program. - - Hardware simulator: If the SIGRC value returned by - sim_stop_reason() is passed back to the simulator via SIGGNAL then - the hardware simulator shall correctly deliver the hardware event - indicated by that signal. If a value of zero is passed in then the - simulation will continue as if there were no outstanding signal. - The effect of any other SIGGNAL value is is implementation - dependant. - - Process simulator: If SIGRC is non-zero then the corresponding - signal is delivered to the simulated program and execution is then - continued. A zero SIGRC value indicates that the program should - continue as normal. */ - -void sim_resume PARAMS ((SIM_DESC sd, int step, int siggnal)); - - -/* Asynchronous request to stop the simulation. - A nonzero return indicates that the simulator is able to handle - the request */ - -int sim_stop PARAMS ((SIM_DESC sd)); - - -/* Fetch the REASON why the program stopped. - - SIM_EXITED: The program has terminated. SIGRC indicates the target - dependant exit status. - - SIM_STOPPED: The program has stopped. SIGRC uses the host's signal - numbering as a way of identifying the reaon: program interrupted by - user via a sim_stop request (SIGINT); a breakpoint instruction - (SIGTRAP); a completed single step (SIGTRAP); an internal error - condition (SIGABRT); an illegal instruction (SIGILL); Access to an - undefined memory region (SIGSEGV); Mis-aligned memory access - (SIGBUS). For some signals information in addition to the signal - number may be retained by the simulator (e.g. offending address), - that information is not directly accessable via this interface. - - SIM_SIGNALLED: The program has been terminated by a signal. The - simulator has encountered target code that causes the the program - to exit with signal SIGRC. - - SIM_RUNNING, SIM_POLLING: The return of one of these values - indicates a problem internal to the simulator. */ - -enum sim_stop { sim_running, sim_polling, sim_exited, sim_stopped, sim_signalled }; - -void sim_stop_reason PARAMS ((SIM_DESC sd, enum sim_stop *reason, int *sigrc)); - - -/* Passthru for other commands that the simulator might support. - Simulators should be prepared to deal with any combination of NULL - or empty CMD. */ - -void sim_do_command PARAMS ((SIM_DESC sd, char *cmd)); - -/* Call these functions to set and clear breakpoints at ADDR. */ - -SIM_RC sim_set_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); -SIM_RC sim_clear_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); -SIM_RC sim_clear_all_breakpoints PARAMS ((SIM_DESC sd)); - -/* These functions are used to enable and disable breakpoints. */ - -SIM_RC sim_enable_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); -SIM_RC sim_disable_breakpoint PARAMS ((SIM_DESC sd, SIM_ADDR addr)); -SIM_RC sim_enable_all_breakpoints PARAMS ((SIM_DESC sd)); -SIM_RC sim_disable_all_breakpoints PARAMS ((SIM_DESC sd)); - - -/* Provide simulator with a default (global) host_callback_struct. - THIS PROCEDURE IS DEPRECIATED. - GDB and NRUN do not use this interface. - This procedure does not take a SIM_DESC argument as it is - used before sim_open. */ - -void sim_set_callbacks PARAMS ((struct host_callback_struct *)); - - -/* Set the size of the simulator memory array. - THIS PROCEDURE IS DEPRECIATED. - GDB and NRUN do not use this interface. - This procedure does not take a SIM_DESC argument as it is - used before sim_open. */ - -void sim_size PARAMS ((int i)); - - -/* Single-step simulator with tracing enabled. - THIS PROCEDURE IS DEPRECIATED. - THIS PROCEDURE IS EVEN MORE DEPRECATED THAN SIM_SET_TRACE - GDB and NRUN do not use this interface. - This procedure returns: ``0'' indicating that the simulator should - be continued using sim_trace() calls; ``1'' indicating that the - simulation has finished. */ - -int sim_trace PARAMS ((SIM_DESC sd)); - - -/* Enable tracing. - THIS PROCEDURE IS DEPRECIATED. - GDB and NRUN do not use this interface. - This procedure returns: ``0'' indicating that the simulator should - be continued using sim_trace() calls; ``1'' indicating that the - simulation has finished. */ - -void sim_set_trace PARAMS ((void)); - - -/* Configure the size of the profile buffer. - THIS PROCEDURE IS DEPRECIATED. - GDB and NRUN do not use this interface. - This procedure does not take a SIM_DESC argument as it is - used before sim_open. */ - -void sim_set_profile_size PARAMS ((int n)); - - -/* Kill the running program. - THIS PROCEDURE IS DEPRECIATED. - GDB and NRUN do not use this interface. - This procedure will be replaced as part of the introduction of - multi-cpu simulators. */ - -void sim_kill PARAMS ((SIM_DESC sd)); - -#ifdef __cplusplus -} -#endif - -#endif /* !defined (REMOTE_SIM_H) */ diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 85de967d7c7..f7dfd133ca4 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * wrapper.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * armos.c: Include "gdb/callback.h". + 2002-05-29 Nick Clifton * armcopro.c (XScale_check_memacc): Set the FSR and FAR registers diff --git a/sim/arm/armos.c b/sim/arm/armos.c index 4635932b497..ccf9a576e87 100644 --- a/sim/arm/armos.c +++ b/sim/arm/armos.c @@ -83,7 +83,7 @@ extern int _fisatty (FILE *); /* For RDIError_BreakpointReached. */ #include "dbg_rdi.h" -#include "callback.h" +#include "gdb/callback.h" extern host_callback *sim_callback; extern unsigned ARMul_OSInit (ARMul_State *); diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c index 0ff2cd9dc02..9aa462ebb98 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -28,8 +28,8 @@ #include #include #include -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "armdefs.h" #include "armemu.h" #include "dbg_rdi.h" diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8400639be49..f7c73915213 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,24 @@ +2002-06-08 Andrew Cagney + + * gentmap.c (gen_targ_map_c): Generate "gdb/callback.h". + * sim-basics.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + * run.c: Ditto. + * sim-load.c: Ditto. + * callback.c: Ditto. + * syscall.c: Ditto. + * Make-common.in (callback_h): Define. + (remote_sim_h): Define. + (run.o): Update. + (callback.o): Update. + (syscall.o): Update. + (sim-load.o): + (nrun.o): Update. + (sim-hload.o): Update. + (sim-io.o): Update. + (sim-reason.o): Update. + (sim-reg.o): Update. + (sim-resume.o): Update. + 2002-05-30 Kazu Hirata * run.c: Fix formatting. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 519b213da73..6662efd748a 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -248,6 +248,9 @@ LIB_OBJS = callback.o syscall.o targ-map.o $(SIM_OBJS) RUNTESTFLAGS = +callback_h = $(srcroot)/include/gdb/callback.h +remote_sim_h = $(srcroot)/include/gdb/remote-sim.h + all: $(SIM_EXTRA_ALL) libsim.a run .gdbinit libsim.a: $(LIB_OBJS) @@ -259,8 +262,7 @@ run: $(SIM_RUN_OBJS) libsim.a $(LIBDEPS) $(CC) $(ALL_CFLAGS) -o run$(EXEEXT) \ $(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS) -run.o: $(srccom)/run.c config.h tconfig.h \ - $(srcroot)/include/remote-sim.h $(srcroot)/include/callback.h +run.o: $(srccom)/run.c config.h tconfig.h $(remote_sim_h) $(callback_h) $(CC) -c $(srccom)/run.c $(ALL_CFLAGS) # FIXME: Ideally, callback.o and friends live in a library outside of @@ -268,12 +270,10 @@ run.o: $(srccom)/run.c config.h tconfig.h \ # devo/libremote because this directory would contain more than just # a library). -callback.o: $(srccom)/callback.c config.h tconfig.h \ - $(srcroot)/include/callback.h targ-vals.h +callback.o: $(srccom)/callback.c config.h tconfig.h $(callback_h) targ-vals.h $(CC) -c $(srccom)/callback.c $(ALL_CFLAGS) -syscall.o: $(srccom)/syscall.c config.h tconfig.h \ - $(srcroot)/include/callback.h targ-vals.h +syscall.o: $(srccom)/syscall.c config.h tconfig.h $(callback_h) targ-vals.h $(CC) -c $(srccom)/syscall.c $(ALL_CFLAGS) targ-map.o: targ-map.c targ-vals.h @@ -399,21 +399,18 @@ sim-fpu.o: $(srccom)/sim-fpu.c $(sim-fpu_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-fpu.c $(ALL_CFLAGS) -sim-hload.o: $(srccom)/sim-hload.c $(sim-assert_h) \ - $(srcroot)/include/remote-sim.h \ +sim-hload.o: $(srccom)/sim-hload.c $(sim-assert_h) $(remote_sim_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-hload.c $(ALL_CFLAGS) -sim-hrw.o: $(srccom)/sim-hrw.c $(sim-assert_h) $(sim_core_h) \ - $(srcroot)/include/remote-sim.h \ +sim-hrw.o: $(srccom)/sim-hrw.c $(sim-assert_h) $(sim_core_h) $(remote_sim_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-hrw.c $(ALL_CFLAGS) sim-hw.o: $(srccom)/sim-hw.c $(sim_main_headers) $(CC) -c $(srccom)/sim-hw.c $(ALL_CFLAGS) -sim-info.o: $(srccom)/sim-info.c $(sim-assert_h) \ - $(srcroot)/include/remote-sim.h \ +sim-info.o: $(srccom)/sim-info.c $(sim-assert_h) $(remote_sim_h) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srccom)/sim-info.c $(ALL_CFLAGS) @@ -423,8 +420,8 @@ sim-inline.c: $(srccom)/sim-inline.c cat $(srccom)/$@ >> tmp-$@ $(SHELL) $(srcdir)/../../move-if-change tmp-$@ $@ -sim-io.o: $(srccom)/sim-io.c $(sim_main_headers) $(sim-io_h) \ - $(srcroot)/include/remote-sim.h targ-vals.h +sim-io.o: $(srccom)/sim-io.c $(sim_main_headers) $(sim-io_h) $(remote_sim_h) \ + targ-vals.h $(CC) -c $(srccom)/sim-io.c $(ALL_CFLAGS) sim-memopt.o: $(srccom)/sim-memopt.c $(sim_main_headers) \ @@ -439,16 +436,13 @@ sim-options.o: $(srccom)/sim-options.c $(sim_main_headers) \ $(sim-options_h) $(sim-io_h) $(CC) -c $(srccom)/sim-options.c $(ALL_CFLAGS) -sim-reason.o: $(srccom)/sim-reason.c $(sim_main_headers) \ - $(srcroot)/include/remote-sim.h +sim-reason.o: $(srccom)/sim-reason.c $(sim_main_headers) $(remote_sim_h) $(CC) -c $(srccom)/sim-reason.c $(ALL_CFLAGS) -sim-reg.o: $(srccom)/sim-reg.c $(sim_main_headers) \ - $(srcroot)/include/remote-sim.h +sim-reg.o: $(srccom)/sim-reg.c $(sim_main_headers) $(remote_sim_h) $(CC) -c $(srccom)/sim-reg.c $(ALL_CFLAGS) -sim-resume.o: $(srccom)/sim-resume.c $(sim_main_headers) \ - $(srcroot)/include/remote-sim.h +sim-resume.o: $(srccom)/sim-resume.c $(sim_main_headers) $(remote_sim_h) $(CC) -c $(srccom)/sim-resume.c $(ALL_CFLAGS) sim-run.o: $(srccom)/sim-run.c $(sim_main_headers) @@ -478,7 +472,7 @@ sim-utils.o: $(srccom)/sim-utils.c $(sim_main_headers) sim-watch.o: $(srccom)/sim-watch.c $(sim_main_headers) $(CC) -c $(srccom)/sim-watch.c $(ALL_CFLAGS) -sim-load.o: $(srccom)/sim-load.c $(srcroot)/include/callback.h +sim-load.o: $(srccom)/sim-load.c $(callback_h) $(CC) -c $(srccom)/sim-load.c $(ALL_CFLAGS) sim-break.o: $(srccom)/sim-break.c $(sim_main_headers) \ @@ -547,8 +541,7 @@ dv-sockser.o: $(srccom)/dv-sockser.h $(sim_main_headers) $(CC) -c $(srccom)/dv-sockser.c $(ALL_CFLAGS) -nrun.o: $(srccom)/nrun.c config.h tconfig.h \ - $(srcroot)/include/remote-sim.h $(srcroot)/include/callback.h \ +nrun.o: $(srccom)/nrun.c config.h tconfig.h $(remote_sim_h) $(callback_h) \ $(sim_main_headers) $(CC) -c $(srccom)/nrun.c $(ALL_CFLAGS) @@ -685,7 +678,7 @@ cgen-arch: force $(SHELL) $(srccom)/cgen.sh arch $(srcdir) \ $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ $(arch) "$(FLAGS)" ignored "$(isa)" $(mach) ignored ignored - + cgen-cpu: force $(SHELL) $(srccom)/cgen.sh cpu $(srcdir) \ $(CGEN) $(CGENDIR) "$(CGENFLAGS)" \ diff --git a/sim/common/callback.c b/sim/common/callback.c index af5de148ad0..db0fff68e80 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -46,7 +46,7 @@ #include #include #include -#include "callback.h" +#include "gdb/callback.h" #include "targ-vals.h" #ifdef HAVE_UNISTD_H diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c index e4f5d0dc8b4..897a6f70c77 100644 --- a/sim/common/gentmap.c +++ b/sim/common/gentmap.c @@ -68,7 +68,7 @@ gen_targ_map_c () printf ("#include \n"); printf ("#include \n"); printf ("#include \"ansidecl.h\"\n"); - printf ("#include \"callback.h\"\n"); + printf ("#include \"gdb/callback.h\"\n"); printf ("#include \"targ-vals.h\"\n"); printf ("\n"); diff --git a/sim/common/run.c b/sim/common/run.c index a2180a1a46a..d8c86cdd701 100644 --- a/sim/common/run.c +++ b/sim/common/run.c @@ -43,8 +43,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "libiberty.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "ansidecl.h" #include "run-sim.h" diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index fc34b21618f..a7d7a1ed472 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -132,8 +132,8 @@ typedef enum { #endif #include "ansidecl.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "sim-config.h" diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c index bfe3f15c4bd..314d2dd173c 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -36,8 +36,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., #include "bfd.h" #include "sim-utils.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" static void eprintf PARAMS ((host_callback *, const char *, ...)); static void xprintf PARAMS ((host_callback *, const char *, ...)); diff --git a/sim/common/syscall.c b/sim/common/syscall.c index e0a3b880b84..75121cf2fc4 100644 --- a/sim/common/syscall.c +++ b/sim/common/syscall.c @@ -46,7 +46,7 @@ #include #include #include -#include "callback.h" +#include "gdb/callback.h" #include "targ-vals.h" #ifndef ENOSYS diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 67b3ab73a13..91d71f3f512 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,10 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * gencode.c: Do not include "callback.h". + * d10v_sim.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + * interp.c: Ditto. + 2002-06-08 Andrew Cagney * interp.c (sim_fetch_register): Fix name of enum used in cast. diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 7ea6059aaad..f46c54dd388 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/Makefile.in @@ -22,7 +22,7 @@ SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT -INCLUDE = d10v_sim.h $(srcroot)/include/callback.h targ-vals.h endian.c \ +INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \ $(srcroot)/include/gdb/sim-d10v.h # This selects the d10v newlib/libgloss syscall definitions. diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h index 377a001580d..ca14006fbce 100644 --- a/sim/d10v/d10v_sim.h +++ b/sim/d10v/d10v_sim.h @@ -3,7 +3,7 @@ #include #include #include "ansidecl.h" -#include "callback.h" +#include "gdb/callback.h" #include "opcode/d10v.h" #include "bfd.h" @@ -21,7 +21,7 @@ extern int d10v_debug; -#include "remote-sim.h" +#include "gdb/remote-sim.h" #include "sim-config.h" #include "sim-types.h" diff --git a/sim/d10v/gencode.c b/sim/d10v/gencode.c index 2d1269be996..b66297d0146 100644 --- a/sim/d10v/gencode.c +++ b/sim/d10v/gencode.c @@ -3,7 +3,6 @@ #include #include #include "ansidecl.h" -#include "callback.h" #include "opcode/d10v.h" static void write_header PARAMS ((void)); diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 37a2e1177d1..e465a809d02 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -1,8 +1,8 @@ #include #include "sysdep.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "d10v_sim.h" #include "gdb/sim-d10v.h" diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index f2ff60050a1..d68e6639a2b 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Andrew Cagney + + * sis.h: Include "gdb/remote-sim.h" and "gdb/callback.h". + * interf.c: Include "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index d0a781eb937..19318864534 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -31,7 +31,7 @@ #include #include "sim-config.h" -#include "remote-sim.h" +#include "gdb/remote-sim.h" #ifndef fprintf extern fprintf(); diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h index 2a895c0277d..5bdd7704e24 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -21,8 +21,8 @@ */ #include "ansidecl.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "end.h" diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index 09aa6fb7048..443b2228ba7 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * compile.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2002-05-19 Kazu Hirata * compile.c: Fix formatting. diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c index 27530dbfd56..b8c5ef3f568 100644 --- a/sim/h8300/compile.c +++ b/sim/h8300/compile.c @@ -32,8 +32,8 @@ #endif #include "ansidecl.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #ifndef SIGTRAP # define SIGTRAP 5 diff --git a/sim/h8500/ChangeLog b/sim/h8500/ChangeLog index af4f78470bb..eeb4d6ddc48 100644 --- a/sim/h8500/ChangeLog +++ b/sim/h8500/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * compile.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/h8500/compile.c b/sim/h8500/compile.c index 1aad644fa8a..aec8ce97372 100644 --- a/sim/h8500/compile.c +++ b/sim/h8500/compile.c @@ -31,8 +31,8 @@ #include #include "ansidecl.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #define O_RECOMPILE 85 #define DEFINE_TABLE diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 12734148c17..ee0cd2eac7a 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * sim-main.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2002-03-07 Stephane Carrez * m68hc11_sim.c (cpu_move8): Call sim_engine_abort in default case. diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in index 51e873bbbeb..a054a329c7d 100644 --- a/sim/m68hc11/Makefile.in +++ b/sim/m68hc11/Makefile.in @@ -42,7 +42,7 @@ SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_OBJS = @m68hc11_extra_objs@ -INCLUDE = $(srcdir)/../../include/callback.h \ +INCLUDE = $(srcdir)/../../include/gdb/callback.h \ interrupts.h sim-main.h diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index a47e7aa36e9..75c3b5b8451 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -36,8 +36,8 @@ typedef address_word sim_cia; #include "opcode/m68hc11.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "opcode/m68hc11.h" #include "sim-types.h" diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index a5e5ef97c94..066f0f3bedb 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index 456e4811cd4..79c7d2ede0b 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include /* for byte ordering macros */ #include "bfd.h" -#include "callback.h" +#include "gdb/callback.h" #include "libiberty.h" -#include "remote-sim.h" +#include "gdb/remote-sim.h" #ifndef NUM_ELEM #define NUM_ELEM(A) (sizeof (A) / sizeof (A)[0]) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 51366dbbacb..e0e664b99aa 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2002-06-07 Chris Demetriou Ed Satterthwaite diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 8cc6318aaef..d069d2bc834 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -61,8 +61,8 @@ code on the hardware. #include "getopt.h" #include "libiberty.h" #include "bfd.h" -#include "callback.h" /* GDB simulator callback interface */ -#include "remote-sim.h" /* GDB simulator interface */ +#include "gdb/callback.h" /* GDB simulator callback interface */ +#include "gdb/remote-sim.h" /* GDB simulator interface */ #include "sysdep.h" diff --git a/sim/mn10200/ChangeLog b/sim/mn10200/ChangeLog index 6e997245746..ddc51c9b8d9 100644 --- a/sim/mn10200/ChangeLog +++ b/sim/mn10200/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * mn10200_sim.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2001-04-15 J.T. Conklin * Makefile.in (simops.o): Add simops.h to dependency list. diff --git a/sim/mn10200/Makefile.in b/sim/mn10200/Makefile.in index bcc15c86834..563a4edec7b 100644 --- a/sim/mn10200/Makefile.in +++ b/sim/mn10200/Makefile.in @@ -25,7 +25,7 @@ SIM_EXTRA_CLEAN = clean-extra # Select mn10200 support in nltvals.def. NL_TARGET = -DNL_TARGET_mn10200 -INCLUDE = mn10200_sim.h $(srcdir)/../../include/callback.h +INCLUDE = mn10200_sim.h $(srcdir)/../../include/gdb/callback.h ## COMMON_POST_CONFIG_FRAG diff --git a/sim/mn10200/mn10200_sim.h b/sim/mn10200/mn10200_sim.h index a7b7c4d888c..2f85aa0cb4f 100644 --- a/sim/mn10200/mn10200_sim.h +++ b/sim/mn10200/mn10200_sim.h @@ -1,10 +1,10 @@ #include #include #include "ansidecl.h" -#include "callback.h" +#include "gdb/callback.h" #include "opcode/mn10200.h" #include -#include "remote-sim.h" +#include "gdb/remote-sim.h" #ifndef INLINE #ifdef __GNUC__ diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 59f45155012..7245767f471 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,9 @@ +2002-06-09 Andrew Cagney + + * Makefile.in (INCLUDE): Update path to callback.h. + * mn10300_sim.h: Include "gdb/callback.h" and "gdb/remote-sim.h". + * tconfig.in: Ditto. + 2001-05-06 Jim Blandy * mn10300.igen: Doc fixes. diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index f3a52ed1994..1f493ec467d 100644 --- a/sim/mn10300/Makefile.in +++ b/sim/mn10300/Makefile.in @@ -48,7 +48,7 @@ SIM_EXTRA_CLEAN = clean-extra # Select mn10300 support in nltvals.def. NL_TARGET = -DNL_TARGET_mn10300 -INCLUDE = mn10300_sim.h $(srcdir)/../../include/callback.h +INCLUDE = mn10300_sim.h $(srcdir)/../../include/gdb/callback.h # List of extra flags to always pass to $(CC). SIM_EXTRA_CFLAGS = @sim_gen@ -DPOLL_QUIT_INTERVAL=0x20 diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index da6c25915be..6a2c5715583 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -1,10 +1,10 @@ #include #include #include "ansidecl.h" -#include "callback.h" +#include "gdb/callback.h" #include "opcode/mn10300.h" #include -#include "remote-sim.h" +#include "gdb/remote-sim.h" #include "bfd.h" #ifndef INLINE diff --git a/sim/mn10300/tconfig.in b/sim/mn10300/tconfig.in index 521b6e77694..14ca8e77645 100644 --- a/sim/mn10300/tconfig.in +++ b/sim/mn10300/tconfig.in @@ -2,8 +2,8 @@ /* FIXME: This is unnecessarily necessary: */ #include "ansidecl.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "sim-module.h" MODULE_INSTALL_FN dv_sockser_install; diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index dce94995bc2..0aea7d41b49 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Andrew Cagney + + * main.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * sim_calls.c: Ditto. + 2002-05-30 DJ Delorie * lf.c (lf_print__gnu_copyleft): Convert multiline strings to diff --git a/sim/ppc/main.c b/sim/ppc/main.c index f6ac87f45fd..4df78ab5aef 100644 --- a/sim/ppc/main.c +++ b/sim/ppc/main.c @@ -31,8 +31,8 @@ #include "events.h" /* FIXME: psim should provide the interface */ #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #ifdef HAVE_STDLIB_H #include diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c index 47af5b12a45..f2c2d1950d5 100644 --- a/sim/ppc/sim_calls.c +++ b/sim/ppc/sim_calls.c @@ -42,8 +42,8 @@ #include "defs.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" /* Define the rate at which the simulator should poll the host for a quit. */ diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 541ed1f27d2..62320a84a69 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + 2001-01-30 Ben Elliston * interp.c (sim_create_inferior): Record program arguments for diff --git a/sim/sh/interp.c b/sim/sh/interp.c index 99f51d16a2c..286dd2dccba 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -27,8 +27,8 @@ #include "sysdep.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" /* This file is local - if newlib changes, then so should this. */ #include "syscall.h" diff --git a/sim/w65/ChangeLog b/sim/w65/ChangeLog index 088f8b24867..ea4ffbe3041 100644 --- a/sim/w65/ChangeLog +++ b/sim/w65/ChangeLog @@ -1,3 +1,7 @@ +2002-06-08 Andrew Cagney + + * interp.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + Tue May 23 21:39:23 2000 Andrew Cagney * configure: Regenerated to track ../common/aclocal.m4 changes. diff --git a/sim/w65/interp.c b/sim/w65/interp.c index 36c4e322c9c..a4b325a1cc7 100644 --- a/sim/w65/interp.c +++ b/sim/w65/interp.c @@ -33,8 +33,8 @@ #endif #include #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "../../newlib/libc/sys/w65/sys/syscall.h" #include "interp.h" diff --git a/sim/z8k/ChangeLog b/sim/z8k/ChangeLog index da38d37eabc..b6f5ed8346c 100644 --- a/sim/z8k/ChangeLog +++ b/sim/z8k/ChangeLog @@ -1,3 +1,8 @@ +2002-06-09 Andrew Cagney + + * iface.c: Include "gdb/callback.h" and "gdb/remote-sim.h". + * support.c: Ditto. + 2002-06-06 Andrew Cagney * writecode.c (lookup_inst): Generate inverse table on-the-fly. diff --git a/sim/z8k/iface.c b/sim/z8k/iface.c index 1b3883ef545..c76d63f30a6 100644 --- a/sim/z8k/iface.c +++ b/sim/z8k/iface.c @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "tm.h" #include "signal.h" #include "bfd.h" -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #ifndef NULL #define NULL 0 diff --git a/sim/z8k/support.c b/sim/z8k/support.c index 73923640628..e3cdc736e03 100644 --- a/sim/z8k/support.c +++ b/sim/z8k/support.c @@ -36,8 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include #include -#include "callback.h" -#include "remote-sim.h" +#include "gdb/callback.h" +#include "gdb/remote-sim.h" #include "syscall.h" static int get_now PARAMS ((void));