fix makefile and tests

Makefile

@@ -27,11 +27,11 @@ FLAGS = -felf64
 all: $(NAME)
 
 test: test.c bonus
-	clang -z noexecstack test.c -L. -lasm_bonus  -o test -g
+	clang -z noexecstack test.c -L. -lasm  -o test -g
 	./test || echo -e "\033[31m tests exited with an error code"
 
 bonus: $(OBJS_DIR) $(OBJS) $(OBJS_BONUS)
-	ar rcs $@ $(OBJS) $(OBJS_BONUS)
+	ar rcs $(NAME) $(OBJS) $(OBJS_BONUS)
 
 $(NAME): $(OBJS_DIR) $(OBJS)
 	ar rcs $@ $(OBJS)

srcs/bonus/ft_atoi_base.s

@@ -9,26 +9,33 @@ whitespaces: db " ", 0x0c, 0x0a, 0x0d, 0x09, 0x0b, 0
 
 section .text
 
-; checks if a char is in the invalid_chars
+; get index of char in string or returns -1 if not found
+; char in dil
+; str in rsi
 get_char_index: 
 	xor rax, rax
-	push rsi
 
-get_char_index_loop:
+	push rsi ; keep start index in stack
+
+	test dil, dil
+	je .error
+
+.get_char_index_loop:
 	cmp dil, [rsi] ;is char invalid
-	jz get_char_index_found 
+	jz .get_char_index_found 
 
 	mov al, [rsi] ; is end of string
 	test al, al
 	lea rsi, [rsi + 1]
-	jne get_char_index_loop 
+	jne .get_char_index_loop 
 
+.error:
 	mov	rax, -1 ;not found and at the end
 	pop rsi
 	ret
 
-get_char_index_found:
+.get_char_index_found:
-	pop rax ;return index of the found char
+	pop rax ;return index of the found char (compare to top of stack)
 	sub rsi, rax
 	mov rax, rsi 
 	ret
@@ -40,7 +47,7 @@ check_duplicate_char:
 
 	mov al ,[rdi] ; test if \0
 	test al, al
-	jz no_duplicate 
+	jz .no_duplicate 
 
 	push rdi
 	mov rsi, rdi
@@ -55,7 +62,7 @@ check_duplicate_char:
 	mov rax, 1
 	ret
 
-no_duplicate:
+.no_duplicate:
 	xor rax, rax
 	ret
 
@@ -69,25 +76,24 @@ check_base:
 
 	mov al, [rdi] ; check if it's an empty string
 	test al, al
-	jne chk_bs_duplicate
+	jne .chk_bs_duplicate
 	xor rax, rax
 	ret
 
-chk_bs_duplicate:
+.chk_bs_duplicate:
 	push rdi
 	call check_duplicate_char
 	pop rdi
 	test rax, rax
-	jz chk_bs_char
+	jz .chk_bs_char
 
 	xor rax, rax
 	ret
 
-
+.chk_bs_char:
-chk_bs_char:
 	mov al, [rdi] ; if rdi is \0, return 0
 	test al, al
-	jz base_ok 
+	jz .base_ok 
 
 	push rdi ; if current char is in invalid_chars
 	mov dil, [rdi];
@@ -97,12 +103,12 @@ chk_bs_char:
 
 	cmp rax, -1 ; if not -1, error
 	lea rdi, [rdi + 1]
-	jz chk_bs_char
+	jz .chk_bs_char
 
 	xor rax, rax; return 0
 	ret
 
-base_ok:
+.base_ok:
 	mov rax,1
 	ret
 
@@ -113,53 +119,56 @@ base_ok:
 ft_atoi_base:
 	xor rax, rax ;check if there is a null pointer in rdi or rsi
 	test rdi, rdi
-	jz final_number
+	jz .return 
 	test rsi, rsi
-	jz final_number
+	jz .return 
 
 	push rdi ; is base valid
 	push rsi
 	mov rdi, rsi
+	sub rsp, 8
 	call check_base
+	add rsp, 8
 	pop rsi
 	pop rdi
 
 	test rax, rax
-	jne whitespace_skip ; if 0 , base is not valid
+	jne .whitespace_skip ; if 0 , base is not valid
-	xor rax, rax
 	ret
 	
-
+.whitespace_skip_inc:
-whitespace_skip_inc:
 	lea rdi, [rdi + 1]
-whitespace_skip:
+.whitespace_skip:
 	push rdi
 	push rsi
 	mov dil, [rdi]
 	lea rsi, [rel whitespaces]
