git: 2e6ed47a4609 - main - stand: Move MOD_xxx macros from modinfo.h to .c

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=2e6ed47a4609ff03a9308a173c64900485172c22

commit 2e6ed47a4609ff03a9308a173c64900485172c22
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-09-16 15:08:52 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-09-16 15:18:56 +0000

    stand: Move MOD_xxx macros from modinfo.h to .c
    
    Now that MOD_xxx macros are modinfo.c, they don't need to be in
    modinfo.h.
    
    Sponsored by:           Netflix
    Differential Revision:  https://reviews.freebsd.org/D36573
---
 stand/common/modinfo.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++-
 stand/common/modinfo.h | 63 -----------------------------------------------
 2 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/stand/common/modinfo.c b/stand/common/modinfo.c
index a274890ace64..15116b3b9b78 100644
--- a/stand/common/modinfo.c
+++ b/stand/common/modinfo.c
@@ -42,7 +42,69 @@
 #include "bootstrap.h"
 #include "modinfo.h"
 
-static int align;
+/*
+ * Copy module-related data into the load area, where it can be
+ * used as a directory for loaded modules.
+ *
+ * Module data is presented in a self-describing format.  Each datum
+ * is preceded by a 32-bit identifier and a 32-bit size field.
+ *
+ * Currently, the following data are saved:
+ *
+ * MOD_NAME	(variable)		module name (string)
+ * MOD_TYPE	(variable)		module type (string)
+ * MOD_ARGS	(variable)		module parameters (string)
+ * MOD_ADDR	sizeof(vm_offset_t)	module load address
+ * MOD_SIZE	sizeof(size_t)		module size
+ * MOD_METADATA	(variable)		type-specific metadata
+ *
+ * Clients are required to define a MOD_ALIGN(l) macro which rounds the passed
+ * in length to the required alignment for the kernel being booted.
+ */
+
+#define COPY32(v, a, c) {			\
+    uint32_t	x = (v);			\
+    if (c)					\
+        archsw.arch_copyin(&x, a, sizeof(x));	\
+    a += sizeof(x);				\
+}
+
+#define MOD_STR(t, a, s, c) {			\
+    COPY32(t, a, c);				\
+    COPY32(strlen(s) + 1, a, c)			\
+    if (c)					\
+        archsw.arch_copyin(s, a, strlen(s) + 1);\
+    a += MOD_ALIGN(strlen(s) + 1);		\
+}
+
+#define MOD_NAME(a, s, c)	MOD_STR(MODINFO_NAME, a, s, c)
+#define MOD_TYPE(a, s, c)	MOD_STR(MODINFO_TYPE, a, s, c)
+#define MOD_ARGS(a, s, c)	MOD_STR(MODINFO_ARGS, a, s, c)
+
+#define MOD_VAR(t, a, s, c) {			\
+    COPY32(t, a, c);				\
+    COPY32(sizeof(s), a, c);			\
+    if (c)					\
+        archsw.arch_copyin(&s, a, sizeof(s));	\
+    a += MOD_ALIGN(sizeof(s));			\
+}
+
+#define MOD_ADDR(a, s, c)	MOD_VAR(MODINFO_ADDR, a, s, c)
+#define MOD_SIZE(a, s, c)	MOD_VAR(MODINFO_SIZE, a, s, c)
+
+#define MOD_METADATA(a, mm, c) {		\
+    COPY32(MODINFO_METADATA | mm->md_type, a, c);\
+    COPY32(mm->md_size, a, c);			\
+    if (c)					\
+        archsw.arch_copyin(mm->md_data, a, mm->md_size);\
+    a += MOD_ALIGN(mm->md_size);		\
+}
+
+#define MOD_END(a, c) {				\
+    COPY32(MODINFO_END, a, c);			\
+    COPY32(0, a, c);				\
+}
+
 #define MOD_ALIGN(l)	roundup(l, align)
 
 vm_offset_t
@@ -53,7 +115,9 @@ md_copymodules(vm_offset_t addr, bool kern64)
 	uint64_t		scratch64;
 	uint32_t		scratch32;
 	int			c;
+	int			align;
 
+	align = kern64 ? sizeof(uint64_t) : sizeof(uint32_t);
 	c = addr != 0;
 	/* start with the first module on the list, should be the kernel */
 	for (fp = file_findfile(NULL, NULL); fp != NULL; fp = fp->f_next) {
diff --git a/stand/common/modinfo.h b/stand/common/modinfo.h
index 3d7f26a3c963..fc56173e1c51 100644
--- a/stand/common/modinfo.h
+++ b/stand/common/modinfo.h
@@ -6,69 +6,6 @@
 #ifndef COMMON_MODINFO_H
 #define COMMON_MODINFO_H
 
-/*
- * Copy module-related data into the load area, where it can be
- * used as a directory for loaded modules.
- *
- * Module data is presented in a self-describing format.  Each datum
- * is preceded by a 32-bit identifier and a 32-bit size field.
- *
- * Currently, the following data are saved:
- *
- * MOD_NAME	(variable)		module name (string)
- * MOD_TYPE	(variable)		module type (string)
- * MOD_ARGS	(variable)		module parameters (string)
- * MOD_ADDR	sizeof(vm_offset_t)	module load address
- * MOD_SIZE	sizeof(size_t)		module size
- * MOD_METADATA	(variable)		type-specific metadata
- *
- * Clients are required to define a MOD_ALIGN(l) macro which rounds the passed
- * in length to the required alignment for the kernel being booted.
- */
-
-#define COPY32(v, a, c) {			\
-    uint32_t	x = (v);			\
-    if (c)					\
-        archsw.arch_copyin(&x, a, sizeof(x));	\
-    a += sizeof(x);				\
-}
-
-#define MOD_STR(t, a, s, c) {			\
-    COPY32(t, a, c);				\
-    COPY32(strlen(s) + 1, a, c)			\
-    if (c)					\
-        archsw.arch_copyin(s, a, strlen(s) + 1);\
-    a += MOD_ALIGN(strlen(s) + 1);		\
-}
-
-#define MOD_NAME(a, s, c)	MOD_STR(MODINFO_NAME, a, s, c)
-#define MOD_TYPE(a, s, c)	MOD_STR(MODINFO_TYPE, a, s, c)
-#define MOD_ARGS(a, s, c)	MOD_STR(MODINFO_ARGS, a, s, c)
-
-#define MOD_VAR(t, a, s, c) {			\
-    COPY32(t, a, c);				\
-    COPY32(sizeof(s), a, c);			\
-    if (c)					\
-        archsw.arch_copyin(&s, a, sizeof(s));	\
-    a += MOD_ALIGN(sizeof(s));			\
-}
-
-#define MOD_ADDR(a, s, c)	MOD_VAR(MODINFO_ADDR, a, s, c)
-#define MOD_SIZE(a, s, c)	MOD_VAR(MODINFO_SIZE, a, s, c)
-
-#define MOD_METADATA(a, mm, c) {		\
-    COPY32(MODINFO_METADATA | mm->md_type, a, c);\
-    COPY32(mm->md_size, a, c);			\
-    if (c)					\
-        archsw.arch_copyin(mm->md_data, a, mm->md_size);\
-    a += MOD_ALIGN(mm->md_size);		\
-}
-
-#define MOD_END(a, c) {				\
-    COPY32(MODINFO_END, a, c);			\
-    COPY32(0, a, c);				\
-}
-
 vm_offset_t md_copymodules(vm_offset_t addr, bool kern64);
 
 #endif /* COMMON_MODINFO_H */