Index: kernel/arch/abs32le/include/memstr.h =================================================================== --- kernel/arch/abs32le/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup abs32le - * @{ - */ -/** @file - */ - -#ifndef KERN_abs32le_MEMSTR_H_ -#define KERN_abs32le_MEMSTR_H_ - -#define memcpy(dst, src, cnt) _memcpy((dst), (src), (cnt)) -#define memsetb(dst, cnt, val) _memsetb((dst), (cnt), (val)) -#define memsetw(dst, cnt, val) _memsetw((dst), (cnt), (val)) - -#endif - -/** @} - */ Index: kernel/arch/amd64/include/memstr.h =================================================================== --- kernel/arch/amd64/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup amd64 - * @{ - */ -/** @file - */ - -#ifndef KERN_amd64_MEMSTR_H_ -#define KERN_amd64_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/amd64/src/asm.S =================================================================== --- kernel/arch/amd64/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/amd64/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -37,7 +37,4 @@ .global read_efer_flag .global set_efer_flag -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -46,12 +43,4 @@ .global early_putchar -/* Wrapper for generic memsetb */ -memsetb: - jmp _memsetb - -/* Wrapper for generic memsetw */ -memsetw: - jmp _memsetw - #define MEMCPY_DST %rdi #define MEMCPY_SRC %rsi @@ -74,5 +63,4 @@ * */ -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/arm32/include/memstr.h =================================================================== --- kernel/arch/arm32/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup arm32 - * @{ - */ -/** @file - * @brief Memory manipulating functions declarations. - */ - -#ifndef KERN_arm32_MEMSTR_H_ -#define KERN_arm32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/arm32/src/asm.S =================================================================== --- kernel/arch/arm32/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/arm32/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -29,7 +29,4 @@ .text -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -38,11 +35,4 @@ .global early_putchar -memsetb: - b _memsetb - -memsetw: - b _memsetw - -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/arm32/src/exception.c =================================================================== --- kernel/arch/arm32/src/exception.c (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/arm32/src/exception.c (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -35,5 +35,4 @@ #include -#include #include #include Index: kernel/arch/ia32/include/memstr.h =================================================================== --- kernel/arch/ia32/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ia32 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia32_MEMSTR_H_ -#define KERN_ia32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/ia32/src/asm.S =================================================================== --- kernel/arch/ia32/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/ia32/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -38,7 +38,4 @@ .global paging_on .global enable_l_apic_in_msr -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_from_uspace_failover_address @@ -47,12 +44,4 @@ .global early_putchar -/* Wrapper for generic memsetb */ -memsetb: - jmp _memsetb - -/* Wrapper for generic memsetw */ -memsetw: - jmp _memsetw - #define MEMCPY_DST 4 #define MEMCPY_SRC 8 @@ -74,5 +63,4 @@ * */ -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/ia64/include/memstr.h =================================================================== --- kernel/arch/ia64/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ia64 - * @{ - */ -/** @file - */ - -#ifndef KERN_ia64_MEMSTR_H_ -#define KERN_ia64_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/ia64/src/asm.S =================================================================== --- kernel/arch/ia64/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/ia64/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -30,5 +30,4 @@ .text -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -39,5 +38,6 @@ * * This memcpy() has been taken from the assembler output of - * the generic _memcpy() and modified to have the failover part. + * a plain C implementation of memcpy() modified to have the + * failover part. * * @param in0 Destination address. @@ -46,5 +46,4 @@ * */ -memcpy: memcpy_from_uspace: memcpy_to_uspace: @@ -141,12 +140,4 @@ br.ret.sptk.many rp -.global memsetb -memsetb: - br _memsetb - -.global memsetw -memsetw: - br _memsetw - .global cpu_halt cpu_halt: Index: kernel/arch/mips32/include/memstr.h =================================================================== --- kernel/arch/mips32/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup mips32 - * @{ - */ -/** @file - */ - -#ifndef KERN_mips32_MEMSTR_H_ -#define KERN_mips32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/mips32/src/asm.S =================================================================== --- kernel/arch/mips32/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/mips32/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -57,20 +57,8 @@ nop -.global memsetb -memsetb: - j _memsetb - nop - -.global memsetw -memsetw: - j _memsetw - nop - -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace .global memcpy_from_uspace_failover_address .global memcpy_to_uspace_failover_address -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/ppc32/include/memstr.h =================================================================== --- kernel/arch/ppc32/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ppc32 - * @{ - */ -/** @file - */ - -#ifndef KERN_ppc32_MEMSTR_H_ -#define KERN_ppc32_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/ppc32/src/asm.S =================================================================== --- kernel/arch/ppc32/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/ppc32/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -35,7 +35,4 @@ .global iret .global iret_syscall -.global memsetb -.global memsetw -.global memcpy .global memcpy_from_uspace .global memcpy_to_uspace @@ -208,11 +205,4 @@ rfi -memsetb: - b _memsetb - -memsetw: - b _memsetw - -memcpy: memcpy_from_uspace: memcpy_to_uspace: Index: kernel/arch/sparc64/include/memstr.h =================================================================== --- kernel/arch/sparc64/include/memstr.h (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2005 Sergey Bondari - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup sparc64 - * @{ - */ -/** @file - */ - -#ifndef KERN_sparc64_MEMSTR_H_ -#define KERN_sparc64_MEMSTR_H_ - -#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt)) - -extern void memsetw(void *, size_t, uint16_t); -extern void memsetb(void *, size_t, uint8_t); - -#endif - -/** @} - */ Index: kernel/arch/sparc64/src/asm.S =================================================================== --- kernel/arch/sparc64/src/asm.S (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/sparc64/src/asm.S (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -34,78 +34,4 @@ .register %g2, #scratch .register %g3, #scratch - -/* - * This is the assembly language version of our _memcpy() generated by gcc. - */ -.global memcpy -memcpy: - mov %o0, %o3 /* save dst */ - add %o1, 7, %g1 - and %g1, -8, %g1 - cmp %o1, %g1 - be,pn %xcc, 3f - add %o0, 7, %g1 - mov 0, %g3 - - 0: - - brz,pn %o2, 2f - mov 0, %g2 - - 1: - - ldub [%g3 + %o1], %g1 - add %g2, 1, %g2 - cmp %o2, %g2 - stb %g1, [%g3 + %o0] - bne,pt %xcc, 1b - mov %g2, %g3 - - 2: - - jmp %o7 + 8 /* exit point */ - mov %o3, %o0 - - 3: - - and %g1, -8, %g1 - cmp %o0, %g1 - bne,pt %xcc, 0b - mov 0, %g3 - srlx %o2, 3, %g4 - brz,pn %g4, 5f - mov 0, %g5 - - 4: - - sllx %g3, 3, %g2 - add %g5, 1, %g3 - ldx [%o1 + %g2], %g1 - mov %g3, %g5 - cmp %g4, %g3 - bne,pt %xcc, 4b - stx %g1, [%o0 + %g2] - - 5: - - and %o2, 7, %o2 - brz,pn %o2, 2b - sllx %g4, 3, %g1 - mov 0, %g2 - add %g1, %o0, %o0 - add %g1, %o1, %g4 - mov 0, %g3 - - 6: - - ldub [%g2 + %g4], %g1 - stb %g1, [%g2 + %o0] - add %g3, 1, %g2 - cmp %o2, %g2 - bne,pt %xcc, 6b - mov %g2, %g3 - - jmp %o7 + 8 /* exit point */ - mov %o3, %o0 /* @@ -264,14 +190,4 @@ mov %g0, %o0 /* return 0 on failure */ -.global memsetb -memsetb: - ba %xcc, _memsetb - nop - -.global memsetw -memsetw: - ba %xcc, _memsetw - nop - .global early_putchar early_putchar: Index: kernel/arch/sparc64/src/mm/sun4u/as.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/as.c (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/sparc64/src/mm/sun4u/as.c (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -43,5 +43,4 @@ #include -#include #include #include Index: kernel/arch/sparc64/src/mm/sun4v/as.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4v/as.c (revision 5ea37b133befe12ca9715db499b9a245a2d7c6db) +++ kernel/arch/sparc64/src/mm/sun4v/as.c (revision e392ebd1f63cb1335233471a9824a9791fad55b8) @@ -46,5 +46,4 @@ #include -#include #include #include