Fix stack alineament on new process.

[bertos.git] / bertos / cpu / types.h

diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index 1b2b23f4c7538fb4ddafd7ec25277a81fc6ec35b..daeec2ea7b332a198ab55168e6984bc565686feb 100644 (file)
--- a/bertos/cpu/types.h
+++ b/bertos/cpu/types.h
@@ -47,51 +47,77 @@
 
 #if CPU_I196
 
-       typedef uint16_t cpuflags_t; // FIXME
-       typedef unsigned int cpustack_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
+       #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
 
 #elif CPU_X86
 
-       /* Get IRQ_* definitions from the hosting environment. */
+       /* Get cpu_flags_t definition from the hosting environment. */
        #include <cfg/os.h>
        #if OS_EMBEDDED
-               typedef uint32_t cpuflags_t; // FIXME
+               typedef uint32_t cpu_flags_t; // FIXME
        #endif /* OS_EMBEDDED */
 
+       typedef uint32_t cpu_atomic_t;
+
        #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_CPUALIGNED_T SIZEOF_CPUSTACK_T
        #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_CPUALIGNED_T SIZEOF_CPUSTACK_T
        #endif
 
 #elif CPU_ARM
 
-       typedef uint32_t cpuflags_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_CPUALIGNED_T 8
 
 #elif CPU_PPC
 
-       typedef uint32_t cpuflags_t; // FIXME
-       typedef uint32_t cpustack_t; // FIXME
+       /* Get cpu_flags_t definition from the hosting environment. */
+       #include <cfg/os.h>
+       #if OS_EMBEDDED
+               typedef uint32_t cpu_flags_t;
+       #endif
+
+       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_CPUALIGNED_T SIZEOF_CPUSTACK_T
 
 #elif CPU_DSP56K
 
-       typedef uint16_t cpuflags_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
+       #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
 
 #elif CPU_AVR
 
-       typedef uint8_t cpuflags_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_CPUALIGNED_T SIZEOF_CPUSTACK_T
 
 #else
        #error No CPU_... defined.
@@ -187,7 +213,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(cpustack_t) == SIZEOF_CPUSTACK_T);
+STATIC_ASSERT(sizeof(cpu_stack_t) == SIZEOF_CPUSTACK_T);
+STATIC_ASSERT(sizeof(cpu_aligned_stack_t) == SIZEOF_CPUALIGNED_T);
 
 
 #endif /* CPU_TYPES_H */