Changeset ba18512 in mainline for src

Timestamp:

2005-08-30T21:33:09Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b524f816

Parents:

fa0dfaf

Message:

Switch order of 'src' and 'dst' arguments in some left-over uses of memcopy.

Cleanup.

Location:

src

Files:

• Makefile.config (modified) (2 diffs)
• lib/memstr.c (modified) (1 diff)
• main/kinit.c (modified) (1 diff)
• mm/vm.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)

src/Makefile.config

@@ -1 @@
-ARCH=ia32
+#ARCH=ia32
 #ARCH=mips
 #ARCH=ia64
@@ -35 +35 @@
 #TEST_DIR=fpu/fpu1
 #TEST_DIR=print/print1
-TEST_DIR=thread/thread1
+#TEST_DIR=thread/thread1

src/lib/memstr.c

@@ -42 +42 @@
  *
  */
-
-char *  _memcopy(void * dst,const void *src, 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;

src/main/kinit.c

@@ -132 +132 @@
         if (!a) panic("vm_area_create: vm_text");
         vm_area_map(a, m);
-        memcopy((__address) utext, PA2KA(a->mapping[0]), utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
+        memcopy(PA2KA(a->mapping[0]), (__address) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
 
         /*

src/mm/vm.c

@@ -67 +67 @@
                         src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
                         dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC);
-//                      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((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
                         m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);

src/proc/scheduler.c

@@ -362 +362 @@
                 THREAD = NULL;
         }
-        printf("*0*");
+
         THREAD = find_best_thread();
-        printf("*1*");
         
         spinlock_lock(&THREAD->lock);