|
From: Dirk M. <mu...@kd...> - 2005-02-27 00:04:32
|
CVS commit by mueller:
C99 style comments -> c89 style comments
M +108 -107 vki_arch.h 1.14
M +4 -4 vki_arch_posixtypes.h 1.4
--- valgrind/include/x86-linux/vki_arch.h #1.13:1.14
@@ -32,10 +32,10 @@
#define __X86_LINUX_VKI_ARCH_H
-// x86 is little-endian.
+/* x86 is little-endian. */
#define VKI_LITTLE_ENDIAN 1
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/types.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/types.h */
+/*----------------------------------------------------------------------*/
typedef unsigned char __vki_u8;
@@ -53,7 +53,7 @@ typedef unsigned short vki_u16;
typedef unsigned int vki_u32;
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/page.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/page.h */
+/*----------------------------------------------------------------------*/
/* PAGE_SHIFT determines the page size */
@@ -61,7 +61,7 @@ typedef unsigned int vki_u32;
#define VKI_PAGE_SIZE (1UL << VKI_PAGE_SHIFT)
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/signal.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/signal.h */
+/*----------------------------------------------------------------------*/
#define VKI_MINSIGSTKSZ 2048
@@ -81,5 +81,5 @@ typedef __vki_restorefn_t __user *__vki_
#define VKI_SIG_IGN ((__vki_sighandler_t)1) /* ignore signal */
-//#ifdef __KERNEL__
+/*#ifdef __KERNEL__*/
/* Most things should be clean enough to redefine this at will, if care
is taken to make libc match. */
@@ -94,5 +94,5 @@ typedef struct {
unsigned long sig[_VKI_NSIG_WORDS];
} vki_sigset_t;
-//#endif
+/*#endif*/
#define VKI_SIGHUP 1
@@ -102,5 +102,5 @@ typedef struct {
#define VKI_SIGTRAP 5
#define VKI_SIGABRT 6
-//#define VKI_SIGIOT 6
+/*#define VKI_SIGIOT 6*/
#define VKI_SIGBUS 7
#define VKI_SIGFPE 8
@@ -132,11 +132,11 @@ typedef struct {
/* These should not be considered constants from userland. */
#define VKI_SIGRTMIN 32
-// [[This was (_NSIG-1) in 2.4.X... not sure if it matters.]]
+/* [[This was (_NSIG-1) in 2.4.X... not sure if it matters.]] */
#define VKI_SIGRTMAX _VKI_NSIG
/* Use high signals because native pthreads wants to use low */
-#define VKI_SIGVGKILL (VG_(max_signal)-0) // [[internal: kill]]
-#define VKI_SIGVGCHLD (VG_(max_signal)-1) // [[internal: thread death]]
-#define VKI_SIGVGRTUSERMAX (VG_(max_signal)-2) // [[internal: last user-usable RT signal]]
+#define VKI_SIGVGKILL (VG_(max_signal)-0) /* [[internal: kill]] */
+#define VKI_SIGVGCHLD (VG_(max_signal)-1) /* [[internal: thread death]] */
+#define VKI_SIGVGRTUSERMAX (VG_(max_signal)-2) /* [[internal: last user-usable RT signal]] */
#define VKI_SA_NOCLDSTOP 0x00000001u
@@ -150,5 +150,5 @@ typedef struct {
#define VKI_SA_NOMASK VKI_SA_NODEFER
#define VKI_SA_ONESHOT VKI_SA_RESETHAND
-//#define VKI_SA_INTERRUPT 0x20000000 /* dummy -- ignored */
+/*#define VKI_SA_INTERRUPT 0x20000000 dummy -- ignored */
#define VKI_SA_RESTORER 0x04000000
@@ -158,8 +158,9 @@ typedef struct {
struct vki_old_sigaction {
- // [[Nb: a 'k' prefix is added to "sa_handler" because
- // bits/sigaction.h (which gets dragged in somehow via signal.h)
- // #defines it as something else. Since that is done for glibc's
- // purposes, which we don't care about here, we use our own name.]]
+ /* [[Nb: a 'k' prefix is added to "sa_handler" because
+ bits/sigaction.h (which gets dragged in somehow via signal.h)
+ #defines it as something else. Since that is done for glibc's
+ purposes, which we don't care about here, we use our own name.]]
+ */
__vki_sighandler_t ksa_handler;
vki_old_sigset_t sa_mask;
@@ -169,5 +170,5 @@ struct vki_old_sigaction {
struct vki_sigaction {
- // [[See comment about extra 'k' above]]
+ /* [[See comment about extra 'k' above]] */
__vki_sighandler_t ksa_handler;
unsigned long sa_flags;
@@ -182,7 +183,7 @@ typedef struct vki_sigaltstack {
} vki_stack_t;
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/sigcontext.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/sigcontext.h */
+/*----------------------------------------------------------------------*/
struct _vki_fpreg {
@@ -248,7 +249,7 @@ struct vki_sigcontext {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/mman.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/mman.h */
+/*----------------------------------------------------------------------*/
#define VKI_PROT_NONE 0x0 /* No page permissions */
@@ -259,12 +260,12 @@ struct vki_sigcontext {
#define VKI_MAP_SHARED 0x01 /* Share changes */
#define VKI_MAP_PRIVATE 0x02 /* Changes are private */
-//#define VKI_MAP_TYPE 0x0f /* Mask for type of mapping */
+/*#define VKI_MAP_TYPE 0x0f */ /* Mask for type of mapping */
#define VKI_MAP_FIXED 0x10 /* Interpret addr exactly */
#define VKI_MAP_ANONYMOUS 0x20 /* don't use a file */
#define VKI_MAP_NORESERVE 0x4000 /* don't check for reservations */
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/fcntl.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/fcntl.h */
+/*----------------------------------------------------------------------*/
#define VKI_O_RDONLY 00
@@ -278,5 +279,5 @@ struct vki_sigcontext {
#define VKI_F_DUPFD 0 /* dup */
-//#define VKI_F_GETFD 1 /* get close_on_exec */
+/*#define VKI_F_GETFD 1*/ /* get close_on_exec */
#define VKI_F_SETFD 2 /* set/clear close_on_exec */
#define VKI_F_GETFL 3 /* get file->f_flags */
@@ -295,7 +296,7 @@ struct vki_sigcontext {
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/resource.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/resource.h */
+/*----------------------------------------------------------------------*/
#define VKI_RLIMIT_DATA 2 /* max data size */
@@ -304,7 +305,7 @@ struct vki_sigcontext {
#define VKI_RLIMIT_NOFILE 7 /* max number of open files */
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/socket.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/socket.h */
+/*----------------------------------------------------------------------*/
#define VKI_SOL_SOCKET 1
@@ -314,7 +315,7 @@ struct vki_sigcontext {
#define VKI_SOCK_STREAM 1 /* stream (connection) socket */
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/sockios.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/sockios.h
+ ----------------------------------------------------------------------*/
#define VKI_SIOCSPGRP 0x8902
@@ -322,7 +323,7 @@ struct vki_sigcontext {
#define VKI_SIOCGSTAMP 0x8906 /* Get stamp */
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/stat.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/stat.h
+ ----------------------------------------------------------------------*/
#define VKI_S_IFMT 00170000
@@ -401,7 +402,7 @@ struct vki_stat64 {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/statfs.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/statfs.h
+ ----------------------------------------------------------------------*/
struct vki_statfs {
@@ -419,7 +420,7 @@ struct vki_statfs {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/termios.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/termios.h
+ ----------------------------------------------------------------------*/
struct vki_winsize {
@@ -441,7 +442,7 @@ struct vki_termio {
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/termbits.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/termbits.h
+ ----------------------------------------------------------------------*/
typedef unsigned char vki_cc_t;
@@ -458,7 +459,7 @@ struct vki_termios {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/ioctl.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/ioctl.h
+ ----------------------------------------------------------------------*/
#define _VKI_IOC_NRBITS 8
@@ -506,7 +507,7 @@ extern unsigned int __vki_invalid_size_a
#define _VKI_IOC_SIZE(nr) (((nr) >> _VKI_IOC_SIZESHIFT) & _VKI_IOC_SIZEMASK)
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/ioctls.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/ioctls.h
+ ----------------------------------------------------------------------*/
#define VKI_TCGETS 0x5401
@@ -539,7 +540,7 @@ extern unsigned int __vki_invalid_size_a
#define VKI_FIOASYNC 0x5452
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/poll.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/poll.h
+ ----------------------------------------------------------------------*/
/* These are specified by iBCS2 */
@@ -552,7 +553,7 @@ struct vki_pollfd {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/user.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/user.h
+ ----------------------------------------------------------------------*/
struct vki_user_i387_struct {
@@ -599,7 +600,7 @@ struct vki_user_regs_struct {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/elf.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/elf.h
+ ----------------------------------------------------------------------*/
typedef unsigned long vki_elf_greg_t;
@@ -613,7 +614,7 @@ typedef struct vki_user_fxsr_struct vki_
#define VKI_AT_SYSINFO 32
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/ucontext.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/ucontext.h
+ ----------------------------------------------------------------------*/
struct vki_ucontext {
@@ -625,7 +626,7 @@ struct vki_ucontext {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/segment.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/segment.h
+ ----------------------------------------------------------------------*/
#define VKI_GDT_ENTRY_TLS_ENTRIES 3
@@ -633,7 +634,7 @@ struct vki_ucontext {
#define VKI_GDT_ENTRY_TLS_MAX (VKI_GDT_ENTRY_TLS_MIN + VKI_GDT_ENTRY_TLS_ENTRIES - 1)
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/ldt.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/ldt.h
+ ----------------------------------------------------------------------*/
/* [[Nb: This is the structure passed to the modify_ldt syscall. Just so as
@@ -651,18 +652,18 @@ struct vki_user_desc {
unsigned int seg_not_present:1;
unsigned int useable:1;
- // [[Nb: this field is not in the kernel sources, but it has always
- // been in the Valgrind sources so I will keep it there in case it's
- // important... this is an x86-defined data structure so who
- // knows; maybe it's important to set this field to zero at some
- // point. --njn]]
+ /* [[Nb: this field is not in the kernel sources, but it has always
+ been in the Valgrind sources so I will keep it there in case it's
+ important... this is an x86-defined data structure so who
+ knows; maybe it's important to set this field to zero at some
+ point. --njn]] */
unsigned int reserved:25;
};
-// [[Nb: for our convenience within Valgrind, use a more specific name]]
+/* [[Nb: for our convenience within Valgrind, use a more specific name]] */
typedef struct vki_user_desc vki_modify_ldt_t;
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/ipcbuf.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/ipcbuf.h
+ ----------------------------------------------------------------------*/
struct vki_ipc64_perm
@@ -681,7 +682,7 @@ struct vki_ipc64_perm
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/sembuf.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/sembuf.h
+ ----------------------------------------------------------------------*/
struct vki_semid64_ds {
@@ -696,7 +697,7 @@ struct vki_semid64_ds {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/msgbuf.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/msgbuf.h
+ ----------------------------------------------------------------------*/
struct vki_msqid64_ds {
@@ -717,7 +718,7 @@ struct vki_msqid64_ds {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/ipc.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/ipc.h
+ ----------------------------------------------------------------------*/
struct vki_ipc_kludge {
@@ -726,7 +727,7 @@ struct vki_ipc_kludge {
};
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/shmbuf.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ From linux-2.6.8.1/include/asm-i386/shmbuf.h
+ ----------------------------------------------------------------------*/
struct vki_shmid64_ds {
@@ -758,7 +759,7 @@ struct vki_shminfo64 {
};
-//----------------------------------------------------------------------
-// DRM ioctls
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ DRM ioctls
+ ----------------------------------------------------------------------*/
struct vki_drm_buf_pub {
Int idx; /**< Index into the master buffer list */
@@ -778,9 +779,9 @@ struct vki_drm_buf_map {
-//----------------------------------------------------------------------
-// And that's it!
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------
+ And that's it!
+ ----------------------------------------------------------------------*/
-#endif // __X86_LINUX_VKI_ARCH_H
+#endif /* __X86_LINUX_VKI_ARCH_H */
/*--------------------------------------------------------------------*/
--- valgrind/include/x86-linux/vki_arch_posixtypes.h #1.3:1.4
@@ -33,7 +33,7 @@
#define __X86_LINUX_VKI_ARCH_POSIXTYPES_H
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/asm-i386/posix_types.h
-//----------------------------------------------------------------------
+/*----------------------------------------------------------------------*/
+/* From linux-2.6.8.1/include/asm-i386/posix_types.h */
+/*----------------------------------------------------------------------*/
typedef unsigned short __vki_kernel_mode_t;
@@ -62,5 +62,5 @@ typedef struct {
} __vki_kernel_fsid_t;
-#endif // __X86_LINUX_VKI_ARCH_POSIXTYPES_H
+#endif /* __X86_LINUX_VKI_ARCH_POSIXTYPES_H */
/*--------------------------------------------------------------------*/
|