Changeset 5f70118 in mainline for kernel/arch/mips32

Timestamp:

2010-01-10T12:16:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/mips32

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• include/exception.h (modified) (2 diffs)
• include/mm/page.h (modified) (1 diff)
• include/types.h (modified) (1 diff)
• src/debug/stacktrace.c (moved) (moved from uspace/lib/libc/arch/ia32/include/stackarg.h ) (3 diffs)
• src/debug/stacktrace_asm.S (added)

kernel/arch/mips32/Makefile.inc

@@ -70 +70 @@
         arch/$(KARCH)/src/debugger.c \
         arch/$(KARCH)/src/cpu/cpu.c \
+        arch/$(KARCH)/src/debug/stacktrace.c \
+        arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/mm/frame.c \
         arch/$(KARCH)/src/mm/page.c \

kernel/arch/mips32/_link.ld.in

@@ -38 +38 @@
                 *(.bss);                        /* uninitialized static variables */
                 *(COMMON);                      /* global variables */
+                . = ALIGN(8);
                 symbol_table = .;
                 *(symtab.*);

kernel/arch/mips32/include/exception.h

@@ -58 +58 @@
 #define EXC_VCED        31
 
-typedef struct {
+typedef struct istate {
         uint32_t at;
         uint32_t v0;
@@ -102 +102 @@
         return istate->epc;
 }
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* FIXME */
+}
 
 extern void exception(istate_t *istate);

kernel/arch/mips32/include/mm/page.h

@@ -141 +141 @@
 #include <arch/exception.h>
 
-static inline int get_pt_flags(pte_t *pt, size_t i)
+/** Page Table Entry. */
+typedef struct {
+        unsigned g : 1;                 /**< Global bit. */
+        unsigned p : 1;                 /**< Present bit. */
+        unsigned d : 1;                 /**< Dirty bit. */
+        unsigned cacheable : 1;         /**< Cacheable bit. */
+        unsigned : 1;                   /**< Unused. */
+        unsigned soft_valid : 1;        /**< Valid content even if not present. */
+        unsigned pfn : 24;              /**< Physical frame number. */
+        unsigned w : 1;                 /**< Page writable bit. */
+        unsigned a : 1;                 /**< Accessed bit. */
+} pte_t;
+
+
+static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
 {
         pte_t *p = &pt[i];

kernel/arch/mips32/include/types.h

@@ -80 +80 @@
 #define PRIxn "x"       /**< Format for hexadecimal (u)native_t. */
 
-/** Page Table Entry. */
-typedef struct {
-        unsigned g : 1;                 /**< Global bit. */
-        unsigned p : 1;                 /**< Present bit. */
-        unsigned d : 1;                 /**< Dirty bit. */
-        unsigned cacheable : 1;         /**< Cacheable bit. */
-        unsigned : 1;                   /**< Unused. */
-        unsigned soft_valid : 1;        /**< Valid content even if not present. */
-        unsigned pfn : 24;              /**< Physical frame number. */
-        unsigned w : 1;                 /**< Page writable bit. */
-        unsigned a : 1;                 /**< Accessed bit. */
-} pte_t;
-
 #endif
 

kernel/arch/mips32/src/debug/stacktrace.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcia32
+/** @addtogroup mips32
  * @{
  */
@@ -33 +33 @@
  */
 
-/*
- * Variable argument list manipulation macros
- * for architectures using stack to pass arguments.
- */
- 
-#ifndef LIBC_ia32_STACKARG_H_
-#define LIBC_ia32_STACKARG_H_
+#include <stacktrace.h>
+#include <syscall/copy.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
-#include <sys/types.h>
+bool kernel_frame_pointer_validate(uintptr_t fp)
+{
+        return false;
+}
 
-/* dont allow to define it second time in stdarg.h */
-#define __VARARGS_DEFINED
+bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+{
+        return false;
+}
 
-typedef struct va_list {
-        int pos;
-        uint8_t *last;
-} va_list;
+bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
+{
+        return false;
+}
 
-#define va_start(ap, lst) \
-        (ap).pos = sizeof(lst);                         \
-        (ap).last = (uint8_t *) &(lst)
+bool uspace_frame_pointer_validate(uintptr_t fp)
+{
+        return false;
+}
 
-#define va_arg(ap, type)                \
-        (*((type *)((ap).last + ((ap).pos  += sizeof(type) ) - sizeof(type))))
+bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+{
+        return false;
+}
 
-#define va_end(ap)
-
-
-#endif
+bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
+{
+        return false;
+}
 
 /** @}