Skip to content

Commit aea7bea

Browse files
committed
aes: [XTS] use unsigned conditional jumps
Signed-off-by: Pablo de Lara <[email protected]>
1 parent 37ddc36 commit aea7bea

2 files changed

+24
-24
lines changed

aes/XTS_AES_128_dec_expanded_key_vaes.asm

+12-12
Original file line numberDiff line numberDiff line change
@@ -368,38 +368,38 @@ FUNC:
368368
%endif
369369

370370
cmp N_val, 128
371-
jl _less_than_128_bytes
371+
jb _less_than_128_bytes
372372

373373
vpbroadcastq zpoly, ghash_poly_8b
374374

375375
cmp N_val, 256
376-
jge _start_by16
376+
jae _start_by16
377377
jmp _start_by8
378378

379379
_do_last_n_blocks:
380380
cmp N_val, 0
381381
je _ret_
382382

383383
cmp N_val, (7*16)
384-
jge _remaining_num_blocks_is_7
384+
jae _remaining_num_blocks_is_7
385385

386386
cmp N_val, (6*16)
387-
jge _remaining_num_blocks_is_6
387+
jae _remaining_num_blocks_is_6
388388

389389
cmp N_val, (5*16)
390-
jge _remaining_num_blocks_is_5
390+
jae _remaining_num_blocks_is_5
391391

392392
cmp N_val, (4*16)
393-
jge _remaining_num_blocks_is_4
393+
jae _remaining_num_blocks_is_4
394394

395395
cmp N_val, (3*16)
396-
jge _remaining_num_blocks_is_3
396+
jae _remaining_num_blocks_is_3
397397

398398
cmp N_val, (2*16)
399-
jge _remaining_num_blocks_is_2
399+
jae _remaining_num_blocks_is_2
400400

401401
cmp N_val, (1*16)
402-
jge _remaining_num_blocks_is_1
402+
jae _remaining_num_blocks_is_1
403403

404404
;; _remaining_num_blocks_is_0:
405405
vmovdqu xmm1, xmm5 ; xmm5 contains last full block to decrypt with next teawk
@@ -572,10 +572,10 @@ _main_loop_run_16:
572572
sub N_val, 256
573573

574574
cmp N_val, 256
575-
jge _main_loop_run_16
575+
jae _main_loop_run_16
576576

577577
cmp N_val, 128
578-
jge _main_loop_run_8
578+
jae _main_loop_run_8
579579

580580
vextracti32x4 xmm0, zmm4, 0x3 ; keep last decrypted block
581581
jmp _do_last_n_blocks
@@ -618,7 +618,7 @@ _main_loop_run_8:
618618
sub N_val, 128
619619

620620
cmp N_val, 128
621-
jge _main_loop_run_8
621+
jae _main_loop_run_8
622622

623623
vextracti32x4 xmm0, zmm2, 0x3 ; keep last decrypted block
624624
jmp _do_last_n_blocks

aes/XTS_AES_128_enc_expanded_key_vaes.asm

+12-12
Original file line numberDiff line numberDiff line change
@@ -421,38 +421,38 @@ FUNC:
421421
%endif
422422

423423
cmp N_val, 128
424-
jl _less_than_128_bytes
424+
jb _less_than_128_bytes
425425

426426
vpbroadcastq zpoly, ghash_poly_8b
427427

428428
cmp N_val, 256
429-
jge _start_by16
429+
jae _start_by16
430430
jmp _start_by8
431431

432432
_do_last_n_blocks:
433433
cmp N_val, 0
434434
je _ret_
435435

436436
cmp N_val, (7*16)
437-
jge _remaining_num_blocks_is_7
437+
jae _remaining_num_blocks_is_7
438438

439439
cmp N_val, (6*16)
440-
jge _remaining_num_blocks_is_6
440+
jae _remaining_num_blocks_is_6
441441

442442
cmp N_val, (5*16)
443-
jge _remaining_num_blocks_is_5
443+
jae _remaining_num_blocks_is_5
444444

445445
cmp N_val, (4*16)
446-
jge _remaining_num_blocks_is_4
446+
jae _remaining_num_blocks_is_4
447447

448448
cmp N_val, (3*16)
449-
jge _remaining_num_blocks_is_3
449+
jae _remaining_num_blocks_is_3
450450

451451
cmp N_val, (2*16)
452-
jge _remaining_num_blocks_is_2
452+
jae _remaining_num_blocks_is_2
453453

454454
cmp N_val, (1*16)
455-
jge _remaining_num_blocks_is_1
455+
jae _remaining_num_blocks_is_1
456456

457457
;; _remaining_num_blocks_is_0:
458458
vmovdqa xmm8, xmm0
@@ -612,10 +612,10 @@ _main_loop_run_16:
612612
sub N_val, 256
613613

614614
cmp N_val, 256
615-
jge _main_loop_run_16
615+
jae _main_loop_run_16
616616

617617
cmp N_val, 128
618-
jge _main_loop_run_8
618+
jae _main_loop_run_8
619619

620620
vextracti32x4 xmm0, zmm4, 0x3 ; keep last encrypted block
621621
jmp _do_last_n_blocks
@@ -657,7 +657,7 @@ _main_loop_run_8:
657657
sub N_val, 128
658658

659659
cmp N_val, 128
660-
jge _main_loop_run_8
660+
jae _main_loop_run_8
661661

662662
vextracti32x4 xmm0, zmm2, 0x3 ; keep last encrypted block
663663
jmp _do_last_n_blocks

0 commit comments

Comments
 (0)