Changeset f8d069e8 in mainline

Timestamp:

2006-06-02T00:54:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

01ebbdf

Parents:

8da51ad

Message:

Remove three infinite loops introduced yesterday

Make ia64 ready to load 5 ELF images.

Files:

• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (1 diff)
• generic/src/mm/as.c (modified) (6 diffs)

arch/ia64/Makefile.inc

@@ -42 +42 @@
 INIT0_SIZE = 0x100000
 
-INIT1_ADDRESS = 0xe000000000800000
-INIT1_SIZE = 0x100000
-
 CFLAGS += -mconstant-gp -fno-unwind-tables -mfixed-range=f32-f127
 LFLAGS += -EL
 AFLAGS += -mconstant-gp
 
-DEFS += -D__64_BITS__ -DINIT0_ADDRESS=$(INIT0_ADDRESS) -DINIT0_SIZE=$(INIT0_SIZE) \
-        -DINIT1_ADDRESS=$(INIT1_ADDRESS) -DINIT1_SIZE=$(INIT1_SIZE)
+DEFS += -D__64_BITS__ -DINIT0_ADDRESS=$(INIT0_ADDRESS) -DINIT0_SIZE=$(INIT0_SIZE)
 
 ## Compile with page hash table support.

arch/ia64/src/ia64.c

@@ -48 +48 @@
 {
         /* Setup usermode init tasks. */
-        init.cnt = 2;
+        init.cnt = 5;
         init.tasks[0].addr = INIT0_ADDRESS;
         init.tasks[0].size = INIT0_SIZE;
-        init.tasks[1].addr = INIT1_ADDRESS;
-        init.tasks[1].size = INIT1_SIZE;
+        init.tasks[1].addr = INIT0_ADDRESS + 0x400000;
+        init.tasks[1].size = INIT0_SIZE;
+        init.tasks[2].addr = INIT0_ADDRESS + 0x800000;
+        init.tasks[2].size = INIT0_SIZE;
+        init.tasks[3].addr = INIT0_ADDRESS + 0xc00000;
+        init.tasks[3].size = INIT0_SIZE;
+        init.tasks[4].addr = INIT0_ADDRESS + 0x1000000;
+        init.tasks[4].size = INIT0_SIZE;
 }
 

generic/src/mm/as.c

@@ -137 +137 @@
 {
         ipl_t ipl;
-        bool cond;
+        link_t *cur;
 
         ASSERT(as->refcount == 0);
@@ -157 +157 @@
          * Destroy address space areas of the address space.
          */     
-        for (cond = true; cond; ) {
+        for (cur = as->as_area_btree.leaf_head.next; cur != &as->as_area_btree.leaf_head; cur = cur->next) {
                 btree_node_t *node;
+                int i;
                 
-                ASSERT(!list_empty(&as->as_area_btree.leaf_head));
-                node = list_get_instance(&as->as_area_btree.leaf_head.next, btree_node_t, leaf_link);
-                if ((cond = node->keys))
-                        as_area_destroy(as, node->key[0]);
-        }
-        
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+                for (i = 0; i < node->keys; i++)
+                        as_area_destroy(as, node->key[i]);
+        }
+
         btree_destroy(&as->as_area_btree);
         page_table_destroy(as->page_table);
@@ -411 +411 @@
         as_area_t *area;
         __address base;
+        link_t *cur;
         ipl_t ipl;
-        bool cond;
 
         ipl = interrupts_disable();
@@ -433 +433 @@
         /*
          * Visit only the pages mapped by used_space B+tree.
-         * Note that we must be very careful when walking the tree
-         * leaf list and removing used space as the leaf list changes
-         * unpredictibly after each remove. The solution is to actually
-         * not walk the tree at all, but to remove items from the head
-         * of the leaf list until there are some keys left.
-         */
-        for (cond = true; cond;) {
+         */
+        for (cur = area->used_space.leaf_head.next; cur != &area->used_space.leaf_head; cur = cur->next) {
                 btree_node_t *node;
+                int i;
                 
-                ASSERT(!list_empty(&area->used_space.leaf_head));
-                node = list_get_instance(area->used_space.leaf_head.next, btree_node_t, leaf_link);
-                if ((cond = (bool) node->keys)) {
-                        __address b = node->key[0];
-                        count_t i;
+                node = list_get_instance(cur, btree_node_t, leaf_link);
+                for (i = 0; i < node->keys; i++) {
+                        __address b = node->key[i];
+                        count_t j;
                         pte_t *pte;
                         
-                        for (i = 0; i < (count_t) node->value[0]; i++) {
+                        for (j = 0; j < (count_t) node->value[i]; j++) {
                                 page_table_lock(as, false);
-                                pte = page_mapping_find(as, b + i*PAGE_SIZE);
+                                pte = page_mapping_find(as, b + j*PAGE_SIZE);
                                 ASSERT(pte && PTE_VALID(pte) && PTE_PRESENT(pte));
                                 if (area->backend && area->backend->frame_free) {
                                         area->backend->frame_free(area,
-                                                b + i*PAGE_SIZE, PTE_GET_FRAME(pte));
+                                                b + j*PAGE_SIZE, PTE_GET_FRAME(pte));
                                 }
-                                page_mapping_remove(as, b + i*PAGE_SIZE);
+                                page_mapping_remove(as, b + j*PAGE_SIZE);
                                 page_table_unlock(as, false);
                         }
@@ -1474 +1469 @@
         if (--sh_info->refcount == 0) {
                 dealloc = true;
-                bool cond;
+                link_t *cur;
                 
                 /*
@@ -1480 +1475 @@
                  * reference from all frames found there.
                  */
-                for (cond = true; cond;) {
+                for (cur = sh_info->pagemap.leaf_head.next; cur != &sh_info->pagemap.leaf_head; cur = cur->next) {
                         btree_node_t *node;
+                        int i;
                         
-                        ASSERT(!list_empty(&sh_info->pagemap.leaf_head));
-                        node = list_get_instance(sh_info->pagemap.leaf_head.next, btree_node_t, leaf_link);
-                        if ((cond = node->keys)) {
-                                frame_free(ADDR2PFN((__address) node->value[0]));
-                        }
+                        node = list_get_instance(cur, btree_node_t, leaf_link);
+                        for (i = 0; i < node->keys; i++) 
+                                frame_free(ADDR2PFN((__address) node->value[i]));
                 }