Changeset 34120f10 in mainline for boot


Ignore:
Timestamp:
2023-10-27T19:38:31Z (2 years 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:
boot
Files:
3 deleted
19 edited
1 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/meson.build

    rc89ae25 r34120f10  
    6565        'src/mm.c',
    6666        'src/putchar.c',
     67        '../../../common/stdc/mem.c',
    6768        '../../genarch/src/division.c',
    68         '../../generic/src/memstr.c',
    6969        '../../generic/src/printf_core.c',
    7070        '../../generic/src/vprintf.c',
    7171        '../../generic/src/printf.c',
    72         '../../generic/src/str.c',
     72        '../../../common/str.c',
    7373        '../../generic/src/version.c',
    7474        '../../generic/src/inflate.c',

  • boot/arch/arm32/src/main.c

    rc89ae25 r34120f10  
    4040#include <halt.h>
    4141#include <printf.h>
    42 #include <memstr.h>
     42#include <mem.h>
    4343#include <version.h>
    4444#include <macros.h>

  • boot/arch/arm64/meson.build

    rc89ae25 r34120f10  
    4848        'src/main.c',
    4949        'src/relocate.c',
     50        '../../../common/stdc/mem.c',
    5051        '../../genarch/src/efi.c',
    5152        '../../generic/src/gzip.c',
    5253        '../../generic/src/inflate.c',
    5354        '../../generic/src/kernel.c',
    54         '../../generic/src/memstr.c',
    5555        '../../generic/src/payload.c',
    5656        '../../generic/src/printf.c',
    5757        '../../generic/src/printf_core.c',
    58         '../../generic/src/str.c',
     58        '../../../common/str.c',
    5959        '../../generic/src/tar.c',
    6060        '../../generic/src/version.c',

  • boot/arch/arm64/src/main.c

    rc89ae25 r34120f10  
    4646#include <kernel.h>
    4747#include <macros.h>
    48 #include <memstr.h>
     48#include <mem.h>
    4949#include <payload.h>
    5050#include <printf.h>

  • boot/arch/ia64/meson.build

    rc89ae25 r34120f10  
    4141        'src/pal_asm.S',
    4242        'src/putchar.c',
     43        '../../../common/stdc/mem.c',
    4344        '../../genarch/src/efi.c',
    4445        '../../genarch/src/division.c',
    4546        '../../generic/src/balloc.c',
    46         '../../generic/src/memstr.c',
    4747        '../../generic/src/printf_core.c',
    4848        '../../generic/src/vprintf.c',
    4949        '../../generic/src/printf.c',
    50         '../../generic/src/str.c',
     50        '../../../common/str.c',
    5151        '../../generic/src/version.c',
    5252        '../../generic/src/inflate.c',

  • boot/arch/ia64/src/main.c

    rc89ae25 r34120f10  
    3737#include <halt.h>
    3838#include <printf.h>
    39 #include <memstr.h>
     39#include <mem.h>
    4040#include <version.h>
    4141#include <macros.h>

  • boot/arch/mips32/meson.build

    rc89ae25 r34120f10  
    4242        'src/main.c',
    4343        'src/putchar.c',
     44        '../../../common/stdc/mem.c',
    4445        '../../genarch/src/division.c',
    4546        '../../genarch/src/multiplication.c',
    46         '../../generic/src/memstr.c',
    4747        '../../generic/src/printf_core.c',
    4848        '../../generic/src/vprintf.c',
    4949        '../../generic/src/printf.c',
    50         '../../generic/src/str.c',
     50        '../../../common/str.c',
    5151        '../../generic/src/version.c',
    5252        '../../generic/src/inflate.c',

  • boot/arch/mips32/src/main.c

    rc89ae25 r34120f10  
    3333#include <halt.h>
    3434#include <printf.h>
    35 #include <memstr.h>
     35#include <mem.h>
    3636#include <version.h>
    3737#include <macros.h>

  • boot/arch/ppc32/meson.build

    rc89ae25 r34120f10  
    3737        'src/ofw.c',
    3838
     39        '../../../common/stdc/mem.c',
    3940        '../../genarch/src/ofw.c',
    4041        '../../genarch/src/ofw_tree.c',
    … …  
    4243        '../../genarch/src/multiplication.c',
    4344        '../../generic/src/balloc.c',
    44         '../../generic/src/memstr.c',
    4545        '../../generic/src/printf_core.c',
    4646        '../../generic/src/vprintf.c',
    4747        '../../generic/src/printf.c',
    48         '../../generic/src/str.c',
     48        '../../../common/str.c',
    4949        '../../generic/src/version.c',
    5050        '../../generic/src/inflate.c',

  • boot/arch/ppc32/src/main.c

    rc89ae25 r34120f10  
    3535#include <halt.h>
    3636#include <printf.h>
    37 #include <memstr.h>
     37#include <mem.h>
    3838#include <version.h>
    3939#include <macros.h>

  • boot/arch/riscv64/meson.build

    rc89ae25 r34120f10  
    3737        'src/ucb.c',
    3838        'src/putchar.c',
    39         '../../generic/src/memstr.c',
     39
     40        '../../../common/stdc/mem.c',
    4041        '../../generic/src/printf_core.c',
    4142        '../../generic/src/vprintf.c',
    4243        '../../generic/src/printf.c',
    43         '../../generic/src/str.c',
     44        '../../../common/str.c',
    4445        '../../generic/src/version.c',
    4546        '../../generic/src/inflate.c',

  • boot/arch/sparc64/meson.build

    rc89ae25 r34120f10  
    3737        'src/ofw.c',
    3838
     39        '../../../common/stdc/mem.c',
    3940        '../../genarch/src/ofw.c',
    4041        '../../genarch/src/ofw_tree.c',
    4142        '../../generic/src/balloc.c',
    42         '../../generic/src/memstr.c',
    4343        '../../generic/src/printf_core.c',
    4444        '../../generic/src/vprintf.c',
    4545        '../../generic/src/printf.c',
    46         '../../generic/src/str.c',
     46        '../../../common/str.c',
    4747        '../../generic/src/version.c',
    4848        '../../generic/src/inflate.c',

  • boot/arch/sparc64/src/main.c

    rc89ae25 r34120f10  
    3636#include <halt.h>
    3737#include <printf.h>
    38 #include <memstr.h>
     38#include <mem.h>
    3939#include <version.h>
    4040#include <macros.h>

  • boot/genarch/src/ofw_tree.c

    rc89ae25 r34120f10  
    3333#include <str.h>
    3434#include <balloc.h>
    35 #include <memstr.h>
     35#include <mem.h>
    3636
    3737static char path[OFW_TREE_PATH_MAX_LEN + 1];

  • boot/generic/include/assert.h

    rc89ae25 r34120f10  
    11/*
    2  * Copyright (c) 2006 Ondrej Palkovsky
     2 * Copyright (c) 2023 Jiří Zárevúcky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup kernel_generic_mm
    30  * @{
    31  */
    32 /** @file
    33  */
     29#ifndef BOOT_ASSERT_H_
     30#define BOOT_ASSERT_H_
    3431
    35 #ifndef KERN_STDLIB_H_
    36 #define KERN_STDLIB_H_
     32#define assert(expr) ((void) (expr))
    3733
    38 #include <stddef.h>
    39 
    40 extern void *malloc(size_t)
    41     __attribute__((malloc));
    42 extern void *realloc(void *, size_t)
    43     __attribute__((warn_unused_result));
    44 extern void free(void *);
    45 
    46 #endif
    47 
    48 /** @}
    49  */
     34#endif /* BOOT_ASSERT_H_ */

  • boot/generic/include/errno.h

    rc89ae25 r34120f10  
    3939#define EINVAL     -14  /* Invalid value. */
    4040#define EOVERFLOW  -16  /* The result does not fit its size. */
     41#define EIO        -17
    4142
    4243typedef int errno_t;

  • boot/generic/src/gzip.c

    rc89ae25 r34120f10  
    3232#include <stddef.h>
    3333#include <errno.h>
    34 #include <memstr.h>
     34#include <mem.h>
    3535#include <byteorder.h>
    3636#include <gzip.h>

  • boot/generic/src/inflate.c

    rc89ae25 r34120f10  
    6969#include <stdint.h>
    7070#include <errno.h>
    71 #include <memstr.h>
     71#include <mem.h>
    7272#include <inflate.h>
    7373

  • boot/generic/src/payload.c

    rc89ae25 r34120f10  
    3636#include <gzip.h>
    3737#include <stdbool.h>
    38 #include <memstr.h>
     38#include <mem.h>
    3939#include <errno.h>
    4040#include <str.h>

  • boot/meson.build

    rc89ae25 r34120f10  
    7878                '../abi/arch'/BARCH/'include',
    7979                '../abi/include',
     80                '../common/include',
    8081        )
    8182
Note: See TracChangeset for help on using the changeset viewer.