Changeset b678410 in mainline for uspace/lib/c/arch

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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:

uspace/lib/c/arch

Files:

• ia32/include/config.h (modified) (1 diff)
• ia32/include/ddi.h (modified) (1 diff)
• ia32/include/faddr.h (modified) (1 diff)
• ia32/include/fibril.h (modified) (2 diffs)
• ia32/src/stacktrace.c (modified) (1 diff)
• ia64/_link.ld.in (modified) (1 diff)
• ia64/src/entry.s (modified) (1 diff)
• ia64/src/thread_entry.s (modified) (1 diff)
• mips32/include/atomic.h (modified) (1 diff)

uspace/lib/c/arch/ia32/include/config.h

@@ -36 +36 @@
 #define LIBC_ia32_CONFIG_H_
 
-#define PAGE_WIDTH      12
-#define PAGE_SIZE       (1 << PAGE_WIDTH)
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
+
+#define USER_ADDRESS_SPACE_START_ARCH  UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH    UINT32_C(0x7fffffff)
 
 #endif

uspace/lib/c/arch/ia32/include/ddi.h

@@ -37 +37 @@
 #include <libarch/types.h>
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+#define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))
 
 static inline uint8_t pio_read_8(ioport8_t *port)

uspace/lib/c/arch/ia32/include/faddr.h

@@ -38 +38 @@
 #include <libarch/types.h>
 
-#define FADDR(fptr)             ((uintptr_t) (fptr))
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif

uspace/lib/c/arch/ia32/include/fibril.h

@@ -42 +42 @@
  * panic sooner or later
  */
-#define SP_DELTA     (12)
+#define SP_DELTA  12
 
 #define context_set(c, _pc, stack, size, ptls) \
@@ -51 +51 @@
                 (c)->ebp = 0; \
         } while (0)
-        
-/* We include only registers that must be preserved
+
+/*
+ * We include only registers that must be preserved
  * during function call
  */

uspace/lib/c/arch/ia32/src/stacktrace.c

@@ -35 +35 @@
  */
 
+#include <libarch/config.h>
 #include <sys/types.h>
 #include <bool.h>
-
 #include <stacktrace.h>
 
-#define FRAME_OFFSET_FP_PREV    0
-#define FRAME_OFFSET_RA         4
+#define FRAME_OFFSET_FP_PREV  0
+#define FRAME_OFFSET_RA       4
 
 bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp)
 {
         (void) st;
-        return fp != 0;
+        return (fp != 0) && (fp <= USER_ADDRESS_SPACE_END_ARCH);
 }
 

uspace/lib/c/arch/ia64/_link.ld.in

@@ -22 +22 @@
         
         .got : {
-                _gp = .;
+                /* Tell the linker where we expect GP to point. */
+                __gp = .;
                 *(.got .got.*);
         } :data

uspace/lib/c/arch/ia64/src/entry.s

@@ -39 +39 @@
 __entry:
         alloc loc0 = ar.pfs, 0, 1, 2, 0
-        movl gp = _gp
+        movl gp = __gp
         
         # Pass PCB pointer as the first argument to __main

uspace/lib/c/arch/ia64/src/thread_entry.s

@@ -37 +37 @@
         alloc loc0 = ar.pfs, 0, 1, 1, 0
 
-        movl gp = _gp
+        movl gp = __gp
         
         #

uspace/lib/c/arch/mips32/include/atomic.h

@@ -70 +70 @@
                 "       sc %0, %1\n"
                 "       beq %0, %4, 1b\n"       /* if the atomic operation failed, try again */
-                /*      nop     */              /* nop is inserted automatically by compiler */
                 "       nop\n"
                 : "=&r" (tmp),