Enhancement in file header

Moved the macro before .data section
Add a .bss section
Reorganisation of .data section

wtfstopw.asm

@@ -26,21 +26,20 @@
 ; Interact :
 ; 	press enter to exit
 ; 	send SIGINT (with kill -2 ir ctrl + c) for a new lap
-
-
-
 [bits 64]
 
+%define O_NONBLOCK 0x800
+
 STRUC TIMESPEC_STRUC
 	.tv_sec: resq 1
 	.tv_nsec: resq 1
 ENDSTRUC
 
 
-%macro TIMESPEC 3
+%macro TIMESPEC 1
 	%1: ISTRUC TIMESPEC_STRUC
-		at TIMESPEC_STRUC.tv_sec, dq %2
-		at TIMESPEC_STRUC.tv_nsec, dq %3
+		at TIMESPEC_STRUC.tv_sec, resq 1
+		at TIMESPEC_STRUC.tv_nsec, resq 1
 	IEND
 	%define %1.tv_sec %1+TIMESPEC_STRUC.tv_sec
 	%define %1.tv_nsec %1+TIMESPEC_STRUC.tv_nsec
@@ -53,9 +52,9 @@ STRUC SIGACTION_STRUC
 	.sa_mask:         resb      128
 ENDSTRUC
 
-section .data
-
-	sigaction: ISTRUC SIGACTION_STRUC
+; from https://www.linuxnasm.be/home/library/lib-includes/signals-inc
+%macro SIGACTION 1
+	%1: ISTRUC SIGACTION_STRUC
 		at  SIGACTION_STRUC.sa_handler, dq 0
 		at  SIGACTION_STRUC.sa_flags, dq 0
 		at  SIGACTION_STRUC.sa_restorer, dq 0
@@ -65,14 +64,34 @@ section .data
 	%define sigaction.sa_flags sigaction+SIGACTION_STRUC.sa_flags
 	%define sigaction.sa_restorer sigaction+SIGACTION_STRUC.sa_restorer
 	%define sigaction.sa_mask sigaction+SIGACTION_STRUC.sa_mask
+%endmacro
 
-	TIMESPEC ts_start, 0, 0
-	TIMESPEC ts_cur, 0, 0
-	TIMESPEC ts_sleep, 0, 100000000 ; set before mainloop
+section .bss
+align 8
+	TIMESPEC ts_start
+	TIMESPEC ts_cur
+	TIMESPEC ts_sleep
+	buf: resb 1
 
+section .data
 
-	faultmsg: db "Fault !", 0xA
-	faultmsglen: equ $ - faultmsg
+	time_res: dq 2 ; 2 digits bellow seconds can grow to 8
+	fcntl_flag: dq 0
+	SIGACTION sigaction
+
+	align 8
+	hours: times 8 db '0' ; allows storing max hours in 1<<64 secs
+	timestr: db ":00:00.0           ", 0
+	align 8
+	timestrlen: equ $ - timestr
+	hourslen: equ timestr - hours ; hours len -> the max number of digits
+
+	lapsmsg: db "Lap : "
+	lapsmsglen: equ $ - lapsmsg
+
+	lapcount: times 20 db '0' ; allows storing decimal repr of 1<<64
+	lapcountlen: equ $ - lapcount
+	laplen: dq 2
 
 	startmsg: db "Press Enter or ctrl+d to exit and ctrl+c for new lap."
 	db 0xA
@@ -100,25 +119,12 @@ section .data
 	badval_msg: db "Value for -r should be in [1..8] but got "
 	badval_msglen: equ $ - badval_msg
 
-	hours: db "000000000" ; increase size of this string to increase hours max
-	timestr: db ":00:00.0           ", 0
-	timestrlen: equ $ - timestr
-	hourslen: equ timestr - hours ; hours len -> the max number of digits
-
-	time_res: dq 2 ; 2 digits bellow seconds can grow to 8
+	faultmsg: db "Fault !", 0xA
+	faultmsglen: equ $ - faultmsg
 
 	nl: db 0x0A
 	cr: db 0xd
-	buf: db 0
-
-	lapsmsg: db "Lap : "
-	lapsmsglen: equ $ - lapsmsg
 
-	lapcount: db "00000000"
-	lapcountlen: equ $ - lapcount
-	laplen: dq 2
-
-	fcntl_flag: dq 0
 
 section .text
 global _start
@@ -128,7 +134,7 @@ _start:
 jmp arg_parse
 arg_ok:
 
-; set stdin non blocking
+; set stdin reads non blocking
 xor rdx, rdx
 xor rdi, rdi
 mov rax, 72 ; fcntl
@@ -136,7 +142,7 @@ mov rsi, 3 ; F_GETFL
 syscall
 mov [fcntl_flag], rax
 mov rdx, rax
-or rdx, 0x800 ; O_NONBLOCK
+or rdx, O_NONBLOCK
 mov rax, 72 ; fcntl
 mov rsi, 4 ; F_SETFL
 syscall
@@ -173,6 +179,7 @@ syscall
 
 ; set value for ts_sleep.tv_nsec given time_res
 ; div sleep time by 10 for each digits added bellow seconds
+mov qword [ts_sleep.tv_sec], 0
 mov rax, 100000000
 mov r8, [time_res]
 mov r9, 10
@@ -358,7 +365,7 @@ proc_print_time:
 
 	mov rax, 1 ; write
 	mov rdi, [rsp + 16] ; fd as 2nd argument
-	mov rdx, timestrlen + 9
+	mov rdx, timestrlen + hourslen
 	sub rdx, rcx ; timestr + hours len
 	lea rsi, [hours + rcx] ; hours start pointer
 	syscall