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 daeec2ea7b332a198ab55168e6984bc565686feb..bb4aa79f2092982c9b414c865413462d7b5bea9f 100644
(file)
--- a/
bertos/cpu/types.h
+++ b/
bertos/cpu/types.h
@@
-174,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
@@
-197,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);
@@
-215,6
+230,6
@@
STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
#endif
STATIC_ASSERT(sizeof(cpu_stack_t) == SIZEOF_CPUSTACK_T);
STATIC_ASSERT(sizeof(cpu_aligned_stack_t) == SIZEOF_CPUALIGNED_T);
#endif
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 */