Changeset 6f8a426 in mainline for arch/ppc32

Timestamp:

2006-02-21T00:04:20Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0fad93a

Parents:

cd92528

Message:

indentation changes
ppc32 fpu context save/restore
ppc32 CPU version
ppc32 memcpy

Location:

arch/ppc32

Files:

• Makefile.inc (modified) (1 diff)
• include/context_offset.h (modified) (1 diff)
• include/cpu.h (modified) (1 diff)
• include/cpuid.h (moved) (moved from arch/ppc32/src/fpu_context.c ) (2 diffs)
• include/fpu_context.h (modified) (1 diff)
• src/asm.S (modified) (1 diff)
• src/cpu/cpu.c (modified) (2 diffs)
• src/fpu_context.S (added)

arch/ppc32/Makefile.inc

@@ -56 +56 @@
         arch/$(ARCH)/src/context.S \
         arch/$(ARCH)/src/debug/panic.s \
-        arch/$(ARCH)/src/fpu_context.c \
+        arch/$(ARCH)/src/fpu_context.S \
         arch/$(ARCH)/src/ppc32.c \
         arch/$(ARCH)/src/dummy.s \

arch/ppc32/include/context_offset.h

@@ -1 +1 @@
 /* This file is automatically generated by gencontext.c. */
 /* struct context */
-#define OFFSET_SP   0x0
-#define OFFSET_PC   0x4
-#define OFFSET_R2   0x8
-#define OFFSET_R13  0xc
-#define OFFSET_R14  0x10
-#define OFFSET_R15  0x14
-#define OFFSET_R16  0x18
-#define OFFSET_R17  0x1c
-#define OFFSET_R18  0x20
-#define OFFSET_R19  0x24
-#define OFFSET_R20  0x28
-#define OFFSET_R21  0x2c
-#define OFFSET_R22  0x30
-#define OFFSET_R23  0x34
-#define OFFSET_R24  0x38
-#define OFFSET_R25  0x3c
-#define OFFSET_R26  0x40
-#define OFFSET_R27  0x44
-#define OFFSET_R28  0x48
-#define OFFSET_R29  0x4c
-#define OFFSET_R30  0x50
-#define OFFSET_R31  0x54
-#define OFFSET_CR   0x58
+#define OFFSET_SP    0x0
+#define OFFSET_PC    0x4
+#define OFFSET_R2    0x8
+#define OFFSET_R13   0xc
+#define OFFSET_R14   0x10
+#define OFFSET_R15   0x14
+#define OFFSET_R16   0x18
+#define OFFSET_R17   0x1c
+#define OFFSET_R18   0x20
+#define OFFSET_R19   0x24
+#define OFFSET_R20   0x28
+#define OFFSET_R21   0x2c
+#define OFFSET_R22   0x30
+#define OFFSET_R23   0x34
+#define OFFSET_R24   0x38
+#define OFFSET_R25   0x3c
+#define OFFSET_R26   0x40
+#define OFFSET_R27   0x44
+#define OFFSET_R28   0x48
+#define OFFSET_R29   0x4c
+#define OFFSET_R30   0x50
+#define OFFSET_R31   0x54
+#define OFFSET_CR    0x58
+
+#define OFFSET_FR14  0x0
+#define OFFSET_FR15  0x8
+#define OFFSET_FR16  0x10
+#define OFFSET_FR17  0x18
+#define OFFSET_FR18  0x20
+#define OFFSET_FR19  0x28
+#define OFFSET_FR20  0x30
+#define OFFSET_FR21  0x38
+#define OFFSET_FR22  0x40
+#define OFFSET_FR23  0x48
+#define OFFSET_FR24  0x50
+#define OFFSET_FR25  0x58
+#define OFFSET_FR26  0x60
+#define OFFSET_FR27  0x68
+#define OFFSET_FR28  0x70
+#define OFFSET_FR29  0x78
+#define OFFSET_FR30  0x80
+#define OFFSET_FR31  0x88
+#define OFFSET_FPSCR 0x90

