Changeset da1bafb in mainline for kernel/arch/ppc32/src/mm/frame.c

Timestamp:

2010-05-24T18:57:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

File:

• kernel/arch/ppc32/src/mm/frame.c (modified) (4 diffs)

kernel/arch/ppc32/src/mm/frame.c

@@ -45 +45 @@
 void physmem_print(void)
 {
-        unsigned int i;
-        
         printf("Base       Size\n");
         printf("---------- ----------\n");
-                
+        
+        size_t i;
         for (i = 0; i < memmap.cnt; i++) {
                 printf("%#10x %#10x\n", memmap.zones[i].start,
-                        memmap.zones[i].size);
+                    memmap.zones[i].size);
         }
 }
@@ -60 +59 @@
         pfn_t minconf = 2;
         size_t i;
-        pfn_t start, conf;
-        size_t size;
         
         for (i = 0; i < memmap.cnt; i++) {
-                start = ADDR2PFN(ALIGN_UP((uintptr_t) memmap.zones[i].start, FRAME_SIZE));
-                size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
+                pfn_t start = ADDR2PFN(ALIGN_UP((uintptr_t) memmap.zones[i].start,
+                    FRAME_SIZE));
+                size_t size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
                 
+                pfn_t conf;
                 if ((minconf < start) || (minconf >= start + size))
                         conf = start;
@@ -73 +72 @@
                 
                 zone_create(start, size, conf, 0);
-                if (last_frame < ALIGN_UP((uintptr_t) memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE))
-                        last_frame = ALIGN_UP((uintptr_t) memmap.zones[i].start + memmap.zones[i].size, FRAME_SIZE);
+                if (last_frame < ALIGN_UP((uintptr_t) memmap.zones[i].start
+                    + memmap.zones[i].size, FRAME_SIZE))
+                        last_frame = ALIGN_UP((uintptr_t) memmap.zones[i].start
+                            + memmap.zones[i].size, FRAME_SIZE);
         }
         
@@ -82 +83 @@
         
         /* Mark the Page Hash Table frames as unavailable */
-        uint32_t sdr1;
-        asm volatile (
-                "mfsdr1 %0\n"
-                : "=r" (sdr1)
-        );
-        frame_mark_unavailable(ADDR2PFN(sdr1 & 0xffff000), 16); // FIXME
+        uint32_t sdr1 = sdr1_get();
+        
+        // FIXME: compute size of PHT exactly
+        frame_mark_unavailable(ADDR2PFN(sdr1 & 0xffff000), 16);
 }