mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-05 11:11:04 +00:00
a04549c194
This patch makes further coding style fixes where code was breaking lines after an operator, contrary to the GNU Coding Standards. As with the previous patch, it is limited to files following a reasonable approximation to GNU style already, and is not exhaustive; more such issues remain to be fixed. Tested for x86_64, and with build-many-glibcs.py. * dirent/dirent.h [!_DIRENT_HAVE_D_NAMLEN && _DIRENT_HAVE_D_RECLEN] (_D_ALLOC_NAMLEN): Break lines before rather than after operators. * elf/cache.c (print_cache): Likewise. * gshadow/fgetsgent_r.c (__fgetsgent_r): Likewise. * htl/pt-getattr.c (__pthread_getattr_np): Likewise. * hurd/hurdinit.c (_hurd_setproc): Likewise. * hurd/hurdkill.c (_hurd_sig_post): Likewise. * hurd/hurdlookup.c (__file_name_lookup_under): Likewise. * hurd/hurdsig.c (_hurd_internal_post_signal): Likewise. (reauth_proc): Likewise. * hurd/lookup-at.c (__file_name_lookup_at): Likewise. (__file_name_split_at): Likewise. (__directory_name_split_at): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/port2fd.c (_hurd_port2fd): Likewise. * iconv/gconv_dl.c (do_print): Likewise. * inet/netinet/in.h (struct sockaddr_in): Likewise. * libio/wstrops.c (_IO_wstr_seekoff): Likewise. * locale/setlocale.c (new_composite_name): Likewise. * malloc/memusagestat.c (main): Likewise. * misc/fstab.c (fstab_convert): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Likewise. * nss/nss_compat/compat-grp.c (getgrent_next_nss): Likewise. (getgrent_next_file): Likewise. (internal_getgrnam_r): Likewise. (internal_getgrgid_r): Likewise. * nss/nss_compat/compat-initgroups.c (getgrent_next_nss): Likewise. (internal_getgrent_r): Likewise. * nss/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Likewise. (getpwent_next_nss): Likewise. (getpwent_next_file): Likewise. (internal_getpwnam_r): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (getspent_next_nss_netgr): Likewise. (getspent_next_nss): Likewise. (internal_getspnam_r): Likewise. * pwd/fgetpwent_r.c (__fgetpwent_r): Likewise. * shadow/fgetspent_r.c (__fgetspent_r): Likewise. * string/strchr.c (STRCHR): Likewise. * string/strchrnul.c (STRCHRNUL): Likewise. * sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_IEEE): Likewise. * sysdeps/aarch64/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/csky/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/generic/memcopy.h (PAGE_COPY_FWD_MAYBE): Likewise. * sysdeps/generic/symbol-hacks.h (__stack_chk_fail_local): Likewise. * sysdeps/gnu/netinet/ip_icmp.h (ICMP_INFOTYPE): Likewise. * sysdeps/gnu/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/gnu/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/hppa/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Likewise. * sysdeps/mach/hurd/bits/stat.h (S_ISPARE): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise. (open_file): Likewise. * sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c (pthread_mutexattr_setprotocol): Likewise. * sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise. * sysdeps/mach/hurd/mmap.c (__mmap): Likewise. * sysdeps/mach/hurd/ptrace.c (ptrace): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/microblaze/dl-machine.h (elf_machine_type_class): Likewise. (elf_machine_rela): Likewise. * sysdeps/mips/mips32/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/mips/mips64/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/mips/sys/asm.h (multiple #if conditionals): Likewise. * sysdeps/posix/rename.c (rename): Likewise. * sysdeps/powerpc/novmx-sigjmp.c (__novmx__sigjmp_save): Likewise. * sysdeps/powerpc/sigjmp.c (__vmx__sigjmp_save): Likewise. * sysdeps/s390/fpu/fenv_libc.h (FPC_VALID_MASK): Likewise. * sysdeps/s390/utf8-utf16-z9.c (gconv_end): Likewise. * sysdeps/unix/grantpt.c (grantpt): Likewise. * sysdeps/unix/sysv/linux/a.out.h (N_TXTOFF): Likewise. * sysdeps/unix/sysv/linux/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/unix/sysv/linux/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/x86/cpu-features.c (get_common_indices): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
139 lines
4.2 KiB
C
139 lines
4.2 KiB
C
#ifndef __A_OUT_GNU_H__
|
|
#define __A_OUT_GNU_H__
|
|
|
|
#include <bits/a.out.h>
|
|
|
|
#define __GNU_EXEC_MACROS__
|
|
|
|
struct exec
|
|
{
|
|
unsigned long a_info; /* Use macros N_MAGIC, etc for access. */
|
|
unsigned int a_text; /* Length of text, in bytes. */
|
|
unsigned int a_data; /* Length of data, in bytes. */
|
|
unsigned int a_bss; /* Length of uninitialized data area for file, in bytes. */
|
|
unsigned int a_syms; /* Length of symbol table data in file, in bytes. */
|
|
unsigned int a_entry; /* Start address. */
|
|
unsigned int a_trsize;/* Length of relocation info for text, in bytes. */
|
|
unsigned int a_drsize;/* Length of relocation info for data, in bytes. */
|
|
};
|
|
|
|
enum machine_type
|
|
{
|
|
M_OLDSUN2 = 0,
|
|
M_68010 = 1,
|
|
M_68020 = 2,
|
|
M_SPARC = 3,
|
|
M_386 = 100,
|
|
M_MIPS1 = 151,
|
|
M_MIPS2 = 152
|
|
};
|
|
|
|
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
|
|
#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
|
|
#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
|
|
#define N_SET_INFO(exec, magic, type, flags) \
|
|
((exec).a_info = ((magic) & 0xffff) \
|
|
| (((int)(type) & 0xff) << 16) \
|
|
| (((flags) & 0xff) << 24))
|
|
#define N_SET_MAGIC(exec, magic) \
|
|
((exec).a_info = ((exec).a_info & 0xffff0000) | ((magic) & 0xffff))
|
|
#define N_SET_MACHTYPE(exec, machtype) \
|
|
((exec).a_info = \
|
|
((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
|
|
#define N_SET_FLAGS(exec, flags) \
|
|
((exec).a_info = \
|
|
((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
|
|
|
|
/* Code indicating object file or impure executable. */
|
|
#define OMAGIC 0407
|
|
/* Code indicating pure executable. */
|
|
#define NMAGIC 0410
|
|
/* Code indicating demand-paged executable. */
|
|
#define ZMAGIC 0413
|
|
/* This indicates a demand-paged executable with the header in the text.
|
|
The first page is unmapped to help trap NULL pointer references. */
|
|
#define QMAGIC 0314
|
|
/* Code indicating core file. */
|
|
#define CMAGIC 0421
|
|
|
|
#define N_TRSIZE(a) ((a).a_trsize)
|
|
#define N_DRSIZE(a) ((a).a_drsize)
|
|
#define N_SYMSIZE(a) ((a).a_syms)
|
|
#define N_BADMAG(x) \
|
|
(N_MAGIC(x) != OMAGIC && N_MAGIC(x) != NMAGIC \
|
|
&& N_MAGIC(x) != ZMAGIC && N_MAGIC(x) != QMAGIC)
|
|
#define _N_HDROFF(x) (1024 - sizeof (struct exec))
|
|
#define N_TXTOFF(x) \
|
|
(N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) \
|
|
: (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
|
|
#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
|
|
#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data)
|
|
#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x))
|
|
#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x))
|
|
#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x))
|
|
|
|
/* Address of text segment in memory after it is loaded. */
|
|
#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? 4096 : 0)
|
|
|
|
/* Address of data segment in memory after it is loaded. */
|
|
#define SEGMENT_SIZE 1024
|
|
|
|
#define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1))
|
|
#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
|
|
|
|
#define N_DATADDR(x) \
|
|
(N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \
|
|
: (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
|
|
#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data)
|
|
|
|
#if !defined (N_NLIST_DECLARED)
|
|
struct nlist
|
|
{
|
|
union
|
|
{
|
|
char *n_name;
|
|
struct nlist *n_next;
|
|
long n_strx;
|
|
} n_un;
|
|
unsigned char n_type;
|
|
char n_other;
|
|
short n_desc;
|
|
unsigned long n_value;
|
|
};
|
|
#endif /* no N_NLIST_DECLARED. */
|
|
|
|
#define N_UNDF 0
|
|
#define N_ABS 2
|
|
#define N_TEXT 4
|
|
#define N_DATA 6
|
|
#define N_BSS 8
|
|
#define N_FN 15
|
|
#define N_EXT 1
|
|
#define N_TYPE 036
|
|
#define N_STAB 0340
|
|
#define N_INDR 0xa
|
|
#define N_SETA 0x14 /* Absolute set element symbol. */
|
|
#define N_SETT 0x16 /* Text set element symbol. */
|
|
#define N_SETD 0x18 /* Data set element symbol. */
|
|
#define N_SETB 0x1A /* Bss set element symbol. */
|
|
#define N_SETV 0x1C /* Pointer to set vector in data area. */
|
|
|
|
#if !defined (N_RELOCATION_INFO_DECLARED)
|
|
/* This structure describes a single relocation to be performed.
|
|
The text-relocation section of the file is a vector of these structures,
|
|
all of which apply to the text section.
|
|
Likewise, the data-relocation section applies to the data section. */
|
|
|
|
struct relocation_info
|
|
{
|
|
int r_address;
|
|
unsigned int r_symbolnum:24;
|
|
unsigned int r_pcrel:1;
|
|
unsigned int r_length:2;
|
|
unsigned int r_extern:1;
|
|
unsigned int r_pad:4;
|
|
};
|
|
#endif /* no N_RELOCATION_INFO_DECLARED. */
|
|
|
|
#endif /* __A_OUT_GNU_H__ */
|