Changeset 9756131 in mainline for src

Timestamp:

2005-08-31T10:00:14Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b9e97fb

Parents:

3de9e5e

Message:

Get rid of memcopy().
All we now have is memcpy() and _memcpy().
memcpy() is defined to be builtin.
Where not applicable, architectures must implement memcpy() code or call slowish _memcopy().

Location:

src

Files:

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

src/lib/memstr.c

@@ -42 +42 @@
  *
  */
-char *_memcopy(void * dst, const void *src, size_t cnt)
+char *_memcpy(void * dst, const void *src, size_t cnt)
 {
         int i;
@@ -51 +51 @@
         return (char *)src;
 }
-
 
 /** Fill block of memory

src/main/kinit.c

@@ -132 +132 @@
         if (!a) panic("vm_area_create: vm_text");
         vm_area_map(a, m);
-        memcopy(PA2KA(a->mapping[0]), (__address) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
+        memcpy((void *) PA2KA(a->mapping[0]), (void *) 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);
-                        memcopy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
+                        memcpy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
                         m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
                 }