Changeset b1fd4f0 in mainline

Timestamp:

2006-03-16T18:52:51Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6a22fcb

Parents:

2ba1f39

Message:

update kernel/loader API

Location:

arch/ppc32

Files:

• include/asm/regname.h (modified) (3 diffs)
• src/boot/boot.S (modified) (1 diff)

arch/ppc32/include/asm/regname.h

@@ -182 +182 @@
 #define ctr             9
 #define dec             22
+#define sdr1    25
 #define srr0    26
 #define srr1    27
@@ -189 +190 @@
 #define sprg3   275
 #define prv             287
+#define hid0    1008
 
 /* MSR bits */
@@ -194 +196 @@
 #define msr_dr  (1 << 5)
 
+/* HID0 bits */
+#define hid0_ice        (1 << 15)
+#define hid0_dce        (1 << 14)
+#define hid0_icfi       (1 << 11)
+#define hid0_dci        (1 << 10)
+
+/* Cache sizes */
+#define L1_CACHE_LINES (128 * 8)
+#define L1_CACHE_BYTES 5
+
 #endif

arch/ppc32/src/boot/boot.S

@@ -44 +44 @@
         # from boot loader
         
-        lis r4, 0x80000000@ha
-        addi r4, r4, 0x80000000@l
+        lis r31, 0x80000000@ha
+        addi r31, r31, 0x80000000@l
         
-        add r10, r10, r4
+        add r3, r3, r31
 
-        lis r4, memmap@ha
-        addi r4, r4, memmap@l    # r4 = memmap
+        lis r31, memmap@ha
+        addi r31, r31, memmap@l    # r31 = memmap
         
-        lwz r5, 0(r10)           # memmap->total
-        stw r5, 0(r4)
+        lwz r30, 0(r3)             # memmap->total
+        stw r30, 0(r31)
         
-        lwzu r5, 4(r10)           # memmap->count
-        stwu r5, 4(r4)
+        lwzu r30, 4(r3)            # memmap->count
+        stwu r30, 4(r31)
         
-        cmpwi r5, 0
+        cmpwi r30, 0
         beq memmap_end
         
-        mtctr r5
+        mtctr r30
         memmap_loop:
         
-                lwzu r5, 4(r10)           # memmap->zones[i].start
-                stwu r5, 4(r4)
+                lwzu r30, 4(r3)           # memmap->zones[i].start
+                stwu r30, 4(r31)
                 
-                lwzu r5, 4(r10)           # memmap->zones[i].size
-                stwu r5, 4(r4)
+                lwzu r30, 4(r3)           # memmap->zones[i].size
+                stwu r30, 4(r31)
         
         bdnz memmap_loop