Code clean Makefile enhancement + start message

wtfstopw.asm

 
 ;
 ; A simple precise stopwatch
-; Build : nasm -felf64 wtfstopw.asm && ld wtfstopw.o -o wtfstopw
+; Build : nasm -felf64 wtfstopw.asm && ld -mefl_x86_64 wtfstopw.o -o wtfstopw
+; Build Debug : nasm -felf64 -l wtfstopw.lst wtfstopw.asm && ld -s -mefl_x86_64 wtfstopw.o -o wtfstopw
 ;
 ; Usage : ./wtfstopw
 ;	press enter to exit
 
 [bits 64]
 
-section .data
-
-	STRUC TIMESPEC_STRUC
-		.tv_sec: resq 1
-		.tv_nsec: resq 1
-	ENDSTRUC
+STRUC TIMESPEC_STRUC
+	.tv_sec: resq 1
+	.tv_nsec: resq 1
+ENDSTRUC
 
 
-	%macro TIMESPEC 1
-		%1: ISTRUC TIMESPEC_STRUC
-			at TIMESPEC_STRUC.tv_sec, dq 0
-			at TIMESPEC_STRUC.tv_nsec, dq 0
-		IEND
-		%define %1.tv_sec %1+TIMESPEC_STRUC.tv_sec
-		%define %1.tv_nsec %1+TIMESPEC_STRUC.tv_nsec
-	%endmacro
+%macro TIMESPEC 1
+	%1: ISTRUC TIMESPEC_STRUC
+		at TIMESPEC_STRUC.tv_sec, dq 0
+		at TIMESPEC_STRUC.tv_nsec, dq 0
+	IEND
+	%define %1.tv_sec %1+TIMESPEC_STRUC.tv_sec
+	%define %1.tv_nsec %1+TIMESPEC_STRUC.tv_nsec
+%endmacro
 
-	STRUC SIGACTION_STRUC
-		.sa_handler:      resq      1
-		.sa_flags:        resq      1
-		.sa_restorer:     resq      1
-		.sa_mask:         resb      128
-	ENDSTRUC
+STRUC SIGACTION_STRUC
+	.sa_handler:      resq      1
+	.sa_flags:        resq      1
+	.sa_restorer:     resq      1
+	.sa_mask:         resb      128
+ENDSTRUC
 
+section .data
 
 	sigaction: ISTRUC SIGACTION_STRUC
 		at  SIGACTION_STRUC.sa_handler, dq 0
 	TIMESPEC ts_cur
 
 	ts_sleep:
-		tv_sleep_s dd 0,0
-		tv_sleep_us dd 10000000,0 
+		tv_sleep_s dq 0
+		tv_sleep_us dq 10000000
 
 	;; 1/2s sleep
 	;ts_sleep:
 	faultmsg: db "fault", 0xA
 	faultmsglen: equ $ - faultmsg
 
-	msg:	db "0 Hello, world!", 10
-	msglen: equ $ - msg
+	startmsg: db "Press Enter or ctrl+d to exit and ctrl+c for new lap."
+	db 0xA
+	startmsglen: equ $ - startmsg
 
 	hours: db "000000000"
 	timestr: db ":00:00.0000    ", 0x0a
 mov rsi, ts_start
 syscall
 
+mov rax, 1 ; write
+mov rdi, 2 ; stderr
+mov rsi, startmsg
+mov rdx, startmsglen
+syscall
+
 main_loop:
 	push 2 ; stderr
 	push 0x0D ; \r
 	mov rsi, 0
 	syscall
 
-	jmp main_loop
+jmp main_loop ; main_loop
 
 flush_stdin:
 	mov rax, 0
 ; Print current time on FD r10 and put r13b as leading char
 ;
 proc_print_time:
+	; push ret addr before arguments
 	pop r8
 	pop r9
 	pop r10
 	push r8
 	push r10
 	push r9
+
 	; updating ts_cur time
 	mov rax, 228 ; clock_gettime
 	mov rdi, 0 ; CLOCK_REALTIME
 	mov rsi, ts_cur
 	syscall
 
+	; Calculating elapsed ns
 	mov rax, [ts_cur.tv_nsec]
 	mov rbx, [ts_start.tv_nsec]
 	sub rax, rbx