1
0
Fork 0
forked from nuttx/nuttx-update

Modify standard header files to work with RGMP

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3596 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-05-12 18:07:05 +00:00
parent fff9db3c57
commit cd5cb04547
10 changed files with 492 additions and 8 deletions

View file

@ -3369,8 +3369,7 @@ build
<h2>Allow for architecture optimized implementations</h2>
<p>
The architecture can provide optimized versions of the
following to improve system performance.
The architecture can provide optimized versions of the following to improve system performance.
</p>
<ul>
@ -3380,6 +3379,12 @@ build
<code>CONFIG_ARCH_STRNCPY</code>, <code>CONFIG_ARCH_STRLEN</code>, <code>CONFIG_ARCH_STRNLEN</code>,
<code>CONFIG_ARCH_BZERO</code>
</p>
<p>
The architecture may provide custom versions of certain standard header files:
</p>
<p>
<code>CONFIG_ARCH_MATH_H</code>, <code>CONFIG_ARCH_STDBOOL_H</code>, <code>CONFIG_ARCH_STDINT_H</code>
</p>
</ul>
<h2>Sizes of configurable things (0 disables)</h2>

65
arch/rgmp/include/math.h Normal file
View file

@ -0,0 +1,65 @@
/****************************************************************************
* arch/rgmp/include/math.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. 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.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "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
* COPYRIGHT OWNER OR CONTRIBUTORS 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 __ARCH_RGMP_INCLUDE_MATH_H
#define __ARCH_RGMP_INCLUDE_MATH_H
/****************************************************************************
* Included Files
****************************************************************************/
/****************************************************************************
* Type Definitions
****************************************************************************/
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
#else
#define EXTERN extern
#endif
#include <rgmp/math.h>
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __ARCH_RGMP_INCLUDE_MATH_H */

View file

@ -0,0 +1,89 @@
/****************************************************************************
* arch/rgmp/include/stdbool.h
*
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. 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.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "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
* COPYRIGHT OWNER OR CONTRIBUTORS 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 __ARCH_RGMP_INCLUDE_STDBOOL_H
#define __ARCH_RGMP_INCLUDE_STDBOOL_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include <stdint.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* bool, true, and false must be provided as macros so that they can be
* redefined by the application if necessary.
*
* NOTE: Under C99 'bool' is required to be defined to be the intrinsic type
* _Bool. However, in this NuttX context, we need backward compatibility
* to pre-C99 standards where _Bool is not an intrinsic type. Hence, we
* use _Bool8 as the underlying type.
*/
#ifndef CONFIG_ARCH_RGMP
#define bool _Bool8
#endif
#define true 1
#define false 0
#define __bool_true_false_are_defined 1
/****************************************************************************
* Public Types
****************************************************************************/
/* A byte is the smallest address memory element (at least in architectures
* that do not support bit banding). The requirement is only that type _Bool
* be large enough to hold the values 0 and 1. We select uint8_t to minimize
* the RAM footprint of the executable.
*
* NOTE: We can't actually define the type _Bool here. Under C99 _Bool is
* an intrinsic type and cannot be the target of a typedef. However, in this
* NuttX context, we also need backward compatibility to pre-C99 standards
* where _Bool is not an intrinsic type. We work around this by using _Bool8
* as the underlying type.
*/
#ifndef CONFIG_ARCH_RGMP
typedef uint8_t _Bool8;
#endif
#endif /* __ARCH_RGMP_INCLUDE_STDBOOL_H */

299
arch/rgmp/include/stdint.h Normal file
View file

