Skip to content

Commit

Permalink
aes-gcm-avx512.pl: Fixed mingw64 build
Browse files Browse the repository at this point in the history
Decoration prefix for some assembler labels in aes-gcm-avx512.pl was
fixed for mingw64 build.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #17868)

(cherry picked from commit 224ea84)
  • Loading branch information
amatyuko-intc authored and t8m committed Nov 11, 2022
1 parent 3f3d328 commit a1fed5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions crypto/modes/asm/aes-gcm-avx512.pl
Expand Up @@ -4767,7 +4767,7 @@ sub GCM_COMPLETE {
.align 8
.L${func_name}_seh_info:
.byte 1 # version 1, no flags
.byte \$L\$${func_name}_seh_prolog_end-\$L\$${func_name}_seh_begin
.byte .L${func_name}_seh_prolog_end-.L${func_name}_seh_begin
.byte 31 # num_slots = 1*8 + 2 + 1 + 2*10
# FR = rbp; Offset from RSP = $XMM_STORAGE scaled on 16
.byte @{[$UWOP_REG_NUMBER{rbp} | (($XMM_STORAGE / 16 ) << 4)]}
Expand All @@ -4780,19 +4780,19 @@ sub GCM_COMPLETE {
# Scaled-by-16 stack offset
my $xmm_reg_offset = ($reg_idx - 6);
$code .= <<___;
.byte \$L\$${func_name}_seh_save_xmm${reg_idx}-\$L\$${func_name}_seh_begin
.byte .L${func_name}_seh_save_xmm${reg_idx}-.L${func_name}_seh_begin
.byte @{[$UWOP_SAVE_XMM128 | (${reg_idx} << 4)]}
.value $xmm_reg_offset
___
}
$code .= <<___;
# Frame pointer (occupy 1 slot)
.byte \$L\$${func_name}_seh_setfp-\$L\$${func_name}_seh_begin
.byte .L${func_name}_seh_setfp-.L${func_name}_seh_begin
.byte $UWOP_SET_FPREG
# Occupy 2 slots, as stack allocation < 512K, but > 128 bytes
.byte \$L\$${func_name}_seh_allocstack_xmm-\$L\$${func_name}_seh_begin
.byte .L${func_name}_seh_allocstack_xmm-.L${func_name}_seh_begin
.byte $UWOP_ALLOC_LARGE
.value `($XMM_STORAGE + 8) / 8`
___
Expand All @@ -4801,7 +4801,7 @@ sub GCM_COMPLETE {
# Occupy 1 slot each
foreach my $reg ("rsi", "rdi", "r15", "r14", "r13", "r12", "rbp", "rbx") {
$code .= <<___;
.byte \$L\$${func_name}_seh_push_${reg}-\$L\$${func_name}_seh_begin
.byte .L${func_name}_seh_push_${reg}-.L${func_name}_seh_begin
.byte @{[$UWOP_PUSH_NONVOL | ($UWOP_REG_NUMBER{$reg} << 4)]}
___
}
Expand Down
2 changes: 1 addition & 1 deletion crypto/perlasm/x86_64-xlate.pl
Expand Up @@ -811,7 +811,7 @@
}
last;
};
/\.rva|\.long|\.quad/
/\.rva|\.long|\.quad|\.byte/
&& do { $$line =~ s/([_a-z][_a-z0-9]*)/$globals{$1} or $1/gei;
$$line =~ s/\.L/$decor/g;
last;
Expand Down

0 comments on commit a1fed5b

Please sign in to comment.