projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch "preempt" in "trunk".
[bertos.git]
/
bertos
/
cpu
/
types.h
diff --git
a/bertos/cpu/types.h
b/bertos/cpu/types.h
index 03bbdbf36dcbc37373f6e787ec9d38afa406f4e6..bb4aa79f2092982c9b414c865413462d7b5bea9f 100644
(file)
--- a/
bertos/cpu/types.h
+++ b/
bertos/cpu/types.h
@@
-47,63
+47,77
@@
#if CPU_I196
#if CPU_I196
- typedef uint16_t cpuflags_t; // FIXME
- typedef unsigned int cpustack_t;
- typedef unsigned int cpuatomic_t;
+ typedef uint16_t cpu_flags_t; // FIXME
+ typedef unsigned int cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
+ typedef unsigned int cpu_atomic_t;
#warning Verify following constant
#define SIZEOF_CPUSTACK_T 2
#warning Verify following constant
#define SIZEOF_CPUSTACK_T 2
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#elif CPU_X86
#elif CPU_X86
- /* Get cpuflags_t definition from the hosting environment. */
+ /* Get cpu
_
flags_t definition from the hosting environment. */
#include <cfg/os.h>
#if OS_EMBEDDED
#include <cfg/os.h>
#if OS_EMBEDDED
- typedef uint32_t cpuflags_t; // FIXME
+ typedef uint32_t cpu
_
flags_t; // FIXME
#endif /* OS_EMBEDDED */
#endif /* OS_EMBEDDED */
- typedef uint32_t cpuatomic_t;
+ typedef uint32_t cpu
_
atomic_t;
#if CPU_X86_64
#if CPU_X86_64
- typedef uint64_t cpustack_t;
+ typedef uint64_t cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
#define SIZEOF_CPUSTACK_T 8
#define SIZEOF_CPUSTACK_T 8
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#else
#else
- typedef uint32_t cpustack_t;
+ typedef uint32_t cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
#define SIZEOF_CPUSTACK_T 4
#define SIZEOF_CPUSTACK_T 4
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#endif
#elif CPU_ARM
#endif
#elif CPU_ARM
- typedef uint32_t cpuflags_t;
- typedef uint32_t cpuatomic_t;
- typedef uint32_t cpustack_t;
+ typedef uint32_t cpu_flags_t;
+ typedef uint32_t cpu_atomic_t;
+ typedef uint32_t cpu_stack_t;
+ typedef uint64_t cpu_aligned_stack_t;
#define SIZEOF_CPUSTACK_T 4
#define SIZEOF_CPUSTACK_T 4
+ #define SIZEOF_CPUALIGNED_T 8
#elif CPU_PPC
#elif CPU_PPC
- /* Get cpuflags_t definition from the hosting environment. */
+ /* Get cpu
_
flags_t definition from the hosting environment. */
#include <cfg/os.h>
#if OS_EMBEDDED
#include <cfg/os.h>
#if OS_EMBEDDED
- typedef uint32_t cpuflags_t;
+ typedef uint32_t cpu
_
flags_t;
#endif
#endif
- typedef uint32_t cpuatomic_t;
- typedef uint32_t cpustack_t;
+ typedef uint32_t cpu_atomic_t;
+ typedef uint32_t cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
#define SIZEOF_CPUSTACK_T 4
#define SIZEOF_CPUSTACK_T 4
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#elif CPU_DSP56K
#elif CPU_DSP56K
- typedef uint16_t cpuflags_t;
- typedef uint16_t cpuatomic_t;
- typedef unsigned int cpustack_t;
+ typedef uint16_t cpu_flags_t;
+ typedef uint16_t cpu_atomic_t;
+ typedef unsigned int cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
#warning Verify following costant
#define SIZEOF_CPUSTACK_T 2
#warning Verify following costant
#define SIZEOF_CPUSTACK_T 2
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#elif CPU_AVR
#elif CPU_AVR
- typedef uint8_t cpuflags_t;
- typedef uint8_t cpuatomic_t;
- typedef uint8_t cpustack_t;
+ typedef uint8_t cpu_flags_t;
+ typedef uint8_t cpu_atomic_t;
+ typedef uint8_t cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
#define SIZEOF_CPUSTACK_T 1
#define SIZEOF_CPUSTACK_T 1
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#else
#error No CPU_... defined.
#else
#error No CPU_... defined.
@@
-160,6
+174,16
@@
#endif
#endif
#endif
#endif
+#ifndef SIZEOF_SIZE_T
+#if CPU_REG_BITS < 32
+ #define SIZEOF_SIZE_T 2
+#elif CPU_REG_BITS == 32
+ #define SIZEOF_SIZE_T 4
+#else /* CPU_REG_BITS > 32 */
+ #define SIZEOF_SIZE_T 8
+#endif
+#endif
+
#ifndef CPU_BITS_PER_CHAR
#define CPU_BITS_PER_CHAR (SIZEOF_CHAR * 8)
#endif
#ifndef CPU_BITS_PER_CHAR
#define CPU_BITS_PER_CHAR (SIZEOF_CHAR * 8)
#endif
@@
-183,6
+207,11
@@
/*\}*/
/*\}*/
+#ifndef INT_MAX
+ #define INT_MAX ((int)((unsigned int)~0 >> 1))
+ #define INT_MIN (-INT_MAX - 1)
+#endif
+
/* Sanity checks for the above definitions */
STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR);
STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT);
/* Sanity checks for the above definitions */
STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR);
STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT);
@@
-199,7
+228,8
@@
STATIC_ASSERT(sizeof(uint32_t) * CPU_BITS_PER_CHAR == 32);
STATIC_ASSERT(sizeof(int64_t) * CPU_BITS_PER_CHAR == 64);
STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
#endif
STATIC_ASSERT(sizeof(int64_t) * CPU_BITS_PER_CHAR == 64);
STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
#endif
-STATIC_ASSERT(sizeof(cpustack_t) == SIZEOF_CPUSTACK_T);
-
+STATIC_ASSERT(sizeof(cpu_stack_t) == SIZEOF_CPUSTACK_T);
+STATIC_ASSERT(sizeof(cpu_aligned_stack_t) == SIZEOF_CPUALIGNED_T);
+STATIC_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T);
#endif /* CPU_TYPES_H */
#endif /* CPU_TYPES_H */