PERFORCE change 79236 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=79236

Change 79236 by peter at peter_overcee on 2005/06/30 05:10:33

	More pre-commit tidy-up

Affected files ...

.. //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#7 edit
.. //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#7 edit
.. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#9 edit
.. //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#7 edit
.. //depot/projects/hammer/sys/kern/sys_process.c#31 edit

Differences ...

==== //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#7 (text+ko) ====

@@ -64,11 +64,24 @@
 #include <compat/ia32/ia32_reg.h>
 
 extern struct sysentvec ia32_freebsd_sysvec;
-#define	PROC(d, w, t, r) wrap32 ? proc_ ## d ## _ ## w ## 32(t, r ## 32) : proc_ ## d ## _ ## w(t, r)
-#define	UIOMOVE_FROMBUF(k, u) wrap32 ? uiomove_frombuf(& k ## 32, sizeof(k ## 32), u) : uiomove_frombuf(& k, sizeof(k), u)
+/*
+ * PROC(write, dbregs, td2, &r) becomes
+ * proc_write_dbregs(td2, &r)   or
+ * proc_write_dbregs32(td2, &r32)
+ *
+ * UIOMOVE_FROMBUF(r, uio) becomes
+ * uiomove_frombuf(&r, sizeof(r), uio)  or
+ * uiomove_frombuf(&r32, sizeof(r32), uio)
+ */
+#define	PROC(d, w, t, r)	wrap32 ? \
+	proc_ ## d ## _ ## w ## 32(t, r ## 32) : \
+	proc_ ## d ## _ ## w(t, r)
+#define	UIOMOVE_FROMBUF(k, u)	wrap32 ? \
+	uiomove_frombuf(& k ## 32, sizeof(k ## 32), u) : \
+	uiomove_frombuf(& k, sizeof(k), u)
 #else
-#define	PROC(d, w, t, r) proc_ ## d ## _ ## w(t, r)
-#define	UIOMOVE_FROMBUF(k, u) uiomove_frombuf(& k, sizeof(k), u)
+#define	PROC(d, w, t, r)	proc_ ## d ## _ ## w(t, r)
+#define	UIOMOVE_FROMBUF(k, u)	uiomove_frombuf(& k, sizeof(k), u)
 #endif
 
 int

==== //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#7 (text+ko) ====

@@ -58,11 +58,24 @@
 #include <compat/ia32/ia32_reg.h>
 
 extern struct sysentvec ia32_freebsd_sysvec;
-#define	PROC(d, w, t, r) wrap32 ? proc_ ## d ## _ ## w ## 32(t, r ## 32) : proc_ ## d ## _ ## w(t, r)
-#define	UIOMOVE_FROMBUF(k, u) wrap32 ? uiomove_frombuf(& k ## 32, sizeof(k ## 32), u) : uiomove_frombuf(& k, sizeof(k), u)
+/*
+ * PROC(write, fpregs, td2, &r) becomes
+ * proc_write_fpregs(td2, &r)   or
+ * proc_write_fpregs32(td2, &r32)
+ *
+ * UIOMOVE_FROMBUF(r, uio) becomes
+ * uiomove_frombuf(&r, sizeof(r), uio)  or
+ * uiomove_frombuf(&r32, sizeof(r32), uio)
+ */
+#define	PROC(d, w, t, r)	wrap32 ? \
+	proc_ ## d ## _ ## w ## 32(t, r ## 32) : \
+	proc_ ## d ## _ ## w(t, r)
+#define	UIOMOVE_FROMBUF(k, u)	wrap32 ? \
+	uiomove_frombuf(& k ## 32, sizeof(k ## 32), u) : \
+	uiomove_frombuf(& k, sizeof(k), u)
 #else
-#define	PROC(d, w, t, r) proc_ ## d ## _ ## w(t, r)
-#define	UIOMOVE_FROMBUF(k, u) uiomove_frombuf(& k, sizeof(k), u)
+#define	PROC(d, w, t, r)	proc_ ## d ## _ ## w(t, r)
+#define	UIOMOVE_FROMBUF(k, u)	uiomove_frombuf(& k, sizeof(k), u)
 #endif
 
 int

==== //depot/projects/hammer/sys/fs/procfs/procfs_map.c#9 (text+ko) ====

@@ -186,7 +186,7 @@
 			(u_long)entry->start, (u_long)entry->end,
 			resident, privateresident,
 #ifdef COMPAT_IA32
-			wrap32 ? NULL : obj,
+			wrap32 ? NULL : obj,	/* Hide 64 bit value */
 #else
 			obj,
 #endif

==== //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#7 (text+ko) ====

@@ -58,11 +58,24 @@
 #include <compat/ia32/ia32_reg.h>
 
 extern struct sysentvec ia32_freebsd_sysvec;
-#define	PROC(d, w, t, r) wrap32 ? proc_ ## d ## _ ## w ## 32(t, r ## 32) : proc_ ## d ## _ ## w(t, r)
-#define	UIOMOVE_FROMBUF(k, u) wrap32 ? uiomove_frombuf(& k ## 32, sizeof(k ## 32), u) : uiomove_frombuf(& k, sizeof(k), u)
+/*
+ * PROC(write, regs, td2, &r) becomes
+ * proc_write_regs(td2, &r)   or
+ * proc_write_regs32(td2, &r32)
+ *
+ * UIOMOVE_FROMBUF(r, uio) becomes
+ * uiomove_frombuf(&r, sizeof(r), uio)  or
+ * uiomove_frombuf(&r32, sizeof(r32), uio)
+ */
+#define	PROC(d, w, t, r)	wrap32 ? \
+	proc_ ## d ## _ ## w ## 32(t, r ## 32) : \
+	proc_ ## d ## _ ## w(t, r)
+#define	UIOMOVE_FROMBUF(k, u)	wrap32 ? \
+	uiomove_frombuf(& k ## 32, sizeof(k ## 32), u) : \
+	uiomove_frombuf(& k, sizeof(k), u)
 #else
-#define	PROC(d, w, t, r) proc_ ## d ## _ ## w(t, r)
-#define	UIOMOVE_FROMBUF(k, u) uiomove_frombuf(& k, sizeof(k), u)
+#define	PROC(d, w, t, r)	proc_ ## d ## _ ## w(t, r)
+#define	UIOMOVE_FROMBUF(k, u)	uiomove_frombuf(& k, sizeof(k), u)
 #endif
 
 int

==== //depot/projects/hammer/sys/kern/sys_process.c#31 (text+ko) ====

@@ -364,9 +364,11 @@
  * .. except this is done at runtime.
  */
 #define	COPYIN(u, k, s)		wrap32 ? \
-	copyin(u, k ## 32, s ## 32) : copyin(u, k, s)
+	copyin(u, k ## 32, s ## 32) : \
+	copyin(u, k, s)
 #define	COPYOUT(k, u, s)	wrap32 ? \
-	copyout(k ## 32, u, s ## 32) : copyout(k, u, s)
+	copyout(k ## 32, u, s ## 32) : \
+	copyout(k, u, s)
 #else
 #define	COPYIN(u, k, s)		copyin(u, k, s)
 #define	COPYOUT(k, u, s)	copyout(k, u, s)
@@ -457,8 +459,6 @@
 
 #ifdef COMPAT_IA32
 /*
- * This CPP subterfuge is to try and reduce the number of ifdefs in
- * the body of the code.
  *   PROC_READ(regs, td2, addr);
  * becomes either:
  *   proc_read_regs(td2, addr);
@@ -469,7 +469,8 @@
  * from writing to 64 bit address space targets.
  */
 #define	PROC_READ(w, t, a)	wrap32 ? \
-	proc_read_ ## w ## 32(t, a) : proc_read_ ## w (t, a)
+	proc_read_ ## w ## 32(t, a) : \
+	proc_read_ ## w (t, a)
 #define	PROC_WRITE(w, t, a)	wrap32 ? \
 	(safe ? proc_write_ ## w ## 32(t, a) : EINVAL ) : \
 	proc_write_ ## w (t, a)
@@ -876,10 +877,11 @@
 		uio.uio_segflg = UIO_USERSPACE;
 		uio.uio_td = td;
 #ifdef COMPAT_IA32
-		switch (wrap32 ? piod32->piod_op : piod->piod_op) {
+		tmp = wrap32 ? piod32->piod_op : piod->piod_op;
 #else
-		switch (piod->piod_op) {
+		tmp = piod->piod_op;
 #endif
+		switch (tmp) {
 		case PIOD_READ_D:
 		case PIOD_READ_I:
 			uio.uio_rw = UIO_READ;
@@ -893,13 +895,11 @@
 		}
 		error = proc_rwmem(p, &uio);
 #ifdef COMPAT_IA32
-		if (wrap32) {
+		if (wrap32)
 			piod32->piod_len -= uio.uio_resid;
-		} else
+		else
 #endif
-		{
 			piod->piod_len -= uio.uio_resid;
-		}
 		return (error);
 
 	case PT_KILL: