Update To 11.40.268.0
[platform/framework/web/crosswalk.git] / src / third_party / boringssl / win-x86_64 / crypto / modes / ghash-x86_64.asm
index 9993d75..5d8fadc 100644 (file)
@@ -1,15 +1,19 @@
-OPTION DOTNAME
-.text$ SEGMENT ALIGN(256) 'CODE'
-EXTERN OPENSSL_ia32cap_P:NEAR
+default        rel
+%define XMMWORD
+%define YMMWORD
+%define ZMMWORD
+section        .text code align=64
 
-PUBLIC gcm_gmult_4bit
+EXTERN OPENSSL_ia32cap_P
+
+global gcm_gmult_4bit
 
 ALIGN  16
-gcm_gmult_4bit PROC PUBLIC
-       mov     QWORD PTR[8+rsp],rdi    ;WIN64 prologue
-       mov     QWORD PTR[16+rsp],rsi
+gcm_gmult_4bit:
+       mov     QWORD[8+rsp],rdi        ;WIN64 prologue
+       mov     QWORD[16+rsp],rsi
        mov     rax,rsp
-$L$SEH_begin_gcm_gmult_4bit::
+$L$SEH_begin_gcm_gmult_4bit:
        mov     rdi,rcx
        mov     rsi,rdx
 
@@ -17,98 +21,97 @@ $L$SEH_begin_gcm_gmult_4bit::
        push    rbx
        push    rbp
        push    r12
-$L$gmult_prologue::
+$L$gmult_prologue:
 
-       movzx   r8,BYTE PTR[15+rdi]
-       lea     r11,QWORD PTR[$L$rem_4bit]
+       movzx   r8,BYTE[15+rdi]
+       lea     r11,[$L$rem_4bit]
        xor     rax,rax
        xor     rbx,rbx
        mov     al,r8b
        mov     bl,r8b
        shl     al,4
        mov     rcx,14
-       mov     r8,QWORD PTR[8+rax*1+rsi]
-       mov     r9,QWORD PTR[rax*1+rsi]
-       and     bl,0f0h
+       mov     r8,QWORD[8+rax*1+rsi]
+       mov     r9,QWORD[rax*1+rsi]
+       and     bl,0xf0
        mov     rdx,r8
-       jmp     $L$oop1
+       jmp     NEAR $L$oop1
 
 ALIGN  16
-$L$oop1::
+$L$oop1:
        shr     r8,4
-       and     rdx,0fh
+       and     rdx,0xf
        mov     r10,r9
-       mov     al,BYTE PTR[rcx*1+rdi]
+       mov     al,BYTE[rcx*1+rdi]
        shr     r9,4
-       xor     r8,QWORD PTR[8+rbx*1+rsi]
+       xor     r8,QWORD[8+rbx*1+rsi]
        shl     r10,60
-       xor     r9,QWORD PTR[rbx*1+rsi]
+       xor     r9,QWORD[rbx*1+rsi]
        mov     bl,al
-       xor     r9,QWORD PTR[rdx*8+r11]
+       xor     r9,QWORD[rdx*8+r11]
        mov     rdx,r8
        shl     al,4
        xor     r8,r10
        dec     rcx
-       js      $L$break1
+       js      NEAR $L$break1
 
        shr     r8,4
-       and     rdx,0fh
+       and     rdx,0xf
        mov     r10,r9
        shr     r9,4
