Changeset 9756131 in mainline

Timestamp:

2005-08-31T10:00:14Z (19 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().

Files:

• arch/amd64/src/dummy.s (modified) (2 diffs)
• arch/amd64/src/supplib.c (modified) (1 diff)
• arch/ia32/src/asm.S (modified) (2 diffs)
• arch/ia32/src/drivers/ega.c (modified) (1 diff)
• arch/ia32/src/mm/page.c (modified) (1 diff)
• arch/ia32/src/smp/mps.c (modified) (1 diff)
• arch/ia32/src/smp/smp.c (modified) (1 diff)
• arch/ia64/src/asm.S (modified) (1 diff)
• arch/mips/src/asm.s (modified) (1 diff)
• arch/ppc/src/dummy.s (modified) (2 diffs)
• include/memstr.h (modified) (2 diffs)
• src/lib/memstr.c (modified) (2 diffs)
• src/main/kinit.c (modified) (1 diff)
• src/mm/vm.c (modified) (1 diff)
• test/synch/rwlock4/test.c (modified) (1 diff)

arch/amd64/src/dummy.s

@@ -51 +51 @@
 .global dummy
 .global asm_delay_loop
+.global memcpy
 
 cpu_priority_high:
@@ -74 +75 @@
 page_arch_init:
 frame_arch_init:
+memcpy:
 
 dummy:

arch/amd64/src/supplib.c

@@ -31 +31 @@
 /* TODO: Rewrite to assembler */
 
-char *memcpy(void *dst, const void *src, size_t cnt)
-{
-        _memcopy(dst, src, cnt);
-}
-
-char *memcopy(void * dst, const void *src, size_t cnt)
-{
-        _memcopy(dst, src, cnt);
-}
-
 void memsetw(__address dst, size_t cnt, __u16 x)
 {

arch/ia32/src/asm.S

@@ -44 +44 @@
 .global outw
 .global outl
-.global memcopy
+.global memcpy
 .global memsetb
 .global memsetw
@@ -266 +266 @@
 DST=8
 CNT=16
-memcopy:
+memcpy:
         push %ebp
         movl %esp,%ebp

arch/ia32/src/drivers/ega.c

@@ -74 +74 @@
                 return;
 
-        memcopy((void *)PA2KA(VIDEORAM),(void *)(PA2KA(VIDEORAM) + ROW*2), (SCREEN - ROW)*2); //swaped
+        memcpy((void *)PA2KA(VIDEORAM), (void *)(PA2KA(VIDEORAM) + ROW*2), (SCREEN - ROW)*2);
         memsetw(PA2KA(VIDEORAM) + (SCREEN - ROW)*2, ROW, 0x0720);
         ega_cursor = ega_cursor - ROW;

arch/ia32/src/mm/page.c

@@ -73 +73 @@
 
                 dba = frame_alloc(FRAME_KA | FRAME_PANIC);
-                memcopy((void *)dba,(void *)bootstrap_dba , PAGE_SIZE); //swaped
+                memcpy((void *)dba, (void *)bootstrap_dba , PAGE_SIZE);
                 write_cr3(KA2PA(dba));
         }

arch/ia32/src/smp/mps.c

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

arch/ia32/src/smp/smp.c

@@ -140 +140 @@
                         panic("couldn't allocate memory for GDT\n");
 
-                memcopy(gdt_new, gdt, GDT_ITEMS*sizeof(struct descriptor));           // swaped
+                memcpy(gdt_new, gdt, GDT_ITEMS*sizeof(struct descriptor));
                 memsetb((__address)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
                 gdtr.base = KA2PA((__address) gdt_new);

arch/ia64/src/asm.S

@@ -31 +31 @@
 .global memcpy
 memcpy:
-        /*
-         * Switch the role of first two arguments
-         */
-        sub r33 = r33, r32      ;;
-        add r32 = r32, r33      ;;
-        sub r33 = r32, r33      
-                
-        br _memcopy
-
-.global memcopy
-memcopy:
-        br _memcopy
+        br _memcpy
 
 .global memsetb

arch/mips/src/asm.s

@@ -151 +151 @@
         nop
 
-.global memcopy
-memcopy:
-        j _memcopy
+.global memcpy
+memcpy:
+        j _memcpy
         nop
 

arch/ppc/src/dummy.s

@@ -30 +30 @@
 
 .global memcpy
-.global memcopy
 .global cpu_priority_read
 .global memsetb
@@ -47 +46 @@
 
 memcpy:
-memcopy:
 cpu_priority_read:
 memsetb:

include/memstr.h

@@ -33 +33 @@
 #include <arch/types.h>
 
-extern char *memcpy(void * dst, const void *src, size_t cnt);
-extern char *memcopy(void * dst, const void *src, size_t cnt);
+#define memcpy(dst, src, cnt)   __builtin_memcpy((dst), (src), (cnt)); 
 
 extern void memsetw(__address dst, size_t cnt, __u16 x);
@@ -44 +43 @@
  * Architecture independent variants.
  */
-extern char *_memcopy(void *dst, const void *src, size_t cnt);
+extern char *_memcpy(void *dst, const void *src, size_t cnt);
 extern void _memsetb(__address dst, size_t cnt, __u8 x);
 extern void _memsetw(__address dst, size_t cnt, __u16 x);

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);
                 }

test/synch/rwlock4/test.c

@@ -34 +34 @@
 #include <arch/types.h>
 #include <arch/context.h>
+#include <context.h>
 #include <panic.h>