Changeset 9c0a9b3 in mainline for src

Timestamp:

2005-08-30T19:44:27Z (20 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

d0c30f7

Parents:

8fc0d455

Message:

1) memcopy and _memcopy functions rewriten to ANSI C norm.
2) Repaired ia32,ia64 and mips version of SPARTAN to work with this memcopy functions
3) Warning for non declared funcions added and repaired ia32,ia64 and mips versions to pass build process with this warning and Werror option

Location:

src

Files:

• Makefile.config (modified) (1 diff)
• debug/print.c (modified) (1 diff)
• lib/memstr.c (modified) (2 diffs)
• main/kinit.c (modified) (1 diff)
• main/uinit.c (modified) (1 diff)
• mm/frame.c (modified) (1 diff)
• mm/heap.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/vm.c (modified) (2 diffs)
• proc/scheduler.c (modified) (2 diffs)
• proc/thread.c (modified) (1 diff)
• synch/semaphore.c (modified) (1 diff)
• synch/spinlock.c (modified) (1 diff)

src/Makefile.config

@@ -35 +35 @@
 #TEST_DIR=fpu/fpu1
 #TEST_DIR=print/print1
+TEST_DIR=thread/thread1

src/debug/print.c

@@ -32 +32 @@
 #include <arch/arg.h>
 #include <arch/asm.h>
+#include <arch.h>
 
 

src/lib/memstr.c

@@ -42 +42 @@
  *
  */
-void _memcopy(__address src, __address dst, size_t cnt)
+
+char *  _memcopy(void * dst,const void *src, size_t cnt);
+char *  _memcopy(void * dst,const void *src, size_t cnt)
 {
         int i;
@@ -48 +50 @@
         for (i=0; i<cnt; i++)
                 *((__u8 *) (dst + i)) = *((__u8 *) (src + i));
+                
+        return (char *)src;
 }
 

src/main/kinit.c

@@ -41 +41 @@
 #include <arch/mm/page.h>
 #include <mm/vm.h>
+#include <print.h>
 
 #ifdef __SMP__

src/main/uinit.c

@@ -31 +31 @@
 #include <proc/thread.h>
 #include <userspace.h>
+#include <print.h>
+
 
 void uinit(void *arg)

src/mm/frame.c

@@ -44 +44 @@
 
 #include <arch/asm.h>
+#include <arch.h>
 
 count_t frames = 0;

src/mm/heap.c

@@ -34 +34 @@
 #include <arch/types.h>
 #include <arch/asm.h>
+#include <arch.h>
 
 /*

src/mm/page.c

@@ -33 +33 @@
 #include <typedefs.h>
 #include <arch/asm.h>
+#include <memstr.h>
+
 
 void page_init(void)

src/mm/vm.c

@@ -41 +41 @@
 #include <arch/asm.h>
 #include <debug.h>
+#include <memstr.h>
+#include <arch.h>
 
 #define KAS_START_INDEX         PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)
@@ -67 +69 @@
 //                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
 //                      memcopy((__address) &src_ptl0[KAS_START_INDEX], (__address) &dst_ptl0[KAS_START_INDEX], KAS_INDICES*sizeof(pte_t));
-                        memcopy(PA2KA((__address) GET_PTL0_ADDRESS()), (__address) dst_ptl0, PAGE_SIZE);
+                        memcopy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
                         m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
                 }

src/proc/scheduler.c

@@ -44 +44 @@
 #include <arch/faddr.h>
 #include <arch/atomic.h>
+#include <print.h>
+#include <mm/frame.h>
+#include <mm/heap.h>
+
 
 volatile int nrdy;
@@ -358 +362 @@
                 THREAD = NULL;
         }
-
+        printf("*0*");
         THREAD = find_best_thread();
+        printf("*1*");
         
         spinlock_lock(&THREAD->lock);

src/proc/thread.c

@@ -51 +51 @@
 #include <arch/faddr.h>
 #include <arch/atomic.h>
+#include <memstr.h>
 
 char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"}; /**< Thread states */

src/synch/semaphore.c

@@ -32 +32 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
+#include <arch.h>
 
 void semaphore_initialize(semaphore_t *s, int val)

src/synch/spinlock.c

@@ -32 +32 @@
 #include <arch/barrier.h>
 #include <synch/spinlock.h>
+#include <print.h>
 
 #ifdef __SMP__