Changeset 50805c9 in mainline

Timestamp:

2014-09-06T09:31:39Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b482287

Parents:

089901e

Message:

Autogenerate sparc64 fibril context_t and its offsets.

Location:

uspace/lib/c/arch/sparc64

Files:

• Makefile.inc (modified) (1 diff)
• include/libarch/context_offset.h (deleted)
• include/libarch/fibril.h (modified) (2 diffs)
• include/libarch/fibril_context.ag (added)
• src/fibril.S (modified) (3 diffs)

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

@@ -37 +37 @@
 
 ARCH_AUTOGENS_AG = \
-        arch/$(UARCH)/include/libarch/istate_struct.ag
+        arch/$(UARCH)/include/libarch/istate_struct.ag \
+        arch/$(UARCH)/include/libarch/fibril_context.ag
 
 .PRECIOUS: arch/$(UARCH)/src/entry.o

uspace/lib/c/arch/sparc64/include/libarch/fibril.h

@@ -37 +37 @@
 
 #include <libarch/stack.h>
+#include <libarch/fibril_context.h>
 #include <sys/types.h>
 #include <align.h>
@@ -51 +52 @@
         } while (0)
 
-/*
- * Save only registers that must be preserved across
- * function calls.
- */
-typedef struct {
-        uintptr_t sp;           /* %o6 */
-        uintptr_t pc;           /* %o7 */
-        uint64_t i0;
-        uint64_t i1;
-        uint64_t i2;
-        uint64_t i3;
-        uint64_t i4;
-        uint64_t i5;
-        uintptr_t fp;           /* %i6 */
-        uintptr_t i7;
-        uint64_t l0;
-        uint64_t l1;
-        uint64_t l2;
-        uint64_t l3;
-        uint64_t l4;
-        uint64_t l5;
-        uint64_t l6;
-        uint64_t l7;
-        uint64_t tp;            /* %g7 */
-} context_t;
-
 static inline uintptr_t context_get_fp(context_t *ctx)
 {

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

@@ -27 +27 @@
 #
 
-#include <libarch/context_offset.h>
+#include <libarch/fibril_context.h>
 
 .text
@@ -39 +39 @@
         # should a thread switch occur.
         #
-        CONTEXT_SAVE_ARCH_CORE %o0
+        stx %sp, [%o0 + CONTEXT_OFFSET_SP]
+        stx %o7, [%o0 + CONTEXT_OFFSET_PC]
+        stx %i0, [%o0 + CONTEXT_OFFSET_I0]
+        stx %i1, [%o0 + CONTEXT_OFFSET_I1]
+        stx %i2, [%o0 + CONTEXT_OFFSET_I2]
+        stx %i3, [%o0 + CONTEXT_OFFSET_I3]
+        stx %i4, [%o0 + CONTEXT_OFFSET_I4]
+        stx %i5, [%o0 + CONTEXT_OFFSET_I5]
+        stx %fp, [%o0 + CONTEXT_OFFSET_FP]
+        stx %i7, [%o0 + CONTEXT_OFFSET_I7]
+        stx %l0, [%o0 + CONTEXT_OFFSET_L0]
+        stx %l1, [%o0 + CONTEXT_OFFSET_L1]
+        stx %l2, [%o0 + CONTEXT_OFFSET_L2]
+        stx %l3, [%o0 + CONTEXT_OFFSET_L3]
+        stx %l4, [%o0 + CONTEXT_OFFSET_L4]
+        stx %l5, [%o0 + CONTEXT_OFFSET_L5]
+        stx %l6, [%o0 + CONTEXT_OFFSET_L6]
+        stx %l7, [%o0 + CONTEXT_OFFSET_L7]
+        stx %g7, [%o0 + CONTEXT_OFFSET_TP]
         retl
         mov 1, %o0              ! context_save_arch returns 1
@@ -52 +70 @@
         flushw
         
-        CONTEXT_RESTORE_ARCH_CORE %o0
+        ldx [%o0 + CONTEXT_OFFSET_SP], %sp
+        ldx [%o0 + CONTEXT_OFFSET_PC], %o7
+        ldx [%o0 + CONTEXT_OFFSET_I0], %i0
+        ldx [%o0 + CONTEXT_OFFSET_I1], %i1
+        ldx [%o0 + CONTEXT_OFFSET_I2], %i2
+        ldx [%o0 + CONTEXT_OFFSET_I3], %i3
+        ldx [%o0 + CONTEXT_OFFSET_I4], %i4
+        ldx [%o0 + CONTEXT_OFFSET_I5], %i5
+        ldx [%o0 + CONTEXT_OFFSET_FP], %fp
+        ldx [%o0 + CONTEXT_OFFSET_I7], %i7
+        ldx [%o0 + CONTEXT_OFFSET_L0], %l0
+        ldx [%o0 + CONTEXT_OFFSET_L1], %l1
+        ldx [%o0 + CONTEXT_OFFSET_L2], %l2
+        ldx [%o0 + CONTEXT_OFFSET_L3], %l3
+        ldx [%o0 + CONTEXT_OFFSET_L4], %l4
+        ldx [%o0 + CONTEXT_OFFSET_L5], %l5
+        ldx [%o0 + CONTEXT_OFFSET_L6], %l6
+        ldx [%o0 + CONTEXT_OFFSET_L7], %l7
+        ldx [%o0 + CONTEXT_OFFSET_TP], %g7
         retl
         xor %o0, %o0, %o0       ! context_restore_arch returns 0