Changeset 5f70118 in mainline for kernel/arch/ia32/src/debug/stacktrace.c

Timestamp:

2010-01-10T12:16:59Z (15 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.

File:

• kernel/arch/ia32/src/debug/stacktrace.c (moved) (moved from uspace/lib/libc/arch/mips32/include/stackarg.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
+/** @addtogroup ia32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb        
  */
 
-#ifndef LIBC_mips32_STACKARG_H_
-#define LIBC_mips32_STACKARG_H_
+#include <stacktrace.h>
+#include <syscall/copy.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
-/* dont allow to define it second time in stdarg.h */
-#define __VARARGS_DEFINED
+#define FRAME_OFFSET_FP_PREV    0
+#define FRAME_OFFSET_RA         1
 
-#include <sys/types.h>
+bool kernel_frame_pointer_validate(uintptr_t fp)
+{
+        return fp != 0;
+}
 
-/**
- * va_arg macro for MIPS32 - problem is that 64 bit values must be aligned on an 8-byte boundary (32bit values not)
- * To satisfy this, paddings must be sometimes inserted. 
- */
+bool kernel_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+{
+        uint32_t *stack = (void *) fp;
+        *prev = stack[FRAME_OFFSET_FP_PREV];
+        return true;
+}
 
-typedef uint8_t* va_list;
+bool kernel_return_address_get(uintptr_t fp, uintptr_t *ra)
+{
+        uint32_t *stack = (void *) fp;
+        *ra = stack[FRAME_OFFSET_RA];
+        return true;
+}
 
-#define va_start(ap, lst) \
-        ((ap) = (va_list)&(lst) + sizeof(lst))
+bool uspace_frame_pointer_validate(uintptr_t fp)
+{
+        return fp != 0;
+}
 
-#define va_arg(ap, type)        \
-        (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((uint32_t)((ap) + 2*4 - 1) & (~3)) : ((uint32_t)((ap) + 2*8 -1) & (~7)) )))[-1])
+bool uspace_frame_pointer_prev(uintptr_t fp, uintptr_t *prev)
+{
+        return !copy_from_uspace((void *) prev,
+            (uint32_t *) fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+}
 
-#define va_end(ap)
-
-#endif
+bool uspace_return_address_get(uintptr_t fp, uintptr_t *ra)
+{
+        return !copy_from_uspace((void *) ra, (uint32_t *) fp + FRAME_OFFSET_RA,
+            sizeof(*ra));
+}
 
 /** @}