-       xor     r8,QWORD PTR[8+rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
        shl     r10,60
-       xor     r9,QWORD PTR[rax*1+rsi]
-       and     bl,0f0h
-       xor     r9,QWORD PTR[rdx*8+r11]
+       xor     r9,QWORD[rax*1+rsi]
+       and     bl,0xf0
+       xor     r9,QWORD[rdx*8+r11]
        mov     rdx,r8
        xor     r8,r10
-       jmp     $L$oop1
+       jmp     NEAR $L$oop1
 
 ALIGN  16
-$L$break1::
+$L$break1:
        shr     r8,4
-       and     rdx,0fh
+       and     rdx,0xf
        mov     r10,r9
        shr     r9,4
-       xor     r8,QWORD PTR[8+rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
        shl     r10,60
-       xor     r9,QWORD PTR[rax*1+rsi]
-       and     bl,0f0h
-       xor     r9,QWORD PTR[rdx*8+r11]
+       xor     r9,QWORD[rax*1+rsi]
+       and     bl,0xf0
+       xor     r9,QWORD[rdx*8+r11]
        mov     rdx,r8
        xor     r8,r10
 
        shr     r8,4
-       and     rdx,0fh
+       and     rdx,0xf
        mov     r10,r9
        shr     r9,4
-       xor     r8,QWORD PTR[8+rbx*1+rsi]
+       xor     r8,QWORD[8+rbx*1+rsi]
        shl     r10,60
-       xor     r9,QWORD PTR[rbx*1+rsi]
+       xor     r9,QWORD[rbx*1+rsi]
        xor     r8,r10
-       xor     r9,QWORD PTR[rdx*8+r11]
+       xor     r9,QWORD[rdx*8+r11]
 
        bswap   r8
        bswap   r9
-       mov     QWORD PTR[8+rdi],r8
-       mov     QWORD PTR[rdi],r9
-
-       mov     rbx,QWORD PTR[16+rsp]
-       lea     rsp,QWORD PTR[24+rsp]
-$L$gmult_epilogue::
-       mov     rdi,QWORD PTR[8+rsp]    ;WIN64 epilogue
-       mov     rsi,QWORD PTR[16+rsp]
+       mov     QWORD[8+rdi],r8
+       mov     QWORD[rdi],r9
+
+       mov     rbx,QWORD[16+rsp]
+       lea     rsp,[24+rsp]
+$L$gmult_epilogue:
+       mov     rdi,QWORD[8+rsp]        ;WIN64 epilogue
+       mov     rsi,QWORD[16+rsp]
        DB      0F3h,0C3h               ;repret
-$L$SEH_end_gcm_gmult_4bit::
-gcm_gmult_4bit ENDP
-PUBLIC gcm_ghash_4bit
+$L$SEH_end_gcm_gmult_4bit:
+global gcm_ghash_4bit
 
 ALIGN  16
-gcm_ghash_4bit PROC PUBLIC
-       mov     QWORD PTR[8+rsp],rdi    ;WIN64 prologue
-       mov     QWORD PTR[16+rsp],rsi
+gcm_ghash_4bit:
+       mov     QWORD[8+rsp],rdi        ;WIN64 prologue
+       mov     QWORD[16+rsp],rsi
        mov     rax,rsp
-$L$SEH_begin_gcm_ghash_4bit::
+$L$SEH_begin_gcm_ghash_4bit:
        mov     rdi,rcx
        mov     rsi,rdx
        mov     rdx,r8
@@ -122,218 +125,218 @@ $L$SEH_begin_gcm_ghash_4bit::
        push    r14
        push    r15
        sub     rsp,280
-$L$ghash_prologue::
+$L$ghash_prologue:
        mov     r14,rdx
        mov     r15,rcx
        sub     rsi,-128
-       lea     rbp,QWORD PTR[((16+128))+rsp]
+       lea     rbp,[((16+128))+rsp]
        xor     edx,edx
-       mov     r8,QWORD PTR[((0+0-128))+rsi]
-       mov     rax,QWORD PTR[((0+8-128))+rsi]
+       mov     r8,QWORD[((0+0-128))+rsi]
+       mov     rax,QWORD[((0+8-128))+rsi]
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     r9,QWORD PTR[((16+0-128))+rsi]
+       mov     r9,QWORD[((16+0-128))+rsi]
        shl     dl,4
-       mov     rbx,QWORD PTR[((16+8-128))+rsi]
+       mov     rbx,QWORD[((16+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[rsp],dl
+       mov     BYTE[rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[rbp],r8
-       mov     r8,QWORD PTR[((32+0-128))+rsi]
+       mov     QWORD[rbp],r8
+       mov     r8,QWORD[((32+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((0-128))+rbp],rax
-       mov     rax,QWORD PTR[((32+8-128))+rsi]
+       mov     QWORD[((0-128))+rbp],rax
+       mov     rax,QWORD[((32+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[1+rsp],dl
+       mov     BYTE[1+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[8+rbp],r9
-       mov     r9,QWORD PTR[((48+0-128))+rsi]
+       mov     QWORD[8+rbp],r9
+       mov     r9,QWORD[((48+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((8-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((48+8-128))+rsi]
+       mov     QWORD[((8-128))+rbp],rbx
+       mov     rbx,QWORD[((48+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[2+rsp],dl
+       mov     BYTE[2+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[16+rbp],r8
-       mov     r8,QWORD PTR[((64+0-128))+rsi]
+       mov     QWORD[16+rbp],r8
+       mov     r8,QWORD[((64+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((16-128))+rbp],rax
-       mov     rax,QWORD PTR[((64+8-128))+rsi]
+       mov     QWORD[((16-128))+rbp],rax
+       mov     rax,QWORD[((64+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[3+rsp],dl
+       mov     BYTE[3+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[24+rbp],r9
-       mov     r9,QWORD PTR[((80+0-128))+rsi]
+       mov     QWORD[24+rbp],r9
+       mov     r9,QWORD[((80+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((24-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((80+8-128))+rsi]
+       mov     QWORD[((24-128))+rbp],rbx
+       mov     rbx,QWORD[((80+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[4+rsp],dl
+       mov     BYTE[4+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[32+rbp],r8
-       mov     r8,QWORD PTR[((96+0-128))+rsi]
+       mov     QWORD[32+rbp],r8
+       mov     r8,QWORD[((96+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((32-128))+rbp],rax
-       mov     rax,QWORD PTR[((96+8-128))+rsi]
+       mov     QWORD[((32-128))+rbp],rax
+       mov     rax,QWORD[((96+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[5+rsp],dl
+       mov     BYTE[5+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[40+rbp],r9
-       mov     r9,QWORD PTR[((112+0-128))+rsi]
+       mov     QWORD[40+rbp],r9
+       mov     r9,QWORD[((112+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((40-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((112+8-128))+rsi]
+       mov     QWORD[((40-128))+rbp],rbx
+       mov     rbx,QWORD[((112+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[6+rsp],dl
+       mov     BYTE[6+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[48+rbp],r8
-       mov     r8,QWORD PTR[((128+0-128))+rsi]
+       mov     QWORD[48+rbp],r8
+       mov     r8,QWORD[((128+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((48-128))+rbp],rax
-       mov     rax,QWORD PTR[((128+8-128))+rsi]
+       mov     QWORD[((48-128))+rbp],rax
+       mov     rax,QWORD[((128+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[7+rsp],dl
+       mov     BYTE[7+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[56+rbp],r9
-       mov     r9,QWORD PTR[((144+0-128))+rsi]
+       mov     QWORD[56+rbp],r9
+       mov     r9,QWORD[((144+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((56-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((144+8-128))+rsi]
+       mov     QWORD[((56-128))+rbp],rbx
+       mov     rbx,QWORD[((144+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[8+rsp],dl
+       mov     BYTE[8+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[64+rbp],r8
-       mov     r8,QWORD PTR[((160+0-128))+rsi]
+       mov     QWORD[64+rbp],r8
+       mov     r8,QWORD[((160+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((64-128))+rbp],rax
-       mov     rax,QWORD PTR[((160+8-128))+rsi]
+       mov     QWORD[((64-128))+rbp],rax
+       mov     rax,QWORD[((160+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[9+rsp],dl
+       mov     BYTE[9+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[72+rbp],r9
-       mov     r9,QWORD PTR[((176+0-128))+rsi]
+       mov     QWORD[72+rbp],r9
+       mov     r9,QWORD[((176+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((72-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((176+8-128))+rsi]
+       mov     QWORD[((72-128))+rbp],rbx
+       mov     rbx,QWORD[((176+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[10+rsp],dl
+       mov     BYTE[10+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[80+rbp],r8
-       mov     r8,QWORD PTR[((192+0-128))+rsi]
+       mov     QWORD[80+rbp],r8
+       mov     r8,QWORD[((192+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((80-128))+rbp],rax
-       mov     rax,QWORD PTR[((192+8-128))+rsi]
+       mov     QWORD[((80-128))+rbp],rax
+       mov     rax,QWORD[((192+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[11+rsp],dl
+       mov     BYTE[11+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[88+rbp],r9
-       mov     r9,QWORD PTR[((208+0-128))+rsi]
+       mov     QWORD[88+rbp],r9
+       mov     r9,QWORD[((208+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((88-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((208+8-128))+rsi]
+       mov     QWORD[((88-128))+rbp],rbx
+       mov     rbx,QWORD[((208+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[12+rsp],dl
+       mov     BYTE[12+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[96+rbp],r8
-       mov     r8,QWORD PTR[((224+0-128))+rsi]
+       mov     QWORD[96+rbp],r8
+       mov     r8,QWORD[((224+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((96-128))+rbp],rax
-       mov     rax,QWORD PTR[((224+8-128))+rsi]
+       mov     QWORD[((96-128))+rbp],rax
+       mov     rax,QWORD[((224+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[13+rsp],dl
+       mov     BYTE[13+rsp],dl
        or      rbx,r10
        mov     dl,al
        shr     rax,4
        mov     r10,r8
        shr     r8,4
-       mov     QWORD PTR[104+rbp],r9
-       mov     r9,QWORD PTR[((240+0-128))+rsi]
+       mov     QWORD[104+rbp],r9
+       mov     r9,QWORD[((240+0-128))+rsi]
        shl     dl,4
-       mov     QWORD PTR[((104-128))+rbp],rbx
-       mov     rbx,QWORD PTR[((240+8-128))+rsi]
+       mov     QWORD[((104-128))+rbp],rbx
+       mov     rbx,QWORD[((240+8-128))+rsi]
        shl     r10,60
-       mov     BYTE PTR[14+rsp],dl
+       mov     BYTE[14+rsp],dl
        or      rax,r10
        mov     dl,bl
        shr     rbx,4
        mov     r10,r9
        shr     r9,4
-       mov     QWORD PTR[112+rbp],r8
+       mov     QWORD[112+rbp],r8
        shl     dl,4
-       mov     QWORD PTR[((112-128))+rbp],rax
+       mov     QWORD[((112-128))+rbp],rax
        shl     r10,60
-       mov     BYTE PTR[15+rsp],dl
+       mov     BYTE[15+rsp],dl
        or      rbx,r10
-       mov     QWORD PTR[120+rbp],r9
-       mov     QWORD PTR[((120-128))+rbp],rbx
+       mov     QWORD[120+rbp],r9
+       mov     QWORD[((120-128))+rbp],rbx
        add     rsi,-128
-       mov     r8,QWORD PTR[8+rdi]
-       mov     r9,QWORD PTR[rdi]
+       mov     r8,QWORD[8+rdi]
+       mov     r9,QWORD[rdi]
        add     r15,r14
-       lea     r11,QWORD PTR[$L$rem_8bit]
-       jmp     $L$outer_loop
+       lea     r11,[$L$rem_8bit]
+       jmp     NEAR $L$outer_loop
 ALIGN  16
-$L$outer_loop::
-       xor     r9,QWORD PTR[r14]
-       mov     rdx,QWORD PTR[8+r14]
-       lea     r14,QWORD PTR[16+r14]
+$L$outer_loop:
+       xor     r9,QWORD[r14]
+       mov     rdx,QWORD[8+r14]
+       lea     r14,[16+r14]
        xor     rdx,r8
-       mov     QWORD PTR[rdi],r9
-       mov     QWORD PTR[8+rdi],rdx
+       mov     QWORD[rdi],r9
+       mov     QWORD[8+rdi],rdx
        shr     rdx,32
        xor     rax,rax
        rol     edx,8
@@ -342,30 +345,30 @@ $L$outer_loop::
        shl     al,4
        shr     ebx,4
        rol     edx,8
-       mov     r8,QWORD PTR[8+rax*1+rsi]
-       mov     r9,QWORD PTR[rax*1+rsi]
+       mov     r8,QWORD[8+rax*1+rsi]
+       mov     r9,QWORD[rax*1+rsi]
        mov     al,dl
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        xor     r12,r8
        mov     r10,r9
        shr     r8,8
        movzx   r12,r12b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -374,18 +377,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        shl     r13,48
        xor     r12,r8
@@ -393,20 +396,20 @@ $L$outer_loop::
        xor     r9,r13
        shr     r8,8
        movzx   r12,r12b
-       mov     edx,DWORD PTR[8+rdi]
+       mov     edx,DWORD[8+rdi]
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -415,18 +418,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        shl     r13,48
        xor     r12,r8
@@ -435,18 +438,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r12,r12b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -455,18 +458,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        shl     r13,48
        xor     r12,r8
@@ -474,20 +477,20 @@ $L$outer_loop::
        xor     r9,r13
        shr     r8,8
        movzx   r12,r12b
-       mov     edx,DWORD PTR[4+rdi]
+       mov     edx,DWORD[4+rdi]
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -496,18 +499,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        shl     r13,48
        xor     r12,r8
@@ -516,18 +519,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r12,r12b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -536,18 +539,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        shl     r13,48
        xor     r12,r8
@@ -555,20 +558,20 @@ $L$outer_loop::
        xor     r9,r13
        shr     r8,8
        movzx   r12,r12b
-       mov     edx,DWORD PTR[rdi]
+       mov     edx,DWORD[rdi]
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -577,18 +580,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        shr     ecx,4
        shl     r13,48
        xor     r12,r8
@@ -597,18 +600,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r12,r12b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
+       xor     r9,QWORD[rbx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r12,WORD PTR[r12*2+r11]
+       movzx   r12,WORD[r12*2+r11]
        movzx   ebx,dl
        shl     al,4
-       movzx   r13,BYTE PTR[rcx*1+rsp]
+       movzx   r13,BYTE[rcx*1+rsp]
        shr     ebx,4
        shl     r12,48
        xor     r13,r8
@@ -617,18 +620,18 @@ $L$outer_loop::
        shr     r8,8
        movzx   r13,r13b
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rcx*8+rbp]
+       xor     r8,QWORD[((-128))+rcx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rcx*8+rbp]
+       xor     r9,QWORD[rcx*8+rbp]
        rol     edx,8
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        mov     al,dl
        xor     r8,r10
-       movzx   r13,WORD PTR[r13*2+r11]
+       movzx   r13,WORD[r13*2+r11]
        movzx   ecx,dl
        shl     al,4
-       movzx   r12,BYTE PTR[rbx*1+rsp]
+       movzx   r12,BYTE[rbx*1+rsp]
        and     ecx,240
        shl     r13,48
        xor     r12,r8
@@ -636,14 +639,14 @@ $L$outer_loop::
        xor     r9,r13
        shr     r8,8
        movzx   r12,r12b
-       mov     edx,DWORD PTR[((-4))+rdi]
+       mov     edx,DWORD[((-4))+rdi]
        shr     r9,8
-       xor     r8,QWORD PTR[((-128))+rbx*8+rbp]
+       xor     r8,QWORD[((-128))+rbx*8+rbp]
        shl     r10,56
-       xor     r9,QWORD PTR[rbx*8+rbp]
-       movzx   r12,WORD PTR[r12*2+r11]
-       xor     r8,QWORD PTR[8+rax*1+rsi]
-       xor     r9,QWORD PTR[rax*1+rsi]
+       xor     r9,QWORD[rbx*8+rbp]
+       movzx   r12,WORD[r12*2+r11]
+       xor     r8,QWORD[8+rax*1+rsi]
+       xor     r9,QWORD[rax*1+rsi]
        shl     r12,48
        xor     r8,r10
        xor     r9,r12
@@ -652,44 +655,43 @@ $L$outer_loop::
        mov     r10,r9
        shl     r13b,4
        shr     r9,4
-       xor     r8,QWORD PTR[8+rcx*1+rsi]
-       movzx   r13,WORD PTR[r13*2+r11]
+       xor     r8,QWORD[8+rcx*1+rsi]
+       movzx   r13,WORD[r13*2+r11]
        shl     r10,60
-       xor     r9,QWORD PTR[rcx*1+rsi]
+       xor     r9,QWORD[rcx*1+rsi]
        xor     r8,r10
        shl     r13,48
        bswap   r8
        xor     r9,r13
        bswap   r9
        cmp     r14,r15
-       jb      $L$outer_loop
-       mov     QWORD PTR[8+rdi],r8
-       mov     QWORD PTR[rdi],r9
-
-       lea     rsi,QWORD PTR[280+rsp]
-       mov     r15,QWORD PTR[rsi]
-       mov     r14,QWORD PTR[8+rsi]
-       mov     r13,QWORD PTR[16+rsi]
-       mov     r12,QWORD PTR[24+rsi]
-       mov     rbp,QWORD PTR[32+rsi]
-       mov     rbx,QWORD PTR[40+rsi]
-       lea     rsp,QWORD PTR[48+rsi]
-$L$ghash_epilogue::
-       mov     rdi,QWORD PTR[8+rsp]    ;WIN64 epilogue
-       mov     rsi,QWORD PTR[16+rsp]
+       jb      NEAR $L$outer_loop
+       mov     QWORD[8+rdi],r8
+       mov     QWORD[rdi],r9
+
+       lea     rsi,[280+rsp]
+       mov     r15,QWORD[rsi]
+       mov     r14,QWORD[8+rsi]
+       mov     r13,QWORD[16+rsi]
+       mov     r12,QWORD[24+rsi]
+       mov     rbp,QWORD[32+rsi]
+       mov     rbx,QWORD[40+rsi]
+       lea     rsp,[48+rsi]
+$L$ghash_epilogue:
+       mov     rdi,QWORD[8+rsp]        ;WIN64 epilogue
+       mov     rsi,QWORD[16+rsp]
        DB      0F3h,0C3h               ;repret
-$L$SEH_end_gcm_ghash_4bit::
-gcm_ghash_4bit ENDP
-PUBLIC gcm_init_clmul
+$L$SEH_end_gcm_ghash_4bit:
+global gcm_init_clmul
 
 ALIGN  16
-gcm_init_clmul PROC PUBLIC
-$L$_init_clmul::
-$L$SEH_begin_gcm_init_clmul::
+gcm_init_clmul:
+$L$_init_clmul:
+$L$SEH_begin_gcm_init_clmul:
 
-DB     048h,083h,0ech,018h
-DB     00fh,029h,034h,024h
-       movdqu  xmm2,XMMWORD PTR[rdx]
+DB     0x48,0x83,0xec,0x18
+DB     0x0f,0x29,0x34,0x24
+       movdqu  xmm2,XMMWORD[rdx]
        pshufd  xmm2,xmm2,78
 
 
@@ -703,7 +705,7 @@ DB  00fh,029h,034h,024h
        por     xmm2,xmm3
 
 
-       pand    xmm5,XMMWORD PTR[$L$0x1c2_polynomial]
+       pand    xmm5,XMMWORD[$L$0x1c2_polynomial]
        pxor    xmm2,xmm5
 
 
@@ -750,11 +752,11 @@ DB        102,15,58,68,222,0
        pshufd  xmm3,xmm2,78
        pshufd  xmm4,xmm0,78
        pxor    xmm3,xmm2
-       movdqu  XMMWORD PTR[rcx],xmm2
+       movdqu  XMMWORD[rcx],xmm2
        pxor    xmm4,xmm0
-       movdqu  XMMWORD PTR[16+rcx],xmm0
+       movdqu  XMMWORD[16+rcx],xmm0
 DB     102,15,58,15,227,8
-       movdqu  XMMWORD PTR[32+rcx],xmm4
+       movdqu  XMMWORD[32+rcx],xmm4
        movdqa  xmm1,xmm0
        pshufd  xmm3,xmm0,78
        pxor    xmm3,xmm0
@@ -833,25 +835,25 @@ DB        102,15,58,68,222,0
        pshufd  xmm3,xmm5,78
        pshufd  xmm4,xmm0,78
        pxor    xmm3,xmm5
-       movdqu  XMMWORD PTR[48+rcx],xmm5
+       movdqu  XMMWORD[48+rcx],xmm5
        pxor    xmm4,xmm0
-       movdqu  XMMWORD PTR[64+rcx],xmm0
+       movdqu  XMMWORD[64+rcx],xmm0
 DB     102,15,58,15,227,8
-       movdqu  XMMWORD PTR[80+rcx],xmm4
-       movaps  xmm6,XMMWORD PTR[rsp]
-       lea     rsp,QWORD PTR[24+rsp]
-$L$SEH_end_gcm_init_clmul::
+       movdqu  XMMWORD[80+rcx],xmm4
+       movaps  xmm6,XMMWORD[rsp]
+       lea     rsp,[24+rsp]
+$L$SEH_end_gcm_init_clmul:
        DB      0F3h,0C3h               ;repret
-gcm_init_clmul ENDP
-PUBLIC gcm_gmult_clmul
+
+global gcm_gmult_clmul
 
 ALIGN  16
-gcm_gmult_clmul        PROC PUBLIC
-$L$_gmult_clmul::
-       movdqu  xmm0,XMMWORD PTR[rcx]
-       movdqa  xmm5,XMMWORD PTR[$L$bswap_mask]
-       movdqu  xmm2,XMMWORD PTR[rdx]
-       movdqu  xmm4,XMMWORD PTR[32+rdx]
+gcm_gmult_clmul:
+$L$_gmult_clmul:
+       movdqu  xmm0,XMMWORD[rcx]
+       movdqa  xmm5,XMMWORD[$L$bswap_mask]
+       movdqu  xmm2,XMMWORD[rdx]
+       movdqu  xmm4,XMMWORD[32+rdx]
 DB     102,15,56,0,197
        movdqa  xmm1,xmm0
        pshufd  xmm3,xmm0,78
@@ -891,57 +893,57 @@ DB        102,15,58,68,220,0
        psrlq   xmm0,1
        pxor    xmm0,xmm1
 DB     102,15,56,0,197
-       movdqu  XMMWORD PTR[rcx],xmm0
+       movdqu  XMMWORD[rcx],xmm0
        DB      0F3h,0C3h               ;repret
-gcm_gmult_clmul        ENDP
-PUBLIC gcm_ghash_clmul
+
+global gcm_ghash_clmul
 
 ALIGN  32
-gcm_ghash_clmul        PROC PUBLIC
-$L$_ghash_clmul::
-       lea     rax,QWORD PTR[((-136))+rsp]
-$L$SEH_begin_gcm_ghash_clmul::
-
-DB     048h,08dh,060h,0e0h
-DB     00fh,029h,070h,0e0h
-DB     00fh,029h,078h,0f0h
-DB     044h,00fh,029h,000h
-DB     044h,00fh,029h,048h,010h
-DB     044h,00fh,029h,050h,020h
-DB     044h,00fh,029h,058h,030h
-DB     044h,00fh,029h,060h,040h
-DB     044h,00fh,029h,068h,050h
-DB     044h,00fh,029h,070h,060h
-DB     044h,00fh,029h,078h,070h
-       movdqa  xmm10,XMMWORD PTR[$L$bswap_mask]
-
-       movdqu  xmm0,XMMWORD PTR[rcx]
-       movdqu  xmm2,XMMWORD PTR[rdx]
-       movdqu  xmm7,XMMWORD PTR[32+rdx]
+gcm_ghash_clmul:
+$L$_ghash_clmul:
+       lea     rax,[((-136))+rsp]
+$L$SEH_begin_gcm_ghash_clmul:
+
+DB     0x48,0x8d,0x60,0xe0
+DB     0x0f,0x29,0x70,0xe0
+DB     0x0f,0x29,0x78,0xf0
+DB     0x44,0x0f,0x29,0x00
+DB     0x44,0x0f,0x29,0x48,0x10
+DB     0x44,0x0f,0x29,0x50,0x20
+DB     0x44,0x0f,0x29,0x58,0x30
+DB     0x44,0x0f,0x29,0x60,0x40
+DB     0x44,0x0f,0x29,0x68,0x50
+DB     0x44,0x0f,0x29,0x70,0x60
+DB     0x44,0x0f,0x29,0x78,0x70
+       movdqa  xmm10,XMMWORD[$L$bswap_mask]
+
+       movdqu  xmm0,XMMWORD[rcx]
+       movdqu  xmm2,XMMWORD[rdx]
+       movdqu  xmm7,XMMWORD[32+rdx]
 DB     102,65,15,56,0,194
 
-       sub     r9,010h
-       jz      $L$odd_tail
+       sub     r9,0x10
+       jz      NEAR $L$odd_tail
 
-       movdqu  xmm6,XMMWORD PTR[16+rdx]
-       mov     eax,DWORD PTR[((OPENSSL_ia32cap_P+4))]
-       cmp     r9,030h
-       jb      $L$skip4x
+       movdqu  xmm6,XMMWORD[16+rdx]
+       mov     eax,DWORD[((OPENSSL_ia32cap_P+4))]
+       cmp     r9,0x30
+       jb      NEAR $L$skip4x
 
        and     eax,71303168
        cmp     eax,4194304
-       je      $L$skip4x
+       je      NEAR $L$skip4x
 
-       sub     r9,030h
-       mov     rax,0A040608020C0E000h
-       movdqu  xmm14,XMMWORD PTR[48+rdx]
-       movdqu  xmm15,XMMWORD PTR[64+rdx]
+       sub     r9,0x30
+       mov     rax,0xA040608020C0E000
+       movdqu  xmm14,XMMWORD[48+rdx]
+       movdqu  xmm15,XMMWORD[64+rdx]
 
 
 
 
-       movdqu  xmm3,XMMWORD PTR[48+r8]
-       movdqu  xmm11,XMMWORD PTR[32+r8]
+       movdqu  xmm3,XMMWORD[48+r8]
+       movdqu  xmm11,XMMWORD[32+r8]
 DB     102,65,15,56,0,218
 DB     102,69,15,56,0,218
        movdqa  xmm5,xmm3
@@ -959,11 +961,11 @@ DB        102,68,15,58,68,238,17
 DB     102,68,15,58,68,231,16
        xorps   xmm3,xmm11
        xorps   xmm5,xmm13
-       movups  xmm7,XMMWORD PTR[80+rdx]
+       movups  xmm7,XMMWORD[80+rdx]
        xorps   xmm4,xmm12
 
-       movdqu  xmm11,XMMWORD PTR[16+r8]
-       movdqu  xmm8,XMMWORD PTR[r8]
+       movdqu  xmm11,XMMWORD[16+r8]
+       movdqu  xmm8,XMMWORD[r8]
 DB     102,69,15,56,0,218
 DB     102,69,15,56,0,194
        movdqa  xmm13,xmm11
@@ -979,27 +981,27 @@ DB        102,68,15,58,68,231,0
        xorps   xmm3,xmm11
        xorps   xmm5,xmm13
 
-       lea     r8,QWORD PTR[64+r8]
-       sub     r9,040h
-       jc      $L$tail4x
+       lea     r8,[64+r8]
+       sub     r9,0x40
+       jc      NEAR $L$tail4x
 
-       jmp     $L$mod4_loop
+       jmp     NEAR $L$mod4_loop
 ALIGN  32
-$L$mod4_loop::
+$L$mod4_loop:
 DB     102,65,15,58,68,199,0
        xorps   xmm4,xmm12
-       movdqu  xmm11,XMMWORD PTR[48+r8]
+       movdqu  xmm11,XMMWORD[48+r8]
 DB     102,69,15,56,0,218
 DB     102,65,15,58,68,207,17
        xorps   xmm0,xmm3
-       movdqu  xmm3,XMMWORD PTR[32+r8]
+       movdqu  xmm3,XMMWORD[32+r8]
        movdqa  xmm13,xmm11
 DB     102,68,15,58,68,199,16
        pshufd  xmm12,xmm11,78
        xorps   xmm1,xmm5
        pxor    xmm12,xmm11
 DB     102,65,15,56,0,218
-       movups  xmm7,XMMWORD PTR[32+rdx]
+       movups  xmm7,XMMWORD[32+rdx]
        xorps   xmm8,xmm4
 DB     102,68,15,58,68,218,0
        pshufd  xmm4,xmm3,78
@@ -1013,7 +1015,7 @@ DB        102,68,15,58,68,234,17
        pslldq  xmm8,8
        psrldq  xmm9,8
        pxor    xmm0,xmm8
-       movdqa  xmm8,XMMWORD PTR[$L$7_mask]
+       movdqa  xmm8,XMMWORD[$L$7_mask]
        pxor    xmm1,xmm9
 DB     102,76,15,110,200
 
@@ -1028,17 +1030,17 @@ DB      102,15,58,68,222,0
        psrldq  xmm8,8
        pxor    xmm0,xmm9
        pxor    xmm1,xmm8
-       movdqu  xmm8,XMMWORD PTR[r8]
+       movdqu  xmm8,XMMWORD[r8]
 
        movdqa  xmm9,xmm0
        psrlq   xmm0,1
 DB     102,15,58,68,238,17
        xorps   xmm3,xmm11
-       movdqu  xmm11,XMMWORD PTR[16+r8]
+       movdqu  xmm11,XMMWORD[16+r8]
 DB     102,69,15,56,0,218
 DB     102,15,58,68,231,16
        xorps   xmm5,xmm13
-       movups  xmm7,XMMWORD PTR[80+rdx]
+       movups  xmm7,XMMWORD[80+rdx]
 DB     102,69,15,56,0,194
        pxor    xmm1,xmm9
        pxor    xmm9,xmm0
@@ -1062,11 +1064,11 @@ DB      102,69,15,58,68,238,17
 DB     102,68,15,58,68,231,0
        xorps   xmm5,xmm13
 
-       lea     r8,QWORD PTR[64+r8]
-       sub     r9,040h
-       jnc     $L$mod4_loop
+       lea     r8,[64+r8]
+       sub     r9,0x40
+       jnc     NEAR $L$mod4_loop
 
-$L$tail4x::
+$L$tail4x:
 DB     102,65,15,58,68,199,0
 DB     102,65,15,58,68,207,17
 DB     102,68,15,58,68,199,16
@@ -1107,19 +1109,19 @@ DB      102,68,15,58,68,199,16
        pxor    xmm0,xmm4
        psrlq   xmm0,1
        pxor    xmm0,xmm1
-       add     r9,040h
-       jz      $L$done
-       movdqu  xmm7,XMMWORD PTR[32+rdx]
-       sub     r9,010h
-       jz      $L$odd_tail
-$L$skip4x::
+       add     r9,0x40
+       jz      NEAR $L$done
+       movdqu  xmm7,XMMWORD[32+rdx]
+       sub     r9,0x10
+       jz      NEAR $L$odd_tail
+$L$skip4x:
 
 
 
 
 
-       movdqu  xmm8,XMMWORD PTR[r8]
-       movdqu  xmm3,XMMWORD PTR[16+r8]
+       movdqu  xmm8,XMMWORD[r8]
+       movdqu  xmm3,XMMWORD[16+r8]
 DB     102,69,15,56,0,194
 DB     102,65,15,56,0,218
        pxor    xmm0,xmm8
@@ -1131,15 +1133,15 @@ DB      102,15,58,68,218,0
 DB     102,15,58,68,234,17
 DB     102,15,58,68,231,0
 
-       lea     r8,QWORD PTR[32+r8]
+       lea     r8,[32+r8]
        nop
-       sub     r9,020h
-       jbe     $L$even_tail
+       sub     r9,0x20
+       jbe     NEAR $L$even_tail
        nop
-       jmp     $L$mod_loop
+       jmp     NEAR $L$mod_loop
 
 ALIGN  32
-$L$mod_loop::
+$L$mod_loop:
        movdqa  xmm1,xmm0
        movdqa  xmm8,xmm4
        pshufd  xmm4,xmm0,78
@@ -1151,10 +1153,10 @@ DB      102,15,58,68,231,16
 
        pxor    xmm0,xmm3
        pxor    xmm1,xmm5
-       movdqu  xmm9,XMMWORD PTR[r8]
+       movdqu  xmm9,XMMWORD[r8]
        pxor    xmm8,xmm0
 DB     102,69,15,56,0,202
-       movdqu  xmm3,XMMWORD PTR[16+r8]
+       movdqu  xmm3,XMMWORD[16+r8]
 
        pxor    xmm8,xmm1
        pxor    xmm1,xmm9
@@ -1191,15 +1193,15 @@ DB      102,15,58,68,234,17
        pxor    xmm9,xmm0
        psrlq   xmm0,5
        pxor    xmm0,xmm9
-       lea     r8,QWORD PTR[32+r8]
+       lea     r8,[32+r8]
        psrlq   xmm0,1
 DB     102,15,58,68,231,0
        pxor    xmm0,xmm1
 
-       sub     r9,020h
-       ja      $L$mod_loop
+       sub     r9,0x20
+       ja      NEAR $L$mod_loop
 
-$L$even_tail::
+$L$even_tail:
        movdqa  xmm1,xmm0
        movdqa  xmm8,xmm4
        pshufd  xmm4,xmm0,78
@@ -1243,10 +1245,10 @@ DB      102,15,58,68,231,16
        psrlq   xmm0,1
        pxor    xmm0,xmm1
        test    r9,r9
-       jnz     $L$done
+       jnz     NEAR $L$done
 
-$L$odd_tail::
-       movdqu  xmm8,XMMWORD PTR[r8]
+$L$odd_tail:
+       movdqu  xmm8,XMMWORD[r8]
 DB     102,69,15,56,0,194
        pxor    xmm0,xmm8
        movdqa  xmm1,xmm0
@@ -1286,101 +1288,101 @@ DB    102,15,58,68,223,0
        pxor    xmm0,xmm4
        psrlq   xmm0,1
        pxor    xmm0,xmm1
-$L$done::
+$L$done:
 DB     102,65,15,56,0,194
-       movdqu  XMMWORD PTR[rcx],xmm0
-       movaps  xmm6,XMMWORD PTR[rsp]
-       movaps  xmm7,XMMWORD PTR[16+rsp]
-       movaps  xmm8,XMMWORD PTR[32+rsp]
-       movaps  xmm9,XMMWORD PTR[48+rsp]
-       movaps  xmm10,XMMWORD PTR[64+rsp]
-       movaps  xmm11,XMMWORD PTR[80+rsp]
-       movaps  xmm12,XMMWORD PTR[96+rsp]
-       movaps  xmm13,XMMWORD PTR[112+rsp]
-       movaps  xmm14,XMMWORD PTR[128+rsp]
-       movaps  xmm15,XMMWORD PTR[144+rsp]
-       lea     rsp,QWORD PTR[168+rsp]
-$L$SEH_end_gcm_ghash_clmul::
+       movdqu  XMMWORD[rcx],xmm0
+       movaps  xmm6,XMMWORD[rsp]
+       movaps  xmm7,XMMWORD[16+rsp]
+       movaps  xmm8,XMMWORD[32+rsp]
+       movaps  xmm9,XMMWORD[48+rsp]
+       movaps  xmm10,XMMWORD[64+rsp]
+       movaps  xmm11,XMMWORD[80+rsp]
+       movaps  xmm12,XMMWORD[96+rsp]
+       movaps  xmm13,XMMWORD[112+rsp]
+       movaps  xmm14,XMMWORD[128+rsp]
+       movaps  xmm15,XMMWORD[144+rsp]
+       lea     rsp,[168+rsp]
+$L$SEH_end_gcm_ghash_clmul:
        DB      0F3h,0C3h               ;repret
-gcm_ghash_clmul        ENDP
-PUBLIC gcm_init_avx
+
+global gcm_init_avx
 
 ALIGN  32
-gcm_init_avx   PROC PUBLIC
-       jmp     $L$_init_clmul
-gcm_init_avx   ENDP
-PUBLIC gcm_gmult_avx
+gcm_init_avx:
+       jmp     NEAR $L$_init_clmul
+
+global gcm_gmult_avx
 
 ALIGN  32
-gcm_gmult_avx  PROC PUBLIC
-       jmp     $L$_gmult_clmul
-gcm_gmult_avx  ENDP
-PUBLIC gcm_ghash_avx
+gcm_gmult_avx:
+       jmp     NEAR $L$_gmult_clmul
+
+global gcm_ghash_avx
 
 ALIGN  32
-gcm_ghash_avx  PROC PUBLIC
-       jmp     $L$_ghash_clmul
-gcm_ghash_avx  ENDP
+gcm_ghash_avx:
+       jmp     NEAR $L$_ghash_clmul
+
 ALIGN  64
-$L$bswap_mask::
+$L$bswap_mask:
 DB     15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-$L$0x1c2_polynomial::
-DB     1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0c2h
-$L$7_mask::
+$L$0x1c2_polynomial:
+DB     1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0xc2
+$L$7_mask:
        DD      7,0,7,0
-$L$7_mask_poly::
+$L$7_mask_poly:
        DD      7,0,450,0
 ALIGN  64
 
-$L$rem_4bit::
+$L$rem_4bit:
        DD      0,0,0,471859200,0,943718400,0,610271232
        DD      0,1887436800,0,1822425088,0,1220542464,0,1423966208
        DD      0,3774873600,0,4246732800,0,3644850176,0,3311403008
        DD      0,2441084928,0,2376073216,0,2847932416,0,3051356160
 
-$L$rem_8bit::
-       DW      00000h,001C2h,00384h,00246h,00708h,006CAh,0048Ch,0054Eh
-       DW      00E10h,00FD2h,00D94h,00C56h,00918h,008DAh,00A9Ch,00B5Eh
-       DW      01C20h,01DE2h,01FA4h,01E66h,01B28h,01AEAh,018ACh,0196Eh
-       DW      01230h,013F2h,011B4h,01076h,01538h,014FAh,016BCh,0177Eh
-       DW      03840h,03982h,03BC4h,03A06h,03F48h,03E8Ah,03CCCh,03D0Eh
-       DW      03650h,03792h,035D4h,03416h,03158h,0309Ah,032DCh,0331Eh
-       DW      02460h,025A2h,027E4h,02626h,02368h,022AAh,020ECh,0212Eh
-       DW      02A70h,02BB2h,029F4h,02836h,02D78h,02CBAh,02EFCh,02F3Eh
-       DW      07080h,07142h,07304h,072C6h,07788h,0764Ah,0740Ch,075CEh
-       DW      07E90h,07F52h,07D14h,07CD6h,07998h,0785Ah,07A1Ch,07BDEh
-       DW      06CA0h,06D62h,06F24h,06EE6h,06BA8h,06A6Ah,0682Ch,069EEh
-       DW      062B0h,06372h,06134h,060F6h,065B8h,0647Ah,0663Ch,067FEh
-       DW      048C0h,04902h,04B44h,04A86h,04FC8h,04E0Ah,04C4Ch,04D8Eh
-       DW      046D0h,04712h,04554h,04496h,041D8h,0401Ah,0425Ch,0439Eh
-       DW      054E0h,05522h,05764h,056A6h,053E8h,0522Ah,0506Ch,051AEh
-       DW      05AF0h,05B32h,05974h,058B6h,05DF8h,05C3Ah,05E7Ch,05FBEh
-       DW      0E100h,0E0C2h,0E284h,0E346h,0E608h,0E7CAh,0E58Ch,0E44Eh
-       DW      0EF10h,0EED2h,0EC94h,0ED56h,0E818h,0E9DAh,0EB9Ch,0EA5Eh
-       DW      0FD20h,0FCE2h,0FEA4h,0FF66h,0FA28h,0FBEAh,0F9ACh,0F86Eh
-       DW      0F330h,0F2F2h,0F0B4h,0F176h,0F438h,0F5FAh,0F7BCh,0F67Eh
-       DW      0D940h,0D882h,0DAC4h,0DB06h,0DE48h,0DF8Ah,0DDCCh,0DC0Eh
-       DW      0D750h,0D692h,0D4D4h,0D516h,0D058h,0D19Ah,0D3DCh,0D21Eh
-       DW      0C560h,0C4A2h,0C6E4h,0C726h,0C268h,0C3AAh,0C1ECh,0C02Eh
-       DW      0CB70h,0CAB2h,0C8F4h,0C936h,0CC78h,0CDBAh,0CFFCh,0CE3Eh
-       DW      09180h,09042h,09204h,093C6h,09688h,0974Ah,0950Ch,094CEh
-       DW      09F90h,09E52h,09C14h,09DD6h,09898h,0995Ah,09B1Ch,09ADEh
-       DW      08DA0h,08C62h,08E24h,08FE6h,08AA8h,08B6Ah,0892Ch,088EEh
-       DW      083B0h,08272h,08034h,081F6h,084B8h,0857Ah,0873Ch,086FEh
-       DW      0A9C0h,0A802h,0AA44h,0AB86h,0AEC8h,0AF0Ah,0AD4Ch,0AC8Eh
-       DW      0A7D0h,0A612h,0A454h,0A596h,0A0D8h,0A11Ah,0A35Ch,0A29Eh
-       DW      0B5E0h,0B422h,0B664h,0B7A6h,0B2E8h,0B32Ah,0B16Ch,0B0AEh
-       DW      0BBF0h,0BA32h,0B874h,0B9B6h,0BCF8h,0BD3Ah,0BF7Ch,0BEBEh
+$L$rem_8bit:
+       DW      0x0000,0x01C2,0x0384,0x0246,0x0708,0x06CA,0x048C,0x054E
+       DW      0x0E10,0x0FD2,0x0D94,0x0C56,0x0918,0x08DA,0x0A9C,0x0B5E
+       DW      0x1C20,0x1DE2,0x1FA4,0x1E66,0x1B28,0x1AEA,0x18AC,0x196E
+       DW      0x1230,0x13F2,0x11B4,0x1076,0x1538,0x14FA,0x16BC,0x177E
+       DW      0x3840,0x3982,0x3BC4,0x3A06,0x3F48,0x3E8A,0x3CCC,0x3D0E
+       DW      0x3650,0x3792,0x35D4,0x3416,0x3158,0x309A,0x32DC,0x331E
+       DW      0x2460,0x25A2,0x27E4,0x2626,0x2368,0x22AA,0x20EC,0x212E
+       DW      0x2A70,0x2BB2,0x29F4,0x2836,0x2D78,0x2CBA,0x2EFC,0x2F3E
+       DW      0x7080,0x7142,0x7304,0x72C6,0x7788,0x764A,0x740C,0x75CE
+       DW      0x7E90,0x7F52,0x7D14,0x7CD6,0x7998,0x785A,0x7A1C,0x7BDE
+       DW      0x6CA0,0x6D62,0x6F24,0x6EE6,0x6BA8,0x6A6A,0x682C,0x69EE
+       DW      0x62B0,0x6372,0x6134,0x60F6,0x65B8,0x647A,0x663C,0x67FE
+       DW      0x48C0,0x4902,0x4B44,0x4A86,0x4FC8,0x4E0A,0x4C4C,0x4D8E
+       DW      0x46D0,0x4712,0x4554,0x4496,0x41D8,0x401A,0x425C,0x439E
+       DW      0x54E0,0x5522,0x5764,0x56A6,0x53E8,0x522A,0x506C,0x51AE
+       DW      0x5AF0,0x5B32,0x5974,0x58B6,0x5DF8,0x5C3A,0x5E7C,0x5FBE
+       DW      0xE100,0xE0C2,0xE284,0xE346,0xE608,0xE7CA,0xE58C,0xE44E
+       DW      0xEF10,0xEED2,0xEC94,0xED56,0xE818,0xE9DA,0xEB9C,0xEA5E
+       DW      0xFD20,0xFCE2,0xFEA4,0xFF66,0xFA28,0xFBEA,0xF9AC,0xF86E
+       DW      0xF330,0xF2F2,0xF0B4,0xF176,0xF438,0xF5FA,0xF7BC,0xF67E
+       DW      0xD940,0xD882,0xDAC4,0xDB06,0xDE48,0xDF8A,0xDDCC,0xDC0E
+       DW      0xD750,0xD692,0xD4D4,0xD516,0xD058,0xD19A,0xD3DC,0xD21E
+       DW      0xC560,0xC4A2,0xC6E4,0xC726,0xC268,0xC3AA,0xC1EC,0xC02E
+       DW      0xCB70,0xCAB2,0xC8F4,0xC936,0xCC78,0xCDBA,0xCFFC,0xCE3E
+       DW      0x9180,0x9042,0x9204,0x93C6,0x9688,0x974A,0x950C,0x94CE
+       DW      0x9F90,0x9E52,0x9C14,0x9DD6,0x9898,0x995A,0x9B1C,0x9ADE
+       DW      0x8DA0,0x8C62,0x8E24,0x8FE6,0x8AA8,0x8B6A,0x892C,0x88EE
+       DW      0x83B0,0x8272,0x8034,0x81F6,0x84B8,0x857A,0x873C,0x86FE
+       DW      0xA9C0,0xA802,0xAA44,0xAB86,0xAEC8,0xAF0A,0xAD4C,0xAC8E
+       DW      0xA7D0,0xA612,0xA454,0xA596,0xA0D8,0xA11A,0xA35C,0xA29E
+       DW      0xB5E0,0xB422,0xB664,0xB7A6,0xB2E8,0xB32A,0xB16C,0xB0AE
+       DW      0xBBF0,0xBA32,0xB874,0xB9B6,0xBCF8,0xBD3A,0xBF7C,0xBEBE
 
 DB     71,72,65,83,72,32,102,111,114,32,120,56,54,95,54,52
 DB     44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32
 DB     60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111
 DB     114,103,62,0
 ALIGN  64
-EXTERN __imp_RtlVirtualUnwind:NEAR
+EXTERN __imp_RtlVirtualUnwind
 
 ALIGN  16
-se_handler     PROC PRIVATE
+se_handler:
        push    rsi
        push    rdi
        push    rbx
@@ -1392,58 +1394,58 @@ se_handler      PROC PRIVATE
        pushfq
        sub     rsp,64
 
-       mov     rax,QWORD PTR[120+r8]
-       mov     rbx,QWORD PTR[248+r8]
+       mov     rax,QWORD[120+r8]
+       mov     rbx,QWORD[248+r8]
 
-       mov     rsi,QWORD PTR[8+r9]
-       mov     r11,QWORD PTR[56+r9]
+       mov     rsi,QWORD[8+r9]
+       mov     r11,QWORD[56+r9]
 
-       mov     r10d,DWORD PTR[r11]
-       lea     r10,QWORD PTR[r10*1+rsi]
+       mov     r10d,DWORD[r11]
+       lea     r10,[r10*1+rsi]
        cmp     rbx,r10
-       jb      $L$in_prologue
+       jb      NEAR $L$in_prologue
 
-       mov     rax,QWORD PTR[152+r8]
+       mov     rax,QWORD[152+r8]
 
-       mov     r10d,DWORD PTR[4+r11]
-       lea     r10,QWORD PTR[r10*1+rsi]
+       mov     r10d,DWORD[4+r11]
+       lea     r10,[r10*1+rsi]
        cmp     rbx,r10
-       jae     $L$in_prologue
+       jae     NEAR $L$in_prologue
 
-       lea     rax,QWORD PTR[24+rax]
+       lea     rax,[24+rax]
 
-       mov     rbx,QWORD PTR[((-8))+rax]
-       mov     rbp,QWORD PTR[((-16))+rax]
-       mov     r12,QWORD PTR[((-24))+rax]
-       mov     QWORD PTR[144+r8],rbx
-       mov     QWORD PTR[160+r8],rbp
-       mov     QWORD PTR[216+r8],r12
+       mov     rbx,QWORD[((-8))+rax]
+       mov     rbp,QWORD[((-16))+rax]
+       mov     r12,QWORD[((-24))+rax]
+       mov     QWORD[144+r8],rbx
+       mov     QWORD[160+r8],rbp
+       mov     QWORD[216+r8],r12
 
-$L$in_prologue::
-       mov     rdi,QWORD PTR[8+rax]
-       mov     rsi,QWORD PTR[16+rax]
-       mov     QWORD PTR[152+r8],rax
-       mov     QWORD PTR[168+r8],rsi
-       mov     QWORD PTR[176+r8],rdi
+$L$in_prologue:
+       mov     rdi,QWORD[8+rax]
+       mov     rsi,QWORD[16+rax]
+       mov     QWORD[152+r8],rax
+       mov     QWORD[168+r8],rsi
+       mov     QWORD[176+r8],rdi
 
-       mov     rdi,QWORD PTR[40+r9]
+       mov     rdi,QWORD[40+r9]
        mov     rsi,r8
        mov     ecx,154
-       DD      0a548f3fch
+       DD      0xa548f3fc
 
        mov     rsi,r9
        xor     rcx,rcx
-       mov     rdx,QWORD PTR[8+rsi]
-       mov     r8,QWORD PTR[rsi]
-       mov     r9,QWORD PTR[16+rsi]
-       mov     r10,QWORD PTR[40+rsi]
-       lea     r11,QWORD PTR[56+rsi]
-       lea     r12,QWORD PTR[24+rsi]
-       mov     QWORD PTR[32+rsp],r10
-       mov     QWORD PTR[40+rsp],r11
-       mov     QWORD PTR[48+rsp],r12
-       mov     QWORD PTR[56+rsp],rcx
-       call    QWORD PTR[__imp_RtlVirtualUnwind]
+       mov     rdx,QWORD[8+rsi]
+       mov     r8,QWORD[rsi]
+       mov     r9,QWORD[16+rsi]
+       mov     r10,QWORD[40+rsi]
+       lea     r11,[56+rsi]
+       lea     r12,[24+rsi]
+       mov     QWORD[32+rsp],r10
+       mov     QWORD[40+rsp],r11
+       mov     QWORD[48+rsp],r12
+       mov     QWORD[56+rsp],rcx
+       call    QWORD[__imp_RtlVirtualUnwind]
 
        mov     eax,1
        add     rsp,64
@@ -1457,54 +1459,49 @@ $L$in_prologue::
        pop     rdi
        pop     rsi
        DB      0F3h,0C3h               ;repret
-se_handler     ENDP
 
-.text$ ENDS
-.pdata SEGMENT READONLY ALIGN(4)
+
+section        .pdata rdata align=4
 ALIGN  4
-       DD      imagerel $L$SEH_begin_gcm_gmult_4bit
-       DD      imagerel $L$SEH_end_gcm_gmult_4bit
-       DD      imagerel $L$SEH_info_gcm_gmult_4bit
-
-       DD      imagerel $L$SEH_begin_gcm_ghash_4bit
-       DD      imagerel $L$SEH_end_gcm_ghash_4bit
-       DD      imagerel $L$SEH_info_gcm_ghash_4bit
-
-       DD      imagerel $L$SEH_begin_gcm_init_clmul
-       DD      imagerel $L$SEH_end_gcm_init_clmul
-       DD      imagerel $L$SEH_info_gcm_init_clmul
-
-       DD      imagerel $L$SEH_begin_gcm_ghash_clmul
-       DD      imagerel $L$SEH_end_gcm_ghash_clmul
-       DD      imagerel $L$SEH_info_gcm_ghash_clmul
-.pdata ENDS
-.xdata SEGMENT READONLY ALIGN(8)
+       DD      $L$SEH_begin_gcm_gmult_4bit wrt ..imagebase
+       DD      $L$SEH_end_gcm_gmult_4bit wrt ..imagebase
+       DD      $L$SEH_info_gcm_gmult_4bit wrt ..imagebase
+
+       DD      $L$SEH_begin_gcm_ghash_4bit wrt ..imagebase
+       DD      $L$SEH_end_gcm_ghash_4bit wrt ..imagebase
+       DD      $L$SEH_info_gcm_ghash_4bit wrt ..imagebase
+
+       DD      $L$SEH_begin_gcm_init_clmul wrt ..imagebase
+       DD      $L$SEH_end_gcm_init_clmul wrt ..imagebase
+       DD      $L$SEH_info_gcm_init_clmul wrt ..imagebase
+
+       DD      $L$SEH_begin_gcm_ghash_clmul wrt ..imagebase
+       DD      $L$SEH_end_gcm_ghash_clmul wrt ..imagebase
+       DD      $L$SEH_info_gcm_ghash_clmul wrt ..imagebase
+section        .xdata rdata align=8
 ALIGN  8
-$L$SEH_info_gcm_gmult_4bit::
+$L$SEH_info_gcm_gmult_4bit:
 DB     9,0,0,0
-       DD      imagerel se_handler
-       DD      imagerel $L$gmult_prologue,imagerel $L$gmult_epilogue
-$L$SEH_info_gcm_ghash_4bit::
+       DD      se_handler wrt ..imagebase
+       DD      $L$gmult_prologue wrt ..imagebase,$L$gmult_epilogue wrt ..imagebase
+$L$SEH_info_gcm_ghash_4bit:
 DB     9,0,0,0
-       DD      imagerel se_handler
-       DD      imagerel $L$ghash_prologue,imagerel $L$ghash_epilogue
-$L$SEH_info_gcm_init_clmul::
-DB     001h,008h,003h,000h
-DB     008h,068h,000h,000h
-DB     004h,022h,000h,000h
-$L$SEH_info_gcm_ghash_clmul::
-DB     001h,033h,016h,000h
-DB     033h,0f8h,009h,000h
-DB     02eh,0e8h,008h,000h
-DB     029h,0d8h,007h,000h
-DB     024h,0c8h,006h,000h
-DB     01fh,0b8h,005h,000h
-DB     01ah,0a8h,004h,000h
-DB     015h,098h,003h,000h
-DB     010h,088h,002h,000h
-DB     00ch,078h,001h,000h
-DB     008h,068h,000h,000h
-DB     004h,001h,015h,000h
-
-.xdata ENDS
-END
+       DD      se_handler wrt ..imagebase
+       DD      $L$ghash_prologue wrt ..imagebase,$L$ghash_epilogue wrt ..imagebase
+$L$SEH_info_gcm_init_clmul:
+DB     0x01,0x08,0x03,0x00
+DB     0x08,0x68,0x00,0x00
+DB     0x04,0x22,0x00,0x00
+$L$SEH_info_gcm_ghash_clmul:
+DB     0x01,0x33,0x16,0x00
+DB     0x33,0xf8,0x09,0x00
+DB     0x2e,0xe8,0x08,0x00
+DB     0x29,0xd8,0x07,0x00
+DB     0x24,0xc8,0x06,0x00
+DB     0x1f,0xb8,0x05,0x00
+DB     0x1a,0xa8,0x04,0x00
+DB     0x15,0x98,0x03,0x00
+DB     0x10,0x88,0x02,0x00
+DB     0x0c,0x78,0x01,0x00
+DB     0x08,0x68,0x00,0x00
+DB     0x04,0x01,0x15,0x00