Changeset 34120f10 in mainline

Timestamp:

2023-10-27T19:38:31Z (6 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.

Files:

• boot/arch/arm32/meson.build (modified) (view diffs)
• boot/arch/arm32/src/main.c (modified) (view diffs)
• boot/arch/arm64/meson.build (modified) (view diffs)
• boot/arch/arm64/src/main.c (modified) (view diffs)
• boot/arch/ia64/meson.build (modified) (view diffs)
• boot/arch/ia64/src/main.c (modified) (view diffs)
• boot/arch/mips32/meson.build (modified) (view diffs)
• boot/arch/mips32/src/main.c (modified) (view diffs)
• boot/arch/ppc32/meson.build (modified) (view diffs)
• boot/arch/ppc32/src/main.c (modified) (view diffs)
• boot/arch/riscv64/meson.build (modified) (view diffs)
• boot/arch/sparc64/meson.build (modified) (view diffs)
• boot/arch/sparc64/src/main.c (modified) (view diffs)
• boot/genarch/src/ofw_tree.c (modified) (view diffs)
• boot/generic/include/assert.h (moved) (moved from kernel/generic/include/stdlib.h ) (view diffs)
• boot/generic/include/errno.h (modified) (view diffs)
• boot/generic/include/str.h (deleted)
• boot/generic/src/gzip.c (modified) (view diffs)
• boot/generic/src/inflate.c (modified) (view diffs)
• boot/generic/src/memstr.c (deleted)
• boot/generic/src/payload.c (modified) (view diffs)
• boot/generic/src/str.c (deleted)
• boot/meson.build (modified) (view diffs)
• common/adt/bitmap.c (moved) (moved from kernel/generic/src/adt/bitmap.c ) (view diffs)
• common/adt/checksum.c (moved) (moved from uspace/lib/c/generic/adt/checksum.c ) (view diffs)
• common/adt/circ_buf.c (moved) (moved from uspace/lib/c/generic/adt/circ_buf.c ) (view diffs)
• common/adt/hash_table.c (moved) (moved from uspace/lib/c/generic/adt/hash_table.c ) (view diffs)
• common/adt/list.c (moved) (moved from uspace/lib/c/generic/adt/list.c ) (view diffs)
• common/adt/odict.c (moved) (moved from kernel/generic/src/adt/odict.c ) (view diffs)
• common/adt/prodcons.c (moved) (moved from uspace/lib/c/generic/adt/prodcons.c ) (view diffs)
• common/gsort.c (moved) (moved from uspace/lib/c/generic/gsort.c ) (view diffs)
• common/include/adt/bitmap.h (moved) (moved from kernel/generic/include/adt/bitmap.h ) (view diffs)
• common/include/adt/checksum.h (moved) (moved from uspace/lib/c/include/adt/checksum.h ) (view diffs)
• common/include/adt/circ_buf.h (moved) (moved from uspace/lib/c/include/adt/circ_buf.h ) (view diffs)
• common/include/adt/fifo.h (moved) (moved from uspace/lib/c/include/adt/fifo.h ) (view diffs)
• common/include/adt/gcdlcm.h (moved) (moved from uspace/lib/c/include/adt/gcdlcm.h ) (view diffs)
• common/include/adt/hash.h (moved) (moved from uspace/lib/c/include/adt/hash.h ) (view diffs)
• common/include/adt/hash_table.h (moved) (moved from uspace/lib/c/include/adt/hash_table.h ) (view diffs)
• common/include/adt/list.h (moved) (moved from uspace/lib/c/include/adt/list.h ) (view diffs)
• common/include/adt/odict.h (moved) (moved from kernel/generic/include/adt/odict.h ) (view diffs)
• common/include/adt/prodcons.h (moved) (moved from uspace/lib/c/include/adt/prodcons.h ) (view diffs)
• common/include/bsearch.h (moved) (moved from uspace/lib/c/include/bsearch.h ) (view diffs)
• common/include/ctype.h (moved) (moved from uspace/lib/c/include/ctype.h ) (view diffs)
• common/include/gsort.h (moved) (moved from uspace/lib/c/include/gsort.h ) (view diffs)
• common/include/mem.h (moved) (moved from uspace/lib/c/include/mem.h ) (view diffs)
• common/include/printf_core.h (moved) (moved from uspace/lib/c/include/io/printf_core.h ) (view diffs)
• common/include/qsort.h (moved) (moved from uspace/lib/c/include/qsort.h ) (view diffs)
• common/include/stdlib.h (moved) (moved from uspace/lib/c/include/stdlib.h ) (view diffs)
• common/include/str.h (moved) (moved from uspace/lib/c/include/str.h ) (view diffs)
• common/include/str_error.h (moved) (moved from uspace/lib/c/include/str_error.h ) (view diffs)
• common/printf/printf_core.c (moved) (moved from uspace/lib/c/generic/io/printf_core.c ) (view diffs)
• common/stdc/bsearch.c (moved) (moved from uspace/lib/c/generic/bsearch.c ) (view diffs)
• common/stdc/calloc.c (added)
• common/stdc/cc.h (moved) (moved from boot/generic/include/memstr.h ) (view diffs)
• common/stdc/ctype.c (moved) (moved from uspace/lib/c/generic/ctype.c ) (view diffs)
• common/stdc/mem.c (moved) (moved from uspace/lib/c/generic/mem.c ) (view diffs)
• common/stdc/qsort.c (moved) (moved from uspace/lib/c/generic/qsort.c ) (view diffs)
• common/str.c (moved) (moved from uspace/lib/c/generic/str.c ) (view diffs)
• common/str_error.c (moved) (moved from kernel/generic/src/lib/str_error.c ) (view diffs)
• common/strtol.c (moved) (moved from uspace/lib/c/generic/strtol.c ) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/amd64/src/pm.c (modified) (view diffs)
• kernel/arch/arm32/src/ras.c (modified) (view diffs)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia32/src/pm.c (modified) (view diffs)
• kernel/arch/ia32/src/smp/smp.c (modified) (view diffs)
• kernel/arch/ia64/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/ia64/src/mm/vhpt.c (modified) (view diffs)
• kernel/arch/mips32/src/mips32.c (modified) (view diffs)
• kernel/arch/riscv64/src/riscv64.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• kernel/genarch/src/acpi/acpi.c (modified) (view diffs)
• kernel/genarch/src/drivers/ega/ega.c (modified) (view diffs)
• kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/genarch/src/mm/as_pt.c (modified) (view diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
• kernel/genarch/src/ofw/ofw_tree.c (modified) (view diffs)
• kernel/generic/common (added)
• kernel/generic/include/adt/fifo.h (deleted)
• kernel/generic/include/adt/hash.h (deleted)
• kernel/generic/include/adt/hash_table.h (deleted)
• kernel/generic/include/adt/list.h (deleted)
• kernel/generic/include/cc.h (modified) (view diffs)
• kernel/generic/include/cpu/cpu_mask.h (modified) (view diffs)
• kernel/generic/include/lib/memfnc.h (deleted)
• kernel/generic/include/mem.h (deleted)
• kernel/generic/include/memw.h (moved) (moved from kernel/generic/include/gsort.h ) (view diffs)
• kernel/generic/include/str.h (deleted)
• kernel/generic/meson.build (modified) (view diffs)
• kernel/generic/src/adt/hash_table.c (deleted)
• kernel/generic/src/adt/list.c (deleted)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/cpu/cpu.c (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/ddi/irq.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/gsort.c (deleted)
• kernel/generic/src/lib/mem.c (modified) (view diffs)
• kernel/generic/src/lib/memfnc.c (deleted)
• kernel/generic/src/lib/str.c (deleted)
• kernel/generic/src/lib/strtol.c (deleted)
• kernel/generic/src/lib/ubsan.c (modified) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/backend_anon.c (modified) (view diffs)
• kernel/generic/src/mm/backend_elf.c (modified) (view diffs)
• kernel/generic/src/mm/backend_user.c (modified) (view diffs)
• kernel/generic/src/mm/malloc.c (modified) (view diffs)
• kernel/generic/src/mm/slab.c (modified) (view diffs)
• kernel/generic/src/printf/printf_core.c (deleted)
• kernel/generic/src/printf/vsnprintf.c (modified) (view diffs)
• kernel/generic/src/proc/program.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/synch/waitq.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• kernel/meson.build (modified) (view diffs)
• kernel/test/mm/falloc2.c (modified) (view diffs)
• kernel/test/mm/slab1.c (modified) (view diffs)
• kernel/test/mm/slab2.c (modified) (view diffs)
• uspace/app/tester/mm/common.c (modified) (view diffs)
• uspace/lib/c/common (added)
• uspace/lib/c/generic/adt/odict.c (deleted)
• uspace/lib/c/generic/io/asprintf.c (modified) (view diffs)
• uspace/lib/c/generic/io/kio.c (modified) (view diffs)
• uspace/lib/c/generic/io/printf.c (modified) (view diffs)
• uspace/lib/c/generic/io/vprintf.c (modified) (view diffs)
• uspace/lib/c/generic/io/vsnprintf.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/str_error.c (deleted)
• uspace/lib/c/include/adt/odict.h (deleted)
• uspace/lib/c/include/malloc.h (modified) (view diffs)
• uspace/lib/c/meson.build (modified) (view diffs)
• uspace/lib/posix/include/common (added)
• uspace/lib/posix/include/posix/ctype.h (modified) (view diffs)
• uspace/lib/posix/include/posix/stdlib.h (modified) (view diffs)
• uspace/lib/posix/include/posix/string.h (modified) (view diffs)
• uspace/lib/posix/src/stdio.c (modified) (view diffs)
• uspace/lib/posix/src/time.c (modified) (view diffs)
• uspace/lib/posix/src/unistd.c (modified) (view diffs)