Using struc for timespec + move data section

wtfstopw.asm

@@ -20,6 +20,52 @@
 
 [bits 64]
 
+section .data
+
+	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
+
+	TIMESPEC ts_start
+	TIMESPEC ts_cur
+
+	ts_sleep:
+		tv_sleep_s dd 0,0
+		tv_sleep_us dd 10000000,0 
+
+
+	;; 1/2s sleep
+	;ts_sleep:
+	;	tv_sleep_s dq 0
+	;	tv_sleep_us dq 500000000
+
+
+	faultmsg: db "fault", 0xA
+	faultmsglen: equ $ - faultmsg
+
+	msg:	db "0 Hello, world!", 10
+	msglen: equ $ - msg
+
+	hours: db "000000000"
+	timestr: db ":00:00.0000    ", 0x0D
+	timestrlen: equ $ - timestr
+
+	nl: db 0x0A
+	buf: db 0
+
+
+
 section .text
 global _start
 
@@ -53,16 +99,16 @@ print_time:
 	mov rsi, ts_cur
 	syscall
 
-	mov rax, [tv_cur_us]
-	mov rbx, [tv_start_us]
+	mov rax, [ts_cur.tv_nsec]
+	mov rbx, [ts_start.tv_nsec]
 	sub rax, rbx
 	cmp rax, 0
 	jge print_time_us_cont
 	; negativ result
 	add rax, 1000000000
-	mov rbx, [tv_cur_s]
+	mov rbx, [ts_cur.tv_sec]
 	sub rbx, 1
-	mov [tv_cur_s], rbx
+	mov [ts_cur.tv_sec], rbx
 	print_time_us_cont:
 	xor rdx, rdx
 	mov rcx, 100000
@@ -83,8 +129,8 @@ print_time:
 		jg print_time_us_loop
 
 	; handling seconds, minutes & hours
-	mov rax, [tv_cur_s]
-	mov rbx, [tv_start_s]
+	mov rax, [ts_cur.tv_sec]
+	mov rbx, [ts_start.tv_sec]
 	sub rax, rbx
 	; rax now contain elapsed seconds
 	; filling timestr with seconds & minutes
@@ -211,38 +257,4 @@ newline_exit:
 	syscall
 	jmp exit
 
-
-section .data
-
-ts_start:
-	tv_start_s dq 0
-	tv_start_us dq 0
-
-faultmsg: db "fault", 0xA
-faultmsglen: equ $ - faultmsg
-
-msg:	db "0 Hello, world!", 10
-msglen: equ $ - msg
-
-hours: db "000000000"
-timestr: db ":00:00.0000    ", 0x0D
-timestrlen: equ $ - timestr
-
-nl: db 0x0A
-buf: db 0
-
-ts_cur:
-	tv_cur_s dq 0
-	tv_cur_us dq 0
-
-ts_sleep:
-	tv_sleep_s dd 0,0
-	tv_sleep_us dd 10000000,0 
-
-
-;; 1/2s sleep
-;ts_sleep:
-;	tv_sleep_s dq 0
-;	tv_sleep_us dq 500000000
-
 .end: