From 7de19d317a12cb2d699e2adea1564300fe971372 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 25 Nov 1997 09:39:56 +0000 Subject: [PATCH] * callback.h (struct stat): Move forward decl up. (host_callback): Pass stat struct pointer to stat,fstat. (CB_SYS_nnn): Reorganize. (CB_SYSCALL): New members p1,p2. (cb_host_to_target_stat): Delete fourth arg. --- include/ChangeLog | 13 +++++++++++++ include/callback.h | 35 +++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 875c48cfe2..cda5da0f24 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,16 @@ +Tue Nov 25 01:35:52 1997 Doug Evans + + * callback.h (struct stat): Move forward decl up. + (host_callback): Pass stat struct pointer to stat,fstat. + (CB_SYS_nnn): Reorganize. + (CB_SYSCALL): New members p1,p2. + (cb_host_to_target_stat): Delete fourth arg. + +Sat Nov 22 23:34:15 1997 Andrew Cagney + + * remote-sim.h (sim_stop_reason): Clarify sim_signalled SIGRC + argument. + Mon Nov 17 14:00:51 1997 Doug Evans * callback.h (CB_TARGET_DEFS_MAP): Renamed from target_defs_map. diff --git a/include/callback.h b/include/callback.h index ec11cc8f78..6b700fe37b 100644 --- a/include/callback.h +++ b/include/callback.h @@ -68,6 +68,9 @@ typedef struct { #define MAX_CALLBACK_FDS 10 +/* Forward decl for stat/fstat. */ +struct stat; + typedef struct host_callback_struct host_callback; struct host_callback_struct @@ -88,9 +91,8 @@ struct host_callback_struct void (*flush_stdout) PARAMS ((host_callback *)); int (*write_stderr) PARAMS ((host_callback *, const char *, int)); void (*flush_stderr) PARAMS ((host_callback *)); - /* PTR is not `struct stat' because the target's value is stored. */ - int (*stat) PARAMS ((host_callback *, const char *, PTR)); - int (*fstat) PARAMS ((host_callback *, int, PTR)); + 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 @@ -150,8 +152,11 @@ 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. */ + 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 @@ -161,7 +166,7 @@ extern host_callback default_callback; #define CB_SYS_unlink 7 #define CB_SYS_getpid 8 #define CB_SYS_kill 9 -#define CB_SYS_fstat 10 +#define CB_SYS_fstat 10 /*#define CB_SYS_sbrk 11 - not currently a system call, but reserved. */ /* ARGV support. */ @@ -169,11 +174,11 @@ extern host_callback default_callback; #define CB_SYS_argv 13 /* These are extras added for one reason or another. */ -#define CB_SYS_chdir 20 -#define CB_SYS_stat 21 -#define CB_SYS_chmod 22 -#define CB_SYS_utime 23 -#define CB_SYS_time 24 +#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. */ @@ -194,6 +199,8 @@ typedef struct cb_syscall { 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). */ @@ -230,10 +237,10 @@ 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. */ -struct stat; /* forward decl */ -int cb_host_to_target_stat PARAMS ((host_callback *, const struct stat *, - PTR, 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 *)); -- 2.34.1