diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-02-19 21:58:08 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-19 21:58:08 +0000 |
| commit | 92945b5261c412eb590b2b34c7ec9a035f0693a1 (patch) | |
| tree | 2d09031d37dcb8faab0ba90eb72b61681deecc51 /sysdeps/i386/i486 | |
| parent | b65e2ba34b218a58a74123e2d6ba70ab0d4797bf (diff) | |
Remove some bounded-pointers support from i386 .S files.
Diffstat (limited to 'sysdeps/i386/i486')
| -rw-r--r-- | sysdeps/i386/i486/strcat.S | 5 | ||||
| -rw-r--r-- | sysdeps/i386/i486/strlen.S | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/sysdeps/i386/i486/strcat.S b/sysdeps/i386/i486/strcat.S index 6549b5c162..05de49a534 100644 --- a/sysdeps/i386/i486/strcat.S +++ b/sysdeps/i386/i486/strcat.S @@ -31,15 +31,12 @@ .text ENTRY (BP_SYM (strcat)) - ENTER pushl %edi /* Save callee-safe register. */ cfi_adjust_cfa_offset (4) movl DEST(%esp), %edx movl SRC(%esp), %ecx - CHECK_BOUNDS_LOW (%edx, DEST(%esp)) - CHECK_BOUNDS_LOW (%ecx, SRC(%esp)) testb $0xff, (%ecx) /* Is source string empty? */ jz L(8) /* yes => return */ @@ -262,12 +259,10 @@ L(9): movb %al, (%ecx,%edx) /* store first byte of last word */ L(8): /* GKM FIXME: check high bounds */ movl DEST(%esp), %eax /* start address of destination is result */ - RETURN_BOUNDED_POINTER (DEST(%esp)) popl %edi /* restore saved register */ cfi_adjust_cfa_offset (-4) cfi_restore (edi) - LEAVE RET_PTR END (BP_SYM (strcat)) libc_hidden_builtin_def (strcat) diff --git a/sysdeps/i386/i486/strlen.S b/sysdeps/i386/i486/strlen.S index 743918044e..a783c6fe5c 100644 --- a/sysdeps/i386/i486/strlen.S +++ b/sysdeps/i386/i486/strlen.S @@ -28,10 +28,8 @@ .text ENTRY (BP_SYM (strlen)) - ENTER movl STR(%esp), %ecx - CHECK_BOUNDS_LOW (%ecx, STR(%esp)) movl %ecx, %eax /* duplicate it */ andl $3, %ecx /* mask alignment bits */ @@ -129,10 +127,8 @@ L(3): testb %cl, %cl /* is first byte NUL? */ jz L(2) /* yes => return pointer */ incl %eax /* increment pointer */ -L(2): CHECK_BOUNDS_HIGH (%eax, STR(%esp), jb) - subl STR(%esp), %eax /* compute difference to string start */ +L(2): subl STR(%esp), %eax /* compute difference to string start */ - LEAVE ret END (BP_SYM (strlen)) libc_hidden_builtin_def (strlen) |