Changeset b169619 in mainline for kernel/generic/include

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:

kernel/generic/include

Files:

• cc.h (modified) (1 diff)
• cpu/cpu_mask.h (modified) (1 diff)
• lib/memfnc.h (deleted)
• memw.h (moved) (moved from kernel/generic/include/mem.h ) (2 diffs)

kernel/generic/include/cc.h

@@ -38 +38 @@
 
 #ifndef __clang__
-#define ATTRIBUTE_OPTIMIZE(opt) \
-        __attribute__ ((optimize(opt)))
 #define ATTRIBUTE_USED \
         __attribute__ ((used))
 #else
-#define ATTRIBUTE_OPTIMIZE(opt)
 #define ATTRIBUTE_USED
 #endif

kernel/generic/include/cpu/cpu_mask.h

@@ -37 +37 @@
 #include <cpu.h>
 #include <config.h>
-#include <lib/memfnc.h>
+#include <memw.h>
 
 /** Iterates over all cpu id's whose bit is included in the cpu mask.

kernel/generic/include/memw.h

@@ -38 +38 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <cc.h>
 
-#ifdef CONFIG_LTO
-#define DO_NOT_DISCARD ATTRIBUTE_USED
-#else
-#define DO_NOT_DISCARD
-#endif
-
-#define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-#define memcmp(s1, s2, cnt)    __builtin_memcmp((s1), (s2), (cnt))
+#include <mem.h>
 
 extern void memsetb(void *, size_t, uint8_t)
@@ -54 +45 @@
 extern void memsetw(void *, size_t, uint16_t)
     __attribute__((nonnull(1)));
-extern void *memmove(void *, const void *, size_t)
-    __attribute__((nonnull(1, 2))) DO_NOT_DISCARD;
 
 #endif