diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-08-19 18:25:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-08-19 18:25:51 +0000 |
| commit | 98a537b602e93fc67be08a8fc09c726f6d3a0729 (patch) | |
| tree | 7c4531fb617a107726cab5d7da03eabdcb820390 /lib/libc/arch | |
| parent | 88291b8c00b68b3d24804705df4ea96777573ab0 (diff) | |
Use 0xcc trapsleds instead of default/nop/0xcc in BTC alignments
Diffstat (limited to 'lib/libc/arch')
| -rw-r--r-- | lib/libc/arch/i386/string/ffs.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/i386/string/memchr.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/i386/string/strncmp.S | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc/arch/i386/string/ffs.S b/lib/libc/arch/i386/string/ffs.S index 4de8c6aaaf0..7befc0bcbbe 100644 --- a/lib/libc/arch/i386/string/ffs.S +++ b/lib/libc/arch/i386/string/ffs.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: ffs.S,v 1.5 2017/08/19 18:25:50 deraadt Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. @@ -12,7 +12,7 @@ ENTRY(ffs) incl %eax /* bits numbered from 1, not 0 */ ret - .align 2 + .align 2,0xcc L1: xorl %eax,%eax /* clear result */ ret END_WEAK(ffs) diff --git a/lib/libc/arch/i386/string/memchr.S b/lib/libc/arch/i386/string/memchr.S index 87191eb0f2d..b3d773bea4c 100644 --- a/lib/libc/arch/i386/string/memchr.S +++ b/lib/libc/arch/i386/string/memchr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: memchr.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: memchr.S,v 1.5 2017/08/19 18:25:50 deraadt Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. @@ -20,7 +20,7 @@ ENTRY(memchr) leal -1(%edi),%eax /* adjust result of scan */ popl %edi ret - .align 2,0x90 + .align 2,0xcc L1: xorl %eax,%eax popl %edi ret diff --git a/lib/libc/arch/i386/string/strncmp.S b/lib/libc/arch/i386/string/strncmp.S index 6e480c95f2e..bbe3f218a38 100644 --- a/lib/libc/arch/i386/string/strncmp.S +++ b/lib/libc/arch/i386/string/strncmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: strncmp.S,v 1.4 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: strncmp.S,v 1.5 2017/08/19 18:25:50 deraadt Exp $ */ /* * Written by J.T. Conklin <jtc@netbsd.org>. * Public domain. @@ -107,7 +107,7 @@ L3: movzbl (%eax),%eax /* unsigned comparision */ subl %ecx,%eax popl %ebx ret - .align 2,0x90 + .align 2,0xcc L4: xorl %eax,%eax popl %ebx ret |