From: Mike Frysinger Date: Wed, 12 May 2021 04:35:54 +0000 (-0400) Subject: sim: create header namespace X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df68e12b3b3eb91e54d6d888b73049562566e0b3;p=binutils-gdb.git sim: create header namespace The gdb/callback.h & gdb/remote-sim.h headers have nothing to do with gdb and are really definitions for the libsim API under the sim/ tree. While gdb uses those headers as a client, it's not specific to it. So create a new sim/ namespace and move the headers there. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c94628c5c9b..17288692331 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * remote-sim.c: Change gdb/callback.h & gdb/remote-sim.h includes to + sim/callback.h & sim/sim.h. + 2021-05-13 Mike Frysinger * lm32-tdep.c: Delete gdb/callback.h, gdb/remote-sim.h, and diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index f2cf8dbd711..5bedc04011d 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -33,8 +33,8 @@ #include "target.h" #include "process-stratum-target.h" #include "gdbcore.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "command.h" #include "regcache.h" #include "sim-regno.h" diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog index 32a0928a786..17d9cb61264 100644 --- a/include/gdb/ChangeLog +++ b/include/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * callback.h: Moved to ../sim/callback.h. + * remote-sim.h: Moved to ../sim/sim.h. + 2021-02-04 Mike Frysinger * sim-riscv.h: New file. diff --git a/include/gdb/callback.h b/include/gdb/callback.h deleted file mode 100644 index a2e02631628..00000000000 --- a/include/gdb/callback.h +++ /dev/null @@ -1,347 +0,0 @@ -/* Remote target system call callback support. - Copyright (C) 1997-2021 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 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* 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 -#include -#endif -/* Needed for enum bfd_endian. */ -#include "bfd.h" - -/* Mapping of host/target values. */ -/* ??? For debugging purposes, one might want to add a string of the - name of the symbol. */ - -typedef struct { - const char *name; - 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) (host_callback *,int); - int (*get_errno) (host_callback *); - int (*isatty) (host_callback *, int); - int (*lseek) (host_callback *, int, long , int); - int (*open) (host_callback *, const char*, int mode); - int (*read) (host_callback *,int, char *, int); - int (*read_stdin) ( host_callback *, char *, int); - int (*rename) (host_callback *, const char *, const char *); - int (*system) (host_callback *, const char *); - long (*time) (host_callback *, long *); - int (*unlink) (host_callback *, const char *); - int (*write) (host_callback *,int, const char *, int); - int (*write_stdout) (host_callback *, const char *, int); - void (*flush_stdout) (host_callback *); - int (*write_stderr) (host_callback *, const char *, int); - void (*flush_stderr) (host_callback *); - int (*to_stat) (host_callback *, const char *, struct stat *); - int (*to_fstat) (host_callback *, int, struct stat *); - int (*to_lstat) (host_callback *, const char *, struct stat *); - int (*ftruncate) (host_callback *, int, long); - int (*truncate) (host_callback *, const char *, long); - int (*pipe) (host_callback *, int *); - - /* Called by the framework when a read call has emptied a pipe buffer. */ - void (*pipe_empty) (host_callback *, int read_fd, int write_fd); - - /* Called by the framework when a write call makes a pipe buffer - non-empty. */ - void (*pipe_nonempty) (host_callback *, int read_fd, int write_fd); - - /* 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) (host_callback *); - - /* Used when the target has gone away, so we can close open - handles and free memory etc etc. */ - int (*shutdown) (host_callback *); - int (*init) (host_callback *); - - /* depreciated, use vprintf_filtered - Talk to the user on a console. */ - void (*printf_filtered) (host_callback *, const char *, ...); - - /* Talk to the user on a console. */ - void (*vprintf_filtered) (host_callback *, const char *, va_list); - - /* Same as vprintf_filtered but to stderr. */ - void (*evprintf_filtered) (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) (host_callback *, const char *, ...) -#ifdef __GNUC__ - __attribute__ ((__noreturn__)) -#endif - ; - - int last_errno; /* host format */ - - int fdmap[MAX_CALLBACK_FDS]; - /* fd_buddy is used to contruct circular lists of target fds that point to - the same host fd. A uniquely mapped fd points to itself; for a closed - one, fd_buddy has the value -1. The host file descriptors for stdin / - stdout / stderr are never closed by the simulators, so they are put - in a special fd_buddy circular list which also has MAX_CALLBACK_FDS - as a member. */ - /* ??? We don't have a callback entry for dup, although it is trival to - implement now. */ - short fd_buddy[MAX_CALLBACK_FDS+1]; - - /* 0 = none, >0 = reader (index of writer), - <0 = writer (negative index of reader). - If abs (ispipe[N]) == N, then N is an end of a pipe whose other - end is closed. */ - short ispipe[MAX_CALLBACK_FDS]; - - /* A writer stores the buffer at its index. Consecutive writes - realloc the buffer and add to the size. The reader indicates the - read part in its .size, until it has consumed it all, at which - point it deallocates the buffer and zeroes out both sizes. */ - struct pipe_write_buffer - { - int size; - char *buffer; - } pipe_buffer[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; - - enum bfd_endian target_endian; - - /* Size of an "int" on the target (for syscalls whose ABI uses "int"). - This must include padding, and only padding-at-higher-address is - supported. For example, a 64-bit target with 32-bit int:s which - are padded to 64 bits when in an array, should supposedly set this - to 8. The default is 4 which matches ILP32 targets and 64-bit - targets with 32-bit ints and no padding. */ - int target_sizeof_int; - - /* 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 - -/* More standard syscalls. */ -#define CB_SYS_lstat 19 -#define CB_SYS_rename 20 -#define CB_SYS_truncate 21 -#define CB_SYS_ftruncate 22 -#define CB_SYS_pipe 23 - -/* New ARGV support. */ -#define CB_SYS_argc 24 -#define CB_SYS_argnlen 25 -#define CB_SYS_argn 26 - -/* 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) (host_callback * /*cb*/, struct cb_syscall * /*sc*/, - unsigned long /*taddr*/, char * /*buf*/, - int /*bytes*/); - int (*write_mem) (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 (host_callback *, const char *); - -/* Translate target to host syscall function numbers. */ -int cb_target_to_host_syscall (host_callback *, int); - -/* Translate host to target errno value. */ -int cb_host_to_target_errno (host_callback *, int); - -/* Translate target to host open flags. */ -int cb_target_to_host_open (host_callback *, int); - -/* Translate target signal number to host. */ -int cb_target_to_host_signal (host_callback *, int); - -/* Translate host signal number to target. */ -int cb_host_to_gdb_signal (host_callback *, int); - -/* Translate symbols into human readable strings. */ -const char *cb_host_str_syscall (host_callback *, int); -const char *cb_host_str_errno (host_callback *, int); -const char *cb_host_str_signal (host_callback *, int); -const char *cb_target_str_syscall (host_callback *, int); -const char *cb_target_str_errno (host_callback *, int); -const char *cb_target_str_signal (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 (host_callback *, const struct stat *, PTR); - -/* Translate a value to target endian. */ -void cb_store_target_endian (host_callback *, char *, int, long); - -/* Tests for special fds. */ -int cb_is_stdin (host_callback *, int); -int cb_is_stdout (host_callback *, int); -int cb_is_stderr (host_callback *, int); - -/* Read a string out of the target. */ -int cb_get_string (host_callback *, CB_SYSCALL *, char *, int, unsigned long); - -/* Perform a system call. */ -CB_RC cb_syscall (host_callback *, CB_SYSCALL *); - -#endif diff --git a/include/gdb/remote-sim.h b/include/gdb/remote-sim.h deleted file mode 100644 index a3ba3aa36cd..00000000000 --- a/include/gdb/remote-sim.h +++ /dev/null @@ -1,299 +0,0 @@ -/* This file defines the interface between the simulator and gdb. - - Copyright (C) 1993-2021 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 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#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; - - -/* Some structs, as opaque types. */ - -struct bfd; -struct host_callback_struct; - - -/* 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 (SIM_OPEN_KIND kind, struct host_callback_struct *callback, - struct bfd *abfd, char * const *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 (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 (SIM_DESC sd, const 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 (SIM_DESC sd, struct bfd *abfd, - char * const *argv, char * const *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 (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 (SIM_DESC sd, SIM_ADDR mem, const 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 (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, any size not equal to - LENGTH indicates the register was not updated correctly. - - Return a LENGTH of -1 to indicate the register was not updated - and an error has occurred. - - Return a LENGTH of 0 to indicate the register was not updated - but no error has occurred. */ - -int sim_store_register (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 (SIM_DESC sd, int verbose); - - -/* Return a memory map in XML format. - - The caller must free the returned string. - - For details on the format, see GDB's Memory Map Format documentation. */ - -char *sim_memory_map (SIM_DESC sd); - - -/* 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 (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 (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 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 (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 (SIM_DESC sd, const char *cmd); - -/* Complete a command based on the available sim commands. Returns an - array of possible matches. */ - -char **sim_complete_command (SIM_DESC sd, const char *text, const char *word); - -#ifdef __cplusplus -} -#endif - -#endif /* !defined (REMOTE_SIM_H) */ diff --git a/include/sim/ChangeLog b/include/sim/ChangeLog new file mode 100644 index 00000000000..f2aba1e15d8 --- /dev/null +++ b/include/sim/ChangeLog @@ -0,0 +1,4 @@ +2021-05-14 Mike Frysinger + + * callback.h: Moved from ../gdb/callback.h. + * sim.h: Moved from ../gdb/remote-sim.h. diff --git a/include/sim/callback.h b/include/sim/callback.h new file mode 100644 index 00000000000..f021f4d6e4d --- /dev/null +++ b/include/sim/callback.h @@ -0,0 +1,347 @@ +/* Remote target system call callback support. + Copyright (C) 1997-2021 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* 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 SIM_CALLBACK_H +#define SIM_CALLBACK_H + +/* ??? The reason why we check for va_start here should be documented. */ + +#ifndef va_start +#include +#include +#endif +/* Needed for enum bfd_endian. */ +#include "bfd.h" + +/* Mapping of host/target values. */ +/* ??? For debugging purposes, one might want to add a string of the + name of the symbol. */ + +typedef struct { + const char *name; + 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) (host_callback *,int); + int (*get_errno) (host_callback *); + int (*isatty) (host_callback *, int); + int (*lseek) (host_callback *, int, long , int); + int (*open) (host_callback *, const char*, int mode); + int (*read) (host_callback *,int, char *, int); + int (*read_stdin) ( host_callback *, char *, int); + int (*rename) (host_callback *, const char *, const char *); + int (*system) (host_callback *, const char *); + long (*time) (host_callback *, long *); + int (*unlink) (host_callback *, const char *); + int (*write) (host_callback *,int, const char *, int); + int (*write_stdout) (host_callback *, const char *, int); + void (*flush_stdout) (host_callback *); + int (*write_stderr) (host_callback *, const char *, int); + void (*flush_stderr) (host_callback *); + int (*to_stat) (host_callback *, const char *, struct stat *); + int (*to_fstat) (host_callback *, int, struct stat *); + int (*to_lstat) (host_callback *, const char *, struct stat *); + int (*ftruncate) (host_callback *, int, long); + int (*truncate) (host_callback *, const char *, long); + int (*pipe) (host_callback *, int *); + + /* Called by the framework when a read call has emptied a pipe buffer. */ + void (*pipe_empty) (host_callback *, int read_fd, int write_fd); + + /* Called by the framework when a write call makes a pipe buffer + non-empty. */ + void (*pipe_nonempty) (host_callback *, int read_fd, int write_fd); + + /* 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) (host_callback *); + + /* Used when the target has gone away, so we can close open + handles and free memory etc etc. */ + int (*shutdown) (host_callback *); + int (*init) (host_callback *); + + /* depreciated, use vprintf_filtered - Talk to the user on a console. */ + void (*printf_filtered) (host_callback *, const char *, ...); + + /* Talk to the user on a console. */ + void (*vprintf_filtered) (host_callback *, const char *, va_list); + + /* Same as vprintf_filtered but to stderr. */ + void (*evprintf_filtered) (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) (host_callback *, const char *, ...) +#ifdef __GNUC__ + __attribute__ ((__noreturn__)) +#endif + ; + + int last_errno; /* host format */ + + int fdmap[MAX_CALLBACK_FDS]; + /* fd_buddy is used to contruct circular lists of target fds that point to + the same host fd. A uniquely mapped fd points to itself; for a closed + one, fd_buddy has the value -1. The host file descriptors for stdin / + stdout / stderr are never closed by the simulators, so they are put + in a special fd_buddy circular list which also has MAX_CALLBACK_FDS + as a member. */ + /* ??? We don't have a callback entry for dup, although it is trival to + implement now. */ + short fd_buddy[MAX_CALLBACK_FDS+1]; + + /* 0 = none, >0 = reader (index of writer), + <0 = writer (negative index of reader). + If abs (ispipe[N]) == N, then N is an end of a pipe whose other + end is closed. */ + short ispipe[MAX_CALLBACK_FDS]; + + /* A writer stores the buffer at its index. Consecutive writes + realloc the buffer and add to the size. The reader indicates the + read part in its .size, until it has consumed it all, at which + point it deallocates the buffer and zeroes out both sizes. */ + struct pipe_write_buffer + { + int size; + char *buffer; + } pipe_buffer[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; + + enum bfd_endian target_endian; + + /* Size of an "int" on the target (for syscalls whose ABI uses "int"). + This must include padding, and only padding-at-higher-address is + supported. For example, a 64-bit target with 32-bit int:s which + are padded to 64 bits when in an array, should supposedly set this + to 8. The default is 4 which matches ILP32 targets and 64-bit + targets with 32-bit ints and no padding. */ + int target_sizeof_int; + + /* 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 + +/* More standard syscalls. */ +#define CB_SYS_lstat 19 +#define CB_SYS_rename 20 +#define CB_SYS_truncate 21 +#define CB_SYS_ftruncate 22 +#define CB_SYS_pipe 23 + +/* New ARGV support. */ +#define CB_SYS_argc 24 +#define CB_SYS_argnlen 25 +#define CB_SYS_argn 26 + +/* 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) (host_callback * /*cb*/, struct cb_syscall * /*sc*/, + unsigned long /*taddr*/, char * /*buf*/, + int /*bytes*/); + int (*write_mem) (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 (host_callback *, const char *); + +/* Translate target to host syscall function numbers. */ +int cb_target_to_host_syscall (host_callback *, int); + +/* Translate host to target errno value. */ +int cb_host_to_target_errno (host_callback *, int); + +/* Translate target to host open flags. */ +int cb_target_to_host_open (host_callback *, int); + +/* Translate target signal number to host. */ +int cb_target_to_host_signal (host_callback *, int); + +/* Translate host signal number to target. */ +int cb_host_to_gdb_signal (host_callback *, int); + +/* Translate symbols into human readable strings. */ +const char *cb_host_str_syscall (host_callback *, int); +const char *cb_host_str_errno (host_callback *, int); +const char *cb_host_str_signal (host_callback *, int); +const char *cb_target_str_syscall (host_callback *, int); +const char *cb_target_str_errno (host_callback *, int); +const char *cb_target_str_signal (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 (host_callback *, const struct stat *, PTR); + +/* Translate a value to target endian. */ +void cb_store_target_endian (host_callback *, char *, int, long); + +/* Tests for special fds. */ +int cb_is_stdin (host_callback *, int); +int cb_is_stdout (host_callback *, int); +int cb_is_stderr (host_callback *, int); + +/* Read a string out of the target. */ +int cb_get_string (host_callback *, CB_SYSCALL *, char *, int, unsigned long); + +/* Perform a system call. */ +CB_RC cb_syscall (host_callback *, CB_SYSCALL *); + +#endif diff --git a/include/sim/sim.h b/include/sim/sim.h new file mode 100644 index 00000000000..72d0a619aaf --- /dev/null +++ b/include/sim/sim.h @@ -0,0 +1,299 @@ +/* This file defines the interface between the simulator and gdb. + + Copyright (C) 1993-2021 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef SIM_SIM_H +#define SIM_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; + + +/* Some structs, as opaque types. */ + +struct bfd; +struct host_callback_struct; + + +/* 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 (SIM_OPEN_KIND kind, struct host_callback_struct *callback, + struct bfd *abfd, char * const *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 (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 (SIM_DESC sd, const 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 (SIM_DESC sd, struct bfd *abfd, + char * const *argv, char * const *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 (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 (SIM_DESC sd, SIM_ADDR mem, const 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 (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, any size not equal to + LENGTH indicates the register was not updated correctly. + + Return a LENGTH of -1 to indicate the register was not updated + and an error has occurred. + + Return a LENGTH of 0 to indicate the register was not updated + but no error has occurred. */ + +int sim_store_register (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 (SIM_DESC sd, int verbose); + + +/* Return a memory map in XML format. + + The caller must free the returned string. + + For details on the format, see GDB's Memory Map Format documentation. */ + +char *sim_memory_map (SIM_DESC sd); + + +/* 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 (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 (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 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 (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 (SIM_DESC sd, const char *cmd); + +/* Complete a command based on the available sim commands. Returns an + array of possible matches. */ + +char **sim_complete_command (SIM_DESC sd, const char *text, const char *word); + +#ifdef __cplusplus +} +#endif + +#endif /* !defined (SIM_SIM_H) */ diff --git a/sim/ChangeLog b/sim/ChangeLog index 236b156c696..61bb0f4e030 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * README-HACKING: Update callback.h path. + 2021-05-12 Mike Frysinger * README-HACKING: Delete mention of SIM_AC_OPTION_ENVIRONMENT. diff --git a/sim/README-HACKING b/sim/README-HACKING index 69d08ff1ecf..d4867c9e79e 100644 --- a/sim/README-HACKING +++ b/sim/README-HACKING @@ -294,7 +294,7 @@ Userspace System Calls By default, the libgloss userspace is simulated. That means the system call numbers and calling convention matches that of libgloss. Simulating other userspaces (such as Linux) is pretty straightforward, but let's first focus -on the basics. The basic API is covered in include/gdb/callback.h. +on the basics. The basic API is covered in include/sim/callback.h. When an instruction is simulated that invokes the system call method (such as forcing a hardware trap or exception), your simulator code should set up the diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index fba3984299d..085aea6dfb6 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * cpustate.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/aarch64/cpustate.h b/sim/aarch64/cpustate.h index 00b62e1a6f5..c3f26376f49 100644 --- a/sim/aarch64/cpustate.h +++ b/sim/aarch64/cpustate.h @@ -27,7 +27,7 @@ #include #include -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* Symbolic names used to identify general registers which also match the registers indices in machine code. diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c index fae2b7a06bb..cc3cf6add34 100644 --- a/sim/aarch64/interp.c +++ b/sim/aarch64/interp.c @@ -29,8 +29,8 @@ #include "ansidecl.h" #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-aarch64.h" diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 27f651a9d5d..7124a6d0a32 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * armos.c: Update include path. + * wrapper.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/arm/armos.c b/sim/arm/armos.c index 2ce7051a44c..77b256fd5b3 100644 --- a/sim/arm/armos.c +++ b/sim/arm/armos.c @@ -54,7 +54,7 @@ /* For RDIError_BreakpointReached. */ #include "dbg_rdi.h" -#include "gdb/callback.h" +#include "sim/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 54a04f42428..d25184afa09 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -27,8 +27,8 @@ #include #include #include -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" #include "armemu.h" diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 646f318b894..128d14bfb5b 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/avr/interp.c b/sim/avr/interp.c index c806f4c46eb..df1f6e55401 100644 --- a/sim/avr/interp.c +++ b/sim/avr/interp.c @@ -23,7 +23,7 @@ #include "bfd.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-base.h" diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index b5f70d2bb68..3dff4ed2976 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index a4333daa44d..aa5c245c829 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -29,7 +29,7 @@ #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "gdb/signals.h" #include "sim-main.h" #include "sim-syscall.h" diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 4fb31af3b18..fb0f8a851c6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,15 @@ +2021-05-14 Mike Frysinger + + * Make-common.in (callback_h, remote_sim_h): Update path. + * callback.c: Update include path. + * gentmap.c (gen_targ_map_c): Likewise. + * sim-basics.h: Likewise. + * sim-close.c: Likewise. + * sim-core.c: Likewise. + * sim-load.c: Likewise. + * sim-module.h: Likewise. + * syscall.c: Likewise. + 2021-05-08 Mike Frysinger * Make-common.in (modules.c): Touch $@ at the end. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 56b36b23572..d38c849c40d 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -258,8 +258,8 @@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ RUNTESTFLAGS = -callback_h = $(srcroot)/include/gdb/callback.h -remote_sim_h = $(srcroot)/include/gdb/remote-sim.h +callback_h = $(srcroot)/include/sim/callback.h +remote_sim_h = $(srcroot)/include/sim/sim.h all: libsim.a run$(EXEEXT) .gdbinit diff --git a/sim/common/callback.c b/sim/common/callback.c index 55280abb04b..9e6d456e537 100644 --- a/sim/common/callback.c +++ b/sim/common/callback.c @@ -35,7 +35,7 @@ #include #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "targ-vals.h" /* For xmalloc. */ #include "libiberty.h" diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c index a606fad0e4f..8085c3576ac 100644 --- a/sim/common/gentmap.c +++ b/sim/common/gentmap.c @@ -71,7 +71,7 @@ gen_targ_map_c (void) printf ("#include \n"); printf ("#include \n"); printf ("#include \"ansidecl.h\"\n"); - printf ("#include \"gdb/callback.h\"\n"); + printf ("#include \"sim/callback.h\"\n"); printf ("#include \"targ-vals.h\"\n"); printf ("\n"); diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h index e822fb2eb81..7d9c831da51 100644 --- a/sim/common/sim-basics.h +++ b/sim/common/sim-basics.h @@ -119,8 +119,8 @@ typedef enum { /* Basic definitions - ordered so that nothing calls what comes after it. */ #include "ansidecl.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-config.h" diff --git a/sim/common/sim-close.c b/sim/common/sim-close.c index 6878dfcbf31..e64d59e6361 100644 --- a/sim/common/sim-close.c +++ b/sim/common/sim-close.c @@ -20,7 +20,7 @@ #include "sim-main.h" #include "sim-module.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* Generic implementation of sim_close that works with simulators that use sim-module for all custom runtime options. */ diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c index 9b1e1683210..222f9fd8fe9 100644 --- a/sim/common/sim-core.c +++ b/sim/common/sim-core.c @@ -454,7 +454,7 @@ sim_core_translate (sim_core_mapping *mapping, #if EXTERN_SIM_CORE_P -/* See include/gdb/remote-sim.h. */ +/* See include/sim/sim.h. */ char * sim_memory_map (SIM_DESC sd) { diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c index 04681c524a0..b9d85ca2fd6 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -31,8 +31,8 @@ along with this program. If not, see . */ #include "bfd.h" #include "sim-utils.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" static void eprintf (host_callback *, const char *, ...); static void xprintf (host_callback *, const char *, ...); diff --git a/sim/common/sim-module.h b/sim/common/sim-module.h index dad55719431..9c0918fb060 100644 --- a/sim/common/sim-module.h +++ b/sim/common/sim-module.h @@ -30,7 +30,7 @@ along with this program. If not, see . */ TODO: Add facilities for saving/restoring state to/from a file. */ -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* Various function types. */ diff --git a/sim/common/syscall.c b/sim/common/syscall.c index f2883c493ac..258b3d694f4 100644 --- a/sim/common/syscall.c +++ b/sim/common/syscall.c @@ -40,7 +40,7 @@ #include #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "targ-vals.h" #ifndef ENOSYS diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 886ce9b469e..ae43ba170e5 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * cr16_sim.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in index 8cfe3ea3b26..6d6555a3261 100644 --- a/sim/cr16/Makefile.in +++ b/sim/cr16/Makefile.in @@ -27,7 +27,7 @@ SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_DEPS = simops.h -INCLUDE = cr16_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h \ +INCLUDE = cr16_sim.h $(srcroot)/include/sim/callback.h targ-vals.h \ $(srcroot)/include/gdb/sim-cr16.h # This selects the cr16 newlib/libgloss syscall definitions. diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16_sim.h index 8232f0743f7..c3d590d537b 100644 --- a/sim/cr16/cr16_sim.h +++ b/sim/cr16/cr16_sim.h @@ -23,7 +23,7 @@ #include #include #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/cr16.h" #include "bfd.h" @@ -41,7 +41,7 @@ extern int cr16_debug; -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-config.h" #include "sim-types.h" diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c index 8f7fafa715e..7db7f56e21b 100644 --- a/sim/cr16/interp.c +++ b/sim/cr16/interp.c @@ -23,8 +23,8 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index cc70f28bc35..0a5c7a76202 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * d10v_sim.h: Update include path. + * interp.c: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in index 13b902dec5d..67c7efdf32b 100644 --- a/sim/d10v/Makefile.in +++ b/sim/d10v/Makefile.in @@ -28,7 +28,7 @@ SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_DEPS = simops.h -INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \ +INCLUDE = d10v_sim.h $(srcroot)/include/sim/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 64f974f01db..972402cc4d0 100644 --- a/sim/d10v/d10v_sim.h +++ b/sim/d10v/d10v_sim.h @@ -3,7 +3,7 @@ #include #include #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/d10v.h" #include "bfd.h" @@ -21,7 +21,7 @@ extern int d10v_debug; -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-config.h" #include "sim-types.h" diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 62507760af9..a0dc2f59685 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -2,8 +2,8 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 67a763bf58b..950384a11cd 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * interf.c: Update include path. + * sis.h: Likewise. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index c8e025b23e0..c199dabea37 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -28,7 +28,7 @@ #include #include "sim-config.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "gdb/signals.h" #define PSR_CWP 0x7 diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h index 428a6bdcf15..10c500f820a 100644 --- a/sim/erc32/sis.h +++ b/sim/erc32/sis.h @@ -15,8 +15,8 @@ #include "config.h" #include "ansidecl.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include #include diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog index f790f9232a7..d491f2add17 100644 --- a/sim/example-synacor/ChangeLog +++ b/sim/example-synacor/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/example-synacor/interp.c b/sim/example-synacor/interp.c index d2080b6f7f2..e613e167828 100644 --- a/sim/example-synacor/interp.c +++ b/sim/example-synacor/interp.c @@ -22,8 +22,8 @@ specific simulator. Normally this file will be kept small and the target details will live in other files. - For more specific details on these functions, see the gdb/remote-sim.h - header file. */ + For more specific details on these functions, see the sim/sim.h header + file. */ #include "config.h" diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index 9389818f33c..185d16f3db0 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c index ba2297f4078..6120df179b5 100644 --- a/sim/ft32/interp.c +++ b/sim/ft32/interp.c @@ -25,9 +25,9 @@ #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index f8842f57af1..099d70d1b13 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,3 +1,8 @@ +2021-05-14 Mike Frysinger + + * gdb-if.c: Update include path. + * syscalls.c: Likewise. + 2021-05-07 Mike Frysinger * mem.c: Include errno.h. diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c index c2aff064ff0..36986487673 100644 --- a/sim/m32c/gdb-if.c +++ b/sim/m32c/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "ansidecl.h" #include "libiberty.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-m32c.h" diff --git a/sim/m32c/syscalls.c b/sim/m32c/syscalls.c index 86695cb4dde..e9400840be9 100644 --- a/sim/m32c/syscalls.c +++ b/sim/m32c/syscalls.c @@ -25,7 +25,7 @@ along with this program. If not, see . */ #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "cpu.h" #include "mem.h" diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index e88f12e444d..6f2bef52e98 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * sim-main.h: Update include path. + 2021-05-07 Mike Frysinger * dv-m68hc11tim.c (cycle_to_string): Increase buf to 128 bytes. diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h index f42750f0a58..9b461ff0042 100644 --- a/sim/m68hc11/sim-main.h +++ b/sim/m68hc11/sim-main.h @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "opcode/m68hc11.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "opcode/m68hc11.h" #include "sim-types.h" diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index 7a003930984..d165f3c5182 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure.ac: Delete SIM_AC_OPTION_WARNINGS call. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index f726c1e7db7..5e8ad3b8a2f 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -24,9 +24,9 @@ along with this program. If not, see . */ #include #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-base.h" diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index c78e896f4c7..efedaa53ebb 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * interp.c (sim_engine_run): Call TRACE_INSN. diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index bff73279d26..1b89bb49408 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -22,9 +22,9 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-options.h" diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index c8cf4e2501e..963e85ae092 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * dv-tx3904sio.c: Include stdlib.h. diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 64259cc3fed..49b79f91dbc 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -48,8 +48,8 @@ code on the hardware. #include "libiberty.h" #include "bfd.h" #include "elf-bfd.h" -#include "gdb/callback.h" /* GDB simulator callback interface */ -#include "gdb/remote-sim.h" /* GDB simulator interface */ +#include "sim/callback.h" /* GDB simulator callback interface */ +#include "sim/sim.h" /* GDB simulator interface */ #include "sim-syscall.h" /* Simulator system call support */ char* pr_addr (SIM_ADDR addr); diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index a9ba8d74891..fce17ed96e1 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * mn10300_sim.h: Update include path. + 2021-05-04 Mike Frysinger * op_utils.c: Delete sys/times.h include. diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h index f70d486612b..c63efaa6c76 100644 --- a/sim/mn10300/mn10300_sim.h +++ b/sim/mn10300/mn10300_sim.h @@ -1,10 +1,10 @@ #include #include #include "ansidecl.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "opcode/mn10300.h" #include -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "bfd.h" #include "sim-fpu.h" diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index 26864471b8a..20d2ecfc60f 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * interp.c: Delete sys/times.h include. diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c index 4228dd5a466..135716386f7 100644 --- a/sim/moxie/interp.c +++ b/sim/moxie/interp.c @@ -26,7 +26,7 @@ along with this program. If not, see . */ #include #include "bfd.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-base.h" diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 5f7f3067612..e1ed6d624af 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,11 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * gdb-sim.c: Update include path. + * main.c: Likewise. + * psim.h: Likewise. + * sim_calls.c: Likewise. + 2021-04-22 Tom Tromey * mon.c: Update includes. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 7686937f421..63b957d1b4f 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -168,8 +168,8 @@ all: run $(TARGETLIB) $(GDB_OBJ) # Headers outside sim/ppc. ANSIDECL_H = $(srcroot)/include/ansidecl.h BFD_H = ../../bfd/bfd.h -GDB_CALLBACK_H = $(srcroot)/include/gdb/callback.h -GDB_REMOTE_SIM_H = $(srcroot)/include/gdb/remote-sim.h +GDB_CALLBACK_H = $(srcroot)/include/sim/callback.h +GDB_REMOTE_SIM_H = $(srcroot)/include/sim/sim.h GDB_SIM_PPC_H = $(srcroot)/include/gdb/sim-ppc.h COMMON_SIM_BASE_H = $(srcroot)/sim/common/sim-base.h COMMON_SIM_BASICS_H = $(srcroot)/sim/common/sim-basics.h diff --git a/sim/ppc/gdb-sim.c b/sim/ppc/gdb-sim.c index 8b4e5e31072..7217d9c9c52 100644 --- a/sim/ppc/gdb-sim.c +++ b/sim/ppc/gdb-sim.c @@ -24,8 +24,8 @@ #include "ansidecl.h" #include "sim_callbacks.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/sim-ppc.h" /* Return the register name for the supplied SPR if any, or NULL if diff --git a/sim/ppc/main.c b/sim/ppc/main.c index 1e73444ff83..f3f2e9ef338 100644 --- a/sim/ppc/main.c +++ b/sim/ppc/main.c @@ -30,8 +30,8 @@ #include "events.h" /* FIXME: psim should provide the interface */ #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include #ifdef HAVE_UNISTD_H diff --git a/sim/ppc/psim.h b/sim/ppc/psim.h index 07852c2109b..c38b03d8994 100644 --- a/sim/ppc/psim.h +++ b/sim/ppc/psim.h @@ -23,7 +23,7 @@ #include "basics.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" /* the system object */ /* typedef struct _psim psim; */ diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c index c8364f09004..ce4464aa8ea 100644 --- a/sim/ppc/sim_calls.c +++ b/sim/ppc/sim_calls.c @@ -32,8 +32,8 @@ #include "libiberty.h" #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" /* Define the rate at which the simulator should poll the host diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index ac947a3ddcc..5849e1d5911 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/pru/interp.c b/sim/pru/interp.c index 8d247f3795f..6398c6714f2 100644 --- a/sim/pru/interp.c +++ b/sim/pru/interp.c @@ -23,9 +23,9 @@ #include #include #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" #include "libiberty.h" -#include "gdb/remote-sim.h" +#include "sim/sim.h" #include "sim-main.h" #include "sim-assert.h" #include "sim-options.h" diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index f26d4d7a3ef..8ffa97ccfa4 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * Makefile.in: Update path. + * gdb-if.c: Update include path. + * load.h: Likewise. + 2021-05-05 Mike Frysinger * gdb-if.c: Include libiberty.h. diff --git a/sim/rl78/Makefile.in b/sim/rl78/Makefile.in index 675f87be9b9..a7e5a97b5d2 100644 --- a/sim/rl78/Makefile.in +++ b/sim/rl78/Makefile.in @@ -40,8 +40,8 @@ arch = rl78 err.o : err.h fpu.o : cpu.h fpu.h gdb-if.o : cpu.h mem.h load.h \ - $(srcdir)/../../include/gdb/callback.h \ - $(srcdir)/../../include/gdb/remote-sim.h \ + $(srcdir)/../../include/sim/callback.h \ + $(srcdir)/../../include/sim/sim.h \ $(srcdir)/../../include/gdb/signals.h \ $(srcdir)/../../include/gdb/sim-rl78.h load.o : ../../bfd/bfd.h cpu.h mem.h diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c index f4b6754f587..87e343cdd48 100644 --- a/sim/rl78/gdb-if.c +++ b/sim/rl78/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "ansidecl.h" #include "libiberty.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-rl78.h" diff --git a/sim/rl78/load.h b/sim/rl78/load.h index 7461c2162ba..1eaf0457787 100644 --- a/sim/rl78/load.h +++ b/sim/rl78/load.h @@ -23,7 +23,7 @@ #define SIM_RL78_LOAD_H_ #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" void rl78_load (bfd *, host_callback *callbacks, const char * const simname); diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index b941cafcd57..cbb3b471d4d 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,3 +1,9 @@ +2021-05-14 Mike Frysinger + + * gdb-if.c: Update include path. + * load.h: Likewise. + * syscalls.c: Likewise. + 2021-05-05 Mike Frysinger * gdb-if.c: Include libiberty.h. diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index ec419109588..4a0f0701a56 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -28,8 +28,8 @@ along with this program. If not, see . */ #include "ansidecl.h" #include "libiberty.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/signals.h" #include "gdb/sim-rx.h" diff --git a/sim/rx/load.h b/sim/rx/load.h index bb227769cac..562fa235aeb 100644 --- a/sim/rx/load.h +++ b/sim/rx/load.h @@ -20,7 +20,7 @@ along with this program. If not, see . */ #include "bfd.h" -#include "gdb/callback.h" +#include "sim/callback.h" extern int default_machine; diff --git a/sim/rx/syscalls.c b/sim/rx/syscalls.c index 0c75c7dcdf8..73ca0f2b190 100644 --- a/sim/rx/syscalls.c +++ b/sim/rx/syscalls.c @@ -26,7 +26,7 @@ along with this program. If not, see . */ #include #include -#include "gdb/callback.h" +#include "sim/callback.h" #include "cpu.h" #include "mem.h" diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index d3c94d98197..be77f8c351e 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * interp.c: Update include path. + 2021-05-04 Mike Frysinger * configure: Regenerate. diff --git a/sim/sh/interp.c b/sim/sh/interp.c index fa361bacc22..5fb6aff02f0 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -50,8 +50,8 @@ #endif #include "bfd.h" -#include "gdb/callback.h" -#include "gdb/remote-sim.h" +#include "sim/callback.h" +#include "sim/sim.h" #include "gdb/sim-sh.h" #include "sim-main.h"