Changeset 6ba143d in mainline

Timestamp:

2005-05-11T20:23:07Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6a27d63

Parents:

7eb01623

Message:

size_t usage
const qualifier
code cleanup

Files:

• arch/ia32/src/ia32.c (modified) (2 diffs)
• arch/ia32/src/smp/mps.c (modified) (1 diff)
• include/func.h (modified) (1 diff)
• include/memstr.h (modified) (2 diffs)
• include/mm/heap.h (modified) (1 diff)
• include/mm/vm.h (modified) (1 diff)
• src/lib/func.c (modified) (1 diff)
• src/lib/memstr.c (modified) (2 diffs)
• src/mm/heap.c (modified) (2 diffs)
• src/mm/vm.c (modified) (1 diff)

arch/ia32/src/ia32.c

@@ -68 +68 @@
 }
 
-void arch_post_mm_init()
+void arch_post_mm_init(void)
 {
         if (config.cpu_active == 1) {
@@ -75 +75 @@
 }
 
-void arch_late_init()
+void arch_late_init(void)
 {
         if (config.cpu_active == 1) {

arch/ia32/src/smp/mps.c

@@ -290 +290 @@
 #ifdef MPSCT_VERBOSE
         char buf[7];
-        memcopy((__address) bus->bus_type, (__address) buf,6);
+        memcopy((__address) bus->bus_type, (__address) buf, 6);
         buf[6] = 0;
         printf("bus%d: %s\n", bus->bus_id, buf);

include/func.h

@@ -36 +36 @@
 extern void halt(void);
 
-extern int strcmp(char *src, char *dst);
+extern int strcmp(const char *src, const char *dst);
 
 #endif

include/memstr.h

@@ -30 +30 @@
 #define __MEMSTR_H__
 
+#include <typedefs.h>
 #include <arch/types.h>
 
-extern void memcopy(__address src, __address dst, int cnt);
+extern void memcopy(__address src, __address dst, size_t cnt);
 
-extern void memsetw(__address dst, int cnt, __u16 x);
-extern void memsetb(__address dst, int cnt, __u8 x);
+extern void memsetw(__address dst, size_t cnt, __u16 x);
+extern void memsetb(__address dst, size_t cnt, __u8 x);
 
 extern int memcmp(__address src, __address dst, int cnt);
@@ -42 +43 @@
  * Architecture independent variants.
  */
-extern void _memcopy(__address src, __address dst, int cnt);
-extern void _memsetb(__address dst, int cnt, __u8 x);
+extern void _memcopy(__address src, __address dst, size_t cnt);
+extern void _memsetb(__address dst, size_t cnt, __u8 x);
 
 #endif

include/mm/heap.h

@@ -41 +41 @@
 };
 
-extern void heap_init(__address heap, int size);
+extern void heap_init(__address heap, __u32 size);
 
-extern void *malloc(int size);
+extern void *malloc(size_t size);
 extern void free(void *ptr);
 

include/mm/vm.h

@@ -78 +78 @@
 extern void vm_destroy(vm_t *m);
 
-extern vm_area_t *vm_area_create(vm_t *m, vm_type_t type, int size, __address addr);
+extern vm_area_t *vm_area_create(vm_t *m, vm_type_t type, size_t size, __address addr);
 extern void vm_area_destroy(vm_area_t *a);
 

src/lib/func.c

@@ -62 +62 @@
  *
  */
-int strcmp(char *src, char *dst)
+int strcmp(const char *src, const char *dst)
 {
         int i;

src/lib/memstr.c

@@ -42 +42 @@
  *
  */
-void _memcopy(__address src, __address dst, int cnt)
+void _memcopy(__address src, __address dst, size_t cnt)
 {
         int i;
@@ -61 +61 @@
  *
  */
-void _memsetb(__address dst, int cnt, __u8 x)
+void _memsetb(__address dst, size_t cnt, __u8 x)
 {
         int i;

src/mm/heap.c

@@ -43 +43 @@
 static spinlock_t heaplock;
 
-void heap_init(__address heap, int size)
+void heap_init(__address heap, __u32 size)
 {
         spinlock_initialize(&heaplock);
-        memsetb(heap,size,0);
+        memsetb(heap, size, 0);
         chunk0 = (chunk_t *) heap;
         chunk0->used = 0;
@@ -57 +57 @@
  * Uses first-fit algorithm.
  */
-void *malloc(int size)
+void *malloc(size_t size)
 {
         pri_t pri;

src/mm/vm.c

@@ -57 +57 @@
 }
 
-vm_area_t *vm_area_create(vm_t *m, vm_type_t type, int size, __address addr)
+vm_area_t *vm_area_create(vm_t *m, vm_type_t type, size_t size, __address addr)
 {
         pri_t pri;