@ -0,0 +1,299 @@
/****************************************************************************
* arch/rgmp/include/stdint.h
*
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. 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.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "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
* COPYRIGHT OWNER OR CONTRIBUTORS 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 __ARCH_RGMP_INCLUDE_STDINTL_H
#define __ARCH_RGMP_INCLUDE_STDINTL_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include <arch/types.h>
#include <limits.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Limits of exact-width integer types */
#define INT8_MIN 0x80
#define INT8_MAX 0x7f
#define UINT8_MAX 0xff
#define INT16_MIN 0x8000
#define INT16_MAX 0x7fff
#define UINT16_MAX 0xffff
#ifdef __INT64_DEFINED
# define INT24_MIN 0x800000
# define INT24_MAX 0x7fffff
# define UINT24_MAX 0xffffff
#endif
#define INT32_MIN 0x80000000
#define INT32_MAX 0x7fffffff
#define UINT32_MAX 0xffffffff
#ifdef __INT64_DEFINED
# define INT64_MIN 0x8000000000000000
# define INT64_MAX 0x7fffffffffffffff
# define UINT64_MAX 0xffffffffffffffff
#endif
/* Limits of minimum-width integer types */
#define INT8_LEASTN_MIN 0x80
#define INT8_LEASTN_MAX 0x7f
#define UINT8_LEASTN_MAX 0xff
#define INT16_LEASTN_MIN 0x8000
#define INT16_LEASTN_MAX 0x7fff
#define UINT16_LEASTN_MAX 0xffff
#ifdef __INT64_DEFINED
# define INT24_LEASTN_MIN 0x800000
# define INT24_LEASTN_MAX 0x7fffff
# define UINT24_LEASTN_MAX 0xffffff
#endif
#define INT32_LEASTN_MIN 0x80000000
#define INT32_LEASTN_MAX 0x7fffffff
#define UINT32_LEASTN_MAX 0xffffffff
#ifdef __INT64_DEFINED
# define INT64_LEASTN_MIN 0x8000000000000000
# define INT64_LEASTN_MAX 0x7fffffffffffffff
# define UINT64_LEASTN_MAX 0xffffffffffffffff
#endif
/* Limits of fastest minimum-width integer types */
#define INT8_FASTN_MIN 0x80
#define INT8_FASTN_MAX 0x7f
#define UINT8_FASTN_MAX 0xff
#define INT16_FASTN_MIN 0x8000
#define INT16_FASTN_MAX 0x7fff
#define UINT16_FASTN_MAX 0xffff
#ifdef __INT64_DEFINED
# define INT24_FASTN_MIN 0x800000
# define INT24_FASTN_MAX 0x7fffff
# define UINT24_FASTN_MAX 0xffffff
#endif
#define INT32_FASTN_MIN 0x80000000
#define INT32_FASTN_MAX 0x7fffffff
#define UINT32_FASTN_MAX 0xffffffff
#ifdef __INT64_DEFINED
# define INT64_FASTN_MIN 0x8000000000000000
# define INT64_FASTN_MAX 0x7fffffffffffffff
# define UINT64_FASTN_MAX 0xffffffffffffffff
#endif
/* Limits of integer types capable of holding object pointers */
#define INTPTR_MIN PTR_MIN
#define INTPTR_MAX PTR_MIN
#define UINTPTR_MAX UPTR_MAX
/* Limits of greatest-width integer types */
#ifdef __INT64_DEFINED
# define INTMAX_MIN INT64_MIN
# define INTMAX_MAX INT64_MAX
# define UINTMAX_MIN UINT64_MIN
# define UINTMAX_MAX UINT64_MAX
#else
# define INTMAX_MIN INT32_MIN
# define INTMAX_MAX INT32_MAX
# define UINTMAX_MIN UINT32_MIN
# define UINTMAX_MAX UINT32_MAX
#endif
/* Macros for minimum-width integer constant expressions */
#if 0 /* REVISIT: Depends on architecture specific implementation */
#define INT8_C(x) x
#define INT16_C(x) x
#define INT32_C(x) x ## L
#define INT64_C(x) x ## LL
#define UINT8_C(x) x
#define UINT16_C(x) x
#define UINT32_C(x) x ## UL
#define UINT64_C(x) x ## ULL
#endif
/* Macros for greatest-width integer constant expressions
#ifdef CONFIG_HAVE_LONG_LONG
# define INTMAX_C(x) x ## LL
# define UINTMAX_C(x) x ## ULL
#else
# define INTMAX_C(x) x ## L
# define UINTMAX_C(x) x ## UL
#endif
/* Limits of Other Integer Types */
#if 0
# define PTRDIFF_MIN
# define PTRDIFF_MAX
#endif
#ifdef CONFIG_SMALL_MEMORY
# define SIZE_MAX 0xffff
#else
# define SIZE_MAX 0xffffffff
#endif
#if 0
# define WCHAR_MIN
# define WCHAR_MAX
# define WINT_MIN
# define WINT_MAX
#endif
/****************************************************************************
* Public Types
****************************************************************************/
/* Exact-width integer types. NOTE that these types are defined in
* architecture-specific logic with leading underscore character. This file
* typedef's these to the final name without the underscore character. This
* roundabout way of doings things allows the stdint.h to be removed from the
* include/ directory in the event that the user prefers to use the definitions
* provided by their toolchain header files.
*/
#ifdef CONFIG_ARCH_RGMP
#include <rgmp/types.h>
#else
typedef _int8_t int8_t;
typedef _uint8_t uint8_t;
typedef _int16_t int16_t;
typedef _uint16_t uint16_t;
#ifdef __INT24_DEFINED
typedef _int24_t int24_t;
typedef _uint24_t uint24_t;
#endif
typedef _int32_t int32_t;
typedef _uint32_t uint32_t;
#ifdef __INT64_DEFINED
typedef _int64_t int64_t;
typedef _uint64_t uint64_t;
#endif
#endif /* CONFIG_ARCH_RGMP */
/* Minimum-width integer types */
typedef _int8_t int_least8_t;
typedef _uint8_t uint_least8_t;
typedef _int16_t int_least16_t;
typedef _uint16_t uint_least16_t;
#ifdef __INT24_DEFINED
typedef _int24_t int_least24_t;
typedef _uint24_t uint_least24_t;
#else
typedef _int32_t int_least24_t;
typedef _uint32_t uint_least24_t;
#endif
typedef _int32_t int_least32_t;
typedef _uint32_t uint_least32_t;
#ifdef __INT64_DEFINED
typedef _int64_t int_least64_t;
typedef _uint64_t uint_least64_t;
#endif
/* Fastest minimum-width integer types */
typedef _int8_t int_fast8_t;
typedef _uint8_t uint_fast8_t;
typedef int int_fast16_t;
typedef unsigned int uint_fast16_t;
#ifdef __INT24_DEFINED
typedef _int24_t int_fast24_t;
typedef _uint24_t uint_fast24_t;
#else
typedef _int32_t int_fast24_t;
typedef _uint32_t uint_fast24_t;
#endif
typedef _int32_t int_fast32_t;
typedef _uint32_t uint_fast32_t;
#ifdef __INT64_DEFINED
typedef _int64_t int_fast64_t;
typedef _uint64_t uint_fast64_t;
#endif
/* Integer types capable of holding object pointers */
#ifndef CONFIG_ARCH_RGMP
typedef _intptr_t intptr_t;
typedef _uintptr_t uintptr_t;
#endif
/* Greatest-width integer types */
#ifdef __INT64_DEFINED
typedef _int64_t intmax_t;
typedef _uint64_t uintmax_t;
#else
typedef _int32_t intmax_t;
typedef _uint32_t uintmax_t;
#endif
#endif /* __ARCH_RGMP_INCLUDE_STDINTL_H */

