Changeset b169619 in mainline for boot

Timestamp:

2023-10-27T17:38:32Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

44e8541

Parents:

c89ae25

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 13:19:20)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 17:38:32)

Message:

Deduplicate mem functions

There are a number of functions which are copied between
kernel, libc, and potentially boot too. mem*() functions
are first such offenders. All this duplicate code will
be moved to directory 'common'.

Location:

boot

Files:

• arch/arm32/meson.build (modified) (1 diff)
• arch/arm32/src/main.c (modified) (1 diff)
• arch/arm64/meson.build (modified) (1 diff)
• arch/arm64/src/main.c (modified) (1 diff)
• arch/ia64/meson.build (modified) (1 diff)
• arch/ia64/src/main.c (modified) (1 diff)
• arch/mips32/meson.build (modified) (1 diff)
• arch/mips32/src/main.c (modified) (1 diff)
• arch/ppc32/meson.build (modified) (2 diffs)
• arch/ppc32/src/main.c (modified) (1 diff)
• arch/riscv64/meson.build (modified) (1 diff)
• arch/sparc64/meson.build (modified) (1 diff)
• arch/sparc64/src/main.c (modified) (1 diff)
• genarch/src/ofw_tree.c (modified) (1 diff)
• generic/include/stdlib.h (added)
• generic/src/gzip.c (modified) (1 diff)
• generic/src/inflate.c (modified) (1 diff)
• generic/src/memstr.c (deleted)
• generic/src/payload.c (modified) (1 diff)
• meson.build (modified) (1 diff)

boot/arch/arm32/meson.build

@@ -65 +65 @@
         'src/mm.c',
         'src/putchar.c',
+        '../../../common/stdc/mem.c',
         '../../genarch/src/division.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',

boot/arch/arm32/src/main.c

@@ -40 +40 @@
 #include <halt.h>
 #include <printf.h>
-#include <memstr.h>
+#include <mem.h>
 #include <version.h>
 #include <macros.h>

boot/arch/arm64/meson.build

@@ -48 +48 @@
         'src/main.c',
         'src/relocate.c',
+        '../../../common/stdc/mem.c',
         '../../genarch/src/efi.c',
         '../../generic/src/gzip.c',
         '../../generic/src/inflate.c',
         '../../generic/src/kernel.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/payload.c',
         '../../generic/src/printf.c',

boot/arch/arm64/src/main.c

@@ -46 +46 @@
 #include <kernel.h>
 #include <macros.h>
-#include <memstr.h>
+#include <mem.h>
 #include <payload.h>
 #include <printf.h>

boot/arch/ia64/meson.build

@@ -41 +41 @@
         'src/pal_asm.S',
         'src/putchar.c',
+        '../../../common/stdc/mem.c',
         '../../genarch/src/efi.c',
         '../../genarch/src/division.c',
         '../../generic/src/balloc.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',

boot/arch/ia64/src/main.c

@@ -37 +37 @@
 #include <halt.h>
 #include <printf.h>
-#include <memstr.h>
+#include <mem.h>
 #include <version.h>
 #include <macros.h>

boot/arch/mips32/meson.build

@@ -42 +42 @@
         'src/main.c',
         'src/putchar.c',
+        '../../../common/stdc/mem.c',
         '../../genarch/src/division.c',
         '../../genarch/src/multiplication.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',

boot/arch/mips32/src/main.c

@@ -33 +33 @@
 #include <halt.h>
 #include <printf.h>
-#include <memstr.h>
+#include <mem.h>
 #include <version.h>
 #include <macros.h>

boot/arch/ppc32/meson.build

@@ -37 +37 @@
         'src/ofw.c',
 
+        '../../../common/stdc/mem.c',
         '../../genarch/src/ofw.c',
         '../../genarch/src/ofw_tree.c',
@@ -42 +43 @@
         '../../genarch/src/multiplication.c',
         '../../generic/src/balloc.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',

boot/arch/ppc32/src/main.c

@@ -35 +35 @@
 #include <halt.h>
 #include <printf.h>
-#include <memstr.h>
+#include <mem.h>
 #include <version.h>
 #include <macros.h>

boot/arch/riscv64/meson.build

@@ -37 +37 @@
         'src/ucb.c',
         'src/putchar.c',
-        '../../generic/src/memstr.c',
+
+        '../../../common/stdc/mem.c',
         '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',

boot/arch/sparc64/meson.build

@@ -37 +37 @@
         'src/ofw.c',
 
+        '../../../common/stdc/mem.c',
         '../../genarch/src/ofw.c',
         '../../genarch/src/ofw_tree.c',
         '../../generic/src/balloc.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',

boot/arch/sparc64/src/main.c

@@ -36 +36 @@
 #include <halt.h>
 #include <printf.h>
-#include <memstr.h>
+#include <mem.h>
 #include <version.h>
 #include <macros.h>

boot/genarch/src/ofw_tree.c

@@ -33 +33 @@
 #include <str.h>
 #include <balloc.h>
-#include <memstr.h>
+#include <mem.h>
 
 static char path[OFW_TREE_PATH_MAX_LEN + 1];

boot/generic/src/gzip.c

@@ -32 +32 @@
 #include <stddef.h>
 #include <errno.h>
-#include <memstr.h>
+#include <mem.h>
 #include <byteorder.h>
 #include <gzip.h>

boot/generic/src/inflate.c

@@ -69 +69 @@
 #include <stdint.h>
 #include <errno.h>
-#include <memstr.h>
+#include <mem.h>
 #include <inflate.h>
 

boot/generic/src/payload.c

@@ -36 +36 @@
 #include <gzip.h>
 #include <stdbool.h>
-#include <memstr.h>
+#include <mem.h>
 #include <errno.h>
 #include <str.h>

boot/meson.build

@@ -78 +78 @@
                 '../abi/arch'/BARCH/'include',
                 '../abi/include',
+                '../common/include',
         )