From patchwork Thu Apr 23 10:19:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wieczorkiewicz, Pawel" X-Patchwork-Id: 11505423 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 14D7A913 for ; Thu, 23 Apr 2020 10:21:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E51982084D for ; Thu, 23 Apr 2020 10:21:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="naRSXbVc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E51982084D Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxC-0007kV-Ja; Thu, 23 Apr 2020 10:19:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxA-0007kG-SX for xen-devel@lists.xen.org; Thu, 23 Apr 2020 10:19:33 +0000 X-Inumbo-ID: ec29acf8-854b-11ea-83d8-bc764e2007e4 Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ec29acf8-854b-11ea-83d8-bc764e2007e4; Thu, 23 Apr 2020 10:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1587637172; x=1619173172; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=G/m3KuxGHbfU+DBNHOF/luWPlZ6kzIdxDz0P5fCKYf8=; b=naRSXbVcQ9Zu3t0iYaygddzggzsMiGxN2VOYtX/OWbPVNshBlCY6kHwm 4Z7TZlimzJguuZF171t80TrR2g1O3Z6AL184bCUFniJtd+A/w/iGEm3Sv sRAGzxvXiTdxTK82YALBuRqUYEDYsVCSQaKGutYZ2+qyYIg92RHcnbPIf M=; IronPort-SDR: 9oLJ81RDEQ1LcuYVJhv2NK1JbRjTMXbjVwH6uRndoqSVxsJIbSXoC0NU9h9JPOTe8W87C9e+25 6BSyfngpzdrg== X-IronPort-AV: E=Sophos;i="5.73,306,1583193600"; d="scan'208";a="27274836" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-2a-f14f4a47.us-west-2.amazon.com) ([10.43.8.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 23 Apr 2020 10:19:31 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2a-f14f4a47.us-west-2.amazon.com (Postfix) with ESMTPS id 16DC3A07DA; Thu, 23 Apr 2020 10:19:30 +0000 (UTC) Received: from EX13D05EUC002.ant.amazon.com (10.43.164.231) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:29 +0000 Received: from EX13MTAUEA001.ant.amazon.com (10.43.61.82) by EX13D05EUC002.ant.amazon.com (10.43.164.231) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:28 +0000 Received: from dev-dsk-wipawel-1a-0c4e6d58.eu-west-1.amazon.com (10.4.134.33) by mail-relay.amazon.com (10.43.61.243) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Apr 2020 10:19:27 +0000 From: Pawel Wieczorkiewicz To: Subject: [XTF 1/4] string: add freebds libc implementation of strtol() Date: Thu, 23 Apr 2020 10:19:15 +0000 Message-ID: <20200423101918.13566-2-wipawel@amazon.de> X-Mailer: git-send-email 2.16.6 In-Reply-To: <20200423101918.13566-1-wipawel@amazon.de> References: <20200423101918.13566-1-wipawel@amazon.de> MIME-Version: 1.0 Precedence: Bulk X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, wipawel@xen.org, paul@xen.org, semelpaul@gmail.com, andrew.cooper3@citrix.com, wipawel@amazon.de, nmanthey@amazon.de Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Paul Semel Added freebsd libc implementation of the strtol() function. Original can be found here : https://github.com/freebsd/freebsd/blob/master/lib/libc/stdlib/strtol.c Signed-off-by: Paul Semel --- build/files.mk | 1 + common/libc/strtol.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/xtf/libc.h | 2 + 3 files changed, 138 insertions(+) create mode 100644 common/libc/strtol.c diff --git a/build/files.mk b/build/files.mk index dfa27e4..ebc36aa 100644 --- a/build/files.mk +++ b/build/files.mk @@ -13,6 +13,7 @@ obj-perarch += $(ROOT)/common/lib.o obj-perarch += $(ROOT)/common/libc/stdio.o obj-perarch += $(ROOT)/common/libc/string.o obj-perarch += $(ROOT)/common/libc/vsnprintf.o +obj-perarch += $(ROOT)/common/libc/strtol.o obj-perarch += $(ROOT)/common/report.o obj-perarch += $(ROOT)/common/setup.o obj-perarch += $(ROOT)/common/xenbus.o diff --git a/common/libc/strtol.c b/common/libc/strtol.c new file mode 100644 index 0000000..64ce621 --- /dev/null +++ b/common/libc/strtol.c @@ -0,0 +1,135 @@ +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Copyright (c) 2011 The FreeBSD Foundation + * All rights reserved. + * Portions of this software were developed by David Chisnall + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Convert a string to a long integer. + * + * Assumes that the upper and lower case + * alphabets and digits are each contiguous. + */ + +#include + +long strtol(const char *nptr, char **endptr, int base) +{ + const char *s; + unsigned long acc; + char c; + unsigned long cutoff; + int neg, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + s = nptr; + do { + c = *s++; + } while ( c == ' ' ); + if (c == '-') { + neg = 1; + c = *s++; + } else { + neg = 0; + if (c == '+') + c = *s++; + } + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + acc = any = 0; + if (base < 2 || base > 36) + goto noconv; + + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set 'any' if any `digits' consumed; make it negative to indicate + * overflow. + */ + + cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX + : LONG_MAX; + cutlim = cutoff % base; + cutoff /= base; + for ( ; ; c = *s++) { + if (c >= '0' && c <= '9') + c -= '0'; + else if (c >= 'A' && c <= 'Z') + c -= 'A' - 10; + else if (c >= 'a' && c <= 'z') + c -= 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = neg ? LONG_MIN : LONG_MAX; + } else if (!any) { +noconv: + ; + } else if (neg) + acc = -acc; + if (endptr != NULL) + *endptr = (char *)(any ? s - 1 : nptr); + return (acc); +} diff --git a/include/xtf/libc.h b/include/xtf/libc.h index 66f834b..f352f7f 100644 --- a/include/xtf/libc.h +++ b/include/xtf/libc.h @@ -35,6 +35,8 @@ void *memcpy(void *dst, const void *src, size_t n); int memcmp(const void *s1, const void *s2, size_t n); #define memcmp(s1, s2, n) __builtin_memcmp(s1, s2, n) +long strtol(const char *nptr, char **endptr, int base); + size_t strnlen(const char *str, size_t max); int __printf(3, 0) From patchwork Thu Apr 23 10:19:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wieczorkiewicz, Pawel" X-Patchwork-Id: 11505411 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30F23159A for ; Thu, 23 Apr 2020 10:20:14 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D28C20704 for ; Thu, 23 Apr 2020 10:20:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="pleixGnI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D28C20704 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxG-0007kl-SL; Thu, 23 Apr 2020 10:19:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxF-0007kb-IB for xen-devel@lists.xen.org; Thu, 23 Apr 2020 10:19:37 +0000 X-Inumbo-ID: ecef6164-854b-11ea-83d8-bc764e2007e4 Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ecef6164-854b-11ea-83d8-bc764e2007e4; Thu, 23 Apr 2020 10:19:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1587637173; x=1619173173; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=SdYPm/GFznwSuKyPDcCLKFoxWBcmizZriwQogmFgpi8=; b=pleixGnI5HRxdeecvKVYZgoo1Bog9CdpDQ+e+oqH44PnslUIBfVqW9yo Q1B63Xh2A4Zztg0MBI6KbVPiOZqiB3cgQeFBDNSbBNZ54NzIPDPaTlhgs Wu1M2ciUnUTK9dsVA3qldCAxVOdtw/vSQDVFTQWoThrFaMctXCci5ULH7 Y=; IronPort-SDR: RruP8HKAKWseFm5VDZjhpfrDlg8mcIt3nPX+ND5I+CUaUk0Jpj/iP3XZhP277X3mSlTasC3b6n ampsfH6nx8rA== X-IronPort-AV: E=Sophos;i="5.73,306,1583193600"; d="scan'208";a="27274840" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-2a-f14f4a47.us-west-2.amazon.com) ([10.43.8.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 23 Apr 2020 10:19:33 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2a-f14f4a47.us-west-2.amazon.com (Postfix) with ESMTPS id DA2B2A06E6; Thu, 23 Apr 2020 10:19:31 +0000 (UTC) Received: from EX13D02EUC003.ant.amazon.com (10.43.164.10) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:31 +0000 Received: from EX13MTAUEA001.ant.amazon.com (10.43.61.82) by EX13D02EUC003.ant.amazon.com (10.43.164.10) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:30 +0000 Received: from dev-dsk-wipawel-1a-0c4e6d58.eu-west-1.amazon.com (10.4.134.33) by mail-relay.amazon.com (10.43.61.243) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Apr 2020 10:19:29 +0000 From: Pawel Wieczorkiewicz To: Subject: [XTF 2/4] libc, strtol: Add isspace(), isdigit(), isxdigit(), isascii() Date: Thu, 23 Apr 2020 10:19:16 +0000 Message-ID: <20200423101918.13566-3-wipawel@amazon.de> X-Mailer: git-send-email 2.16.6 In-Reply-To: <20200423101918.13566-1-wipawel@amazon.de> References: <20200423101918.13566-1-wipawel@amazon.de> MIME-Version: 1.0 Precedence: Bulk X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, wipawel@xen.org, paul@xen.org, semelpaul@gmail.com, andrew.cooper3@citrix.com, wipawel@amazon.de, nmanthey@amazon.de Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" These ctype.h derived helper functions simplify strtol() code and will help simplify strtoul(). Signed-off-by: Pawel Wieczorkiewicz --- common/lib.c | 8 -------- common/libc/strtol.c | 9 +++------ common/libc/vsnprintf.c | 8 -------- include/xtf/libc.h | 29 +++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/common/lib.c b/common/lib.c index acf4da1..7381a3a 100644 --- a/common/lib.c +++ b/common/lib.c @@ -3,14 +3,6 @@ #include #include -#ifndef isdigit -/* Avoid pulling in all of ctypes just for this. */ -static int isdigit(int c) -{ - return c >= '0' && c <= '9'; -} -#endif - void __noreturn panic(const char *fmt, ...) { va_list args; diff --git a/common/libc/strtol.c b/common/libc/strtol.c index 64ce621..f85ac7a 100644 --- a/common/libc/strtol.c +++ b/common/libc/strtol.c @@ -57,7 +57,7 @@ long strtol(const char *nptr, char **endptr, int base) s = nptr; do { c = *s++; - } while ( c == ' ' ); + } while ( isspace(c) ); if (c == '-') { neg = 1; c = *s++; @@ -67,10 +67,7 @@ long strtol(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X') && - ((s[1] >= '0' && s[1] <= '9') || - (s[1] >= 'A' && s[1] <= 'F') || - (s[1] >= 'a' && s[1] <= 'f'))) { + c == '0' && (*s == 'x' || *s == 'X') && isxdigit(s[1])) { c = s[1]; s += 2; base = 16; @@ -104,7 +101,7 @@ long strtol(const char *nptr, char **endptr, int base) cutlim = cutoff % base; cutoff /= base; for ( ; ; c = *s++) { - if (c >= '0' && c <= '9') + if (isdigit(c)) c -= '0'; else if (c >= 'A' && c <= 'Z') c -= 'A' - 10; diff --git a/common/libc/vsnprintf.c b/common/libc/vsnprintf.c index a49fd30..495c0a5 100644 --- a/common/libc/vsnprintf.c +++ b/common/libc/vsnprintf.c @@ -2,14 +2,6 @@ #include #include -#ifndef isdigit -/* Avoid pulling in all of ctypes just for this. */ -static int isdigit(int c) -{ - return c >= '0' && c <= '9'; -} -#endif - /* * The subset of formatting supported: * diff --git a/include/xtf/libc.h b/include/xtf/libc.h index f352f7f..0caa7d3 100644 --- a/include/xtf/libc.h +++ b/include/xtf/libc.h @@ -56,6 +56,35 @@ bool arch_fmt_pointer( char **str, char *end, const char **fmt_ptr, const void *arg, int width, int precision, unsigned int flags); +#ifndef isspace +static inline int isspace(int c) +{ + return c == ' ' || c == '\t'; +} +#endif + +#ifndef isdigit +static inline int isdigit(int c) +{ + return c >= '0' && c <= '9'; +} +#endif + +#ifndef isxdigit +static inline int isxdigit(int c) +{ + return (isdigit(c) || (c >= 'A' && c <= 'F') || + (c >= 'a' && c <= 'f')); +} +#endif + +#ifndef isascii +static inline int isascii(int c) +{ + return c >= 0 && c <= 127; +} +#endif + #endif /* XTF_LIBC_H */ /* From patchwork Thu Apr 23 10:19:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wieczorkiewicz, Pawel" X-Patchwork-Id: 11505421 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78B9F913 for ; Thu, 23 Apr 2020 10:21:38 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 554C820781 for ; Thu, 23 Apr 2020 10:21:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="kuMJ4xYf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 554C820781 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxo-0008Vm-Kb; Thu, 23 Apr 2020 10:20:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxn-0008VN-91 for xen-devel@lists.xen.org; Thu, 23 Apr 2020 10:20:11 +0000 X-Inumbo-ID: 034d961a-854c-11ea-83d8-bc764e2007e4 Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 034d961a-854c-11ea-83d8-bc764e2007e4; Thu, 23 Apr 2020 10:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1587637211; x=1619173211; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=aBOG/6W6YvsGazAUBqvfFvgqMcAkzkVroszf6yNe9L8=; b=kuMJ4xYfeMFjNAdFAznC3Tr/cN2iHgkRR3/hTHI6ej+oVpT8zXVHLE4/ EjbsU9LOJOh5QCM630+kXwv5PMaTdbJwrw+tj94AuLUiOpyKCt0SZLnVn x6N7uPQ4u0IRlbo2SsO9V4DR5T5fx2o70pryrH6tTz2BdxRyhRLn31GKy c=; IronPort-SDR: TKykPitZHv6+bNPeNmKtlVtViLcZQbXOJCXY+qrfV0dNcNdOJ+/MgtTvRKy0kJx+19vEbMG38x RTKoKA7hPdig== X-IronPort-AV: E=Sophos;i="5.73,306,1583193600"; d="scan'208";a="28374691" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2b-c7131dcf.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 23 Apr 2020 10:19:58 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2b-c7131dcf.us-west-2.amazon.com (Postfix) with ESMTPS id 3BC25A2454; Thu, 23 Apr 2020 10:19:57 +0000 (UTC) Received: from EX13D05EUC001.ant.amazon.com (10.43.164.118) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:33 +0000 Received: from EX13MTAUEA001.ant.amazon.com (10.43.61.82) by EX13D05EUC001.ant.amazon.com (10.43.164.118) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:32 +0000 Received: from dev-dsk-wipawel-1a-0c4e6d58.eu-west-1.amazon.com (10.4.134.33) by mail-relay.amazon.com (10.43.61.243) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Apr 2020 10:19:30 +0000 From: Pawel Wieczorkiewicz To: Subject: [XTF 3/4] libc, strtol: Add FreeBSD libc implementation of strtoul() Date: Thu, 23 Apr 2020 10:19:17 +0000 Message-ID: <20200423101918.13566-4-wipawel@amazon.de> X-Mailer: git-send-email 2.16.6 In-Reply-To: <20200423101918.13566-1-wipawel@amazon.de> References: <20200423101918.13566-1-wipawel@amazon.de> MIME-Version: 1.0 Precedence: Bulk X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, wipawel@xen.org, paul@xen.org, semelpaul@gmail.com, andrew.cooper3@citrix.com, wipawel@amazon.de, nmanthey@amazon.de Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The function was derived from: https://github.com/freebsd/freebsd/blob/master/lib/libc/stdlib/strtoul.c Sligthly modified to use ctypes helpers and ignore locale. Signed-off-by: Pawel Wieczorkiewicz --- common/libc/strtol.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/xtf/libc.h | 1 + 2 files changed, 70 insertions(+) diff --git a/common/libc/strtol.c b/common/libc/strtol.c index f85ac7a..66ba787 100644 --- a/common/libc/strtol.c +++ b/common/libc/strtol.c @@ -130,3 +130,72 @@ long strtol(const char *nptr, char **endptr, int base) *endptr = (char *)(any ? s - 1 : nptr); return (acc); } + +/* + * Convert a string to an unsigned long integer. + * + * Ignores `locale' stuff. Assumes that the upper and lower case + * alphabets and digits are each contiguous. + */ +unsigned long strtoul(const char *nptr, char **endptr, int base) +{ + const char *s = nptr; + unsigned long acc; + unsigned char c; + unsigned long cutoff; + int neg = 0, any, cutlim; + + /* + * See strtol for comments as to the logic used. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X') && isxdigit(s[1])) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + acc = any = 0; + if (base < 2 || base > 36) + goto noconv; + + cutoff = (unsigned long)ULONG_MAX / (unsigned long)base; + cutlim = (unsigned long)ULONG_MAX % (unsigned long)base; + for ( ; ; c = *s++) { + if (isdigit(c)) + c -= '0'; + else if (c >= 'A' && c <= 'Z') + c -= 'A' - 10; + else if (c >= 'a' && c <= 'z') + c -= 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = ULONG_MAX; + } else if (!any) { +noconv: ; + } else if (neg) + acc = -acc; + if (endptr != NULL) + *endptr = (char *)(any ? s - 1 : nptr); + return (acc); +} diff --git a/include/xtf/libc.h b/include/xtf/libc.h index 0caa7d3..75f193b 100644 --- a/include/xtf/libc.h +++ b/include/xtf/libc.h @@ -36,6 +36,7 @@ int memcmp(const void *s1, const void *s2, size_t n); #define memcmp(s1, s2, n) __builtin_memcmp(s1, s2, n) long strtol(const char *nptr, char **endptr, int base); +unsigned long strtoul(const char *nptr, char **endptr, int base); size_t strnlen(const char *str, size_t max); From patchwork Thu Apr 23 10:19:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wieczorkiewicz, Pawel" X-Patchwork-Id: 11505419 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D60E913 for ; Thu, 23 Apr 2020 10:21:37 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7959020781 for ; Thu, 23 Apr 2020 10:21:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.de header.i=@amazon.de header.b="XahiXqLR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7959020781 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxf-000824-9L; Thu, 23 Apr 2020 10:20:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jRYxe-0007uB-3O for xen-devel@lists.xen.org; Thu, 23 Apr 2020 10:20:02 +0000 X-Inumbo-ID: fd8138a4-854b-11ea-933e-12813bfff9fa Received: from smtp-fw-9102.amazon.com (unknown [207.171.184.29]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fd8138a4-854b-11ea-933e-12813bfff9fa; Thu, 23 Apr 2020 10:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1587637201; x=1619173201; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=iTRlqoQz/hwVOrBz98h6nOzsiS/zGlpC/yEg6ke2u/k=; b=XahiXqLR6pxW1mFqorpoJeRQmrymJZqWatRr1jLtCfgGDpbjBj+6Wm29 dRDH20z5TREZsnnLWi2EvYAbzqXnziyoVrCuex4ylm7xvvKcgYL1M3uwD 2GrNcqkdATBwDSE4Hc6lhSOhp1Ddly2qH5ynH6LKeLr4olAm2mb1+qKp4 0=; IronPort-SDR: Ju56CU/S7dcvA7N2sl0BwzWqFa0Ux6JvUZ6bxeZVu7wJYFrDf9IzVvXLSEc9lTadLiyvlJlv9n bL3NNzc65E7w== X-IronPort-AV: E=Sophos;i="5.73,306,1583193600"; d="scan'208";a="39000741" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-2a-53356bf6.us-west-2.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 23 Apr 2020 10:19:59 +0000 Received: from EX13MTAUEA002.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2a-53356bf6.us-west-2.amazon.com (Postfix) with ESMTPS id EA7D0A1DB7; Thu, 23 Apr 2020 10:19:58 +0000 (UTC) Received: from EX13D02EUC004.ant.amazon.com (10.43.164.117) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:35 +0000 Received: from EX13MTAUEA001.ant.amazon.com (10.43.61.82) by EX13D02EUC004.ant.amazon.com (10.43.164.117) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Apr 2020 10:19:33 +0000 Received: from dev-dsk-wipawel-1a-0c4e6d58.eu-west-1.amazon.com (10.4.134.33) by mail-relay.amazon.com (10.43.61.243) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Apr 2020 10:19:32 +0000 From: Pawel Wieczorkiewicz To: Subject: [XTF 4/4] libc: add strncmp() function Date: Thu, 23 Apr 2020 10:19:18 +0000 Message-ID: <20200423101918.13566-5-wipawel@amazon.de> X-Mailer: git-send-email 2.16.6 In-Reply-To: <20200423101918.13566-1-wipawel@amazon.de> References: <20200423101918.13566-1-wipawel@amazon.de> MIME-Version: 1.0 Precedence: Bulk X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, wipawel@xen.org, paul@xen.org, semelpaul@gmail.com, andrew.cooper3@citrix.com, wipawel@amazon.de, nmanthey@amazon.de Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Pawel Wieczorkiewicz --- common/libc/string.c | 11 +++++++++++ include/xtf/libc.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/common/libc/string.c b/common/libc/string.c index 5c25e27..d81e324 100644 --- a/common/libc/string.c +++ b/common/libc/string.c @@ -56,6 +56,17 @@ int (strcmp)(const char *_s1, const char *_s2) return (s1 < s2) ? -1 : (s1 > s2); } +int (strncmp)(const char *_s1, const char *_s2, size_t n) +{ + size_t ctr; + for (ctr = 0; ctr < n; ctr++) { + if (_s1[ctr] != _s2[ctr]) + return (int)(_s1[ctr] - _s2[ctr]); + } + + return 0; +} + void *(memset)(void *s, int c, size_t n) { char *p = s; diff --git a/include/xtf/libc.h b/include/xtf/libc.h index 75f193b..c3783a8 100644 --- a/include/xtf/libc.h +++ b/include/xtf/libc.h @@ -26,6 +26,9 @@ char *strncpy(char *dst, const char *src, size_t n); int strcmp(const char *s1, const char *s2); #define strcmp(s1, s2) __builtin_strcmp(s1, s2) +int strncmp(const char *s1, const char *s2, size_t n); +#define strncmp(s1, s2, n) __builtin_strncmp(s1, s2, n) + void *memset(void *s, int c, size_t n); #define memset(d, c, n) __builtin_memset(d, c, n)