Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look for the character to locate before checking for the NUL character 

As documented in PR port-i386/49208, this fixes strchr(s, '\0'), as used by
the FAT first-stage bootloader on x86 (bootxx_msdos).
strchr(s, '\0') is otherwise equivalent to strlen(string), which would
probably look nicer in the original file, dosfs.c from libsa.

Confirmed working in qemu and on real hardware.
ok joerg@

XXX pull-up to netbsd-6 and netbsd-7
This commit is contained in:
khorben 2014-09-22 20:31:56 +00:00
parent 0c7cf1ae4c
commit 00b617c08a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/libc/arch/i386/string/small/strchr.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: strchr.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $ */ /* $NetBSD: strchr.S,v 1.3 2014/09/22 20:31:56 khorben Exp $ */
/*- /*-
* Copyright (c) 2011 The NetBSD Foundation, Inc. * Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -29,7 +29,7 @@
*/ */
#include <machine/asm.h> #include <machine/asm.h>
RCSID("$NetBSD: strchr.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $") RCSID("$NetBSD: strchr.S,v 1.3 2014/09/22 20:31:56 khorben Exp $")
ENTRY(strchr) ENTRY(strchr)
popl %edx /* Return address */ popl %edx /* Return address */
@ -39,10 +39,10 @@ ENTRY(strchr)
pushl %eax pushl %eax
pushl %edx pushl %edx
1: 1:
cmpb $0, 0(%eax)
je 2f
cmpb %cl, 0(%eax) cmpb %cl, 0(%eax)
je 3f je 3f
cmpb $0, 0(%eax)
je 2f
incl %eax incl %eax
jmp 1b jmp 1b
2: 2: