From e23e9b3f74b0510542064e01ef505b6b7edbe17c Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 16 Jan 2020 10:28:33 +0100 Subject: Merge push_swap to master (optimized ft_memcpy, ft_memset) --- src/mem/ft_memcpy.c | 15 +++++++++++++-- src/mem/ft_memmove.c | 34 ++++++++++++++++++---------------- src/mem/ft_memset.c | 18 +++++++++--------- 3 files changed, 40 insertions(+), 27 deletions(-) (limited to 'src/mem') diff --git a/src/mem/ft_memcpy.c b/src/mem/ft_memcpy.c index 70837bc..ca679fc 100644 --- a/src/mem/ft_memcpy.c +++ b/src/mem/ft_memcpy.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:00:07 by cacharle #+# #+# */ -/* Updated: 2019/11/20 03:20:29 by cacharle ### ########.fr */ +/* Updated: 2019/11/21 18:04:36 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,9 +14,20 @@ void *ft_memcpy(void *dest, const void *src, size_t n) { + long int *long_dest; + const long int *long_src; + if (dest == src) return (dest); + while (n % 8 > 0) + { + n--; + ((t_byte*)dest)[n] = ((t_byte*)src)[n]; + } + long_dest = dest; + long_src = src; + n /= 8; while (n-- > 0) - *((t_byte*)dest + n) = *((t_byte*)src + n); + long_dest[n] = long_src[n]; return (dest); } diff --git a/src/mem/ft_memmove.c b/src/mem/ft_memmove.c index aa107bd..73e26b8 100644 --- a/src/mem/ft_memmove.c +++ b/src/mem/ft_memmove.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:03:21 by cacharle #+# #+# */ -/* Updated: 2019/11/20 03:31:00 by cacharle ### ########.fr */ +/* Updated: 2019/11/21 18:43:26 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,20 +14,22 @@ void *ft_memmove(void *dst, const void *src, size_t len) { - size_t i; - t_byte *dst_cast; - t_byte *src_cast; + long int *long_dst; + const long int *long_src; + void *dst_copy; - if (dst == src) - return (dst); - dst_cast = (t_byte*)dst; - src_cast = (t_byte*)src; - i = -1; - if (dst_cast < src_cast) - while (++i < len) - dst_cast[i] = src_cast[i]; - else - while (len-- > 0) - dst_cast[len] = src_cast[len]; - return (dst); + if (dst >= src) + return (ft_memcpy(dst, src, len)); + dst_copy = dst; + while (len % 8 > 0) + { + len--; + *(t_byte*)dst++ = *(t_byte*)src++; + } + long_dst = dst; + long_src = src; + len /= 8; + while (len-- > 0) + *long_dst++ = *long_src++; + return (dst_copy); } diff --git a/src/mem/ft_memset.c b/src/mem/ft_memset.c index 7963fd0..4ede5f3 100644 --- a/src/mem/ft_memset.c +++ b/src/mem/ft_memset.c @@ -6,26 +6,26 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 10:01:23 by cacharle #+# #+# */ -/* Updated: 2019/11/20 23:22:51 by cacharle ### ########.fr */ +/* Updated: 2019/11/21 18:40:59 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -#define BUF_TYPE long int - void *ft_memset(void *s, int c, size_t n) { - BUF_TYPE buf; + long int buf; + long int *long_s; c = (unsigned char)c; while (n % 8 > 0) - *((t_byte*)s + --n) = (t_byte)c; + *((t_byte*)s + --n) = c; + buf = (long int)c | (long int)c << 8 | (long int)c << 16 + | (long int)c << 24 | (long int)c << 32 | (long int)c << 40 + | (long int)c << 48 | (long int)c << 56; n /= 8; - buf = (BUF_TYPE)c | (BUF_TYPE)c << 8 | (BUF_TYPE)c << 16 - | (BUF_TYPE)c << 24 | (BUF_TYPE)c << 32 | (BUF_TYPE)c << 40 - | (BUF_TYPE)c << 48 | (BUF_TYPE)c << 56; + long_s = s; while (n > 0) - *((BUF_TYPE*)s + --n) = buf; + long_s[--n] = buf; return (s); } -- cgit