Changeset e32e092 in mainline for kernel/generic/src

Timestamp:

2008-06-06T07:34:21Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

eb1c0a3

Parents:

40257f5

Message:

Declare arguments for memstr.h operations as pointers instead of uintptr_t.

Location:

kernel/generic/src

Files:

• adt/hash_table.c (modified) (1 diff)
• cpu/cpu.c (modified) (1 diff)
• ipc/ipc.c (modified) (1 diff)
• lib/memstr.c (modified) (2 diffs)
• lib/objc_ext.c (modified) (1 diff)
• mm/as.c (modified) (1 diff)
• mm/backend_anon.c (modified) (2 diffs)
• mm/backend_elf.c (modified) (2 diffs)
• mm/slab.c (modified) (2 diffs)
• proc/thread.c (modified) (1 diff)

kernel/generic/src/adt/hash_table.c

@@ -64 +64 @@
                 panic("cannot allocate memory for hash table\n");
         }
-        memsetb((uintptr_t) h->entry, m * sizeof(link_t), 0);
+        memsetb(h->entry, m * sizeof(link_t), 0);
         
         for (i = 0; i < m; i++)

kernel/generic/src/cpu/cpu.c

@@ -68 +68 @@
 
                 /* initialize everything */
-                memsetb((uintptr_t) cpus, sizeof(cpu_t) * config.cpu_count, 0);
+                memsetb(cpus, sizeof(cpu_t) * config.cpu_count, 0);
 
                 for (i = 0; i < config.cpu_count; i++) {

kernel/generic/src/ipc/ipc.c

@@ -67 +67 @@
 static void _ipc_call_init(call_t *call)
 {
-        memsetb((uintptr_t) call, sizeof(*call), 0);
+        memsetb(call, sizeof(*call), 0);
         call->callerbox = &TASK->answerbox;
         call->sender = TASK;

kernel/generic/src/lib/memstr.c

@@ -88 +88 @@
  *
  */
-void _memsetb(uintptr_t dst, size_t cnt, uint8_t x)
+void _memsetb(void *dst, size_t cnt, uint8_t x)
 {
         unsigned int i;
@@ -107 +107 @@
  *
  */
-void _memsetw(uintptr_t dst, size_t cnt, uint16_t x)
+void _memsetw(void *dst, size_t cnt, uint16_t x)
 {
         unsigned int i;

kernel/generic/src/lib/objc_ext.c

@@ -162 +162 @@
 void *memset(void *s, int c, size_t n)
 {
-        memsetb((uintptr_t) s, n, c);
+        memsetb(s, n, c);
         return s;
 }

kernel/generic/src/mm/as.c

@@ -325 +325 @@
                 a->backend_data = *backend_data;
         else
-                memsetb((uintptr_t) &a->backend_data, sizeof(a->backend_data),
-                    0);
+                memsetb(&a->backend_data, sizeof(a->backend_data), 0);
 
         btree_create(&a->used_space);

kernel/generic/src/mm/backend_anon.c

@@ -114 +114 @@
                         if (allocate) {
                                 frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
-                                memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                                memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
                                 dirty = true;
                                 
@@ -145 +145 @@
                  */
                 frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
-                memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
                 dirty = true;
         }

kernel/generic/src/mm/backend_elf.c

@@ -163 +163 @@
                  */
                 frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
-                memsetb(PA2KA(frame), FRAME_SIZE, 0);
+                memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
                 dirty = true;
         } else {
@@ -188 +188 @@
                     (void *) (base + i * FRAME_SIZE + pad_lo),
                     FRAME_SIZE - pad_lo - pad_hi);
-                memsetb(PA2KA(frame), pad_lo, 0);
-                memsetb(PA2KA(frame) + FRAME_SIZE - pad_hi, pad_hi, 0);
+                memsetb((void *) PA2KA(frame), pad_lo, 0);
+                memsetb((void *) (PA2KA(frame) + FRAME_SIZE - pad_hi), pad_hi, 0);
                 dirty = true;
         }

kernel/generic/src/mm/slab.c

@@ -560 +560 @@
         cache->mag_cache = malloc(sizeof(slab_mag_cache_t) * config.cpu_count,0);
         for (i = 0; i < config.cpu_count; i++) {
-                memsetb((uintptr_t)&cache->mag_cache[i],
-                        sizeof(cache->mag_cache[i]), 0);
+                memsetb(&cache->mag_cache[i], sizeof(cache->mag_cache[i]), 0);
                 spinlock_initialize(&cache->mag_cache[i].lock, "slab_maglock_cpu");
         }
@@ -579 +578 @@
         ipl_t ipl;
 
-        memsetb((uintptr_t)cache, sizeof(*cache), 0);
+        memsetb(cache, sizeof(*cache), 0);
         cache->name = name;
 

kernel/generic/src/proc/thread.c

@@ -294 +294 @@
         
         /* Not needed, but good for debugging */
-        memsetb((uintptr_t) t->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES,
-            0);
+        memsetb(t->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES, 0);
         
         ipl = interrupts_disable();