+	sub rsp, 8
 	call get_char_index
+	add rsp, 8
 	pop rsi
 	pop rdi
 
 	cmp rax, 0
-	jge whitespace_skip_inc
+	jge .whitespace_skip_inc
 	xor rdx, rdx
-	jmp plus_minus
+	jmp .plus_minus
 
-plus_minus_invert:
+.plus_minus_invert:
 	xor rdx, 1	
 
-plus_minus_inc:
+.plus_minus_inc:
 	lea rdi, [rdi + 1]
 
-plus_minus:
+.plus_minus:
 	mov al, [rdi]
 	cmp al, '-'
-	jz plus_minus_invert
+	jz .plus_minus_invert
 
 	cmp al, '+'
-	jz plus_minus_inc
+	jz .plus_minus_inc
 
+	push rdx ; keep invert sign setting in stack
 
 	
 	push rdi
@@ -169,30 +178,30 @@ plus_minus:
 	pop rsi
 	pop rdi
 
-	mov rbx, rax
+	mov rbx, rax ; keep the length of the base in rbx 
 
 	xor rax, rax
 	
-	push rdx
+.number_loop:
-
-number_loop:
 	mov dl, [rdi]
 	test dl, dl
-	jz final_number
+	jz .final_number
 
 	push rax
 	push rdi
 	push rsi
 	mov dil, dl
+	sub rsp, 8
 	call get_char_index
+	add rsp, 8
 	pop rsi
 	pop rdi
 
 	mov rdx, rax ; save return value in rdx
 	pop rax
 	
-	cmp rdx, -1
+	cmp rdx, -1 ; if the char is not in the base, return the number
-	jz final_number
+	jz .final_number
 
 	push rdx ; imul sets rdx to 0
 	imul rbx
@@ -201,14 +210,15 @@ number_loop:
 
 	lea rdi, [rdi + 1]
 
-	jmp number_loop
+	jmp .number_loop
 
-final_number:
+.final_number:
 	pop rdx
 	test rdx, rdx
-	jne neg_final_number
+	jne .neg_final_number
 	ret	
 
-neg_final_number:
+.neg_final_number:
 	neg rax
+.return:
 	ret

srcs/bonus/ft_list_push_front.s

@@ -5,17 +5,19 @@ section .text
 
 ft_list_push_front:
 	test rdi, rdi
-	jz err
+	jz .err
 
 	push rdi
 	push rsi
 	mov rdi, 16
+	sub rsp, 8
 	call malloc wrt ..plt
+	add rsp, 8
 	pop rsi
 	pop rdi
 
 	test rax, rax ; did malloc return 0
-	jz err
+	jz .err
 
 	push rdi
 	mov rdi, [rdi]
@@ -25,5 +27,5 @@ ft_list_push_front:
 
 	mov [rdi], rax
 	
-err:
+.err:
 	ret

srcs/bonus/ft_list_remove_if.s

@@ -4,25 +4,25 @@ extern free
 section .text
 
 ;this function remove an element from a list, set the previous element to the next
-; the element ot remove is in rax
+; the element to remove is in rax
 ; the previouse element is in r8
 ; the pointer to the start of the list is in rdi
 remove_element:
 	push rsi
-	mov rsi, [rax + 8]
+	mov rsi, [rax + 8] ; save cur->next in rsi
 	call call_free_elem
 
 	test r8, r8
-	jz first_elem
+	jz .first_elem ;if it's the first element, skip setting prev
 
-	mov [r8 + 8], rsi
+	mov [r8 + 8], rsi ; prev->next = rsi
-	jmp remove_element_end
+	jmp .remove_element_end
 
-first_elem:
+.first_elem:
-	mov [rdi], rsi
+	mov [rdi], rsi ;set list start to rsi
 
-remove_element_end:
+.remove_element_end:
-	mov rax, rsi
+	mov rax, rsi ; set cur element to rsi;
 	pop rsi
 	ret
 	
@@ -37,7 +37,9 @@ call_free_elem:
 	push rax
 
 	mov rdi, [rax]
-	call rcx
+	sub rsp, 8
+	call rcx ; call remove
+	add rsp, 8
 
 	pop rdi
 	call free wrt ..plt
@@ -55,18 +57,18 @@ call_free_elem:
 
 ft_list_remove_if:
 	test rdi, rdi
-	jz end 
+	jz .end 
 	test rdx, rdx
-	jz end 
+	jz .end 
 	test rcx, rcx
