WebSVN – HelenOS-historic – Path Comparison – / – /kernel/ Rev 1056 and /kernel/ Rev 1057

Ignore whitespace Rev 1056 → Rev 1057

 /kernel/trunk/arch/ppc32/include/asm/regname.h
 ,6 → 181,7
 #define lr      8
 #define ctr     9
 #define dec     22
+#define sdr1    25
 #define srr0    26
 #define srr1    27
 #define sprg0   272
 ,9 → 189,20
 #define sprg2   274
 #define sprg3   275
 #define prv     287
+#define hid0    1008
 /* MSR bits */
 #define msr_ir  (1 << 4)
 #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

 /kernel/trunk/arch/ppc32/src/boot/boot.S
 ,31 → 43,31
     # r10 contains physical address to memmap_t
     # 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
     memmap_end: