[ADD] ft_rand and [OPTI?] ft_isupper

Author: Antonin GAVREL

Makefile

@@ -6,7 +6,7 @@
 #    By: angavrel <[email protected]>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2017/07/29 21:40:42 by angavrel          #+#    #+#              #
-#    Updated: 2018/01/13 13:28:24 by angavrel         ###   ########.fr        #
+#    Updated: 2018/01/13 17:19:34 by angavrel         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -28,6 +28,7 @@ ASM_FILES =			ft_isascii	\
 					ft_strdup	\
 					ft_abs		\
 					ft_memset	\
+					ft_rand		\
 					table_type
 
 

Usage

@@ -1 +1 @@
-make && gcc libfts.a maintest.c && clear && ./a.out
+make test && ./maintest.out

libfts.h

@@ -21,5 +21,6 @@ char		*ft_strdup(const char *s);
 int         ft_abs(int x);
 void        *ft_memset(void *s, int c, size_t n);
 void        ft_bzero(void *s, size_t n);
+int         ft_rand(void);
 
 #endif

srcs/ft_isupper.s

@@ -6,11 +6,10 @@ section .text
 
 _ft_isupper:			; int ft_isupper
 	call	_ft_isalpha
-	test	eax, eax
-	jz		.end
+	cmovz	eax, eax	; {test eax, eax + mov eax 0}: if ft_isalpha returns 0 move 0 to eax
 	and		edi, 0x20	; checks if 6th bit if ON
-	jnz		.end		; if set, jumps to .end
-	mov		eax, 1
+	cmovnz	eax, eax
+	jnz		.end		; if not set, jumps to .end
 	ret
 
 .end:

srcs/ft_rand.s

@@ -0,0 +1,11 @@
+global _ft_rand
+
+section .text
+
+_ft_rand:      ; int ft_rand(void) : returns integer between 0 and 99
+    rdrand  eax
+    mov     ebx, 100
+    mov     edx, 0
+    div     ebx
+    mov     eax, edx
+    ret

test/maintest.c

@@ -28,27 +28,6 @@ while (++tmp < 255)
 		dprintf(1, "\t\x1b[31mKO\x1b[0m\n");
 }
 
-/*
-**************************** is_isupper ****************************************
-*/
-
-	dprintf(1, "\n\x1b[32mft_isupper:\x1b[0m\n");
-	dprintf(1, "\t%c -> %d\n", '!', ft_isupper('!'));
-	dprintf(1, "\t%c -> %d\n", '@', ft_isupper('@'));
-	dprintf(1, "\t%c -> %d\n", 'A', ft_isupper('A'));
-	dprintf(1, "\t%c -> %d\n", 'F', ft_isupper('F'));
-	dprintf(1, "\t%c -> %d\n", 'K', ft_isupper('K'));
-	dprintf(1, "\t%c -> %d\n", 'T', ft_isupper('T'));
-	dprintf(1, "\t%c -> %d\n", 'Z', ft_isupper('Z'));
-	dprintf(1, "\t%c -> %d\n", '[', ft_isupper('['));
-	dprintf(1, "\t%c -> %d\n", '`', ft_isupper('`'));
-	dprintf(1, "\t%c -> %d\n", 'a', ft_isupper('a'));
-	dprintf(1, "\t%c -> %d\n", 'f', ft_isupper('f'));
-	dprintf(1, "\t%c -> %d\n", 'k', ft_isupper('k'));
-	dprintf(1, "\t%c -> %d\n", 't', ft_isupper('t'));
-	dprintf(1, "\t%c -> %d\n", 'z', ft_isupper('z'));
-	dprintf(1, "\t%c -> %d\n", '{', ft_isupper('{'));
-	dprintf(1, "\t%c -> %d\n", '~', ft_isupper('~'));
 
 /*
 **************************** is_islower ****************************************
@@ -273,5 +252,43 @@ dprintf(1, "\n\x1b[32mft_strdup:\x1b[0m\n");
 	str2 = ft_strdup(str);
 	dprintf(1, "\t'%s' <- str2 = ft_strdup(str)\n", str2);
 
+
+/*
+**************************** is_isupper ****************************************
+*/
+
+	dprintf(1, "\n\x1b[32mft_isupper:\x1b[0m\n");
+
+	tmp = 31;
+	while (++tmp < 127)
+	{
+		dprintf(1, "\t%c -> %d", tmp, check = ft_isupper(tmp));
+		if ((check && (64 < tmp && tmp < 91)) || (!check && (65 > tmp || tmp > 90)))
+			dprintf(1, "\t\x1b[32mOK\x1b[0m\n");
+		else
+			dprintf(1, "\t\x1b[31mKO\x1b[0m\n");
+	}
+
+/*
+**************************** ft_rand *******************************************
+*/
+/*
+	int	rng[100];
+	ft_bzero(rng, 100);
+	tmp = -1;
+	int b;
+	while (++tmp < 50)
+	{
+		b = ft_rand();
+		rng[b] += 1;
+	}
+	tmp = -1;
+	while (++tmp < 100)
+	{
+		dprintf(1, "\tft_rand() value: %d count: %d\n", tmp, rng[tmp]);
+	}
+*/
+//	dprintf(1, "\tft_rand() -> %d", ft_rand());
+
 	return (0);
 }