-	jz end 
+	jz .end 
 
 	xor r8, r8
 
 	mov rax, [rdi]
-loop:
+.loop:
 	test rax, rax
-	jz end	
+	jz .end	
 	push rax
 
 	push rdi
@@ -76,7 +78,9 @@ loop:
 	push r8
 
 	mov rdi, [rax]
+	sub rsp, 8
 	call rdx
+	add rsp, 8
 
 	test eax, eax
 	pop r8
@@ -85,19 +89,20 @@ loop:
 	pop rsi
 	pop rdi
 
-	jz loop_end
+	jnz .loop_end ;if call to rdx returned zero, don't remove
 
 	pop rax
+	sub rsp, 8
 	call remove_element
-	jmp loop
+	add rsp, 8
+	jmp .loop
 
-loop_end:
+.loop_end:
 
 	pop rax
 	mov r8, rax
 	mov rax, [rax + 8]
-	jmp loop 
+	jmp .loop 
 
-
+.end:
-end:
 	ret

srcs/bonus/ft_list_size.s

@@ -5,15 +5,14 @@ section .text
 ft_list_size:
 	xor rax, rax
 
-count_start:
+.count_start:
 	test rdi, rdi
-	jz end
+	jz .end
 
 	mov rdi, [rdi + 8]
+	inc rax
 
-	lea rax, [rax + 1]
+	jmp .count_start
 
-	jmp count_start
+.end:
-
-end:
 	ret

srcs/bonus/ft_list_sort.s

@@ -19,37 +19,37 @@ list_swap:
 
 ft_list_sort:
 	test rdi, rdi
-	jz err
+	jz .err
 	test rsi, rsi
-	jz err
+	jz .err
 
 	mov rdi, [rdi]
 	push rdi
 	call ft_list_size
 	pop rdi
 
-loop:
+.loop:
 	test rax, rax
-	jz err
+	jz .err
 
 	push rax
 	push rdi
 	push rsi
 
 	mov rax, rsi ; move cmp to rax
-	jmp loop2
+	jmp .loop2
 
-loop2_inc:
+.loop2_inc:
 	mov rdi, [rdi + 8]
 
-loop2:
+.loop2:
 	
 	test rdi, rdi
-	jz loop2_end
+	jz .loop2_end
 
 	mov rsi, [rdi + 8]
 	test rsi, rsi
-	jz loop2_end
+	jz .loop2_end
 
 	push rdi
 	mov rdi, [rdi]
@@ -61,24 +61,23 @@ loop2:
 	cmp eax, 0
 	pop rax
 	pop rdi
-	jle loop2_inc
+	jle .loop2_inc
 
 	; then call list_swap
 	mov rsi, [rdi + 8]
 	push rax
+	sub rsp, 8
 	call list_swap
+	add rsp, 8
 	pop rax
-	jmp loop2_inc
+	jmp .loop2_inc
 
-
+.loop2_end:
-
-loop2_end:
 	pop rsi
 	pop rdi
 	pop rax
 	lea rax, [rax - 1]
-	jmp loop
+	jmp .loop
 
-
+.err:
-err:
 	ret

srcs/ft_read.s

@@ -7,13 +7,15 @@ ft_read:
 	syscall
 
 	cmp rax, 0 ; if return is < 0, it's an error in negative
-	jge success
+	jge .success
 
 	neg rax ; inv errno, and set errno
 	mov edi, eax
+	sub rsp, 8
 	call __errno_location wrt ..plt
+	add rsp, 8
 	mov [rax], edi
 	mov rax, -1
 
-success:
+.success:
 	ret

srcs/ft_strcmp.s

@@ -5,44 +5,43 @@ ft_strcmp:
 	xor rax, rax
 
 	test rdi, rdi ; test if args are false
-	jz err
+	jz .err
 	test rsi, rsi
-	jz err
+	jz .err
-loop_start:
+.loop_start:
 	mov al, [rdi]
 	cmp al, [rsi]
-	jne compare 
+	jne .compare 
 
 	test al, al ; test if rdi is \0
-	jz compare
+	jz .compare
 
 	mov al, [rsi] ; test if rsi is \0
 	test al, al
-	jz compare 
+	jz .compare 
 
 	lea rsi, [rsi + 1]
 	lea rdi, [rdi + 1]
-	jmp loop_start
+	jmp .loop_start
 
 
-compare:
+.compare:
 	mov al, [rdi]
 	cmp al, [rsi]
-	jl lower
+	jl .lower
-	jg greater
+	jg .greater
 	mov eax, 0
