Changeset e4d96e9 in mainline

Timestamp:

2013-03-10T22:35:19Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b4df8db

Parents:

40a0e3bd

Message:

Improvements of stack and istate_get() definitions.

• Make sure each architecture has arch/stack.h in kernel.
• Make each architecture define MEM_STACK_SIZE
• istate_get() uses MEM_STACK_SIZE to allow for a greater flexibility in computing the address of the bottom of the memory stack.
• This fixes istate_get() on ia64.

Files:

• kernel/arch/abs32le/include/arch/stack.h (added)
• kernel/arch/amd64/include/arch/stack.h (added)
• kernel/arch/arm32/include/arch/stack.h (modified) (1 diff)
• kernel/arch/ia32/include/arch/stack.h (added)
• kernel/arch/ia64/include/arch/stack.h (modified) (1 diff)
• kernel/arch/mips32/include/arch/stack.h (modified) (1 diff)
• kernel/arch/mips64/include/arch/stack.h (modified) (1 diff)
• kernel/arch/ppc32/include/arch/stack.h (added)
• kernel/arch/sparc64/include/arch/stack.h (modified) (1 diff)
• kernel/generic/src/interrupt/interrupt.c (modified) (2 diffs)
• uspace/lib/c/arch/mips32/include/libarch/stack.h (modified) (1 diff, 1 prop)
• uspace/lib/c/arch/mips64/include/libarch/stack.h (modified) (1 diff, 1 prop)

kernel/arch/arm32/include/arch/stack.h

@@ -37 +37 @@
 #define KERN_arm32_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  STACK_SIZE
+
 #define STACK_ITEM_SIZE         4
 

kernel/arch/ia64/include/arch/stack.h

@@ -36 +36 @@
 #define KERN_ia64_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  (STACK_SIZE / 2)
+
 #define STACK_ITEM_SIZE                 8
 #define STACK_ALIGNMENT                 16

kernel/arch/mips32/include/arch/stack.h

@@ -36 +36 @@
 #define KERN_mips32_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  STACK_SIZE
+
 #define STACK_ITEM_SIZE  4
 #define STACK_ALIGNMENT  8

kernel/arch/mips64/include/arch/stack.h

@@ -36 +36 @@
 #define KERN_mips64_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  STACK_SIZE
+
 #define STACK_ITEM_SIZE  8
 #define STACK_ALIGNMENT  8

kernel/arch/sparc64/include/arch/stack.h

@@ -36 +36 @@
 #define KERN_sparc64_STACK_H_
 
+#include <config.h>
+
+#define MEM_STACK_SIZE  STACK_SIZE
+
 #define STACK_ITEM_SIZE                 8
 

kernel/generic/src/interrupt/interrupt.c

@@ -54 +54 @@
 #include <proc/thread.h>
 #include <arch/cycle.h>
+#include <arch/stack.h>
 #include <str.h>
 #include <trace.h>
@@ -222 +223 @@
         /*
          * The istate structure should be right at the bottom of the kernel
-         * stack.
+         * memory stack.
          */
-        return (istate_t *) ((uint8_t *)
-            thread->kstack + STACK_SIZE - sizeof(istate_t));
+        return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)];
 }
 

uspace/lib/c/arch/mips32/include/libarch/stack.h

@@ -1 @@
-../../../../../../../kernel/arch/mips32/include/arch/stack.h
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/** @addtogroup libcmips32
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_mips32_STACK_H_
+#define LIBC_mips32_STACK_H_
+
+#define STACK_ITEM_SIZE  4
+#define STACK_ALIGNMENT  8
+#define ABI_STACK_FRAME  32
+
+#endif
+
+/** @}
+ */

uspace/lib/c/arch/mips64/include/libarch/stack.h

@@ -1 @@
-../../../../../../../kernel/arch/mips64/include/arch/stack.h
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/** @addtogroup libcmips64
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_mips64_STACK_H_
+#define LIBC_mips64_STACK_H_
+
+#define STACK_ITEM_SIZE  8
+#define STACK_ALIGNMENT  8
+#define ABI_STACK_FRAME  64
+
+#endif
+
+/** @}
+ */