diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-12-06 02:42:00 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-06 01:17:39 -0500 |
commit | 95e40d770e95c0d5317c2566a7976bd3421f380a (patch) | |
tree | ee409c8b3279492f88f1b3b5e675e86d254b899d /sim/ppc/emul_unix.c | |
parent | e4c803f5bb08e946f0550260b39f71eff0192262 (diff) | |
download | gdb-95e40d770e95c0d5317c2566a7976bd3421f380a.zip gdb-95e40d770e95c0d5317c2566a7976bd3421f380a.tar.gz gdb-95e40d770e95c0d5317c2566a7976bd3421f380a.tar.bz2 |
sim: ppc: migrate to standard uintXX_t types
Drop the sim-specific unsignedXX types and move to the standard uintXX_t
types that C11 provides.
Diffstat (limited to 'sim/ppc/emul_unix.c')
-rw-r--r-- | sim/ppc/emul_unix.c | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/sim/ppc/emul_unix.c b/sim/ppc/emul_unix.c index 191e26a..57691d4 100644 --- a/sim/ppc/emul_unix.c +++ b/sim/ppc/emul_unix.c @@ -150,13 +150,13 @@ struct _os_emul_data { /* Structures that are common agmonst the UNIX varients */ struct unix_timeval { - signed32 tv_sec; /* seconds */ - signed32 tv_usec; /* microseconds */ + int32_t tv_sec; /* seconds */ + int32_t tv_usec; /* microseconds */ }; struct unix_timezone { - signed32 tz_minuteswest; /* minutes west of Greenwich */ - signed32 tz_dsttime; /* type of dst correction */ + int32_t tz_minuteswest; /* minutes west of Greenwich */ + int32_t tz_dsttime; /* type of dst correction */ }; #define UNIX_RUSAGE_SELF 0 @@ -166,20 +166,20 @@ struct unix_timezone { struct unix_rusage { struct unix_timeval ru_utime; /* user time used */ struct unix_timeval ru_stime; /* system time used */ - signed32 ru_maxrss; /* maximum resident set size */ - signed32 ru_ixrss; /* integral shared memory size */ - signed32 ru_idrss; /* integral unshared data size */ - signed32 ru_isrss; /* integral unshared stack size */ - signed32 ru_minflt; /* any page faults not requiring I/O */ - signed32 ru_majflt; /* any page faults requiring I/O */ - signed32 ru_nswap; /* swaps */ - signed32 ru_inblock; /* block input operations */ - signed32 ru_oublock; /* block output operations */ - signed32 ru_msgsnd; /* messages sent */ - signed32 ru_msgrcv; /* messages received */ - signed32 ru_nsignals; /* signals received */ - signed32 ru_nvcsw; /* voluntary context switches */ - signed32 ru_nivcsw; /* involuntary " */ + int32_t ru_maxrss; /* maximum resident set size */ + int32_t ru_ixrss; /* integral shared memory size */ + int32_t ru_idrss; /* integral unshared data size */ + int32_t ru_isrss; /* integral unshared stack size */ + int32_t ru_minflt; /* any page faults not requiring I/O */ + int32_t ru_majflt; /* any page faults requiring I/O */ + int32_t ru_nswap; /* swaps */ + int32_t ru_inblock; /* block input operations */ + int32_t ru_oublock; /* block output operations */ + int32_t ru_msgsnd; /* messages sent */ + int32_t ru_msgrcv; /* messages received */ + int32_t ru_nsignals; /* signals received */ + int32_t ru_nvcsw; /* voluntary context switches */ + int32_t ru_nivcsw; /* involuntary " */ }; @@ -1051,15 +1051,15 @@ emul_unix_create(device *root, /* Solaris specific implementation */ -typedef signed32 solaris_uid_t; -typedef signed32 solaris_gid_t; -typedef signed32 solaris_off_t; -typedef signed32 solaris_pid_t; -typedef signed32 solaris_time_t; -typedef unsigned32 solaris_dev_t; -typedef unsigned32 solaris_ino_t; -typedef unsigned32 solaris_mode_t; -typedef unsigned32 solaris_nlink_t; +typedef int32_t solaris_uid_t; +typedef int32_t solaris_gid_t; +typedef int32_t solaris_off_t; +typedef int32_t solaris_pid_t; +typedef int32_t solaris_time_t; +typedef uint32_t solaris_dev_t; +typedef uint32_t solaris_ino_t; +typedef uint32_t solaris_mode_t; +typedef uint32_t solaris_nlink_t; #ifdef HAVE_SYS_STAT_H #define SOLARIS_ST_FSTYPSZ 16 /* array size for file system type name */ @@ -1071,23 +1071,23 @@ typedef unsigned32 solaris_nlink_t; struct solaris_stat { solaris_dev_t st_dev; - signed32 st_pad1[3]; /* reserved for network id */ + int32_t st_pad1[3]; /* reserved for network id */ solaris_ino_t st_ino; solaris_mode_t st_mode; solaris_nlink_t st_nlink; solaris_uid_t st_uid; solaris_gid_t st_gid; solaris_dev_t st_rdev; - signed32 st_pad2[2]; + int32_t st_pad2[2]; solaris_off_t st_size; - signed32 st_pad3; /* future off_t expansion */ + int32_t st_pad3; /* future off_t expansion */ struct unix_timeval st_atim; struct unix_timeval st_mtim; struct unix_timeval st_ctim; - signed32 st_blksize; - signed32 st_blocks; + int32_t st_blksize; + int32_t st_blocks; char st_fstype[SOLARIS_ST_FSTYPSZ]; - signed32 st_pad4[8]; /* expansion area */ + int32_t st_pad4[8]; /* expansion area */ }; /* Convert from host stat structure to solaris stat structure */ @@ -1264,12 +1264,12 @@ do_solaris_fstat(os_emul_data *emul, /* Convert to/from host termio structure */ struct solaris_termio { - unsigned16 c_iflag; /* input modes */ - unsigned16 c_oflag; /* output modes */ - unsigned16 c_cflag; /* control modes */ - unsigned16 c_lflag; /* line discipline modes */ - unsigned8 c_line; /* line discipline */ - unsigned8 c_cc[SOLARIS_NCC]; /* control chars */ + uint16_t c_iflag; /* input modes */ + uint16_t c_oflag; /* output modes */ + uint16_t c_cflag; /* control modes */ + uint16_t c_lflag; /* line discipline modes */ + uint8_t c_line; /* line discipline */ + uint8_t c_cc[SOLARIS_NCC]; /* control chars */ }; STATIC_INLINE_EMUL_UNIX void @@ -1339,9 +1339,9 @@ convert_to_solaris_termio(unsigned_word addr, #ifdef HAVE_TERMIOS_STRUCTURE /* Convert to/from host termios structure */ -typedef unsigned32 solaris_tcflag_t; -typedef unsigned8 solaris_cc_t; -typedef unsigned32 solaris_speed_t; +typedef uint32_t solaris_tcflag_t; +typedef uint8_t solaris_cc_t; +typedef uint32_t solaris_speed_t; struct solaris_termios { solaris_tcflag_t c_iflag; @@ -2002,20 +2002,20 @@ const os_emul emul_solaris = { /* Linux specific implementation */ -typedef unsigned32 linux_dev_t; -typedef unsigned32 linux_ino_t; -typedef unsigned32 linux_mode_t; -typedef unsigned16 linux_nlink_t; -typedef signed32 linux_off_t; -typedef signed32 linux_pid_t; -typedef unsigned32 linux_uid_t; -typedef unsigned32 linux_gid_t; -typedef unsigned32 linux_size_t; -typedef signed32 linux_ssize_t; -typedef signed32 linux_ptrdiff_t; -typedef signed32 linux_time_t; -typedef signed32 linux_clock_t; -typedef signed32 linux_daddr_t; +typedef uint32_t linux_dev_t; +typedef uint32_t linux_ino_t; +typedef uint32_t linux_mode_t; +typedef uint16_t linux_nlink_t; +typedef int32_t linux_off_t; +typedef int32_t linux_pid_t; +typedef uint32_t linux_uid_t; +typedef uint32_t linux_gid_t; +typedef uint32_t linux_size_t; +typedef int32_t linux_ssize_t; +typedef int32_t linux_ptrdiff_t; +typedef int32_t linux_time_t; +typedef int32_t linux_clock_t; +typedef int32_t linux_daddr_t; #ifdef HAVE_SYS_STAT_H /* For the PowerPC, don't both with the 'old' stat structure, since there @@ -2030,16 +2030,16 @@ struct linux_stat { linux_gid_t st_gid; linux_dev_t st_rdev; linux_off_t st_size; - unsigned32 st_blksize; - unsigned32 st_blocks; - unsigned32 st_atimx; /* don't use st_{a,c,m}time, that might a macro */ - unsigned32 __unused1; /* defined by the host's stat.h */ - unsigned32 st_mtimx; - unsigned32 __unused2; - unsigned32 st_ctimx; - unsigned32 __unused3; - unsigned32 __unused4; - unsigned32 __unused5; + uint32_t st_blksize; + uint32_t st_blocks; + uint32_t st_atimx; /* don't use st_{a,c,m}time, that might a macro */ + uint32_t __unused1; /* defined by the host's stat.h */ + uint32_t st_mtimx; + uint32_t __unused2; + uint32_t st_ctimx; + uint32_t __unused3; + uint32_t __unused4; + uint32_t __unused5; }; /* Convert from host stat structure to solaris stat structure */ @@ -2237,12 +2237,12 @@ do_linux_fstat(os_emul_data *emul, /* Convert to/from host termio structure */ struct linux_termio { - unsigned16 c_iflag; /* input modes */ - unsigned16 c_oflag; /* output modes */ - unsigned16 c_cflag; /* control modes */ - unsigned16 c_lflag; /* line discipline modes */ - unsigned8 c_line; /* line discipline */ - unsigned8 c_cc[LINUX_NCC]; /* control chars */ + uint16_t c_iflag; /* input modes */ + uint16_t c_oflag; /* output modes */ + uint16_t c_cflag; /* control modes */ + uint16_t c_lflag; /* line discipline modes */ + uint8_t c_line; /* line discipline */ + uint8_t c_cc[LINUX_NCC]; /* control chars */ }; STATIC_INLINE_EMUL_UNIX void @@ -2319,9 +2319,9 @@ convert_to_linux_termio(unsigned_word addr, #ifdef HAVE_TERMIOS_STRUCTURE /* Convert to/from host termios structure */ -typedef unsigned32 linux_tcflag_t; -typedef unsigned8 linux_cc_t; -typedef unsigned32 linux_speed_t; +typedef uint32_t linux_tcflag_t; +typedef uint8_t linux_cc_t; +typedef uint32_t linux_speed_t; struct linux_termios { linux_tcflag_t c_iflag; @@ -2330,8 +2330,8 @@ struct linux_termios { linux_tcflag_t c_lflag; linux_cc_t c_cc[LINUX_NCCS]; linux_cc_t c_line; - signed32 c_ispeed; - signed32 c_ospeed; + int32_t c_ispeed; + int32_t c_ospeed; }; STATIC_INLINE_EMUL_UNIX void |