-	jmp end
+	jmp .end
 
-lower:
+.lower:
 	mov eax, -1
-	jmp end
+	jmp .end
 
-greater:
+.greater:
 	mov eax, 1
-	jmp end
+	jmp .end
 
-err:
+.err:
 	mov eax, 0
-
+.end:
-end:
 	ret

srcs/ft_strcpy.s

@@ -3,25 +3,25 @@ section .text
 
 ft_strcpy:
 	test rdi, rdi
-	jz err
+	jz .err
 	test rsi, rsi
-	jz err
+	jz .err
 	push rdi
 
 
-loop_start:
+.loop_start:
 	mov al, [rsi]
 	mov [rdi],al 
 	lea rdi, [rdi + 1]
 	lea rsi, [rsi + 1]
 
 	test al, al
-	jne loop_start
+	jne .loop_start
 	
-end:
+.end:
 	pop rax
 	ret
 
-err:
+.err:
 	xor rax, rax
 	ret

srcs/ft_strdup.s

@@ -1,5 +1,6 @@
-extern malloc
 global ft_strdup
+
+extern malloc
 extern ft_strcpy
 extern ft_strlen
 extern __errno_location
@@ -7,7 +8,7 @@ section .text
 
 ft_strdup:
 	test rdi, rdi ; test if arg is NULL
-	jz err
+	jz .err
 
 	push rdi ;push to use it for the strcpy
 	call ft_strlen
@@ -16,17 +17,21 @@ ft_strdup:
 
 	call malloc wrt ..plt
 	test rax, rax
-	jz malloc_failed
+	jz .malloc_failed
 	mov rdi, rax
 	pop rsi
+	sub rsp, 8
 	call ft_strcpy
+	add rsp, 8
 	ret
 
-malloc_failed:
+.malloc_failed:
+	sub rsp, 8
 	call __errno_location wrt ..plt
+	add rsp, 8
 	mov dword [rax], 12
 	pop rax
 
-err:
+.err:
 	xor rax, rax
 	ret

srcs/ft_strlen.s

@@ -3,22 +3,22 @@ section .text
 
 ft_strlen:
 	test rdi, rdi
-	jz err
+	jz .err
 	mov rsi, rdi
-	jmp loop_start
+	jmp .loop_start
 
-increase_pointer:
+.increase_pointer:
 	lea rsi, [rsi + 1]
 
-loop_start:
+.loop_start:
 	mov al, [rsi]
 	test al, al
-	jnz increase_pointer
+	jnz .increase_pointer
-end:
+.end:
 	sub rsi, rdi 
 	mov rax, rsi
 	ret
 
-err:
+.err:
 	xor rax, rax
 	ret

srcs/ft_write.s

@@ -7,14 +7,16 @@ ft_write:
 	syscall
 
 	cmp rax, 0 ; if return is < 0, it's an error in negative
-	jge success
+	jge .success
 
 	neg rax ; inv errno, and set errno
 	mov edi, eax
+	sub rsp, 8
 	call __errno_location wrt ..plt
+	add rsp, 8
 	mov [rax], edi
 	mov rax, -1
 
 
-success:
+.success:
 	ret

test.c

@@ -6,7 +6,7 @@
 /*   By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/29 19:53:58 by tomoron           #+#    #+#             */
-/*   Updated: 2025/04/12 19:30:05 by tomoron          ###   ########.fr       */
+/*   Updated: 2025/08/07 13:40:55 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,6 +89,7 @@ int test_write(void)
 	int fail = 0;
 
 	TEST("writing hello and test return value", ft_write(1, "hello ", 6) == 6);
+	TEST("writing nothing", ft_write(1, "hello", 0) == 0);
 	errno = 0;
 	TEST("failed write return value", ft_write(-1, "", 0) == (size_t)-1);
 	TEST("failed write errno test", errno == 9);
@@ -111,6 +112,7 @@ int test_read(void)
 	close(fd);
 
 	fd = open("test_file.tmp", O_RDONLY);
+	TEST("read 0 char", ft_read(fd, buf, 0) == 0);
 	TEST("read 1 char",  ft_read(fd, buf, 1) == 1);
 	TEST("check read char", memcmp(buf, "p", 1) == 0);
 	TEST("read multiple char", ft_read(fd, buf, 5) == 5);
@@ -249,7 +251,7 @@ int test_list_sort()
 
 int remove_if_compare(void *data, int *nb)
 {
-	return((long)data == *nb);
+	return((long)data != *nb);
 }
 
 int test_list_remove_if()