arch/ppc32/include/cpu.h

@@ -33 +33 @@
 
 struct cpu_arch {
+        int version;
+        int revision;
 };
         

arch/ppc32/include/cpuid.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Jakub Vana
+ * Copyright (C) 2006 Martin Decky
  * All rights reserved.
  *
@@ -25 +25 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
-#include <fpu_context.h>
+#ifndef __ppc32_CPUID_H__
+#define __ppc32_CPUID_H__
 
-void fpu_context_save(fpu_context_t *fctx)
+#include <arch/types.h>
+
+struct cpu_info {
+        __u16 version;
+        __u16 revision;
+} __attribute__ ((packed));
+
+static inline void cpu_version(struct cpu_info *info)
 {
+        __asm__ volatile (
+                "mfspr %0, 287\n"
+                : "=r" (*info)
+        );
 }
 
-
-void fpu_context_restore(fpu_context_t *fctx)
-{
-}
+#endif

arch/ppc32/include/fpu_context.h

@@ -30 +30 @@
 #define __ppc32_FPU_CONTEXT_H__
 
-#include <arch/types.h>
+#ifndef __ppc32_TYPES_H__
+# include <arch/types.h>
+#endif
 
 struct fpu_context {
-};
+        __u64 fr14;
+        __u64 fr15;
+        __u64 fr16;
+        __u64 fr17;
+        __u64 fr18;
+        __u64 fr19;
+        __u64 fr20;
+        __u64 fr21;
+        __u64 fr22;
+        __u64 fr23;
+        __u64 fr24;
+        __u64 fr25;
+        __u64 fr26;
+        __u64 fr27;
+        __u64 fr28;
+        __u64 fr29;
+        __u64 fr30;
+        __u64 fr31;
+        __u32 fpscr;
+} __attribute__ ((packed));
 
 #endif

arch/ppc32/src/asm.S

@@ -86 +86 @@
 
 memcpy:
-        # TODO
+        srwi. r7, r5, 3
+        addi r6, r3, -4
+        addi r4, r4, -4
+        beq     2f
+        
+        andi. r0, r6, 3
+        mtctr r7
+        bne 5f
+        
+        1:
+        
+        lwz r7, 4(r4)
+        lwzu r8, 8(r4)
+        stw r7, 4(r6)
+        stwu r8, 8(r6)
+        bdnz 1b
+        
+        andi. r5, r5, 7
+        
+        2:
+        
+        cmplwi 0, r5, 4
+        blt 3f
+        
+        lwzu r0, 4(r4)
+        addi r5, r5, -4
+        stwu r0, 4(r6)
+        
+        3:
+        
+        cmpwi 0, r5, 0
+        beqlr
+        mtctr r5
+        addi r4, r4, 3
+        addi r6, r6, 3
+        
+        4:
+        
+        lbzu r0, 1(r4)
+        stbu r0, 1(r6)
+        bdnz 4b
         blr
+        
+        5:
+        
+        subfic r0, r0, 4
+        mtctr r0
+        
+        6:
+        
+        lbz r7, 4(r4)
+        addi r4, r4, 1
+        stb r7, 4(r6)
+        addi r6, r6, 1
+        bdnz 6b
+        subf r5, r0, r5
+        rlwinm. r7, r5, 32-3, 3, 31
+        beq 2b
+        mtctr r7
+        b 1b

arch/ppc32/src/cpu/cpu.c

@@ -28 +28 @@
 
 #include <arch/cpu.h>
+#include <arch/cpuid.h>
 #include <cpu.h>
 
@@ -41 +42 @@
 void cpu_identify(void)
 {
+        cpu_info_t info;
+        
+        cpu_version(&info);
+        CPU->arch.version = info.version;
+        CPU->arch.revision = info.revision;
 }
 
 void cpu_print_report(cpu_t *m)
 {
-        printf("cpu%d:\n", m->id);
+        printf("cpu%d: version=%d, revision=%d\n", m->id, m->arch.version, m->arch.revision);
 }