Changeset 99de22b in mainline for uspace/lib/libc/arch/sparc64

Timestamp:

2010-01-15T18:30:25Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eeb643d

Parents:

387416b (diff), 563d6077 (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:

Merged latest trunk changes.

Location:

uspace/lib/libc/arch/sparc64

Files:

• Makefile.inc (modified) (1 diff)
• include/fibril.h (modified) (1 diff)
• src/entry.s (modified) (1 diff)
• src/fibril.S (modified) (2 diffs)
• src/stacktrace.S (added)
• src/thread_entry.s (modified) (1 diff)

uspace/lib/libc/arch/sparc64/Makefile.inc

@@ -34 +34 @@
 
 ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
-        arch/$(UARCH)/src/tls.c
+        arch/$(UARCH)/src/tls.c \
+        arch/$(UARCH)/src/stacktrace.S
 
 GCC_CFLAGS += -mcpu=ultrasparc -m64

uspace/lib/libc/arch/sparc64/include/fibril.h

@@ -46 +46 @@
 #endif
 
-#define context_set(c, _pc, stack, size, ptls)                  \
-        (c)->pc = ((uintptr_t) _pc) - 8;                        \
-        (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size),        \
-                STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);     \
-        (c)->fp = -STACK_BIAS;                                  \
-        (c)->tp = ptls
+#define context_set(c, _pc, stack, size, ptls) \
+        do { \
+                (c)->pc = ((uintptr_t) _pc) - 8; \
+                (c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), \
+                    STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA); \
+                (c)->fp = -STACK_BIAS; \
+                (c)->tp = ptls; \
+        } while (0)
         
 /*

uspace/lib/libc/arch/sparc64/src/entry.s

@@ -39 +39 @@
 #
 __entry:
+        #
+        # Create the first stack frame.
+        #
+        save %sp, -176, %sp
+        flushw
+        add %g0, -0x7ff, %fp
+
         # Pass pcb_ptr as the first argument to __main()
-        mov %o1, %o0
+        mov %i1, %o0
         sethi %hi(_gp), %l7
         call __main

uspace/lib/libc/arch/sparc64/src/fibril.S

@@ -35 +35 @@
 
 context_save:
+        #
+        # We rely on the kernel to flush our active register windows to memory
+        # should a thread switch occur.
+        #
         CONTEXT_SAVE_ARCH_CORE %o0
         retl
@@ -42 +46 @@
         #
         # Flush all active windows.
-        # This is essential, because CONTEXT_LOAD overwrites
-        # %sp of CWP - 1 with the value written to %fp of CWP.
-        # Flushing all active windows mitigates this problem
-        # as CWP - 1 becomes the overlap window.
-        #               
+        # This is essential, because CONTEXT_RESTORE_ARCH_CORE overwrites %sp of
+        # CWP - 1 with the value written to %fp of CWP.  Flushing all active
+        # windows mitigates this problem as CWP - 1 becomes the overlap window.
+        #
         flushw
         

uspace/lib/libc/arch/sparc64/src/thread_entry.s

@@ -35 +35 @@
 #
 __thread_entry:
+        #
+        # Create the first stack frame.
+        #
+        save %sp, -176, %sp
+        flushw
+        add %g0, -0x7ff, %fp
+
         sethi %hi(_gp), %l7
         call __thread_main              ! %o0 contains address of uarg