From b153b255bfaacf1162342fc3cd5232a112f0840b Mon Sep 17 00:00:00 2001 From: Allan Blanchard <allan.blanchard@cea.fr> Date: Wed, 9 Aug 2023 14:00:50 +0200 Subject: [PATCH] [libc] removed old files --- share/libc/__fc_machdep_linux_shared.h | 275 ------ share/libc/__fc_machdep_old.c | 796 ------------------ .../libc/check_parsing_individual_headers.ml | 4 +- tests/libc/fc_libc.c | 1 - tests/libc/oracle/fc_libc.0.res.oracle | 2 +- 5 files changed, 2 insertions(+), 1076 deletions(-) delete mode 100644 share/libc/__fc_machdep_linux_shared.h delete mode 100644 share/libc/__fc_machdep_old.c diff --git a/share/libc/__fc_machdep_linux_shared.h b/share/libc/__fc_machdep_linux_shared.h deleted file mode 100644 index 6f146ffb2ba..00000000000 --- a/share/libc/__fc_machdep_linux_shared.h +++ /dev/null @@ -1,275 +0,0 @@ -/**************************************************************************/ -/* */ -/* This file is part of Frama-C. */ -/* */ -/* Copyright (C) 2007-2024 */ -/* CEA (Commissariat à l'énergie atomique et aux énergies */ -/* alternatives) */ -/* */ -/* you can redistribute it and/or modify it under the terms of the GNU */ -/* Lesser General Public License as published by the Free Software */ -/* Foundation, version 2.1. */ -/* */ -/* It is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ -/* GNU Lesser General Public License for more details. */ -/* */ -/* See the GNU Lesser General Public License version 2.1 */ -/* for more details (enclosed in the file licenses/LGPLv2.1). */ -/* */ -/**************************************************************************/ - -#ifndef __FC_FORCE_INCLUDE_MACHDEP__ -#error "Frama-C: This file shall not be directly included" -#endif -/* This file contains common machine specific values between - Linux x86 32-bit, AMD64 and x86 16-bit.*/ - -#ifndef __FC_MACHDEP_LINUX_SHARED -#define __FC_MACHDEP_LINUX_SHARED - -// These machdeps strive to conform themselves to POSIX.1-2008 -#define __FC_POSIX_VERSION 200809L - -/* Optional */ -#define __INT8_T signed char -#define __INT8_MIN __FC_SCHAR_MIN -#define __INT8_MAX __FC_SCHAR_MAX - -#define __UINT8_T unsigned char -#define __UINT8_MIN __FC_UCHAR_MAX - -#define __INT16_T signed short -#define __INT16_MIN __FC_SHRT_MIN -#define __INT16_MAX __FC_SHRT_MAX - -#define __UINT16_T unsigned short -#define __UINT16_MAX __FC_USHRT_MAX - -/* inttypes */ - -#define __PRI8_PREFIX "hh" -#define __PRI16_PREFIX "h" - -/* Required */ -#define __INT_LEAST8_T signed char -#define __INT_LEAST8_MIN __FC_SCHAR_MIN -#define __INT_LEAST8_MAX __FC_SCHAR_MAX - -#define __UINT_LEAST8_T unsigned char -#define __UINT_LEAST8_MAX __FC_UCHAR_MAX - -#define __INT_LEAST16_T signed short -#define __INT_LEAST16_MIN __FC_SHRT_MIN -#define __INT_LEAST16_MAX __FC_SHRT_MAX - -#define __UINT_LEAST16_T unsigned short -#define __UINT_LEAST16_MAX __FC_USHRT_MAX - -/* Required */ -#define __INT_FAST8_T signed char -#define __INT_FAST8_MIN __FC_SCHAR_MIN -#define __INT_FAST8_MAX __FC_SCHAR_MAX - -#define __UINT_FAST8_T unsigned char -#define __UINT_FAST8_MAX __FC_UCHAR_MAX - -#define __INT_FAST16_T signed int -#define __INT_FAST16_MIN __FC_INT_MIN -#define __INT_FAST16_MAX __FC_INT_MAX - -#define __UINT_FAST16_T unsigned int -#define __UINT_FAST16_MAX __FC_UINT_MAX -#define __PRIFAST16_PREFIX "" - -/* Required */ -#define __INT_MAX_T signed long long -#define __UINT_MAX_T unsigned long long - -#define __PRIMAX_PREFIX "ll" - -/* min and max values as specified in limits.h */ -#define __FC_SCHAR_MIN (-128) -#define __FC_SCHAR_MAX 127 -#define __FC_UCHAR_MAX 255 -#define __FC_SHRT_MIN (-32768) -#define __FC_SHRT_MAX 32767 -#define __FC_USHRT_MAX 65535 -#define __FC_LLONG_MIN (-9223372036854775807LL -1LL) -#define __FC_LLONG_MAX 9223372036854775807LL -#define __FC_ULLONG_MAX 18446744073709551615ULL -#define __FC_PATH_MAX 256 -// Note: POSIX requires HOST_NAME_MAX >= 255, but Linux uses 64 -#define __FC_HOST_NAME_MAX 64 -#define __FC_TTY_NAME_MAX 32 - -/* for stdarg.h */ -#define __FC_VA_LIST_T __builtin_va_list - -/* stdint.h */ -/* NB: in signal.h, sig_atomic_t is hardwired to int. */ -#define __FC_SIG_ATOMIC_MIN __FC_INT_MIN -#define __FC_SIG_ATOMIC_MAX __FC_INT_MAX -#define __FC_WCHAR_MIN __FC_INT_MIN -#define __FC_WCHAR_MAX __FC_INT_MAX -#define __FC_INTMAX_MIN (-9223372036854775807LL -1LL) -#define __FC_INTMAX_MAX 9223372036854775807LL -#define __FC_UINTMAX_MAX 18446744073709551615ULL - -/* stdio.h */ -#define __FC_BUFSIZ 8192 -#define __FC_EOF (-1) -#define __FC_FOPEN_MAX 16 -#define __FC_FILENAME_MAX 2048 -#define __FC_L_tmpnam 2048 -#define __FC_TMP_MAX 0xFFFFFFFF - -/* stdlib.h */ -#define __FC_RAND_MAX 32767 -#define __FC_MB_CUR_MAX ((size_t)16) - -/* errno.h */ -#define __FC_EPERM 1 -#define __FC_ENOENT 2 -#define __FC_ESRCH 3 -#define __FC_EINTR 4 -#define __FC_EIO 5 -#define __FC_ENXIO 6 -#define __FC_E2BIG 7 -#define __FC_ENOEXEC 8 -#define __FC_EBADF 9 -#define __FC_ECHILD 10 -#define __FC_EAGAIN 11 -#define __FC_ENOMEM 12 -#define __FC_EACCES 13 -#define __FC_EFAULT 14 -#define __FC_ENOTBLK 15 -#define __FC_EBUSY 16 -#define __FC_EEXIST 17 -#define __FC_EXDEV 18 -#define __FC_ENODEV 19 -#define __FC_ENOTDIR 20 -#define __FC_EISDIR 21 -#define __FC_EINVAL 22 -#define __FC_ENFILE 23 -#define __FC_EMFILE 24 -#define __FC_ENOTTY 25 -#define __FC_ETXTBSY 26 -#define __FC_EFBIG 27 -#define __FC_ENOSPC 28 -#define __FC_ESPIPE 29 -#define __FC_EROFS 30 -#define __FC_EMLINK 31 -#define __FC_EPIPE 32 -#define __FC_EDOM 33 -#define __FC_ERANGE 34 -#define __FC_EDEADLK 35 -#define __FC_ENAMETOOLONG 36 -#define __FC_ENOLCK 37 -#define __FC_ENOSYS 38 -#define __FC_ENOTEMPTY 39 -#define __FC_ELOOP 40 -#define __FC_EWOULDBLOCK EAGAIN -#define __FC_ENOMSG 42 -#define __FC_EIDRM 43 -#define __FC_ECHRNG 44 -#define __FC_EL2NSYNC 45 -#define __FC_EL3HLT 46 -#define __FC_EL3RST 47 -#define __FC_ELNRNG 48 -#define __FC_EUNATCH 49 -#define __FC_ENOCSI 50 -#define __FC_EL2HLT 51 -#define __FC_EBADE 52 -#define __FC_EBADR 53 -#define __FC_EXFULL 54 -#define __FC_ENOANO 55 -#define __FC_EBADRQC 56 -#define __FC_EBADSLT 57 -#define __FC_EDEADLOCK EDEADLK -#define __FC_EBFONT 59 -#define __FC_ENOSTR 60 -#define __FC_ENODATA 61 -#define __FC_ETIME 62 -#define __FC_ENOSR 63 -#define __FC_ENONET 64 -#define __FC_ENOPKG 65 -#define __FC_EREMOTE 66 -#define __FC_ENOLINK 67 -#define __FC_EADV 68 -#define __FC_ESRMNT 69 -#define __FC_ECOMM 70 -#define __FC_EPROTO 71 -#define __FC_EMULTIHOP 72 -#define __FC_EDOTDOT 73 -#define __FC_EBADMSG 74 -#define __FC_EOVERFLOW 75 -#define __FC_ENOTUNIQ 76 -#define __FC_EBADFD 77 -#define __FC_EREMCHG 78 -#define __FC_ELIBACC 79 -#define __FC_ELIBBAD 80 -#define __FC_ELIBSCN 81 -#define __FC_ELIBMAX 82 -#define __FC_ELIBEXEC 83 -#define __FC_EILSEQ 84 -#define __FC_ERESTART 85 -#define __FC_ESTRPIPE 86 -#define __FC_EUSERS 87 -#define __FC_ENOTSOCK 88 -#define __FC_EDESTADDRREQ 89 -#define __FC_EMSGSIZE 90 -#define __FC_EPROTOTYPE 91 -#define __FC_ENOPROTOOPT 92 -#define __FC_EPROTONOSUPPORT 93 -#define __FC_ESOCKTNOSUPPORT 94 -#define __FC_ENOTSUP 95 -#define __FC_EOPNOTSUPP 95 -#define __FC_EPFNOSUPPORT 96 -#define __FC_EAFNOSUPPORT 97 -#define __FC_EADDRINUSE 98 -#define __FC_EADDRNOTAVAIL 99 -#define __FC_ENETDOWN 100 -#define __FC_ENETUNREACH 101 -#define __FC_ENETRESET 102 -#define __FC_ECONNABORTED 103 -#define __FC_ECONNRESET 104 -#define __FC_ENOBUFS 105 -#define __FC_EISCONN 106 -#define __FC_ENOTCONN 107 -#define __FC_ESHUTDOWN 108 -#define __FC_ETOOMANYREFS 109 -#define __FC_ETIMEDOUT 110 -#define __FC_ECONNREFUSED 111 -#define __FC_EHOSTDOWN 112 -#define __FC_EHOSTUNREACH 113 -#define __FC_EALREADY 114 -#define __FC_EINPROGRESS 115 -#define __FC_ESTALE 116 -#define __FC_EUCLEAN 117 -#define __FC_ENOTNAM 118 -#define __FC_ENAVAIL 119 -#define __FC_EISNAM 120 -#define __FC_EREMOTEIO 121 -#define __FC_EDQUOT 122 -#define __FC_ENOMEDIUM 123 -#define __FC_EMEDIUMTYPE 124 -#define __FC_ECANCELED 125 -#define __FC_ENOKEY 126 -#define __FC_EKEYEXPIRED 127 -#define __FC_EKEYREVOKED 128 -#define __FC_EKEYREJECTED 129 -#define __FC_EOWNERDEAD 130 -#define __FC_ENOTRECOVERABLE 131 -#define __FC_ERFKILL 132 -#define __FC_EHWPOISON 133 - -/* time.h */ -#define __FC_TIME_T long - -/* signal.h */ -#define __FC_NSIG 65 -#define __FC__NSIG __FC_NSIG - -#endif diff --git a/share/libc/__fc_machdep_old.c b/share/libc/__fc_machdep_old.c deleted file mode 100644 index 46afd1d6fd3..00000000000 --- a/share/libc/__fc_machdep_old.c +++ /dev/null @@ -1,796 +0,0 @@ -/**************************************************************************/ -/* */ -/* This file is part of Frama-C. */ -/* */ -/* Copyright (C) 2007-2024 */ -/* CEA (Commissariat à l'énergie atomique et aux énergies */ -/* alternatives) */ -/* */ -/* you can redistribute it and/or modify it under the terms of the GNU */ -/* Lesser General Public License as published by the Free Software */ -/* Foundation, version 2.1. */ -/* */ -/* It is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ -/* GNU Lesser General Public License for more details. */ -/* */ -/* See the GNU Lesser General Public License version 2.1 */ -/* for more details (enclosed in the file licenses/LGPLv2.1). */ -/* */ -/**************************************************************************/ - -#ifndef __FC_MACHDEP -#define __FC_MACHDEP - -#if defined(__FC_MACHDEP_X86_32) || defined(__FC_MACHDEP_GCC_X86_32) -#define __FC_FORCE_INCLUDE_MACHDEP__ -#include "__fc_machdep_linux_shared.h" -#undef __FC_FORCE_INCLUDE_MACHDEP__ -#define __FC_BYTE_ORDER __LITTLE_ENDIAN -/* Required */ -#undef __CHAR_UNSIGNED__ -#define __WORDSIZE 32 -#define __SIZEOF_SHORT 2 -#define __SIZEOF_INT 4 -#define __SIZEOF_LONG 4 -#define __SIZEOF_LONGLONG 8 -#define __CHAR_BIT 8 -#define __PTRDIFF_T int -#define __SIZE_T unsigned int -#define __WCHAR_T long -#define __FC_INT_MIN (-2147483647 - 1) -#define __FC_INT_MAX 2147483647 -#define __FC_UINT_MAX 4294967295U -#define __FC_LONG_MIN (-2147483647L - 1L) -#define __FC_LONG_MAX 2147483647L -#define __FC_ULONG_MAX 4294967295UL -#define __FC_SIZE_MAX __FC_UINT_MAX - -/* Optional */ -#define __INTPTR_T signed int -#define __FC_INTPTR_MIN __FC_INT_MIN -#define __FC_INTPTR_MAX __FC_INT_MAX - -#define __UINTPTR_T unsigned int -#define __FC_UINTPTR_MAX __FC_UINT_MAX - -#define __INT32_T signed int -#define __UINT32_T unsigned int -#define __INT64_T signed long long -#define __UINT64_T unsigned long long - -/* prefixes for inttypes */ -#define __PRI32_PREFIX "" -#define __PRI64_PREFIX "ll" -#define __PRIPTR_PREFIX "" - -/* Required */ -#define __INT_LEAST32_T signed int -#define __INT_LEAST32_MIN __FC_INT_MIN -#define __INT_LEAST32_MAX __FC_INT_MAX - -#define __UINT_LEAST32_T unsigned int -#define __UINT_LEAST32_MAX __FC_UINT_MAX - -#define __INT_LEAST64_T signed long long -#define __INT_LEAST64_MIN __FC_LLONG_MIN -#define __INT_LEAST64_MAX __FC_LLONG_MAX - -#define __UINT_LEAST64_T unsigned long long -#define __UINT_LEAST64_MAX __FC_ULLONG_MAX - -#define __INT_FAST32_T signed int -#define __INT_FAST32_MIN __FC_INT_MIN -#define __INT_FAST32_MAX __FC_INT_MAX - -#define __UINT_FAST32_T unsigned int -#define __UINT_FAST32_MAX __FC_UINT_MAX - -#define __INT_FAST64_T signed long long -#define __INT_FAST64_MIN __FC_LLONG_MIN -#define __INT_FAST64_MAX __FC_LLONG_MAX - -#define __UINT_FAST64_T unsigned long long -#define __UINT_FAST64_MAX __FC_ULLONG_MAX - -/* POSIX */ -#define __SSIZE_T int -#define __SSIZE_MAX __FC_INT_MAX -/* stdio.h */ -#ifndef __FC_L_tmpnam -#define __FC_L_tmpnam 1024 -#endif -/* stdint.h */ -#define __FC_PTRDIFF_MIN __FC_INT_MIN -#define __FC_PTRDIFF_MAX __FC_INT_MAX -/* wchar.h */ -#define __WINT_T unsigned int -#define __FC_WEOF (0xFFFFFFFFU) -#define __FC_WINT_MIN 0 -#define __FC_WINT_MAX __FC_UINT_MAX - -#ifdef __FC_MACHDEP_GCC_X86_32 -#include "__fc_gcc_builtins.h" -#endif - -// End of X86_32 || GCC_X86_32 -#else -#if defined(__FC_MACHDEP_X86_64) || defined(__FC_MACHDEP_GCC_X86_64) -#define __FC_FORCE_INCLUDE_MACHDEP__ -#include "__fc_machdep_linux_shared.h" -#undef __FC_FORCE_INCLUDE_MACHDEP__ -#define __FC_BYTE_ORDER __LITTLE_ENDIAN -/* Required */ -#undef __CHAR_UNSIGNED__ -#define __WORDSIZE 64 -#define __SIZEOF_SHORT 2 -#define __SIZEOF_INT 4 -#define __SIZEOF_LONG 8 -#define __SIZEOF_LONGLONG 8 -#define __CHAR_BIT 8 -#define __PTRDIFF_T long -#define __SIZE_T unsigned long -#define __WCHAR_T int -#define __FC_INT_MIN (-2147483647 - 1) -#define __FC_INT_MAX 2147483647 -#define __FC_UINT_MAX 4294967295U -#define __FC_LONG_MIN (-9223372036854775807L -1L) -#define __FC_LONG_MAX 9223372036854775807L -#define __FC_ULONG_MAX 18446744073709551615UL -#define __FC_SIZE_MAX __FC_ULONG_MAX - -/* Optional */ -#define __INTPTR_T signed long -#define __FC_INTPTR_MIN __FC_LONG_MIN -#define __FC_INTPTR_MAX __FC_LONG_MAX - -#define __UINTPTR_T unsigned long -#define __FC_UINTPTR_MAX __FC_ULONG_MAX - -#define __INT32_T signed int -#define __INT32_MIN __FC_INT_MIN -#define __INT32_MAX __FC_INT_MAX - -#define __UINT32_T unsigned int -#define __UINT32_MAX __FC_UINT_MAX - -#define __INT64_T signed long -#define __INT64_MIN __FC_LONG_MIN -#define __INT64_MAX __FC_LONG_MAX - -#define __UINT64_T unsigned long -#define __UINT64_MAX __FC_ULONG_MAX - -/* prefixes for inttypes */ -#define __PRI32_PREFIX "" -#define __PRI64_PREFIX "l" -#define __PRIPTR_PREFIX "l" - -/* Required */ -#define __INT_LEAST32_T signed int -#define __INT_LEAST32_MIN __FC_INT_MIN -#define __INT_LEAST32_MAX __FC_INT_MAX - -#define __UINT_LEAST32_T unsigned int -#define __UINT_LEAST32_MAX __FC_UINT_MAX - -#define __INT_LEAST64_T signed long -#define __INT_LEAST64_MIN __FC_LONG_MIN -#define __INT_LEAST64_MAX __FC_LONG_MAX - -#define __UINT_LEAST64_T unsigned long -#define __UINT_LEAST64_MAX __FC_ULONG_MAX - -#define __INT_FAST32_T signed int -#define __INT_FAST32_MIN __FC_INT_MIN -#define __INT_FAST32_MAX __FC_INT_MAX - -#define __UINT_FAST32_T unsigned int -#define __UINT_FAST32_MAX __FC_UINT_MAX - -#define __INT_FAST64_T signed long -#define __INT_FAST64_MIN __FC_LONG_MIN -#define __INT_FAST64_MAX __FC_LONG_MAX - -#define __UINT_FAST64_T unsigned long -#define __UINT_FAST64_MAX __FC_ULONG_MAX - -/* POSIX */ -#define __SSIZE_T signed long -#define __SSIZE_MAX __FC_LONG_MAX -/* stdio.h */ -#ifndef __FC_L_tmpnam -#define __FC_L_tmpnam 1024 -#endif -/* stdint.h */ -#define __FC_PTRDIFF_MIN __FC_LONG_MIN -#define __FC_PTRDIFF_MAX __FC_LONG_MAX -/* wchar.h */ -#define __WINT_T unsigned int -#define __FC_WEOF (0xFFFFFFFFU) -#define __FC_WINT_MIN 0 -#define __FC_WINT_MAX __FC_UINT_MAX - -#ifdef __FC_MACHDEP_GCC_X86_64 -#include "__fc_gcc_builtins.h" -#endif - -// End of X86_64 || GCC_X86_64 -#else -#if defined(__FC_MACHDEP_X86_16) || defined(__FC_MACHDEP_GCC_X86_16) -#define __FC_FORCE_INCLUDE_MACHDEP__ -#include "__fc_machdep_linux_shared.h" -#undef __FC_FORCE_INCLUDE_MACHDEP__ -#define __FC_BYTE_ORDER __LITTLE_ENDIAN -/* Required */ -#undef __CHAR_UNSIGNED__ -#define __WORDSIZE 16 -#define __SIZEOF_SHORT 2 -#define __SIZEOF_INT 2 -#define __SIZEOF_LONG 4 -#define __SIZEOF_LONGLONG 8 -#define __CHAR_BIT 8 -#define __PTRDIFF_T long -#define __SIZE_T unsigned int -#define __WCHAR_T int -#define __FC_INT_MIN (-32768) -#define __FC_INT_MAX 32767 -#define __FC_UINT_MAX 65535U -#define __FC_LONG_MIN (-2147483647L -1L) -#define __FC_LONG_MAX 2147483647L -#define __FC_ULONG_MAX 4294967295UL -#define __FC_SIZE_MAX 65535U - - -/* Optional */ -#define __INTPTR_T signed long -#define __FC_INTPTR_MIN __FC_LONG_MIN -#define __FC_INTPTR_MAX __FC_LONG_MAX - -#define __UINTPTR_T unsigned long -#define __FC_UINTPTR_MAX __FC_ULONG_MAX - -#define __INT32_T signed long -#define __INT32_MIN __FC_LONG_MIN -#define __INT32_MAX __FC_LONG_MAX - -#define __INT64_T signed long long -#define __INT64_MIN __FC_LLONG_MIN -#define __INT64_MAX __FC_LLONG_MAX - -#define __UINT32_T unsigned long -#define __UINT32_MAX __FC_ULONG_MAX - -#define __UINT64_T unsigned long long -#define __UINT64_MAX __FC_ULLONG_MAX - -/* inttypes */ - -#define __PRI32_PREFIX "l" -#define __PRI64_PREFIX "ll" -#define __PRIPTR_PREFIX "l" - -/* Required */ -#define __INT_LEAST32_T signed long -#define __INT_LEAST32_MIN __FC_LONG_MIN -#define __INT_LEAST32_MAX __FC_LONG_MAX - -#define __UINT_LEAST32_T unsigned long -#define __UINT_LEAST32_MAX __FC_ULONG_MAX - -#define __INT_LEAST64_T signed long long -#define __INT_LEAST64_MIN __FC_LLONG_MIN -#define __INT_LEAST64_MAX __FC_LLONG_MAX - -#define __UINT_LEAST64_T unsigned long long -#define __UINT_LEAST64_MAX __FC_ULLONG_MAX - -#define __INT_FAST32_T signed long -#define __INT_FAST32_MIN __FC_LONG_MIN -#define __INT_FAST32_MAX __FC_LONG_MAX - -#define __UINT_FAST32_T unsigned long -#define __UINT_FAST32_MAX __FC_ULONG_MAX - -#define __INT_FAST64_T signed long long -#define __INT_FAST64_MIN __FC_LLONG_MIN -#define __INT_FAST64_MAX __FC_LLONG_MAX - -#define __UINT_FAST64_T unsigned long long -#define __UINT_FAST64_MAX __FC_ULLONG_MAX - -/* POSIX */ -#define __SSIZE_T signed long -#define __SSIZE_MAX __FC_LONG_MAX -/* stdio.h */ -#ifndef __FC_L_tmpnam -#define __FC_L_tmpnam 1024 -#endif -/* stdint.h */ -#define __FC_PTRDIFF_MIN __FC_LONG_MIN -#define __FC_PTRDIFF_MAX __FC_LONG_MAX - -/* wchar.h */ -#define __WINT_T unsigned long -#define __FC_WEOF (0xFFFFFFFFUL) -#define __FC_WINT_MIN 0 -#define __FC_WINT_MAX __FC_ULONG_MAX - -#ifdef __FC_MACHDEP_GCC_X86_16 -#include "__fc_gcc_builtins.h" -#endif - -// End of X86_16 || GCC_X86_16 -#else -#ifdef __FC_MACHDEP_PPC_32 -#define __FC_FORCE_INCLUDE_MACHDEP__ -#include "__fc_machdep_linux_shared.h" -#undef __FC_FORCE_INCLUDE_MACHDEP__ -#define __FC_BYTE_ORDER __BIG_ENDIAN -/* Required */ -#undef __CHAR_UNSIGNED__ -#define __WORDSIZE 32 -#define __SIZEOF_SHORT 2 -#define __SIZEOF_INT 4 -#define __SIZEOF_LONG 4 -#define __SIZEOF_LONGLONG 8 -#define __CHAR_BIT 8 -#define __PTRDIFF_T int -#define __SIZE_T unsigned int -#define __WCHAR_T int -#define __FC_INT_MIN (-2147483647 - 1) -#define __FC_INT_MAX 2147483647 -#define __FC_UINT_MAX 4294967295U -#define __FC_LONG_MIN (-2147483647L -1L) -#define __FC_LONG_MAX 2147483647L -#define __FC_ULONG_MAX 4294967295UL -#define __FC_SIZE_MAX __FC_UINT_MAX - -/* Optional */ -#define __INTPTR_T signed int -#define __FC_INTPTR_MIN __FC_LONG_MIN -#define __FC_INTPTR_MAX __FC_LONG_MAX - -#define __UINTPTR_T unsigned int -#define __FC_UINTPTR_MAX __FC_ULONG_MAX - -#define __INT32_T signed int -#define __INT32_MIN __FC_INT_MIN -#define __INT32_MAX __FC_INT_MAX - -#define __UINT32_T unsigned int -#define __UINT32_MAX __FC_UINT_MAX - -#define __INT64_T signed long long -#define __INT64_MIN __FC_LLONG_MIN -#define __INT64_MAX __FC_LLONG_MAX - -#define __UINT64_T unsigned long long -#define __UINT64_MAX __FC_ULLONG_MAX - -/* inttypes */ - -#define __PRI32_PREFIX "" -#define __PRI64_PREFIX "ll" -#define __PRIPTR_PREFIX "" - -/* Required */ -#define __INT_LEAST32_T signed int -#define __INT_LEAST32_MIN __FC_INT_MIN -#define __INT_LEAST32_MAX __FC_INT_MAX - -#define __UINT_LEAST32_T unsigned int -#define __UINT_LEAST32_MAX __FC_UINT_MAX - -#define __INT_LEAST64_T signed long long -#define __INT_LEAST64_MIN __FC_LLONG_MIN -#define __INT_LEAST64_MAX __FC_LLONG_MAX - -#define __UINT_LEAST64_T unsigned long long -#define __UINT_LEAST64_MAX __FC_ULLONG_MAX - -#define __INT_FAST32_T signed int -#define __INT_FAST32_MIN __FC_INT_MIN -#define __INT_FAST32_MAX __FC_INT_MAX - -#define __UINT_FAST32_T unsigned int -#define __UINT_FAST32_MAX __FC_UINT_MAX - -#define __INT_FAST64_T signed long long -#define __INT_FAST64_MIN __FC_LLONG_MIN -#define __INT_FAST64_MAX __FC_LLONG_MAX - -#define __UINT_FAST64_T unsigned long long -#define __UINT_FAST64_MAX __FC_ULLONG_MAX - -/* POSIX */ -#define __SSIZE_T int -#define __SSIZE_MAX __FC_INT_MAX -/* stdio.h */ -#ifndef __FC_L_tmpnam -#define __FC_L_tmpnam 1024 -#endif -/* stdint.h */ -#define __FC_PTRDIFF_MIN __FC_INT_MIN -#define __FC_PTRDIFF_MAX __FC_INT_MAX -#define __FC_INTMAX_MIN (-9223372036854775807LL -1LL) -#define __FC_INTMAX_MAX 9223372036854775807LL -#define __FC_UINTMAX_MAX 18446744073709551615ULL -/* time.h */ -#define __FC_TIME_T long -/* wchar.h */ -#define __WINT_T unsigned int -#define __FC_WEOF (0xFFFFFFFFU) -#define __FC_WINT_MIN 0 -#define __FC_WINT_MAX __FC_UINT_MAX - -// End of PPC_32 -#else -#ifdef __FC_MACHDEP_MSVC_X86_64 -#define __FC_BYTE_ORDER __LITTLE_ENDIAN - -// This machdep does NOT conform itself to POSIX.1-2008 - -/* Required */ -#undef __CHAR_UNSIGNED__ -#define __WORDSIZE 64 -#define __SIZEOF_SHORT 2 -#define __SIZEOF_INT 4 -#define __SIZEOF_LONG 4 -#define __SIZEOF_LONGLONG 8 -#define __CHAR_BIT 8 -#define __PTRDIFF_T long long -#define __SIZE_T unsigned long long - -#define __FC_EOF (-1) -#define __FC_FOPEN_MAX 20 -#define __FC_RAND_MAX 32767 -#define __WCHAR_T unsigned short - -/* min and max values as specified in limits.h */ -#define __FC_SCHAR_MIN (-128) -#define __FC_SCHAR_MAX 127 -#define __FC_UCHAR_MAX 255 -#define __FC_SHRT_MIN (-32768) -#define __FC_SHRT_MAX 32767 -#define __FC_USHRT_MAX 65535 -#define __FC_INT_MIN (-2147483647 - 1) -#define __FC_INT_MAX 2147483647 -#define __FC_UINT_MAX 4294967295U -#define __FC_LONG_MIN (-2147483647L -1L) -#define __FC_LONG_MAX 2147483647L -#define __FC_ULONG_MAX 4294967295UL -#define __FC_LLONG_MIN (-9223372036854775807LL -1LL) -#define __FC_LLONG_MAX 9223372036854775807LL -#define __FC_ULLONG_MAX 18446744073709551615ULL -#define __FC_PATH_MAX 256 -#define __FC_SIZE_MAX __FC_ULLONG_MAX -// Note: SSIZE_T/SSIZE_MAX are not defined in this machdep! -/* Note: MSVC does not define this constant, but because it is used in an ACSL - specification, it is safer to define it anyway. */ -#define __FC_HOST_NAME_MAX 255 -#define __FC_TTY_NAME_MAX 32 - -/* Optional */ -#define __INT8_T signed char -#define __INT8_MIN __FC_SCHAR_MIN -#define __INT8_MAX __FC_SCHAR_MAX - -#define __UINT8_T unsigned char -#define __UINT8_MIN __FC_UCHAR_MAX - -#define __INT16_T signed short -#define __INT16_MIN __FC_SHRT_MIN -#define __INT16_MAX __FC_SHRT_MAX - -#define __UINT16_T unsigned short -#define __UINT16_MAX __FC_USHRT_MAX - -#define __INTPTR_T signed long long -#define __FC_INTPTR_MIN __FC_LLONG_MIN -#define __FC_INTPTR_MAX __FC_LLONG_MAX - -#define __UINTPTR_T unsigned long long -#define __FC_UINTPTR_MAX __FC_ULLONG_MAX - -#define __INT32_T signed int -#define __INT32_MIN __FC_INT_MIN -#define __INT32_MAX __FC_INT_MAX - -#define __UINT32_T unsigned int -#define __UINT32_MAX __FC_UINT_MAX - -#define __INT64_T signed long long -#define __INT64_MIN __FC_LLONG_MIN -#define __INT64_MAX __FC_LLONG_MAX - -#define __UINT64_T unsigned long long -#define __UINT64_MAX __FC_ULLONG_MAX - -/* inttypes */ - -#define __PRI8_PREFIX "hh" -#define __PRI16_PREFIX "h" -#define __PRIFAST16_PREFIX "" -#define __PRI32_PREFIX "" -#define __PRI64_PREFIX "ll" -#define __PRIPTR_PREFIX "ll" -#define __PRIMAX_PREFIX "ll" - -/* Required */ -#define __INT_LEAST8_T signed char -#define __INT_LEAST8_MIN __FC_SCHAR_MIN -#define __INT_LEAST8_MAX __FC_SCHAR_MAX - -#define __UINT_LEAST8_T unsigned char -#define __UINT_LEAST8_MAX __FC_UCHAR_MAX - -#define __INT_LEAST16_T signed short -#define __INT_LEAST16_MIN __FC_SHRT_MIN -#define __INT_LEAST16_MAX __FC_SHRT_MAX - -#define __UINT_LEAST16_T unsigned short -#define __UINT_LEAST16_MAX __FC_USHRT_MAX - -#define __INT_LEAST32_T signed int -#define __INT_LEAST32_MIN __FC_INT_MIN -#define __INT_LEAST32_MAX __FC_INT_MAX - -#define __UINT_LEAST32_T unsigned int -#define __UINT_LEAST32_MAX __FC_UINT_MAX - -#define __INT_LEAST64_T signed long long -#define __INT_LEAST64_MIN __FC_LLONG_MIN -#define __INT_LEAST64_MAX __FC_LLONG_MAX - -#define __UINT_LEAST64_T unsigned long long -#define __UINT_LEAST64_MAX __FC_ULLONG_MAX - -#define __INT_FAST8_T signed char -#define __INT_FAST8_MIN __FC_SCHAR_MIN -#define __INT_FAST8_MAX __FC_SCHAR_MAX - -#define __UINT_FAST8_T unsigned char -#define __UINT_FAST8_MAX __FC_UCHAR_MAX - -#define __INT_FAST16_T signed int -#define __INT_FAST16_MIN __FC_INT_MIN -#define __INT_FAST16_MAX __FC_INT_MAX - -#define __UINT_FAST16_T unsigned int -#define __UINT_FAST16_MAX __FC_UINT_MAX - -#define __INT_FAST32_T signed int -#define __INT_FAST32_MIN __FC_INT_MIN -#define __INT_FAST32_MAX __FC_INT_MAX - -#define __UINT_FAST32_T unsigned int -#define __UINT_FAST32_MAX __FC_UINT_MAX - -#define __INT_FAST64_T signed long long -#define __INT_FAST64_MIN __FC_LLONG_MIN -#define __INT_FAST64_MAX __FC_LLONG_MAX - -#define __UINT_FAST64_T unsigned long long -#define __UINT_FAST64_MAX __FC_ULLONG_MAX - -/* Required */ -#define __INT_MAX_T signed long long -#define __UINT_MAX_T unsigned long long - -/* POSIX */ -#define __SSIZE_T signed long long -/* stdio.h */ -#ifndef __FC_L_tmpnam -#define __FC_L_tmpnam 20 -#endif -/* stdint.h */ -#define __FC_WCHAR_MIN 0 -#define __FC_WCHAR_MAX __FC_USHRT_MAX -#define __FC_PTRDIFF_MIN __FC_LLONG_MIN -#define __FC_PTRDIFF_MAX __FC_LLONG_MAX -#define __FC_INTMAX_MIN (-9223372036854775807LL -1LL) -#define __FC_INTMAX_MAX 9223372036854775807LL -#define __FC_UINTMAX_MAX 18446744073709551615ULL -/* time.h */ -#define __FC_TIME_T __int64 - -/* for stdarg.h */ -#define __FC_VA_LIST_T char* - -/* wchar.h */ -// note: wint_t should contain all values of wchar_t plus WEOF; but this version -// of MSVC does not necessarily respect the standard -#define __WINT_T unsigned short -#define __FC_WEOF (0xFFFFU) -#define __FC_WINT_MIN 0 -#define __FC_WINT_MAX __FC_USHRT_MAX - -/* The following macros are defined to correspond to the version of MSVC used - during the definition of some MSVC-specific features: Visual Studio 2010. - They also help detecting, in some tests, whether we are in MSVC mode. */ -#define _MSC_FULL_VER 160040219 -#define _MSC_VER 1600 - -// MSVC-specific definitions; necessary when parsing MSVC libraries using -// non-MSVC preprocessors and compilers -#undef __ptr64 -#define __ptr64 -#undef __ptr32 -#define __ptr32 -#undef __unaligned -#define __unaligned -#undef __cdecl -#define __cdecl -#undef __possibly_notnullterminated -#define __possibly_notnullterminated -#ifndef errno_t -# define errno_t int -# define _ERRNO_T_DEFINED -#endif -#ifndef _WIN64 -# define _WIN64 1 -#endif -#ifndef _AMD64_ -# define _AMD64_ 1 -#endif -#ifndef _M_AMD64 -# define _M_AMD64 1 -#endif -#ifndef _M_X64 -# define _M_X64 1 -#endif - -/* errno.h */ -#define __FC_EPERM 1 -#define __FC_ENOENT 2 -#define __FC_ESRCH 3 -#define __FC_EINTR 4 -#define __FC_EIO 5 -#define __FC_ENXIO 6 -#define __FC_E2BIG 7 -#define __FC_ENOEXEC 8 -#define __FC_EBADF 9 -#define __FC_ECHILD 10 -#define __FC_EAGAIN 11 -#define __FC_ENOMEM 12 -#define __FC_EACCES 13 -#define __FC_EFAULT 14 -//NOT IN MSVC: #define __FC_ENOTBLK -#define __FC_EBUSY 16 -#define __FC_EEXIST 17 -#define __FC_EXDEV 18 -#define __FC_ENODEV 19 -#define __FC_ENOTDIR 20 -#define __FC_EISDIR 21 -#define __FC_EINVAL 22 -#define __FC_ENFILE 23 -#define __FC_EMFILE 24 -#define __FC_ENOTTY 25 -#define __FC_ETXTBSY 139 -#define __FC_EFBIG 27 -#define __FC_ENOSPC 28 -#define __FC_ESPIPE 29 -#define __FC_EROFS 30 -#define __FC_EMLINK 31 -#define __FC_EPIPE 32 -#define __FC_EDOM 33 -#define __FC_ERANGE 34 -#define __FC_EDEADLK 36 -#define __FC_ENAMETOOLONG 38 -#define __FC_ENOLCK 39 -#define __FC_ENOSYS 40 -#define __FC_ENOTEMPTY 41 -#define __FC_ELOOP 114 -#define __FC_EWOULDBLOCK 140 -#define __FC_ENOMSG 122 -#define __FC_EIDRM 111 -//NOT IN MSVC: #define __FC_ECHRNG -//NOT IN MSVC: #define __FC_EL2NSYNC -//NOT IN MSVC: #define __FC_EL3HLT -//NOT IN MSVC: #define __FC_EL3RST -//NOT IN MSVC: #define __FC_ELNRNG -//NOT IN MSVC: #define __FC_EUNATCH -//NOT IN MSVC: #define __FC_ENOCSI -//NOT IN MSVC: #define __FC_EL2HLT -//NOT IN MSVC: #define __FC_EBADE -//NOT IN MSVC: #define __FC_EBADR -//NOT IN MSVC: #define __FC_EXFULL -//NOT IN MSVC: #define __FC_ENOANO -//NOT IN MSVC: #define __FC_EBADRQC -//NOT IN MSVC: #define __FC_EBADSLT -#define __FC_EDEADLOCK 36 -//NOT IN MSVC: #define __FC_EBFONT -#define __FC_ENOSTR 125 -#define __FC_ENODATA 120 -#define __FC_ETIME 137 -#define __FC_ENOSR 124 -//NOT IN MSVC: #define __FC_ENONET -//NOT IN MSVC: #define __FC_ENOPKG -//NOT IN MSVC: #define __FC_EREMOTE -#define __FC_ENOLINK 121 -//NOT IN MSVC: #define __FC_EADV -//NOT IN MSVC: #define __FC_ESRMNT -//NOT IN MSVC: #define __FC_ECOMM -#define __FC_EPROTO 134 -//NOT IN MSVC: #define __FC_EMULTIHOP -//NOT IN MSVC: #define __FC_EDOTDOT -#define __FC_EBADMSG 104 -#define __FC_EOVERFLOW 132 -//NOT IN MSVC: #define __FC_ENOTUNIQ -//NOT IN MSVC: #define __FC_EBADFD -//NOT IN MSVC: #define __FC_EREMCHG -//NOT IN MSVC: #define __FC_ELIBACC -//NOT IN MSVC: #define __FC_ELIBBAD -//NOT IN MSVC: #define __FC_ELIBSCN -//NOT IN MSVC: #define __FC_ELIBMAX -//NOT IN MSVC: #define __FC_ELIBEXEC -#define __FC_EILSEQ 42 -//NOT IN MSVC: #define __FC_ERESTART -//NOT IN MSVC: #define __FC_ESTRPIPE -//NOT IN MSVC: #define __FC_EUSERS -#define __FC_ENOTSOCK 128 -#define __FC_EDESTADDRREQ 109 -#define __FC_EMSGSIZE 115 -#define __FC_EPROTOTYPE 136 -#define __FC_ENOPROTOOPT 123 -#define __FC_EPROTONOSUPPORT 135 -//NOT IN MSVC: #define __FC_ESOCKTNOSUPPORT -#define __FC_ENOTSUP 129 -#define __FC_EOPNOTSUPP 130 -//NOT IN MSVC: #define __FC_EPFNOSUPPORT -#define __FC_EAFNOSUPPORT 102 -#define __FC_EADDRINUSE 100 -#define __FC_EADDRNOTAVAIL 101 -#define __FC_ENETDOWN 116 -#define __FC_ENETUNREACH 118 -#define __FC_ENETRESET 117 -#define __FC_ECONNABORTED 106 -#define __FC_ECONNRESET 108 -#define __FC_ENOBUFS 119 -#define __FC_EISCONN 113 -#define __FC_ENOTCONN 126 -//NOT IN MSVC: #define __FC_ESHUTDOWN -//NOT IN MSVC: #define __FC_ETOOMANYREFS -#define __FC_ETIMEDOUT 138 -#define __FC_ECONNREFUSED 107 -//NOT IN MSVC: #define __FC_EHOSTDOWN -#define __FC_EHOSTUNREACH 110 -#define __FC_EALREADY 103 -#define __FC_EINPROGRESS 112 -//NOT IN MSVC: #define __FC_ESTALE -//NOT IN MSVC: #define __FC_EUCLEAN -//NOT IN MSVC: #define __FC_ENOTNAM -//NOT IN MSVC: #define __FC_ENAVAIL -//NOT IN MSVC: #define __FC_EISNAM -//NOT IN MSVC: #define __FC_EREMOTEIO -//NOT IN MSVC: #define __FC_EDQUOT -//NOT IN MSVC: #define __FC_ENOMEDIUM -//NOT IN MSVC: #define __FC_EMEDIUMTYPE -#define __FC_ECANCELED 105 -//NOT IN MSVC: #define __FC_ENOKEY -//NOT IN MSVC: #define __FC_EKEYEXPIRED -//NOT IN MSVC: #define __FC_EKEYREVOKED -//NOT IN MSVC: #define __FC_EKEYREJECTED -#define __FC_EOWNERDEAD 133 -#define __FC_ENOTRECOVERABLE 127 -//NOT IN MSVC: #define __FC_ERFKILL -//NOT IN MSVC: #define __FC_EHWPOISON - -/* signal.h */ -#define __FC_NSIG 23 - -// End of MSVC_X86_64 -#else -#error Must define __FC_MACHDEP_<M>, where <M> is one of the \ - following: X86_32, X86_64, X86_16, GCC_X86_32, GCC_X86_64, \ - GCC_X86_16, PPC_32, MSVC_X86_64. \ - If you are using a custom machdep, you must include your machdep \ - header file defining __FC_MACHDEP to avoid inclusion of this file. -#endif -#endif -#endif -#endif -#endif -#endif diff --git a/tests/libc/check_parsing_individual_headers.ml b/tests/libc/check_parsing_individual_headers.ml index 21969ad8745..1ff8543f6d0 100644 --- a/tests/libc/check_parsing_individual_headers.ml +++ b/tests/libc/check_parsing_individual_headers.ml @@ -8,9 +8,7 @@ let is_header f = Str.string_match header_re f 0 (* Files which are *not* supposed to be parsed *) let blacklist libc_dir = - List.map (fun f -> - Datatype.Filepath.concat libc_dir f) - ["tgmath.h"; "complex.h"; "__fc_machdep_linux_shared.h"] + List.map (Datatype.Filepath.concat libc_dir) ["tgmath.h"; "complex.h"] (* only goes down one level, which is enough for the libc *) let collect_headers () = diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c index 30692f59a93..8d9887b9f2a 100644 --- a/tests/libc/fc_libc.c +++ b/tests/libc/fc_libc.c @@ -93,7 +93,6 @@ #include "__fc_integer.h" //#include "__fc_libc.h" //keep this; used by check_full_libc.sh #include "__fc_machdep.h" -//#include "__fc_machdep_linux_shared.h" //keep this; used by check_full_libc.sh #include "fcntl.h" #include "__fc_select.h" #include "__fc_string_axiomatic.h" diff --git a/tests/libc/oracle/fc_libc.0.res.oracle b/tests/libc/oracle/fc_libc.0.res.oracle index bec42d8aa6b..8a1386fbba1 100644 --- a/tests/libc/oracle/fc_libc.0.res.oracle +++ b/tests/libc/oracle/fc_libc.0.res.oracle @@ -5,10 +5,10 @@ [eva] Initial state computed [eva:initial-state] Values of globals at initialization +[eva] fc_libc.c:209: assertion got status valid. [eva] fc_libc.c:210: assertion got status valid. [eva] fc_libc.c:211: assertion got status valid. [eva] fc_libc.c:212: assertion got status valid. -[eva] fc_libc.c:213: assertion got status valid. [eva] Recording results for main [eva] Done for function main [eva] ====== VALUES COMPUTED ====== -- GitLab