From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web10.7352.1608208865821166643 for ; Thu, 17 Dec 2020 04:41:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=GIyxyGyh; spf=pass (domain: nuviainc.com, ip: 209.85.221.51, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f51.google.com with SMTP id i9so26460784wrc.4 for ; Thu, 17 Dec 2020 04:41:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=GrGPbLWn1QrrTUDldkYScG9vOLaIliUBuyH6uDojGR0=; b=GIyxyGyhz0KUivlxFrCHQjEOWR/1Rz+QFi1CLdOtX7Wipeg/XrHnVj/jVwu0BmruUV fk7hp3d4+fFlQsCHU+G2tKTSUTD1rxKPUf3ZFSAPnfE6KFpA7z5Lgq5EZX8tUCC8Wq4p 1FY4J0wPWy2YPHK55nSuoxlkRfzJk21g89ZAA/glpLKEwow0YYkWgi+iBkSZUl1Q278q rYgMw9Fvbx0W1vnT7P7r0XMLcc8Or9RlDxyAKAOO8WWe+fgqGjoUclPC3CKLcYDzqym3 DfA8J1XO04rIK/eL3t6inA6ybZLuw07swuT5FswxNF3pN6MDMcAe7WCrbcYwm0VWwcwr /pTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=GrGPbLWn1QrrTUDldkYScG9vOLaIliUBuyH6uDojGR0=; b=CMSLHSoxRcfsFYJ0UQ7MYdeCzaRqOseUThc+uaMRm0/gpdlnoy/p2SPJLmecP0IiD4 ZroYoMJ2LvFx1b9+s7Amjhn0lUI6EhL6yvckl6Oj+LAzP8pVOneJo2TEt2/FW8VH9xsi ZUlmmQhwuM0l94OAcDhVAHcv2etQzywe0nMYq0M5cCF3khG+sQn7UcvIe5ghy/6JD1Wv fnlesE7tncDWbi9x3r2IzynLfWnMtVVuR27O6KH9l0AmPH8VsiGSvfl8z+jb+wfml1tR qHWoelNq0H0XAp8QywTF4KrST6djWXXjgilq1tE+Zf923byZuR3a5YNsf6oNWbR63vjx ureA== X-Gm-Message-State: AOAM5307J0xCj8R26RnzP9fM9z/9952G7jR0y72cNcFor8rsauD1rWlK NC+2OwK5Wm6ijG1JtXiuGz5kDA== X-Google-Smtp-Source: ABdhPJxQuRwk+zcMaEP8zUca1DI+3BbXGkFQhmXyAgZrd3sK6CxlldB3p5gJK2huCQXS3n2tEMmTQw== X-Received: by 2002:a5d:4cd1:: with SMTP id c17mr43477643wrt.49.1608208864314; Thu, 17 Dec 2020 04:41:04 -0800 (PST) Return-Path: Received: from vanye (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id h16sm8528502wrq.29.2020.12.17.04.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 04:41:03 -0800 (PST) Date: Thu, 17 Dec 2020 12:41:02 +0000 From: "Leif Lindholm" To: Abner Chang Cc: devel@edk2.groups.io, Nickle Wang , Peter O'Hanley Subject: Re: [PATCH v7 3/6] RedfishPkg/CrtLib: C runtime library Message-ID: <20201217124101.GN1664@vanye> References: <20201216031406.7136-1-abner.chang@hpe.com> <20201216031406.7136-4-abner.chang@hpe.com> MIME-Version: 1.0 In-Reply-To: <20201216031406.7136-4-abner.chang@hpe.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Dec 16, 2020 at 11:14:03 +0800, Abner Chang wrote: > CRT library is currently used by edk2 JsonLib (open source > jansson project) and edk2 RedfishLib (libredfish open source > project). CrtLib library provides the necessary C runtime > equivalent edk2 functions for open source projects. > > Signed-off-by: Abner Chang Acked-by: Leif Lindholm > Cc: Leif Lindholm > Cc: Nickle Wang > Cc: Peter O'Hanley > --- > RedfishPkg/Include/Crt/assert.h | 16 + > RedfishPkg/Include/Crt/errno.h | 16 + > RedfishPkg/Include/Crt/limits.h | 16 + > RedfishPkg/Include/Crt/math.h | 16 + > RedfishPkg/Include/Crt/stdarg.h | 15 + > RedfishPkg/Include/Crt/stddef.h | 16 + > RedfishPkg/Include/Crt/stdio.h | 15 + > RedfishPkg/Include/Crt/stdlib.h | 16 + > RedfishPkg/Include/Crt/string.h | 16 + > RedfishPkg/Include/Crt/sys/time.h | 15 + > RedfishPkg/Include/Crt/sys/types.h | 15 + > RedfishPkg/Include/Crt/time.h | 15 + > RedfishPkg/Include/Library/CrtLib.h | 191 +++++++++ > RedfishPkg/Library/CrtLib/CrtLib.c | 595 +++++++++++++++++++++++++++ > RedfishPkg/Library/CrtLib/CrtLib.inf | 38 ++ > RedfishPkg/RedfishLibs.dsc.inc | 1 + > RedfishPkg/RedfishPkg.ci.yaml | 19 + > RedfishPkg/RedfishPkg.dec | 10 + > RedfishPkg/RedfishPkg.dsc | 1 + > 19 files changed, 1042 insertions(+) > create mode 100644 RedfishPkg/Include/Crt/assert.h > create mode 100644 RedfishPkg/Include/Crt/errno.h > create mode 100644 RedfishPkg/Include/Crt/limits.h > create mode 100644 RedfishPkg/Include/Crt/math.h > create mode 100644 RedfishPkg/Include/Crt/stdarg.h > create mode 100644 RedfishPkg/Include/Crt/stddef.h > create mode 100644 RedfishPkg/Include/Crt/stdio.h > create mode 100644 RedfishPkg/Include/Crt/stdlib.h > create mode 100644 RedfishPkg/Include/Crt/string.h > create mode 100644 RedfishPkg/Include/Crt/sys/time.h > create mode 100644 RedfishPkg/Include/Crt/sys/types.h > create mode 100644 RedfishPkg/Include/Crt/time.h > create mode 100644 RedfishPkg/Include/Library/CrtLib.h > create mode 100644 RedfishPkg/Library/CrtLib/CrtLib.c > create mode 100644 RedfishPkg/Library/CrtLib/CrtLib.inf > > diff --git a/RedfishPkg/Include/Crt/assert.h b/RedfishPkg/Include/Crt/assert.h > new file mode 100644 > index 0000000000..f9ab7ef9ca > --- /dev/null > +++ b/RedfishPkg/Include/Crt/assert.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_ASSERT_H_ > +#define CRT_ASSERT_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/errno.h b/RedfishPkg/Include/Crt/errno.h > new file mode 100644 > index 0000000000..d30aee14de > --- /dev/null > +++ b/RedfishPkg/Include/Crt/errno.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_ERRNO_H_ > +#define CRT_ERRNO_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/limits.h b/RedfishPkg/Include/Crt/limits.h > new file mode 100644 > index 0000000000..f3bdd33f2a > --- /dev/null > +++ b/RedfishPkg/Include/Crt/limits.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_LIMITS_H_ > +#define CRT_LIMITS_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/math.h b/RedfishPkg/Include/Crt/math.h > new file mode 100644 > index 0000000000..984c0ccc21 > --- /dev/null > +++ b/RedfishPkg/Include/Crt/math.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_MATH_H_ > +#define CRT_MATH_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/stdarg.h b/RedfishPkg/Include/Crt/stdarg.h > new file mode 100644 > index 0000000000..d5a314ad3b > --- /dev/null > +++ b/RedfishPkg/Include/Crt/stdarg.h > @@ -0,0 +1,15 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef CRT_STDARG_H_ > +#define CRT_STDARG_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/stddef.h b/RedfishPkg/Include/Crt/stddef.h > new file mode 100644 > index 0000000000..15a37bf50e > --- /dev/null > +++ b/RedfishPkg/Include/Crt/stddef.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_STDDEF_H_ > +#define CRT_STDDEF_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/stdio.h b/RedfishPkg/Include/Crt/stdio.h > new file mode 100644 > index 0000000000..25e610be10 > --- /dev/null > +++ b/RedfishPkg/Include/Crt/stdio.h > @@ -0,0 +1,15 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef CRT_STDIO_H_ > +#define CRT_STDIO_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/stdlib.h b/RedfishPkg/Include/Crt/stdlib.h > new file mode 100644 > index 0000000000..5b3dd273c8 > --- /dev/null > +++ b/RedfishPkg/Include/Crt/stdlib.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_STDLIB_H_ > +#define CRT_STDLIB_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/string.h b/RedfishPkg/Include/Crt/string.h > new file mode 100644 > index 0000000000..f60b87ccd2 > --- /dev/null > +++ b/RedfishPkg/Include/Crt/string.h > @@ -0,0 +1,16 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_STRING_H_ > +#define CRT_STRING_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/sys/time.h b/RedfishPkg/Include/Crt/sys/time.h > new file mode 100644 > index 0000000000..4ced176cda > --- /dev/null > +++ b/RedfishPkg/Include/Crt/sys/time.h > @@ -0,0 +1,15 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef CRT_SYS_TIME_H_ > +#define CRT_SYS_TIME_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/sys/types.h b/RedfishPkg/Include/Crt/sys/types.h > new file mode 100644 > index 0000000000..c4f807214c > --- /dev/null > +++ b/RedfishPkg/Include/Crt/sys/types.h > @@ -0,0 +1,15 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef CRT_SYS_TYPES_H_ > +#define CRT_SYS_TYPES_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Crt/time.h b/RedfishPkg/Include/Crt/time.h > new file mode 100644 > index 0000000000..ca04ac8730 > --- /dev/null > +++ b/RedfishPkg/Include/Crt/time.h > @@ -0,0 +1,15 @@ > +/** @file > + Include file to support building the third-party jansson library. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef CRT_TIME_H_ > +#define CRT_TIME_H_ > + > +#include > + > +#endif > diff --git a/RedfishPkg/Include/Library/CrtLib.h b/RedfishPkg/Include/Library/CrtLib.h > new file mode 100644 > index 0000000000..79a16e3192 > --- /dev/null > +++ b/RedfishPkg/Include/Library/CrtLib.h > @@ -0,0 +1,191 @@ > +/** @file > + CRT wrapper head functions for jansson system call. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef CRT_LIB_H_ > +#define CRT_LIB_H_ > + > +#include > +#include > +#include > +#include > + > +#define MAX_STRING_SIZE 0x10000000 > + > +// Minimum value for an object of type long long int. > +#define LLONG_MIN MIN_INT64 > + > +// Maximum value for an object of type long long int. > +#define LLONG_MAX MAX_INT64 > + > +// We dont support double on edk2 > +#define HUGE_VAL 0 > + > +#if defined(MDE_CPU_X64) || defined(MDE_CPU_AARCH64) || defined(MDE_CPU_IA64) || defined(MDE_CPU_RISCV64) > +// > +// With GCC we would normally use SIXTY_FOUR_BIT_LONG, but MSVC needs > +// SIXTY_FOUR_BIT, because 'long' is 32-bit and only 'long long' is > +// 64-bit. Since using 'long long' works fine on GCC too, just do that. > +// > +#define SIXTY_FOUR_BIT > +#elif defined(MDE_CPU_IA32) || defined(MDE_CPU_ARM) || defined(MDE_CPU_EBC) > +#define THIRTY_TWO_BIT > +#endif > + > +// > +// Map all va_xxxx elements to VA_xxx defined in MdePkg/Include/Base.h > +// > +#if !defined(__CC_ARM) // if va_list is not already defined > +#define va_list VA_LIST > +#define va_arg VA_ARG > +#define va_start VA_START > +#define va_end VA_END > +#else // __CC_ARM > +#define va_start(Marker, Parameter) __va_start(Marker, Parameter) > +#define va_arg(Marker, TYPE) __va_arg(Marker, TYPE) > +#define va_end(Marker) ((void)0) > +#endif > + > +// > +// Definitions for global constants used by CRT library routines > +// > +#define INT_MAX MAX_INT32 /* Maximum (signed) int value */ > +#define LONG_MAX 0X7FFFFFFFL /* max value for a long */ > +#define LONG_MIN (-LONG_MAX-1) /* min value for a long */ > +#define ULONG_MAX 0xFFFFFFFF /* Maximum unsigned long value */ > +#define CHAR_BIT 8 /* Number of bits in a char */ > + > +// Maximum value for an object of type unsigned long long int. > +#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL // 2^64 - 1 > +// Maximum value for an object of type unsigned char. > +#define UCHAR_MAX 255 // 2^8 - 1 > + > +// > +// Basic types mapping > +// > +typedef UINTN size_t; > +typedef INTN ssize_t; > +typedef INT32 time_t; > +typedef UINT8 __uint8_t; > +typedef UINT8 sa_family_t; > +typedef UINT32 uid_t; > +typedef UINT32 gid_t; > +typedef INT32 int32_t; > +typedef UINT32 uint32_t; > +typedef UINT16 uint16_t; > +typedef UINT8 uint8_t; > +typedef enum {false, true} bool; > + > +// > +// File operations are not required for EFI building, > +// so FILE is mapped to VOID * to pass build > +// > +typedef VOID *FILE; > + > +// > +// Global variables > +// > +extern int errno; > +extern FILE *stderr; > + > +// > +// Function prototypes of CRT Library routines > +// > +void *malloc (size_t); > +void *realloc (void *, size_t); > +void *calloc (size_t Num, size_t Size); > +void free (void *); > +void *memset (void *, int, size_t); > +int memcmp (const void *, const void *, size_t); > +int isdigit (int); > +int isspace (int); > +int tolower (int); > +int isupper (int); > +int isxdigit (int); > +int isalnum (int); > +void *memcpy (void *, const void *, size_t); > +void *memset (void *, int, size_t); > +void *memchr (const void *, int, size_t); > +int memcmp (const void *, const void *, size_t); > +void *memmove (void *, const void *, size_t); > +int strcmp (const char *, const char *); > +int strncmp (const char *, const char *, size_t); > +char *strcpy (char *, const char *); > +size_t strlen (const char *); > +char *strcat (char *, const char *); > +char *strchr (const char *, int); > +int strcasecmp (const char *, const char *); > +int strncasecmp (const char *, const char *, size_t); > +char *strncpy (char *, size_t, const char *, size_t); > +int strncmp (const char *, const char *, size_t); > +char *strrchr (const char *, int); > +unsigned long strtoul (const char *, char **, int); > +char * strstr (const char *s1 , const char *s2); > +long strtol (const char *, char **, int); > +char *strerror (int); > +size_t strspn (const char *, const char *); > +char * strdup (const char *str); > +char * strpbrk (const char *s1, const char *s2); > +unsigned long long strtoull(const char * nptr, char ** endptr, int base); > +long long strtoll (const char * nptr, char ** endptr, int base); > +long strtol (const char * nptr, char ** endptr, int base); > +double strtod (const char * __restrict nptr, char ** __restrict endptr); > +size_t strcspn (const char *, const char *); > +int printf (const char *, ...); > +int sscanf (const char *, const char *, ...); > +FILE *fopen (const char *, const char *); > +size_t fread (void *, size_t, size_t, FILE *); > +size_t fwrite (const void *, size_t, size_t, FILE *); > +int fclose (FILE *); > +int fprintf (FILE *, const char *, ...); > +int fgetc (FILE * _File); > +uid_t getuid (void); > +uid_t geteuid (void); > +gid_t getgid (void); > +gid_t getegid (void); > +void qsort (void *, size_t, size_t, int (*)(const void *, const void *)); > +char *getenv (const char *); > +#if defined(__GNUC__) && (__GNUC__ >= 2) > +void abort (void) __attribute__((__noreturn__)); > +#else > +void abort (void); > +#endif > +int toupper (int); > +int Digit2Val (int); > +time_t time (time_t *); > + > +// > +// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions > +// > +#define strcmp AsciiStrCmp > +#define memcpy(dest,source,count) CopyMem(dest,source,(UINTN)(count)) > +#define memset(dest,ch,count) SetMem(dest,(UINTN)(count),(UINT8)(ch)) > +#define memchr(buf,ch,count) ScanMem8(buf,(UINTN)(count),(UINT8)ch) > +#define memcmp(buf1,buf2,count) (int)(CompareMem(buf1,buf2,(UINTN)(count))) > +#define memmove(dest,source,count) CopyMem(dest,source,(UINTN)(count)) > +#define strlen(str) (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE)) > +#define strcpy(strDest,strSource) AsciiStrCpyS(strDest,(strlen(strSource)+1),strSource) > +#define strncpy(strDest,strSource,count) AsciiStrnCpyS(strDest,(UINTN)count,strSource,(UINTN)count) > +#define strncpys(strDest, DestLen, strSource,count) AsciiStrnCpyS(strDest,DestLen,strSource,(UINTN)count) > +#define strcat(strDest,strSource) AsciiStrCatS(strDest,(strlen(strSource)+strlen(strDest)+1),strSource) > +#define strchr(str,ch) ScanMem8((VOID *)(str),AsciiStrSize(str),(UINT8)ch) > +#define strcasecmp(str1,str2) (int)AsciiStriCmp(str1,str2) > +#define strstr(s1,s2) AsciiStrStr(s1,s2) > +#define snprintf(buf,len,...) AsciiSPrint(buf,len,__VA_ARGS__) > +#define vsnprintf(buf,len,format,marker) AsciiVSPrint((buf),(len),(format),(marker)) > +#define assert(expression) ASSERT(expression) > +#define offsetof(type,member) OFFSET_OF(type,member) > + > +#define EOF (-1) > + > +extern int errno; > + > +#define ERANGE 34 /* 34 Result too large */ > + > +#endif > diff --git a/RedfishPkg/Library/CrtLib/CrtLib.c b/RedfishPkg/Library/CrtLib/CrtLib.c > new file mode 100644 > index 0000000000..d3705236c8 > --- /dev/null > +++ b/RedfishPkg/Library/CrtLib/CrtLib.c > @@ -0,0 +1,595 @@ > +/** @file > + CRT wrapper functions for system call. > + > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> + (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#include > +#include > +#include > +#include > +#include > + > +int errno = 0; > + > +/** > + Determine if a particular character is an alphanumeric character > + @return Returns 1 if c is an alphanumeric character, otherwise returns 0. > +**/ > +int isalnum (int c) > +{ > + // > + // ::= [0-9] | [a-z] | [A-Z] > + // > + return ((('0' <= (c)) && ((c) <= '9')) || > + (('a' <= (c)) && ((c) <= 'z')) || > + (('A' <= (c)) && ((c) <= 'Z'))); > +} > + > +/** > + Determine if a particular character is a digital character > + > + @return Returns 1 if c is an digital character, otherwise returns 0. > +**/ > +int isdchar (int c) > +{ > + // > + // [0-9] | [e +-.] > + // > + return ((('0' <= (c)) && ((c) <= '9')) || > + (c == 'e') || (c == 'E') || > + (c == '+') || (c == '-') || > + (c == '.')); > +} > + > +/** > + Determine if a particular character is a space character > + > + @return Returns 1 if c is a space character > +**/ > +int isspace (int c) > +{ > + // > + // ::= [ ] > + // > + return ((c) == ' ') || ((c) == '\t') || ((c) == '\r') || ((c) == '\n') || ((c) == '\v') || ((c) == '\f'); > +} > + > +/** > + Allocates memory blocks > +*/ > +void *malloc (size_t size) > +{ > + return AllocatePool ((UINTN) size); > +} > + > +/** > + De-allocates or frees a memory block > +*/ > +void free (void *ptr) > +{ > + // > + // In Standard C, free() handles a null pointer argument transparently. This > + // is not true of FreePool() below, so protect it. > + // > + if (ptr != NULL) { > + FreePool (ptr); > + } > +} > + > +/** > + NetBSD Compatibility Function strdup creates a duplicate copy of a string. > + > + @return Returns the pointer to duplicated string. > +**/ > +char * strdup(const char *str) > +{ > + size_t len; > + char *copy; > + > + len = strlen(str) + 1; > + if ((copy = malloc(len)) == NULL) > + return (NULL); > + memcpy(copy, str, len); > + return (copy); > +} > + > +/** The toupper function converts a lowercase letter to a corresponding > + uppercase letter. > + > + @param[in] c The character to be converted. > + > + @return If the argument is a character for which islower is true and > + there are one or more corresponding characters, as specified by > + the current locale, for which isupper is true, the toupper > + function returns one of the corresponding characters (always the > + same one for any given locale); otherwise, the argument is > + returned unchanged. > +**/ > +int > +toupper( > + IN int c > + ) > +{ > + if ( (c >= 'a') && (c <= 'z') ) { > + c = c - ('a' - 'A'); > + } > + return c; > +} > + > +/** > + Digit to a value. > + > + @return Returns the value of digit. > +**/ > +int > +Digit2Val( int c) > +{ > + if (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))) { /* If c is one of [A-Za-z]... */ > + c = toupper(c) - 7; // Adjust so 'A' is ('9' + 1) > + } > + return c - '0'; // Value returned is between 0 and 35, inclusive. > +} > + > + > +/** The strtoll function converts the initial portion of the string pointed to > + by nptr to long long int representation. > + > + See the description for strtol for more information. > + > + @return The strtoll function returns the converted value, if any. If no > + conversion could be performed, zero is returned. If the correct > + value is outside the range of representable values, LLONG_MIN or > + LLONG_MAX is returned (according to the sign of the value, if any), > + and the value of the macro ERANGE is stored in errno. > +**/ > +long long > +strtoll(const char * nptr, char ** endptr, int base) > +{ > + const char *pEnd; > + long long Result = 0; > + long long Previous; > + int temp; > + BOOLEAN Negative = FALSE; > + > + pEnd = nptr; > + > + if((base < 0) || (base == 1) || (base > 36)) { > + if(endptr != NULL) { > + *endptr = NULL; > + } > + return 0; > + } > + // Skip leading spaces. > + while(isspace(*nptr)) ++nptr; > + > + // Process Subject sequence: optional sign followed by digits. > + if(*nptr == '+') { > + Negative = FALSE; > + ++nptr; > + } > + else if(*nptr == '-') { > + Negative = TRUE; > + ++nptr; > + } > + > + if(*nptr == '0') { /* Might be Octal or Hex */ > + if(toupper(nptr[1]) == 'X') { /* Looks like Hex */ > + if((base == 0) || (base == 16)) { > + nptr += 2; /* Skip the "0X" */ > + base = 16; /* In case base was 0 */ > + } > + } > + else { /* Looks like Octal */ > + if((base == 0) || (base == 8)) { > + ++nptr; /* Skip the leading "0" */ > + base = 8; /* In case base was 0 */ > + } > + } > + } > + if(base == 0) { /* If still zero then must be decimal */ > + base = 10; > + } > + if(*nptr == '0') { > + for( ; *nptr == '0'; ++nptr); /* Skip any remaining leading zeros */ > + pEnd = nptr; > + } > + > + while( isalnum(*nptr) && ((temp = Digit2Val(*nptr)) < base)) { > + Previous = Result; > + Result = MultS64x64 (Result, base) + (long long int)temp; > + if( Result <= Previous) { // Detect Overflow > + if(Negative) { > + Result = LLONG_MIN; > + } > + else { > + Result = LLONG_MAX; > + } > + Negative = FALSE; > + errno = ERANGE; > + break; > + } > + pEnd = ++nptr; > + } > + if(Negative) { > + Result = -Result; > + } > + > + // Save pointer to final sequence > + if(endptr != NULL) { > + *endptr = (char *)pEnd; > + } > + return Result; > +} > + > +/** The strtol, strtoll, strtoul, and strtoull functions convert the initial > + portion of the string pointed to by nptr to long int, long long int, > + unsigned long int, and unsigned long long int representation, respectively. > + First, they decompose the input string into three parts: an initial, > + possibly empty, sequence of white-space characters (as specified by the > + isspace function), a subject sequence resembling an integer represented in > + some radix determined by the value of base, and a final string of one or > + more unrecognized characters, including the terminating null character of > + the input string. Then, they attempt to convert the subject sequence to an > + integer, and return the result. > + > + If the value of base is zero, the expected form of the subject sequence is > + that of an integer constant, optionally preceded > + by a plus or minus sign, but not including an integer suffix. If the value > + of base is between 2 and 36 (inclusive), the expected form of the subject > + sequence is a sequence of letters and digits representing an integer with > + the radix specified by base, optionally preceded by a plus or minus sign, > + but not including an integer suffix. The letters from a (or A) through z > + (or Z) are ascribed the values 10 through 35; only letters and digits whose > + ascribed values are less than that of base are permitted. If the value of > + base is 16, the characters 0x or 0X may optionally precede the sequence of > + letters and digits, following the sign if present. > + > + The subject sequence is defined as the longest initial subsequence of the > + input string, starting with the first non-white-space character, that is of > + the expected form. The subject sequence contains no characters if the input > + string is empty or consists entirely of white space, or if the first > + non-white-space character is other than a sign or a permissible letter or digit. > + > + If the subject sequence has the expected form and the value of base is > + zero, the sequence of characters starting with the first digit is > + interpreted as an integer constant. If the subject sequence has the > + expected form and the value of base is between 2 and 36, it is used as the > + base for conversion, ascribing to each letter its value as given above. If > + the subject sequence begins with a minus sign, the value resulting from the > + conversion is negated (in the return type). A pointer to the final string > + is stored in the object pointed to by endptr, provided that endptr is > + not a null pointer. > + > + In other than the "C" locale, additional locale-specific subject sequence > + forms may be accepted. > + > + If the subject sequence is empty or does not have the expected form, no > + conversion is performed; the value of nptr is stored in the object pointed > + to by endptr, provided that endptr is not a null pointer. > + > + @return The strtol, strtoll, strtoul, and strtoull functions return the > + converted value, if any. If no conversion could be performed, zero > + is returned. If the correct value is outside the range of > + representable values, LONG_MIN, LONG_MAX, LLONG_MIN, LLONG_MAX, > + ULONG_MAX, or ULLONG_MAX is returned (according to the return type > + and sign of the value, if any), and the value of the macro ERANGE > + is stored in errno. > +**/ > +long > +strtol(const char * nptr, char ** endptr, int base) > +{ > + const char *pEnd; > + long Result = 0; > + long Previous; > + int temp; > + BOOLEAN Negative = FALSE; > + > + pEnd = nptr; > + > + if((base < 0) || (base == 1) || (base > 36)) { > + if(endptr != NULL) { > + *endptr = NULL; > + } > + return 0; > + } > + // Skip leading spaces. > + while(isspace(*nptr)) ++nptr; > + > + // Process Subject sequence: optional sign followed by digits. > + if(*nptr == '+') { > + Negative = FALSE; > + ++nptr; > + } > + else if(*nptr == '-') { > + Negative = TRUE; > + ++nptr; > + } > + > + if(*nptr == '0') { /* Might be Octal or Hex */ > + if(toupper(nptr[1]) == 'X') { /* Looks like Hex */ > + if((base == 0) || (base == 16)) { > + nptr += 2; /* Skip the "0X" */ > + base = 16; /* In case base was 0 */ > + } > + } > + else { /* Looks like Octal */ > + if((base == 0) || (base == 8)) { > + ++nptr; /* Skip the leading "0" */ > + base = 8; /* In case base was 0 */ > + } > + } > + } > + if(base == 0) { /* If still zero then must be decimal */ > + base = 10; > + } > + if(*nptr == '0') { > + for( ; *nptr == '0'; ++nptr); /* Skip any remaining leading zeros */ > + pEnd = nptr; > + } > + > + while( isalnum(*nptr) && ((temp = Digit2Val(*nptr)) < base)) { > + Previous = Result; > + Result = (Result * base) + (long int)temp; > + if( Result <= Previous) { // Detect Overflow > + if(Negative) { > + Result = LONG_MIN; > + } > + else { > + Result = LONG_MAX; > + } > + Negative = FALSE; > + errno = ERANGE; > + break; > + } > + pEnd = ++nptr; > + } > + if(Negative) { > + Result = -Result; > + } > + > + // Save pointer to final sequence > + if(endptr != NULL) { > + *endptr = (char *)pEnd; > + } > + return Result; > +} > + > +/** The strtoull function converts the initial portion of the string pointed to > + by nptr to unsigned long long int representation. > + > + See the description for strtol for more information. > + > + @return The strtoull function returns the converted value, if any. If no > + conversion could be performed, zero is returned. If the correct > + value is outside the range of representable values, ULLONG_MAX is > + returned and the value of the macro ERANGE is stored in errno. > +**/ > +unsigned long long > +strtoull(const char * nptr, char ** endptr, int base) > +{ > + const char *pEnd; > + unsigned long long Result = 0; > + unsigned long long Previous; > + int temp; > + > + pEnd = nptr; > + > + if((base < 0) || (base == 1) || (base > 36)) { > + if(endptr != NULL) { > + *endptr = NULL; > + } > + return 0; > + } > + // Skip leading spaces. > + while(isspace(*nptr)) ++nptr; > + > + // Process Subject sequence: optional + sign followed by digits. > + if(*nptr == '+') { > + ++nptr; > + } > + > + if(*nptr == '0') { /* Might be Octal or Hex */ > + if(toupper(nptr[1]) == 'X') { /* Looks like Hex */ > + if((base == 0) || (base == 16)) { > + nptr += 2; /* Skip the "0X" */ > + base = 16; /* In case base was 0 */ > + } > + } > + else { /* Looks like Octal */ > + if((base == 0) || (base == 8)) { > + ++nptr; /* Skip the leading "0" */ > + base = 8; /* In case base was 0 */ > + } > + } > + } > + if(base == 0) { /* If still zero then must be decimal */ > + base = 10; > + } > + if(*nptr == '0') { > + for( ; *nptr == '0'; ++nptr); /* Skip any remaining leading zeros */ > + pEnd = nptr; > + } > + > + while( isalnum(*nptr) && ((temp = Digit2Val(*nptr)) < base)) { > + Previous = Result; > + Result = DivU64x32 (Result, base) + (unsigned long long)temp; > + if( Result < Previous) { // If we overflowed > + Result = ULLONG_MAX; > + errno = ERANGE; > + break; > + } > + pEnd = ++nptr; > + } > + > + // Save pointer to final sequence > + if(endptr != NULL) { > + *endptr = (char *)pEnd; > + } > + return Result; > +} > + > +/** > + edk2 Jansson port does not support doubles, simply return 0. > + > + These conversion functions convert the initial portion of the string > + pointed to by nptr to double, float, and long double representation, > + respectively. > + > + The strtod(), strtof(), and strtold() functions return the converted > + value, if any. > + > + If endptr is not NULL, a pointer to the character after the last charac- > + ter used in the conversion is stored in the location referenced by > + endptr. > + > + If no conversion is performed, zero is returned and the value of nptr is > + stored in the location referenced by endptr. > + > + If the correct value would cause overflow, plus or minus HUGE_VAL, > + HUGE_VALF, or HUGE_VALL is returned (according to the sign and type of > + the return value), and ERANGE is stored in errno. If the correct value > + would cause underflow, zero is returned and ERANGE is stored in errno. > + > + @return Return 0. > +**/ > +double > +strtod (const char * __restrict nptr, char ** __restrict endptr) { > + > + DEBUG((DEBUG_INFO, "We don't supprot double type on edk2 yet!")); > + ASSERT(FALSE); > + return (double)0; > +} > + > +/** > + Allocate and zero-initialize array. > +**/ > +void * > +calloc(size_t Num, size_t Size) > +{ > + void *RetVal; > + size_t NumSize; > + > + NumSize = Num * Size; > + RetVal = NULL; > + if (NumSize != 0) { > + RetVal = malloc(NumSize); > + if( RetVal != NULL) { > + (VOID)ZeroMem( RetVal, NumSize); > + } > + } > + DEBUG((DEBUG_POOL, "0x%p = calloc(%d, %d)\n", RetVal, Num, Size)); > + > + return RetVal; > +} > + > +// > +// The arrays give the cumulative number of days up to the first of the > +// month number used as the index (1 -> 12) for regular and leap years. > +// The value at index 13 is for the whole year. > +// > +UINTN CumulativeDays[2][14] = { > + { > + 0, > + 0, > + 31, > + 31 + 28, > + 31 + 28 + 31, > + 31 + 28 + 31 + 30, > + 31 + 28 + 31 + 30 + 31, > + 31 + 28 + 31 + 30 + 31 + 30, > + 31 + 28 + 31 + 30 + 31 + 30 + 31, > + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31, > + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30, > + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31, > + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30, > + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 > + }, > + { > + 0, > + 0, > + 31, > + 31 + 29, > + 31 + 29 + 31, > + 31 + 29 + 31 + 30, > + 31 + 29 + 31 + 30 + 31, > + 31 + 29 + 31 + 30 + 31 + 30, > + 31 + 29 + 31 + 30 + 31 + 30 + 31, > + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31, > + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30, > + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31, > + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30, > + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 > + } > +}; > + > +#define IsLeap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) > +#define SECSPERMIN (60) > +#define SECSPERHOUR (60 * 60) > +#define SECSPERDAY (24 * SECSPERHOUR) > + > +/** > + Get the system time as seconds elapsed since midnight, January 1, 1970. > +**/ > +time_t time (time_t *timer) > +{ > + EFI_TIME Time; > + time_t CalTime; > + UINTN Year; > + > + // > + // Get the current time and date information > + // > + gRT->GetTime (&Time, NULL); > + > + // > + // Years Handling > + // UTime should now be set to 00:00:00 on Jan 1 of the current year. > + // > + for (Year = 1970, CalTime = 0; Year != Time.Year; Year++) { > + CalTime = CalTime + (time_t)(CumulativeDays[IsLeap(Year)][13] * SECSPERDAY); > + } > + > + // > + // Add in number of seconds for current Month, Day, Hour, Minute, Seconds, and TimeZone adjustment > + // > + CalTime = CalTime + > + (time_t)((Time.TimeZone != EFI_UNSPECIFIED_TIMEZONE) ? (Time.TimeZone * 60) : 0) + > + (time_t)(CumulativeDays[IsLeap(Time.Year)][Time.Month] * SECSPERDAY) + > + (time_t)(((Time.Day > 0) ? Time.Day - 1 : 0) * SECSPERDAY) + > + (time_t)(Time.Hour * SECSPERHOUR) + > + (time_t)(Time.Minute * 60) + > + (time_t)Time.Second; > + > + if (timer != NULL) { > + *timer = CalTime; > + } > + > + return CalTime; > +} > + > +/** > + Performs a quick sort > +**/ > +void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, const void *)) > +{ > + > + ASSERT (base != NULL); > + ASSERT (compare != NULL); > + > + PerformQuickSort (base, (UINTN)num, (UINTN)width, (SORT_COMPARE)compare); > + return; > +} > + > +/** > + Get character from stream, we don't support file operastion on edk2 JSON library. > + > + @return Returns the character currently pointed by the internal file position indicator of the specified stream > + > +**/ > +int fgetc(FILE * _File){ > + return 0; > +} > diff --git a/RedfishPkg/Library/CrtLib/CrtLib.inf b/RedfishPkg/Library/CrtLib/CrtLib.inf > new file mode 100644 > index 0000000000..661822f148 > --- /dev/null > +++ b/RedfishPkg/Library/CrtLib/CrtLib.inf > @@ -0,0 +1,38 @@ > +## @file > +# EDK2 C Runtime Library for opensource project. > +# > +# Copyright (c) 2019, Intel Corporation. All rights reserved.
> +# (C) Copyright 2020 Hewlett Packard Enterprise Development LP
> +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > +## > + > +[Defines] > + INF_VERSION = 0x0001001b > + BASE_NAME = CrtLib > + FILE_GUID = 8263B8AC-D021-425D-B337-3EC96F5DC19B > + MODULE_TYPE = DXE_DRIVER > + VERSION_STRING = 1.0 > + LIBRARY_CLASS = CrtLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER > + > +# > +# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 RISCV64 > +# > + > +[Sources] > + CrtLib.c > + > +[LibraryClasses] > + BaseLib > + BaseSortLib > + DebugLib > + MemoryAllocationLib > + UefiRuntimeServicesTableLib > + > +[Packages] > + MdePkg/MdePkg.dec > + MdeModulePkg/MdeModulePkg.dec > + RedfishPkg/RedfishPkg.dec > + > + > diff --git a/RedfishPkg/RedfishLibs.dsc.inc b/RedfishPkg/RedfishLibs.dsc.inc > index d4c08e18ac..2a951bd8fa 100644 > --- a/RedfishPkg/RedfishLibs.dsc.inc > +++ b/RedfishPkg/RedfishLibs.dsc.inc > @@ -12,5 +12,6 @@ > ## > !if $(REDFISH_ENABLE) == TRUE > Ucs2Utf8Lib|RedfishPkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > + CrtLib|RedfishPkg/Library/CrtLib/CrtLib.inf > !endif > > diff --git a/RedfishPkg/RedfishPkg.ci.yaml b/RedfishPkg/RedfishPkg.ci.yaml > index 20c297ad22..9895fdac99 100644 > --- a/RedfishPkg/RedfishPkg.ci.yaml > +++ b/RedfishPkg/RedfishPkg.ci.yaml > @@ -17,6 +17,25 @@ > ], > ## Both file path and directory path are accepted. > "IgnoreFiles": [ > + ## Below are files incorporated with open source which are > + ## not edk2 coding standard compliant. > + ## > + ## EDK2 CRT library which is not edk2 coding > + ## standard compliant. > + ## C runtime library for EDKII JsonLib. > + "Include/Crt/sys", > + "Include/Crt/assert.h", > + "Include/Crt/errno.h", > + "Include/Crt/limits.h", > + "Include/Crt/math.h", > + "Include/Crt/stdarg.h", > + "Include/Crt/stddef.h", > + "Include/Crt/stdio.h", > + "Include/Crt/stdlib.h", > + "Include/Crt/string.h", > + "Include/Crt/time.h", > + "Include/Library/CrtLib.h", > + "Library/CrtLib/CrtLib.c" > ] > }, > "CompilerPlugin": { > diff --git a/RedfishPkg/RedfishPkg.dec b/RedfishPkg/RedfishPkg.dec > index 3422fa6edf..9a9a1190fb 100644 > --- a/RedfishPkg/RedfishPkg.dec > +++ b/RedfishPkg/RedfishPkg.dec > @@ -16,10 +16,14 @@ > [Includes] > Include > > +[Includes.Common.Private] > + Include/Crt # Header files for C RTL. > + > [LibraryClasses] > ## @libraryclass Platform Redfish Host Interface Library > # Platform implementation-specific Redfish Host Interface. > RedfishPlatformHostInterfaceLib|Include/Library/RedfishHostInterfaceLib.h > + > ## @libraryclass This library provides UCS2 to UTF8 manipulation > # functions. > # > @@ -29,6 +33,12 @@ > # Platform implementation-specific Redfish Credential Interface. > RedfishPlatformCredentialLib|Include/Library/RedfishCredentialLib.h > > + ## @libraryclass Provides the C runtime library functions > + # CRT library is currently used by edk2 JsonLib (open source > + # jansson project) and edk2 RedfishLib (libredfish open source > + # project). > + CrtLib|Include/Library/CrtLib.h > + > [Protocols] > ## Include/Protocol/RedfishDiscover.h > gEfiRedfishDiscoverProtocolGuid = { 0x5db12509, 0x4550, 0x4347, { 0x96, 0xb3, 0x73, 0xc0, 0xff, 0x6e, 0x86, 0x9f }} > diff --git a/RedfishPkg/RedfishPkg.dsc b/RedfishPkg/RedfishPkg.dsc > index 47fab33e3d..8df2c69390 100644 > --- a/RedfishPkg/RedfishPkg.dsc > +++ b/RedfishPkg/RedfishPkg.dsc > @@ -50,5 +50,6 @@ > RedfishPkg/Library/PlatformHostInterfaceLibNull/PlatformHostInterfaceLibNull.inf > RedfishPkg/Library/PlatformCredentialLibNull/PlatformCredentialLibNull.inf > RedfishPkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf > + RedfishPkg/Library/CrtLib/CrtLib.inf > > !include RedfishPkg/Redfish.dsc.inc > -- > 2.17.1 >