@@ -81,8 +81,8 @@ _x86_64_AES_encrypt:
8181 movl 0 (%r14 ,%rdi ,8 ),%edi
8282 movl 0 (%r14 ,%rbp ,8 ),%ebp
8383
84- andl $65280 ,%edi
85- andl $65280 ,%ebp
84+ andl $0x0000ff00 ,%edi
85+ andl $0x0000ff00 ,%ebp
8686
8787 xorl %edi ,%r10d
8888 xorl %ebp ,%r11d
@@ -94,8 +94,8 @@ _x86_64_AES_encrypt:
9494 movl 0 (%r14 ,%rsi ,8 ),%esi
9595 movl 0 (%r14 ,%rdi ,8 ),%edi
9696
97- andl $65280 ,%esi
98- andl $65280 ,%edi
97+ andl $0x0000ff00 ,%esi
98+ andl $0x0000ff00 ,%edi
9999 shrl $16 ,%ebx
100100 xorl %esi ,%r12d
101101 xorl %edi ,%r8d
@@ -108,9 +108,9 @@ _x86_64_AES_encrypt:
108108 movl 0 (%r14 ,%rdi ,8 ),%edi
109109 movl 0 (%r14 ,%rbp ,8 ),%ebp
110110
111- andl $16711680 ,%esi
112- andl $16711680 ,%edi
113- andl $16711680 ,%ebp
111+ andl $0x00ff0000 ,%esi
112+ andl $0x00ff0000 ,%edi
113+ andl $0x00ff0000 ,%ebp
114114
115115 xorl %esi ,%r10d
116116 xorl %edi ,%r11d
@@ -123,9 +123,9 @@ _x86_64_AES_encrypt:
123123 movl 2 (%r14 ,%rdi ,8 ),%edi
124124 movl 2 (%r14 ,%rbp ,8 ),%ebp
125125
126- andl $16711680 ,%esi
127- andl $4278190080 ,%edi
128- andl $4278190080 ,%ebp
126+ andl $0x00ff0000 ,%esi
127+ andl $0xff000000 ,%edi
128+ andl $0xff000000 ,%ebp
129129
130130 xorl %esi ,%r8d
131131 xorl %edi ,%r10d
@@ -138,8 +138,8 @@ _x86_64_AES_encrypt:
138138 movl 2 (%r14 ,%rdi ,8 ),%edi
139139 movl 16 +0 (%r15 ),%eax
140140
141- andl $4278190080 ,%esi
142- andl $4278190080 ,%edi
141+ andl $0xff000000 ,%esi
142+ andl $0xff000000 ,%edi
143143
144144 xorl %esi ,%r12d
145145 xorl %edi ,%r8d
@@ -241,8 +241,8 @@ _x86_64_AES_encrypt_compact:
241241 xorl %r8d ,%edx
242242 cmpq 16 (%rsp ),%r15
243243 je .Lenc_compact_done
244- movl $2155905152 ,%r10d
245- movl $2155905152 ,%r11d
244+ movl $0x80808080 ,%r10d
245+ movl $0x80808080 ,%r11d
246246 andl %eax ,%r10d
247247 andl %ebx ,%r11d
248248 movl %r10d ,%esi
@@ -253,20 +253,20 @@ _x86_64_AES_encrypt_compact:
253253 leal (%rbx ,%rbx ,1 ),%r9d
254254 subl %r10d ,%esi
255255 subl %r11d ,%edi
256- andl $4278124286 ,%r8d
257- andl $4278124286 ,%r9d
258- andl $454761243 ,%esi
259- andl $454761243 ,%edi
256+ andl $0xfefefefe ,%r8d
257+ andl $0xfefefefe ,%r9d
258+ andl $0x1b1b1b1b ,%esi
259+ andl $0x1b1b1b1b ,%edi
260260 movl %eax ,%r10d
261261 movl %ebx ,%r11d
262262 xorl %esi ,%r8d
263263 xorl %edi ,%r9d
264264
265265 xorl %r8d ,%eax
266266 xorl %r9d ,%ebx
267- movl $2155905152 ,%r12d
267+ movl $0x80808080 ,%r12d
268268 roll $24 ,%eax
269- movl $2155905152 ,%ebp
269+ movl $0x80808080 ,%ebp
270270 roll $24 ,%ebx
271271 andl %ecx ,%r12d
272272 andl %edx ,%ebp
@@ -289,10 +289,10 @@ _x86_64_AES_encrypt_compact:
289289 xorl %r10d ,%eax
290290 xorl %r11d ,%ebx
291291
292- andl $4278124286 ,%r8d
293- andl $4278124286 ,%r9d
294- andl $454761243 ,%esi
295- andl $454761243 ,%edi
292+ andl $0xfefefefe ,%r8d
293+ andl $0xfefefefe ,%r9d
294+ andl $0x1b1b1b1b ,%esi
295+ andl $0x1b1b1b1b ,%edi
296296 movl %ecx ,%r12d
297297 movl %edx ,%ebp
298298 xorl %esi ,%r8d
@@ -345,7 +345,7 @@ AES_encrypt:
345345 andq $-64 ,%rsp
346346 subq %rsp ,%rcx
347347 negq %rcx
348- andq $960 ,%rcx
348+ andq $0x3c0 ,%rcx
349349 subq %rcx ,%rsp
350350 subq $32 ,%rsp
351351
@@ -370,7 +370,7 @@ AES_encrypt:
370370 leaq .LAES_Te+2048 (%rip ),%r14
371371 leaq 768 (%rsp ),%rbp
372372 subq %r14 ,%rbp
373- andq $768 ,%rbp
373+ andq $0x300 ,%rbp
374374 leaq (%r14 ,%rbp ,1 ),%r14
375375
376376 call _x86_64_AES_encrypt_compact
@@ -792,7 +792,7 @@ AES_decrypt:
792792 andq $-64 ,%rsp
793793 subq %rsp ,%rcx
794794 negq %rcx
795- andq $960 ,%rcx
795+ andq $0x3c0 ,%rcx
796796 subq %rcx ,%rsp
797797 subq $32 ,%rsp
798798
@@ -817,7 +817,7 @@ AES_decrypt:
817817 leaq .LAES_Td+2048 (%rip ),%r14
818818 leaq 768 (%rsp ),%rbp
819819 subq %r14 ,%rbp
820- andq $768 ,%rbp
820+ andq $0x300 ,%rbp
821821 leaq (%r14 ,%rbp ,1 ),%r14
822822 shrq $3 ,%rbp
823823 addq %rbp ,%r14
@@ -1333,9 +1333,9 @@ AES_cbc_encrypt:
13331333 movq %r14 ,%r10
13341334 leaq 2304 (%r14 ),%r11
13351335 movq %r15 ,%r12
1336- andq $4095 ,%r10
1337- andq $4095 ,%r11
1338- andq $4095 ,%r12
1336+ andq $0xFFF ,%r10
1337+ andq $0xFFF ,%r11
1338+ andq $0xFFF ,%r12
13391339
13401340 cmpq %r11 ,%r12
13411341 jb .Lcbc_te_break_out
@@ -1344,7 +1344,7 @@ AES_cbc_encrypt:
13441344 jmp .Lcbc_te_ok
13451345.Lcbc_te_break_out:
13461346 subq %r10 ,%r12
1347- andq $4095 ,%r12
1347+ andq $0xFFF ,%r12
13481348 addq $320 ,%r12
13491349 subq %r12 ,%r15
13501350.align 4
@@ -1370,7 +1370,7 @@ AES_cbc_encrypt:
13701370
13711371 movq %r15 ,%r10
13721372 subq %r14 ,%r10
1373- andq $4095 ,%r10
1373+ andq $0xfff ,%r10
13741374 cmpq $2304 ,%r10
13751375 jb .Lcbc_do_ecopy
13761376 cmpq $4096 -248 ,%r10
@@ -1557,7 +1557,7 @@ AES_cbc_encrypt:
15571557 leaq -88 -63 (%rcx ),%r10
15581558 subq %rbp ,%r10
15591559 negq %r10
1560- andq $960 ,%r10
1560+ andq $0x3c0 ,%r10
15611561 subq %r10 ,%rbp
15621562
15631563 xchgq %rsp ,%rbp
@@ -1586,7 +1586,7 @@ AES_cbc_encrypt:
15861586 leaq 2048 (%r14 ),%r14
15871587 leaq 768 -8 (%rsp ),%rax
15881588 subq %r14 ,%rax
1589- andq $768 ,%rax
1589+ andq $0x300 ,%rax
15901590 leaq (%r14 ,%rax ,1 ),%r14
15911591
15921592 cmpq $0 ,%rbx
0 commit comments