Index: boot/generic/include/byteorder.h =================================================================== --- boot/generic/include/byteorder.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) +++ boot/generic/include/byteorder.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2005 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_BYTEORDER_H_ +#define LIBC_BYTEORDER_H_ + +#include + +#if !(defined(__BE__) ^ defined(__LE__)) +#error The architecture must be either big-endian or little-endian. +#endif + +#ifdef __BE__ + +#define uint16_t_le2host(n) (uint16_t_byteorder_swap(n)) +#define uint32_t_le2host(n) (uint32_t_byteorder_swap(n)) +#define uint64_t_le2host(n) (uint64_t_byteorder_swap(n)) + +#define uint16_t_be2host(n) (n) +#define uint32_t_be2host(n) (n) +#define uint64_t_be2host(n) (n) + +#define host2uint16_t_le(n) (uint16_t_byteorder_swap(n)) +#define host2uint32_t_le(n) (uint32_t_byteorder_swap(n)) +#define host2uint64_t_le(n) (uint64_t_byteorder_swap(n)) + +#define host2uint16_t_be(n) (n) +#define host2uint32_t_be(n) (n) +#define host2uint64_t_be(n) (n) + +#else + +#define uint16_t_le2host(n) (n) +#define uint32_t_le2host(n) (n) +#define uint64_t_le2host(n) (n) + +#define uint16_t_be2host(n) (uint16_t_byteorder_swap(n)) +#define uint32_t_be2host(n) (uint32_t_byteorder_swap(n)) +#define uint64_t_be2host(n) (uint64_t_byteorder_swap(n)) + +#define host2uint16_t_le(n) (n) +#define host2uint32_t_le(n) (n) +#define host2uint64_t_le(n) (n) + +#define host2uint16_t_be(n) (uint16_t_byteorder_swap(n)) +#define host2uint32_t_be(n) (uint32_t_byteorder_swap(n)) +#define host2uint64_t_be(n) (uint64_t_byteorder_swap(n)) + +#endif + +#define htons(n) host2uint16_t_be((n)) +#define htonl(n) host2uint32_t_be((n)) +#define ntohs(n) uint16_t_be2host((n)) +#define ntohl(n) uint32_t_be2host((n)) + +#define uint8_t_be2host(n) (n) +#define uint8_t_le2host(n) (n) +#define host2uint8_t_be(n) (n) +#define host2uint8_t_le(n) (n) +#define host2uint8_t_le(n) (n) + +#define int8_t_le2host(n) uint8_t_le2host(n) +#define int16_t_le2host(n) uint16_t_le2host(n) +#define int32_t_le2host(n) uint32_t_le2host(n) +#define int64_t_le2host(n) uint64_t_le2host(n) + +#define int8_t_be2host(n) uint8_t_be2host(n) +#define int16_t_be2host(n) uint16_t_be2host(n) +#define int32_t_be2host(n) uint32_t_be2host(n) +#define int64_t_be2host(n) uint64_t_be2host(n) + +#define host2int8_t_le(n) host2uint8_t_le(n) +#define host2int16_t_le(n) host2uint16_t_le(n) +#define host2int32_t_le(n) host2uint32_t_le(n) +#define host2int64_t_le(n) host2uint64_t_le(n) + +#define host2int8_t_be(n) host2uint8_t_be(n) +#define host2int16_t_be(n) host2uint16_t_be(n) +#define host2int32_t_be(n) host2uint32_t_be(n) +#define host2int64_t_be(n) host2uint64_t_be(n) + +static inline uint64_t uint64_t_byteorder_swap(uint64_t n) +{ + return ((n & 0xff) << 56) | + ((n & 0xff00) << 40) | + ((n & 0xff0000) << 24) | + ((n & 0xff000000LL) << 8) | + ((n & 0xff00000000LL) >> 8) | + ((n & 0xff0000000000LL) >> 24) | + ((n & 0xff000000000000LL) >> 40) | + ((n & 0xff00000000000000LL) >> 56); +} + +static inline uint32_t uint32_t_byteorder_swap(uint32_t n) +{ + return ((n & 0xff) << 24) | + ((n & 0xff00) << 8) | + ((n & 0xff0000) >> 8) | + ((n & 0xff000000) >> 24); +} + +static inline uint16_t uint16_t_byteorder_swap(uint16_t n) +{ + return ((n & 0xff) << 8) | + ((n & 0xff00) >> 8); +} + +#endif + +/** @} + */ Index: boot/generic/include/gzip.h =================================================================== --- boot/generic/include/gzip.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) +++ boot/generic/include/gzip.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2014 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LIBCOMPRESS_GZIP_H_ +#define LIBCOMPRESS_GZIP_H_ + +#include +size_t gzip_size(const void *, size_t); +extern int gzip_expand(const void *, size_t, void *, size_t); + +#endif Index: boot/generic/include/inflate.h =================================================================== --- boot/generic/include/inflate.h (revision 174156fd1cf321a6363777352073d05829467b2f) +++ boot/generic/include/inflate.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) @@ -32,5 +32,5 @@ #include -extern int inflate(void *, size_t, void *, size_t); +extern int inflate(const void *, size_t, void *, size_t); #endif Index: boot/generic/include/payload.h =================================================================== --- boot/generic/include/payload.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) +++ boot/generic/include/payload.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018 Jiří Zárevúcky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef BOOT_PAYLOAD_H_ +#define BOOT_PAYLOAD_H_ + +#include +#include +#include + +extern uint8_t payload_start[]; +extern uint8_t payload_end[]; + +extern uint8_t loader_start[]; +extern uint8_t loader_end[]; + +size_t payload_uncompressed_size(void); +void extract_payload(taskmap_t *, uint8_t *, uint8_t *, uintptr_t, + void (*)(void *, size_t)); + +#endif Index: boot/generic/include/tar.h =================================================================== --- boot/generic/include/tar.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) +++ boot/generic/include/tar.h (revision d4eba6d776758cf1fb2f6c2a27ccd1ffb585d964) @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2013 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libuntar + * @{ + */ +/** @file + */ + +#ifndef TAR_H_ +#define TAR_H_ + +#include +#include +#include + +#define TAR_BLOCK_SIZE 512 + +typedef struct tar_header_raw { + char filename[100]; + char permissions[8]; + char owner[8]; + char group[8]; + char size[12]; + char modification_time[12]; + char checksum[8]; + char type; + char name[100]; + char ustar_magic[6]; + char ustar_version[2]; + char ustar_owner_name[32]; + char ustar_group_name[32]; + char ustar_device_major[8]; + char ustar_device_minor[8]; + char ustar_prefix[155]; + char ignored[12]; +} tar_header_raw_t; + +_Static_assert(sizeof(tar_header_raw_t) == TAR_BLOCK_SIZE, "Wrong size for tar header."); + +enum { + TAR_TYPE_NORMAL = '0', + TAR_TYPE_DIRECTORY = '5', +}; + +typedef struct { + const uint8_t *ptr; + size_t length; + size_t next; +} tar_t; + +bool tar_info(const uint8_t *, const uint8_t *, const char **, size_t *); + +#endif + +/** @} + */