aes: [XTS] use unsigned conditional jumps

Signed-off-by: Pablo de Lara <[email protected]>
intel · Dec 9, 2024 · aea7bea · aea7bea
1 parent 37ddc36
commit aea7bea
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/aes/XTS_AES_128_dec_expanded_key_vaes.asm b/aes/XTS_AES_128_dec_expanded_key_vaes.asm
@@ -368,38 +368,38 @@ FUNC:
 %endif
 
 	cmp		N_val, 128
-	jl              _less_than_128_bytes
+	jb              _less_than_128_bytes
 
 	vpbroadcastq	zpoly, ghash_poly_8b
 
 	cmp		N_val, 256
-	jge		_start_by16
+	jae		_start_by16
 	jmp		_start_by8
 
 _do_last_n_blocks:
 	cmp		N_val, 0
 	je		_ret_
 
 	cmp		N_val, (7*16)
-	jge		_remaining_num_blocks_is_7
+	jae		_remaining_num_blocks_is_7
 
 	cmp		N_val, (6*16)
-	jge		_remaining_num_blocks_is_6
+	jae		_remaining_num_blocks_is_6
 
 	cmp		N_val, (5*16)
-	jge		_remaining_num_blocks_is_5
+	jae		_remaining_num_blocks_is_5
 
 	cmp		N_val, (4*16)
-	jge		_remaining_num_blocks_is_4
+	jae		_remaining_num_blocks_is_4
 
 	cmp		N_val, (3*16)
-	jge		_remaining_num_blocks_is_3
+	jae		_remaining_num_blocks_is_3
 
 	cmp		N_val, (2*16)
-	jge		_remaining_num_blocks_is_2
+	jae		_remaining_num_blocks_is_2
 
 	cmp		N_val, (1*16)
-	jge		_remaining_num_blocks_is_1
+	jae		_remaining_num_blocks_is_1
 
 ;; _remaining_num_blocks_is_0:
 	vmovdqu		xmm1, xmm5 ; xmm5 contains last full block to decrypt with next teawk
@@ -572,10 +572,10 @@ _main_loop_run_16:
 	sub		N_val, 256
 
 	cmp		N_val, 256
-	jge		_main_loop_run_16
+	jae		_main_loop_run_16
 
 	cmp		N_val, 128
-	jge		_main_loop_run_8
+	jae		_main_loop_run_8
 
 	vextracti32x4	xmm0, zmm4, 0x3 ; keep last decrypted block
 	jmp		_do_last_n_blocks
@@ -618,7 +618,7 @@ _main_loop_run_8:
 	sub		N_val, 128
 
 	cmp		N_val, 128
-	jge		_main_loop_run_8
+	jae		_main_loop_run_8
 
 	vextracti32x4	xmm0, zmm2, 0x3 ; keep last decrypted block
 	jmp		_do_last_n_blocks

diff --git a/aes/XTS_AES_128_enc_expanded_key_vaes.asm b/aes/XTS_AES_128_enc_expanded_key_vaes.asm
@@ -421,38 +421,38 @@ FUNC:
 %endif
 
 	cmp		N_val, 128
-	jl              _less_than_128_bytes
+	jb              _less_than_128_bytes
 
 	vpbroadcastq	zpoly, ghash_poly_8b
 
 	cmp		N_val, 256
-	jge		_start_by16
+	jae		_start_by16
 	jmp		_start_by8
 
 _do_last_n_blocks:
 	cmp		N_val, 0
 	je		_ret_
 
 	cmp		N_val, (7*16)
-	jge		_remaining_num_blocks_is_7
+	jae		_remaining_num_blocks_is_7
 
 	cmp		N_val, (6*16)
-	jge		_remaining_num_blocks_is_6
+	jae		_remaining_num_blocks_is_6
 
 	cmp		N_val, (5*16)
-	jge		_remaining_num_blocks_is_5
+	jae		_remaining_num_blocks_is_5
 
 	cmp		N_val, (4*16)
-	jge		_remaining_num_blocks_is_4
+	jae		_remaining_num_blocks_is_4
 
 	cmp		N_val, (3*16)
-	jge		_remaining_num_blocks_is_3
+	jae		_remaining_num_blocks_is_3
 
 	cmp		N_val, (2*16)
-	jge		_remaining_num_blocks_is_2
+	jae		_remaining_num_blocks_is_2
 
 	cmp		N_val, (1*16)
-	jge		_remaining_num_blocks_is_1
+	jae		_remaining_num_blocks_is_1
 
 ;; _remaining_num_blocks_is_0:
 	vmovdqa		xmm8, xmm0
@@ -612,10 +612,10 @@ _main_loop_run_16:
 	sub		N_val, 256
 
 	cmp		N_val, 256
-	jge		_main_loop_run_16
+	jae		_main_loop_run_16
 
 	cmp		N_val, 128
-	jge		_main_loop_run_8
+	jae		_main_loop_run_8
 
 	vextracti32x4	xmm0, zmm4, 0x3 ; keep last encrypted block
 	jmp		_do_last_n_blocks
@@ -657,7 +657,7 @@ _main_loop_run_8:
 	sub		N_val, 128
 
 	cmp		N_val, 128
-	jge		_main_loop_run_8
+	jae		_main_loop_run_8
 
 	vextracti32x4	xmm0, zmm2, 0x3 ; keep last encrypted block
 	jmp		_do_last_n_blocks