Changeset 45f7449 in mainline for boot

Timestamp:

2013-03-31T19:46:19Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a5057cc

Parents:

582f4d28

Message:

Revert to the state of mainline,1783.

Location:

boot

Files:

• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/mips32/src/asm.S (modified) (2 diffs)
• generic/include/memstr.h (modified) (1 diff)
• generic/src/memstr.c (modified) (1 diff)

boot/arch/mips32/Makefile.inc

@@ -50 +50 @@
 endif
 
+
 SOURCES = \
         arch/$(BARCH)/src/asm.S \

boot/arch/mips32/src/asm.S

@@ -37 +37 @@
 .global halt
 .global jump_to_kernel
-.global memset
-.global memcpy
 
 .section BOOTSTRAP
@@ -160 +158 @@
         j $a0
         nop
-
-memset:
-        move $v0, $a0
-        beqz $a2, 0f
-        addiu $t1, $a2, -1
-        
-        negu $t0, $a0
-        andi $t0, $t0, 0x3
-        sltu $v1, $a2, $t0
-        bnez $v1, 1f
-        andi $a1, $a1, 0xff
-        
-        7:
-                sltiu $v1, $a2, 4
-                beqz $v1, 2f
-                move $v1, $v0
-                
-                 move $t0, $a2
-        
-        3:
-                sb $a1, 0($v1)
-                addiu $v1, $v1, 1
-                subu $a3, $v1, $v0
-                sltu $a3, $a3, $t0
-                bnez $a3, 3b
-                addiu $t1, $t1, -1
-                
-                beq $a2, $t0, 0f
-                subu $a2, $a2, $t0
-        
-        8:
-                srl $a0, $a2, 0x2
-                sll $t4, $a0, 0x2
-                beqz $t4, 4f
-                sll $t2, $a1, 0x10
-                
-                sll $t3, $a1, 0x8
-                or $t3, $a1, $t3
-                sll $a3, $a1, 0x18
-                or $t3, $t3, $t2
-                or $t3, $t3, $a3
-                addu $t0, $v0, $t0
-                move $a3, $zero
-        
-        5:
-                addiu $a3, $a3, 1
-                sltu $t2, $a3, $a0
-                sw $t3, 0($t0)
-                bnez $t2, 5b
-                addiu $t0, $t0, 4
-                
-                addu $v1, $v1, $t4
-                beq $a2, $t4, 0f
-                subu $t1, $t1, $t4
-        
-        4:
-                addiu $t1, $t1, 1
-                addu $t1, $v1, $t1
-                sb $a1, 0($v1)
-        
-        6:
-                addiu $v1, $v1, 1
-                bnel $v1, $t1, 6b
-                sb $a1, 0($v1)
-        
-        0:
-                jr $ra
-                nop
-        
-        1:
-                j 7b
-                move $t0, $a2
-        
-        2:
-                bnez $t0, 3b
-                nop
-                
-                j 8b
-                subu $a2, $a2, $t0
-
-memcpy:
-        move $t2, $a0  /* save dst */
-        
-        addiu $v0, $a1, 3
-        li $v1, -4  /* 0xfffffffffffffffc */
-        and $v0, $v0, $v1
-        beq $a1, $v0, 3f
-        move $t0, $a0
-        
-        0:
-                beq $a2, $zero, 2f
-                move $a3, $zero
-        
-        1:
-                addu $v0, $a1, $a3
-                lbu $a0, 0($v0)
-                addu $v1, $t0, $a3
-                addiu $a3, $a3, 1
-                bne $a3, $a2, 1b
-                sb $a0, 0($v1)
-        
-        2:
-                jr $ra
-                move $v0, $t2
-        
-        3:
-                addiu $v0, $a0, 3
-                and $v0, $v0, $v1
-                bne $a0, $v0, 0b
-                srl $t1, $a2, 2
-                
-                beq $t1, $zero, 5f
-                move $a3, $zero
-                
-                move $a3, $zero
-                move $a0, $zero
-        
-        4:
-                addu $v0, $a1, $a0
-                lw $v1, 0($v0)
-                addiu $a3, $a3, 1
-                addu $v0, $t0, $a0
-                sw $v1, 0($v0)
-                bne $a3, $t1, 4b
-                addiu $a0, $a0, 4
-        
-        5:
-                andi $a2, $a2, 0x3
-                beq $a2, $zero, 2b
-                nop
-                
-                sll $v0, $a3, 2
-                addu $t1, $v0, $t0
-                move $a3, $zero
-                addu $t0, $v0, $a1
-        
-        6:
-                addu $v0, $t0, $a3
-                lbu $a0, 0($v0)
-                addu $v1, $t1, $a3
-                addiu $a3, $a3, 1
-                bne $a3, $a2, 6b
-                sb $a0, 0($v1)
-                
-                jr $ra
-                move $v0, $t2

boot/generic/include/memstr.h

@@ -35 +35 @@
 #include <typedefs.h>
 
-#define memset(dst, val, cnt)  __builtin_memset((dst), (val), (cnt))
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
-
+extern void *memcpy(void *, const void *, size_t);
+extern void *memset(void *, int, size_t);
 extern void *memmove(void *, const void *, size_t);
 

boot/generic/src/memstr.c

@@ -29 +29 @@
 #include <memstr.h>
 #include <typedefs.h>
+
+/** Move memory block without overlapping.
+ *
+ * Copy cnt bytes from src address to dst address. The source
+ * and destination memory areas cannot overlap.
+ *
+ * @param dst Destination address to copy to.
+ * @param src Source address to copy from.
+ * @param cnt Number of bytes to copy.
+ *
+ * @return Destination address.
+ *
+ */
+void *memcpy(void *dst, const void *src, size_t cnt)
+{
+        uint8_t *dp = (uint8_t *) dst;
+        const uint8_t *sp = (uint8_t *) src;
+        
+        while (cnt-- != 0)
+                *dp++ = *sp++;
+        
+        return dst;
+}
+
+/** Fill block of memory.
+ *
+ * Fill cnt bytes at dst address with the value val.
+ *
+ * @param dst Destination address to fill.
+ * @param val Value to fill.
+ * @param cnt Number of bytes to fill.
+ *
+ * @return Destination address.
+ *
+ */
+void *memset(void *dst, int val, size_t cnt)
+{
+        uint8_t *dp = (uint8_t *) dst;
+        
+        while (cnt-- != 0)
+                *dp++ = val;
+        
+        return dst;
+}
 
 /** Move memory block with possible overlapping.