Changeset 34120f10 in mainline for kernel/generic/src

Timestamp:

2023-10-27T19:38:31Z (21 months ago)

Author:

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

Branches:

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

Children:

63ed840

Parents:

c89ae25 (diff), 694ca3d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge code deduplication work

TL;DR: Added directory /common, which now contains the sole existing
copy of ADT, printf_core, and a few other pieces. Should make changes
to any of those less of a headache.

Location:

kernel/generic/src

Files:

• adt/hash_table.c (deleted)
• adt/list.c (deleted)
• console/kconsole.c (modified) (1 diff)
• cpu/cpu.c (modified) (1 diff)
• ddi/ddi.c (modified) (1 diff)
• ddi/irq.c (modified) (1 diff)
• ipc/ipc.c (modified) (1 diff)
• ipc/sysipc.c (modified) (1 diff)
• lib/gsort.c (deleted)
• lib/mem.c (modified) (2 diffs)
• lib/memfnc.c (deleted)
• lib/str.c (deleted)
• lib/strtol.c (deleted)
• lib/ubsan.c (modified) (1 diff)
• main/kinit.c (modified) (2 diffs)
• mm/as.c (modified) (1 diff)
• mm/backend_anon.c (modified) (1 diff)
• mm/backend_elf.c (modified) (1 diff)
• mm/backend_user.c (modified) (1 diff)
• mm/malloc.c (modified) (1 diff)
• mm/slab.c (modified) (1 diff)
• printf/printf_core.c (deleted)
• printf/vsnprintf.c (modified) (1 diff)
• proc/program.c (modified) (1 diff)
• proc/thread.c (modified) (1 diff)
• synch/waitq.c (modified) (1 diff)
• udebug/udebug_ops.c (modified) (1 diff)

kernel/generic/src/console/kconsole.c

@@ -599 +599 @@
                 /* It's a number - convert it */
                 uint64_t value;
-                char *end;
+                const char *end;
                 errno_t rc = str_uint64_t(text, &end, 0, false, &value);
                 if (end != text + len)

kernel/generic/src/cpu/cpu.c

@@ -45 +45 @@
 #include <config.h>
 #include <panic.h>
-#include <mem.h>
+#include <memw.h>
 #include <adt/list.h>
 #include <stdio.h>

kernel/generic/src/ddi/ddi.c

@@ -54 +54 @@
 #include <align.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <trace.h>
 #include <bitops.h>

kernel/generic/src/ddi/irq.c

@@ -47 +47 @@
 #include <console/console.h>
 #include <interrupt.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch.h>
 

kernel/generic/src/ipc/ipc.c

@@ -54 +54 @@
 #include <arch.h>
 #include <proc/task.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdio.h>
 #include <console/console.h>

kernel/generic/src/ipc/sysipc.c

@@ -36 +36 @@
 #include <assert.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <ipc/ipc.h>
 #include <abi/ipc/methods.h>

kernel/generic/src/lib/mem.c

@@ -41 +41 @@
  */
 
-#include <mem.h>
+#include <memw.h>
 #include <typedefs.h>
 
@@ -77 +77 @@
 }
 
-/** Move memory block with possible overlapping.
- *
- * Copy cnt bytes from src address to dst address. The source
- * and destination memory areas may overlap.
- *
- * @param dst Destination address to copy to.
- * @param src Source address to copy from.
- * @param cnt Number of bytes to copy.
- *
- * @return Destination address.
- *
- */
-void *memmove(void *dst, const void *src, size_t cnt)
-{
-        /* Nothing to do? */
-        if (src == dst)
-                return dst;
-
-        /* Non-overlapping? */
-        if ((dst >= src + cnt) || (src >= dst + cnt))
-                return memcpy(dst, src, cnt);
-
-        uint8_t *dp;
-        const uint8_t *sp;
-
-        /* Which direction? */
-        if (src > dst) {
-                /* Forwards. */
-                dp = dst;
-                sp = src;
-
-                while (cnt-- != 0)
-                        *dp++ = *sp++;
-        } else {
-                /* Backwards. */
-                dp = dst + (cnt - 1);
-                sp = src + (cnt - 1);
-
-                while (cnt-- != 0)
-                        *dp-- = *sp--;
-        }
-
-        return dst;
-}
-
 /** @}
  */

kernel/generic/src/lib/ubsan.c

@@ -10 +10 @@
 #include <stddef.h>
 #include <panic.h>
-#include <mem.h>
+#include <memw.h>
 
 #define PRINTF(...) printf(__VA_ARGS__)

kernel/generic/src/main/kinit.c

@@ -61 +61 @@
 #include <stdio.h>
 #include <log.h>
-#include <mem.h>
+#include <memw.h>
 #include <console/console.h>
 #include <interrupt.h>
@@ -69 +69 @@
 #include <ipc/ipc.h>
 #include <str.h>
+#include <str_error.h>
 #include <sysinfo/stats.h>
 #include <sysinfo/sysinfo.h>

kernel/generic/src/mm/as.c

@@ -69 +69 @@
 #include <assert.h>
 #include <stdio.h>
-#include <mem.h>
+#include <memw.h>
 #include <macros.h>
 #include <bitops.h>

kernel/generic/src/mm/backend_anon.c

@@ -51 +51 @@
 #include <typedefs.h>
 #include <align.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch.h>
 

kernel/generic/src/mm/backend_elf.c

@@ -48 +48 @@
 #include <genarch/mm/page_ht.h>
 #include <align.h>
-#include <mem.h>
+#include <memw.h>
 #include <macros.h>
 #include <arch.h>

kernel/generic/src/mm/backend_user.c

@@ -50 +50 @@
 #include <log.h>
 #include <str.h>
+#include <str_error.h>
 
 static bool user_create(as_area_t *);

kernel/generic/src/mm/malloc.c

@@ -34 +34 @@
 #include <bitops.h>
 #include <mm/slab.h>
-#include <mem.h>
+#include <memw.h>
 #include <main/main.h> // malloc_init()
 #include <macros.h>

kernel/generic/src/mm/slab.c

@@ -106 +106 @@
 #include <mm/slab.h>
 #include <adt/list.h>
-#include <mem.h>
+#include <memw.h>
 #include <align.h>
 #include <mm/frame.h>

kernel/generic/src/printf/vsnprintf.c

@@ -36 +36 @@
 #include <printf/printf_core.h>
 #include <str.h>
-#include <mem.h>
+#include <memw.h>
 #include <errno.h>
 

kernel/generic/src/proc/program.c

@@ -49 +49 @@
 #include <lib/elf_load.h>
 #include <str.h>
+#include <str_error.h>
 #include <log.h>
 #include <syscall/copy.h>

kernel/generic/src/proc/thread.c

@@ -62 +62 @@
 #include <arch/faddr.h>
 #include <atomic.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdio.h>
 #include <stdlib.h>

kernel/generic/src/synch/waitq.c

@@ -59 +59 @@
 #include <adt/list.h>
 #include <arch/cycle.h>
-#include <mem.h>
+#include <memw.h>
 
 /** Initialize wait queue

kernel/generic/src/udebug/udebug_ops.c

@@ -51 +51 @@
 #include <udebug/udebug.h>
 #include <udebug/udebug_ops.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdlib.h>