Changeset 76cec1e in mainline for src/mm

Timestamp:

2005-07-15T21:57:30Z (21 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b4a4c5e3

Parents:

e41c47e

Message:

Huge indentation fix.

Location:

src/mm

Files:

• frame.c (modified) (2 diffs)
• page.c (modified) (2 diffs)

src/mm/frame.c

@@ -55 +55 @@
 void frame_init(void)
 {
-        if (config.cpu_active == 1) {
+        if (config.cpu_active == 1) {
 
-                /*
-                 * The bootstrap processor will allocate all necessary memory for frame allocation.
-                 */
+                /*
+                 * The bootstrap processor will allocate all necessary memory for frame allocation.
+                 */
 
-                frames = config.memory_size / FRAME_SIZE;
-                frame_bitmap_octets = frames / 8 + (frames % 8 > 0);
-                frame_bitmap = (__u8 *) malloc(frame_bitmap_octets);
-                if (!frame_bitmap)
-                        panic("malloc/frame_bitmap\n");
+                frames = config.memory_size / FRAME_SIZE;
+                frame_bitmap_octets = frames / 8 + (frames % 8 > 0);
+                frame_bitmap = (__u8 *) malloc(frame_bitmap_octets);
+                if (!frame_bitmap)
+                        panic("malloc/frame_bitmap\n");
 
-                /*
-                 * Mark all frames free.
-                 */
-                memsetb((__address) frame_bitmap, frame_bitmap_octets, 0);
-                frames_free = frames;
+                /*
+                 * Mark all frames free.
+                 */
+                memsetb((__address) frame_bitmap, frame_bitmap_octets, 0);
+                frames_free = frames;
         }
 
@@ -81 +81 @@
 
         if (config.cpu_active == 1) {
-                /*
-                 * Create the memory address space map. Marked frames and frame
-                 * regions cannot be used for allocation.
-                 */
+                /*
+                 * Create the memory address space map. Marked frames and frame
+                 * regions cannot be used for allocation.
+                 */
                 frame_region_not_free(config.base, config.base + config.kernel_size);
         }

src/mm/page.c

@@ -54 +54 @@
 
         /* TODO: implement portable way of computing page address from address */
-        length = size + (s - (s & 0xfffff000));
-        cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
+        length = size + (s - (s & 0xfffff000));
+        cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
 
-        for (i = 0; i < cnt; i++)
-                map_page_to_frame(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+        for (i = 0; i < cnt; i++)
+                map_page_to_frame(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 
 }
@@ -74 +74 @@
 void map_page_to_frame(__address page, __address frame, int flags, __address root)
 {
-        pte_t *ptl0, *ptl1, *ptl2, *ptl3;
-        __address newpt;
+        pte_t *ptl0, *ptl1, *ptl2, *ptl3;
+        __address newpt;
 
-        ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
+        ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
 
-        if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA);
-                memsetb(newpt, PAGE_SIZE, 0);
-                SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
-                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER);
-        }
+        if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
+                newpt = frame_alloc(FRAME_KA);
+                memsetb(newpt, PAGE_SIZE, 0);
+                SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
+                SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER);
+        }
 
-        ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
+        ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
 
-        if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA);
-                memsetb(newpt, PAGE_SIZE, 0);
-                SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
-                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER);
-        }
+        if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
+                newpt = frame_alloc(FRAME_KA);
+                memsetb(newpt, PAGE_SIZE, 0);
+                SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
+                SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER);
+        }
 
-        ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
+        ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
 
-        if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = frame_alloc(FRAME_KA);
-                memsetb(newpt, PAGE_SIZE, 0);
-                SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
-                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER);
-        }
+        if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
+                newpt = frame_alloc(FRAME_KA);
+                memsetb(newpt, PAGE_SIZE, 0);
+                SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
+                SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER);
+        }
 
-        ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
+        ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
 
-        SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
-        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
+        SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
 }