Add spport for -rX options

wtfstopw.asm

@@ -461,16 +461,14 @@ sig_restorer:
 
 ;
 ;	Argument parsing
-;		TODO : support -r2
 ;
 arg_parse:
 	; Checking argument count
 	mov rax, [rsp]
-	cmp rax, 3
-	je parse_r
 	cmp rax, 1
 	je arg_ok
-	; If 1 argument only it can only be -h
+	cmp rax, 3
+	jle parse_r
 	arg_err: ; badval & badarg jmp here too
 		mov rax, [rsp+8] ; argv[0] program name
 		mov rdi, -1 ; return status
@@ -481,14 +479,32 @@ arg_parse:
 	cmp bl, '-'
 	jne badarg
 	mov bl, [rax+1]
-	cmp bl, 'h' ; -h given with another argument
+	cmp bl, 'h' ; -h
 	je arg_err
 	cmp bl, 'r'
 	jne badarg
 	mov bl, [rax+2]
 	cmp bl, 0
-	; the 1st argument is -r the second must be a 1 digit integer in [1..8]
-	mov rax, [rsp+24]
+	jne arg_nxt ; the value seems to be just after the -r like -r2
+	nxt_arg:
+		; the 1st argument is -r the second must be the time_res
+		; check that the arg exists
+		mov rax, [rsp]
+		cmp rax, 3
+		jne arg_err
+		mov rax, [rsp+24]
+		jmp arg_cont
+	arg_nxt:
+		; check that there is no more args
+		mov rbx, [rsp]
+		cmp rbx, 2
+		jne arg_err
+		add rax, 2
+	arg_cont:
+	; rax should point on the value
+	mov bl, [rax+1]
+	cmp bl, 0
+	jne badval
 	xor rbx, rbx
 	mov bl, [rax]
 	cmp bl, '1'
@@ -496,30 +512,31 @@ arg_parse:
 	cmp bl, '8'
 	jg badval
 	sub bl, '0'
-	dbg1:
 	mov [time_res], rbx
 	jmp arg_ok
 
-badval: ; print an error message, usage and exit
+; print an error message, usage and exit with rax pointing the value
+badval:
 	mov rsi, badval_msg
 	mov rdx, badval_msglen
-	mov rax, [rsp+24]
 	jmp arg_strerr
 
-badarg: ; print an error message, usage and exit
+; print an error message, usage and exit
+badarg:
 	mov rsi, badarg_msg
 	mov rdx, badarg_msglen
 	mov rax, [rsp+16]
 	jmp arg_strerr
 
-arg_strerr: ; rsi msg ptr, rdx msg len, rax arg ptr
+; rsi msg ptr, rdx msg len, rax arg ptr
+arg_strerr:
 	mov r8, rax
 	mov rax, 1
 	mov rdi, 1
 	syscall
 	mov rsi, r8
 	mov rax, r8
-	call strlen
+	call proc_strlen
 	mov rax, 1
 	syscall
 	mov rax, 1
@@ -545,7 +562,7 @@ usage:
 
 	pop rsi
 	mov rax, rsi
-	call strlen
+	call proc_strlen
 	mov rax, 1
 	syscall
 
@@ -559,7 +576,7 @@ usage:
 	syscall
 
 ; With rax pointing on the string, the result will be in rdx
-strlen:
+proc_strlen:
 	mov r8, rax
 	mov r9, r8
 	sub r9, 1