Changeset d5955a5 in mainline

Timestamp:

2014-09-03T21:58:41Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3a07767

Parents:

33add3a8

Message:

Autogenerate ppc32 fibril context_t and its offsets.

Location:

uspace/lib/c/arch/ppc32

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) (2 diffs)

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

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

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

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <libarch/fibril_context.h>
 
 #define SP_DELTA  16
@@ -53 +54 @@
         } while (0)
 
-typedef struct {
-        uint32_t sp;
-        uint32_t pc;
-        
-        uint32_t tls;
-        uint32_t r13;
-        uint32_t r14;
-        uint32_t r15;
-        uint32_t r16;
-        uint32_t r17;
-        uint32_t r18;
-        uint32_t r19;
-        uint32_t r20;
-        uint32_t r21;
-        uint32_t r22;
-        uint32_t r23;
-        uint32_t r24;
-        uint32_t r25;
-        uint32_t r26;
-        uint32_t r27;
-        uint32_t r28;
-        uint32_t r29;
-        uint32_t r30;
-        uint32_t r31;
-        
-        uint32_t cr;
-} __attribute__ ((packed)) context_t;
-
 static inline uintptr_t context_get_fp(context_t *ctx)
 {

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

@@ -33 +33 @@
 
 #include <libarch/regname.h>
-#include <libarch/context_offset.h>
+#include <libarch/fibril_context.h>
 
 context_save:
-        CONTEXT_SAVE_ARCH_CORE r3
+        stw sp, CONTEXT_OFFSET_SP(r3)
+        stw r2, CONTEXT_OFFSET_TLS(r3)
+        stw r13, CONTEXT_OFFSET_R13(r3)
+        stw r14, CONTEXT_OFFSET_R14(r3)
+        stw r15, CONTEXT_OFFSET_R15(r3)
+        stw r16, CONTEXT_OFFSET_R16(r3)
+        stw r17, CONTEXT_OFFSET_R17(r3)
+        stw r18, CONTEXT_OFFSET_R18(r3)
+        stw r19, CONTEXT_OFFSET_R19(r3)
+        stw r20, CONTEXT_OFFSET_R20(r3)
+        stw r21, CONTEXT_OFFSET_R21(r3)
+        stw r22, CONTEXT_OFFSET_R22(r3)
+        stw r23, CONTEXT_OFFSET_R23(r3)
+        stw r24, CONTEXT_OFFSET_R24(r3)
+        stw r25, CONTEXT_OFFSET_R25(r3)
+        stw r26, CONTEXT_OFFSET_R26(r3)
+        stw r27, CONTEXT_OFFSET_R27(r3)
+        stw r28, CONTEXT_OFFSET_R28(r3)
+        stw r29, CONTEXT_OFFSET_R29(r3)
+        stw r30, CONTEXT_OFFSET_R30(r3)
+        stw r31, CONTEXT_OFFSET_R31(r3)
         
         mflr r4
-        stw r4, OFFSET_PC(r3)
+        stw r4, CONTEXT_OFFSET_PC(r3)
         
         mfcr r4
-        stw r4, OFFSET_CR(r3)
+        stw r4, CONTEXT_OFFSET_CR(r3)
         
         # context_save returns 1
@@ -50 +70 @@
 
 context_restore:
-        CONTEXT_RESTORE_ARCH_CORE r3
+        lwz sp, CONTEXT_OFFSET_SP(r3)
+        lwz r2, CONTEXT_OFFSET_TLS(r3)
+        lwz r13, CONTEXT_OFFSET_R13(r3)
+        lwz r14, CONTEXT_OFFSET_R14(r3)
+        lwz r15, CONTEXT_OFFSET_R15(r3)
+        lwz r16, CONTEXT_OFFSET_R16(r3)
+        lwz r17, CONTEXT_OFFSET_R17(r3)
+        lwz r18, CONTEXT_OFFSET_R18(r3)
+        lwz r19, CONTEXT_OFFSET_R19(r3)
+        lwz r20, CONTEXT_OFFSET_R20(r3)
+        lwz r21, CONTEXT_OFFSET_R21(r3)
+        lwz r22, CONTEXT_OFFSET_R22(r3)
+        lwz r23, CONTEXT_OFFSET_R23(r3)
+        lwz r24, CONTEXT_OFFSET_R24(r3)
+        lwz r25, CONTEXT_OFFSET_R25(r3)
+        lwz r26, CONTEXT_OFFSET_R26(r3)
+        lwz r27, CONTEXT_OFFSET_R27(r3)
+        lwz r28, CONTEXT_OFFSET_R28(r3)
+        lwz r29, CONTEXT_OFFSET_R29(r3)
+        lwz r30, CONTEXT_OFFSET_R30(r3)
+        lwz r31, CONTEXT_OFFSET_R31(r3)
         
-        lwz r4, OFFSET_CR(r3)
+        lwz r4, CONTEXT_OFFSET_CR(r3)
         mtcr r4
         
-        lwz r4, OFFSET_PC(r3)
+        lwz r4, CONTEXT_OFFSET_PC(r3)
         mtlr r4