aboutsummaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/ft_memccpy.c12
-rw-r--r--src/mem/ft_memchr.c8
-rw-r--r--src/mem/ft_memcmp.c12
-rw-r--r--src/mem/ft_memcpy.c15
-rw-r--r--src/mem/ft_memmove.c34
-rw-r--r--src/mem/ft_memset.c18
6 files changed, 56 insertions, 43 deletions
diff --git a/src/mem/ft_memccpy.c b/src/mem/ft_memccpy.c
index f95aa03..8ce656a 100644
--- a/src/mem/ft_memccpy.c
+++ b/src/mem/ft_memccpy.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 10:01:53 by cacharle #+# #+# */
-/* Updated: 2019/11/20 03:30:45 by cacharle ### ########.fr */
+/* Updated: 2020/01/17 10:54:03 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,12 +14,12 @@
void *ft_memccpy(void *dest, const void *src, int c, size_t n)
{
- size_t i;
- t_byte *cast_dest;
- t_byte *cast_src;
+ size_t i;
+ t_ftbyte *cast_dest;
+ t_ftbyte *cast_src;
- cast_dest = (t_byte*)dest;
- cast_src = (t_byte*)src;
+ cast_dest = (t_ftbyte*)dest;
+ cast_src = (t_ftbyte*)src;
i = -1;
while (++i < n)
{
diff --git a/src/mem/ft_memchr.c b/src/mem/ft_memchr.c
index d2364db..27e9028 100644
--- a/src/mem/ft_memchr.c
+++ b/src/mem/ft_memchr.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 09:55:31 by cacharle #+# #+# */
-/* Updated: 2019/11/20 03:30:55 by cacharle ### ########.fr */
+/* Updated: 2020/01/17 10:53:57 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,10 +14,10 @@
void *ft_memchr(const void *s, int c, size_t n)
{
- size_t i;
- t_byte *cast_s;
+ size_t i;
+ t_ftbyte *cast_s;
- cast_s = (t_byte*)s;
+ cast_s = (t_ftbyte*)s;
i = -1;
while (++i < n)
if (cast_s[i] == (unsigned char)c)
diff --git a/src/mem/ft_memcmp.c b/src/mem/ft_memcmp.c
index 2c8e179..233d796 100644
--- a/src/mem/ft_memcmp.c
+++ b/src/mem/ft_memcmp.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 09:56:44 by cacharle #+# #+# */
-/* Updated: 2019/11/21 01:58:42 by cacharle ### ########.fr */
+/* Updated: 2020/01/17 10:54:15 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -14,12 +14,12 @@
int ft_memcmp(const void *s1, const void *s2, size_t n)
{
- size_t i;
- t_byte *cast_s1;
- t_byte *cast_s2;
+ size_t i;
+ t_ftbyte *cast_s1;
+ t_ftbyte *cast_s2;
- cast_s1 = (t_byte*)s1;
- cast_s2 = (t_byte*)s2;
+ cast_s1 = (t_ftbyte*)s1;
+ cast_s2 = (t_ftbyte*)s2;
if (n == 0)
return (0);
i = -1;
diff --git a/src/mem/ft_memcpy.c b/src/mem/ft_memcpy.c
index 70837bc..d0ef008 100644
--- a/src/mem/ft_memcpy.c
+++ b/src/mem/ft_memcpy.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 10:00:07 by cacharle #+# #+# */
-/* Updated: 2019/11/20 03:20:29 by cacharle ### ########.fr */
+/* Updated: 2020/01/17 10:39:04 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_ftbyte*)dest)[n] = ((t_ftbyte*)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..2f794fd 100644
--- a/src/mem/ft_memmove.c
+++ b/src/mem/ft_memmove.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 10:03:21 by cacharle #+# #+# */
-/* Updated: 2019/11/20 03:31:00 by cacharle ### ########.fr */
+/* Updated: 2020/01/17 10:39: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_ftbyte*)dst++ = *(t_ftbyte*)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..89f53ff 100644
--- a/src/mem/ft_memset.c
+++ b/src/mem/ft_memset.c
@@ -6,26 +6,26 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 10:01:23 by cacharle #+# #+# */
-/* Updated: 2019/11/20 23:22:51 by cacharle ### ########.fr */
+/* Updated: 2020/01/17 10:39:10 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_ftbyte*)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);
}