Changeset 6c441cf8 in mainline for kernel/generic/src/mm

Timestamp:

2008-02-27T11:49:17Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

56976a17

Parents:

fdb7795

Message:

code cleanup (mostly signed/unsigned)
allow extra compiler warnings

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (8 diffs)
• backend_anon.c (modified) (3 diffs)
• backend_elf.c (modified) (3 diffs)
• frame.c (modified) (3 diffs)
• slab.c (modified) (10 diffs)
• tlb.c (modified) (2 diffs)

kernel/generic/src/mm/as.c

@@ -432 +432 @@
                                 count_t c =
                                     (count_t) node->value[node->keys - 1];
-                                int i = 0;
+                                unsigned int i = 0;
                         
                                 if (overlaps(b, c * PAGE_SIZE, area->base,
@@ -562 +562 @@
             cur != &area->used_space.leaf_head; cur = cur->next) {
                 btree_node_t *node;
-                int i;
+                unsigned int i;
                 
                 node = list_get_instance(cur, btree_node_t, leaf_link);
@@ -1098 +1098 @@
         as_area_t *a;
         btree_node_t *leaf, *lnode;
-        int i;
+        unsigned int i;
         
         a = (as_area_t *) btree_search(&as->as_area_btree, va, &leaf);
@@ -1156 +1156 @@
         as_area_t *a;
         btree_node_t *leaf, *node;
-        int i;
+        unsigned int i;
         
         /*
@@ -1265 +1265 @@
         btree_node_t *leaf, *node;
         count_t pages;
-        int i;
+        unsigned int i;
 
         ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
@@ -1547 +1547 @@
         btree_node_t *leaf, *node;
         count_t pages;
-        int i;
+        unsigned int i;
 
         ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
@@ -1735 +1735 @@
                     cur != &sh_info->pagemap.leaf_head; cur = cur->next) {
                         btree_node_t *node;
-                        int i;
+                        unsigned int i;
                         
                         node = list_get_instance(cur, btree_node_t, leaf_link);
@@ -1796 +1796 @@
                 node = list_get_instance(cur, btree_node_t, leaf_link);
                 
-                int i;
+                unsigned int i;
                 for (i = 0; i < node->keys; i++) {
                         as_area_t *area = node->value[i];

kernel/generic/src/mm/backend_anon.c

@@ -99 +99 @@
                 if (!frame) {
                         bool allocate = true;
-                        int i;
+                        unsigned int i;
                         
                         /*
@@ -194 +194 @@
             cur != &area->used_space.leaf_head; cur = cur->next) {
                 btree_node_t *node;
-                int i;
+                unsigned int i;
                 
                 node = list_get_instance(cur, btree_node_t, leaf_link);
@@ -200 +200 @@
                         uintptr_t base = node->key[i];
                         count_t count = (count_t) node->value[i];
-                        int j;
+                        unsigned int j;
                         
                         for (j = 0; j < count; j++) {

kernel/generic/src/mm/backend_elf.c

@@ -104 +104 @@
                         ALIGN_DOWN(addr, PAGE_SIZE) - area->base, &leaf);
                 if (!frame) {
-                        int i;
+                        unsigned int i;
 
                         /*
@@ -291 +291 @@
         for (cur = &node->leaf_link; cur != &area->used_space.leaf_head;
             cur = cur->next) {
-                int i;
+                unsigned int i;
                 
                 node = list_get_instance(cur, btree_node_t, leaf_link);
@@ -298 +298 @@
                         uintptr_t base = node->key[i];
                         count_t count = (count_t) node->value[i];
-                        int j;
+                        unsigned int j;
                         
                         /*

kernel/generic/src/mm/frame.c

@@ -121 +121 @@
 static inline int frame_index_valid(zone_t *zone, index_t index)
 {
-        return (index >= 0) && (index < zone->count);
+        return (index < zone->count);
 }
 
@@ -211 +211 @@
         spinlock_lock(&zones.lock);
 
-        if (hint >= zones.count || hint < 0)
+        if (hint >= zones.count)
                 hint = 0;
         
@@ -720 +720 @@
         spinlock_lock(&zones.lock);
 
-        if (z1 < 0 || z1 >= zones.count || z2 < 0 || z2 >= zones.count)
+        if ((z1 >= zones.count) || (z2 >= zones.count))
                 goto errout;
         /* We can join only 2 zones with none existing inbetween */

kernel/generic/src/mm/slab.c

@@ -173 +173 @@
         slab_t *slab;
         size_t fsize;
-        int i;
+        unsigned int i;
         unsigned int zone = 0;
         
@@ -192 +192 @@
         
         /* Fill in slab structures */
-        for (i=0; i < (1 << cache->order); i++)
-                frame_set_parent(ADDR2PFN(KA2PA(data))+i, slab, zone);
+        for (i = 0; i < ((unsigned int) 1 << cache->order); i++)
+                frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone);
 
         slab->start = data;
@@ -200 +200 @@
         slab->cache = cache;
 
-        for (i=0; i<cache->objects;i++)
+        for (i = 0; i < cache->objects; i++)
                 *((int *) (slab->start + i*cache->size)) = i+1;
 
@@ -372 +372 @@
                                 slab_magazine_t *mag)
 {
-        int i;
+        unsigned int i;
         count_t frames = 0;
 
-        for (i=0;i < mag->busy; i++) {
+        for (i = 0; i < mag->busy; i++) {
                 frames += slab_obj_destroy(cache, mag->objs[i], NULL);
                 atomic_dec(&cache->cached_objs);
@@ -528 +528 @@
 
 /** Return number of objects that fit in certain cache size */
-static int comp_objects(slab_cache_t *cache)
+static unsigned int comp_objects(slab_cache_t *cache)
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -537 +537 @@
 
 /** Return wasted space in slab */
-static int badness(slab_cache_t *cache)
-{
-        int objects;
-        int ssize;
+static unsigned int badness(slab_cache_t *cache)
+{
+        unsigned int objects;
+        unsigned int ssize;
 
         objects = comp_objects(cache);
@@ -546 +546 @@
         if (cache->flags & SLAB_CACHE_SLINSIDE)
                 ssize -= sizeof(slab_t);
-        return ssize - objects*cache->size;
+        return ssize - objects * cache->size;
 }
 
@@ -554 +554 @@
 static void make_magcache(slab_cache_t *cache)
 {
-        int i;
+        unsigned int i;
         
         ASSERT(_slab_initialized >= 2);
 
         cache->mag_cache = malloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
-        for (i=0; i < config.cpu_count; i++) {
+        for (i = 0; i < config.cpu_count; i++) {
                 memsetb((uintptr_t)&cache->mag_cache[i],
                         sizeof(cache->mag_cache[i]), 0);
-                spinlock_initialize(&cache->mag_cache[i].lock, 
-                                    "slab_maglock_cpu");
+                spinlock_initialize(&cache->mag_cache[i].lock, "slab_maglock_cpu");
         }
 }
@@ -655 +654 @@
 static count_t _slab_reclaim(slab_cache_t *cache, int flags)
 {
-        int i;
+        unsigned int i;
         slab_magazine_t *mag;
         count_t frames = 0;
@@ -676 +675 @@
                 /* Free cpu-bound magazines */
                 /* Destroy CPU magazines */
-                for (i=0; i<config.cpu_count; i++) {
+                for (i = 0; i < config.cpu_count; i++) {
                         spinlock_lock(&cache->mag_cache[i].lock);
 

kernel/generic/src/mm/tlb.c

@@ -82 +82 @@
     uintptr_t page, count_t count)
 {
-        int i;
+        unsigned int i;
 
         CPU->tlb_active = 0;
@@ -145 +145 @@
         uintptr_t page;
         count_t count;
-        int i;
+        unsigned int i;
         
         ASSERT(CPU);