View file

@ -485,6 +485,11 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_ARCH_STRNCPY, CONFIG_ARCH_STRLEN, CONFIG_ARCH_STRNLEN
CONFIG_ARCH_BZERO
The architecture may provide custom versions of certain
standard header files:
CONFIG_ARCH_MATH_H, CONFIG_ARCH_STDBOOL_H, CONFIG_ARCH_STDINT_H
Sizes of configurable things (0 disables)
CONFIG_MAX_TASKS - The maximum number of simultaneously

View file

@ -188,6 +188,9 @@ CONFIG_ARCH_STRNCPY=y
CONFIG_ARCH_STRLEN=y
CONFIG_ARCH_STRNLEN=y
CONFIG_ARCH_BZERO=n
CONFIG_ARCH_MATH_H=y
CONFIG_ARCH_STDINT_H=y
CONFIG_ARCH_STDBOOL_H=y
#
# General build options

View file

@ -188,6 +188,9 @@ CONFIG_ARCH_STRNCPY=y
CONFIG_ARCH_STRLEN=y
CONFIG_ARCH_STRNLEN=y
CONFIG_ARCH_BZERO=n
CONFIG_ARCH_MATH_H=y
CONFIG_ARCH_STDINT_H=y
CONFIG_ARCH_STDBOOL_H=y
#
# General build options

View file

@ -40,6 +40,12 @@
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#ifdef CONFIG_ARCH_MATH_H
# include <arch/math.h>
#else
/****************************************************************************
* Type Definitions
****************************************************************************/
@ -60,4 +66,5 @@ extern "C" {
}
#endif
#endif /* CONFIG_ARCH_MATH_H */
#endif /* __INCLUDE_MATH_H */

View file

@ -1,7 +1,7 @@
/****************************************************************************
* include/stdbool.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -41,9 +41,12 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include <stdint.h>
#ifdef CONFIG_ARCH_STDBOOL_H
# include <arch/stdbool.h>
#else
# include <nuttx/compiler.h>
# include <stdint.h>
/****************************************************************************
* Pre-processor Definitions
@ -82,4 +85,5 @@
typedef uint8_t _Bool8;
#endif /* CONFIG_ARCH_STDBOOL_H */
#endif /* __INCLUDE_STDBOOL_H */

View file

@ -41,10 +41,13 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include <arch/types.h>
#include <limits.h>
#ifdef CONFIG_ARCH_STDBOOL_H
# include <arch/stdbool.h>
#else
# include <nuttx/compiler.h>
# include <arch/types.h>
# include <limits.h>
/****************************************************************************
* Pre-processor Definitions
@ -289,4 +292,5 @@ typedef _int32_t intmax_t;
typedef _uint32_t uintmax_t;
#endif
#endif /* CONFIG_ARCH_STDBOOL_H */
#endif /* __INCLUDE_STDINT_H */