AppPkg: Add the Arithchk utility and clean up some build problems.
AppPkg\ AppPkg.dsc Update copyright date Add Component ArithChk.inf Applications\ Main\ Main.inf Remove DevShell dependency Python\ Python-2.7.2\Modules\ socketmodule.c Initialize addro, in sock_sendto(), before use. ArithChk\ ArithChk.inf arithchk.c NEW This is a direct port of the arithchk program which is included as part of the NetBSD gdtoa library. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: daryl.mcdaniel@intel.com Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16082 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
committed by
darylm503
parent
c21e7a7832
commit
c9f4d4838c
@ -7,7 +7,7 @@
|
|||||||
# for important information about configuring this package for your
|
# for important information about configuring this package for your
|
||||||
# environment.
|
# environment.
|
||||||
#
|
#
|
||||||
# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
|
# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||||
# This program and the accompanying materials
|
# This program and the accompanying materials
|
||||||
# are licensed and made available under the terms and conditions of the BSD License
|
# are licensed and made available under the terms and conditions of the BSD License
|
||||||
# which accompanies this distribution. The full text of the license may be found at
|
# which accompanies this distribution. The full text of the license may be found at
|
||||||
@ -111,6 +111,7 @@
|
|||||||
AppPkg/Applications/Hello/Hello.inf # No LibC includes or functions.
|
AppPkg/Applications/Hello/Hello.inf # No LibC includes or functions.
|
||||||
AppPkg/Applications/Main/Main.inf # Simple invocation. No other LibC functions.
|
AppPkg/Applications/Main/Main.inf # Simple invocation. No other LibC functions.
|
||||||
AppPkg/Applications/Enquire/Enquire.inf #
|
AppPkg/Applications/Enquire/Enquire.inf #
|
||||||
|
AppPkg/Applications/ArithChk/ArithChk.inf #
|
||||||
|
|
||||||
#### A simple fuzzer for OrderedCollectionLib, in particular for
|
#### A simple fuzzer for OrderedCollectionLib, in particular for
|
||||||
#### BaseOrderedCollectionRedBlackTreeLib.
|
#### BaseOrderedCollectionRedBlackTreeLib.
|
||||||
@ -126,7 +127,7 @@
|
|||||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80400040
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80400040
|
||||||
}
|
}
|
||||||
|
|
||||||
#### After extracting the Python distribution, un-comment the following line to build Python.
|
#### Un-comment the following line to build Python.
|
||||||
# AppPkg/Applications/Python/PythonCore.inf
|
# AppPkg/Applications/Python/PythonCore.inf
|
||||||
|
|
||||||
|
|
||||||
|
41
AppPkg/Applications/ArithChk/ArithChk.inf
Normal file
41
AppPkg/Applications/ArithChk/ArithChk.inf
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
## @file
|
||||||
|
# Program to generate an arith.h for use with the gdtoa binary to decimal and decimal to binary
|
||||||
|
# conversion library.
|
||||||
|
#
|
||||||
|
# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||||
|
# This program and the accompanying materials
|
||||||
|
# are licensed and made available under the terms and conditions of the BSD License
|
||||||
|
# which accompanies this distribution. The full text of the license may be found at
|
||||||
|
# http://opensource.org/licenses/bsd-license.
|
||||||
|
#
|
||||||
|
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
|
##
|
||||||
|
|
||||||
|
[Defines]
|
||||||
|
INF_VERSION = 0x00010006
|
||||||
|
BASE_NAME = ArithChk
|
||||||
|
FILE_GUID = B6C0DCB6-434E-4BEC-BDAC-8EE7ED8A4EC8
|
||||||
|
MODULE_TYPE = UEFI_APPLICATION
|
||||||
|
VERSION_STRING = 0.1
|
||||||
|
ENTRY_POINT = ShellCEntryLib
|
||||||
|
|
||||||
|
#
|
||||||
|
# VALID_ARCHITECTURES = IA32 X64
|
||||||
|
#
|
||||||
|
|
||||||
|
[Sources]
|
||||||
|
arithchk.c
|
||||||
|
|
||||||
|
[Packages]
|
||||||
|
StdLib/StdLib.dec
|
||||||
|
MdePkg/MdePkg.dec
|
||||||
|
|
||||||
|
[LibraryClasses]
|
||||||
|
UefiLib
|
||||||
|
LibC
|
||||||
|
LibStdio
|
||||||
|
LibGdtoa
|
||||||
|
|
||||||
|
[BuildOptions]
|
||||||
|
GCC:*_*_*_CC_FLAGS = -Wno-format-security
|
197
AppPkg/Applications/ArithChk/arithchk.c
Normal file
197
AppPkg/Applications/ArithChk/arithchk.c
Normal file
@ -0,0 +1,197 @@
|
|||||||
|
/** @file
|
||||||
|
Program to generate an arith.h for use with the gdtoa binary to decimal and decimal to binary
|
||||||
|
conversion library.
|
||||||
|
|
||||||
|
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||||
|
This program and the accompanying materials
|
||||||
|
are licensed and made available under the terms and conditions of the BSD License
|
||||||
|
which accompanies this distribution. The full text of the license may be found at
|
||||||
|
http://opensource.org/licenses/bsd-license.
|
||||||
|
|
||||||
|
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
|
|
||||||
|
Copyright (C) 1997, 1998 Lucent Technologies
|
||||||
|
All Rights Reserved
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software and
|
||||||
|
its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of Lucent or any of its entities
|
||||||
|
not be used in advertising or publicity pertaining to
|
||||||
|
distribution of the software without specific, written prior
|
||||||
|
permission.
|
||||||
|
|
||||||
|
LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||||
|
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
|
||||||
|
IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
|
||||||
|
SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
|
||||||
|
IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
||||||
|
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
||||||
|
THIS SOFTWARE.
|
||||||
|
|
||||||
|
NetBSD: arithchk.c,v 1.2 2006/01/25 15:27:42 kleink Exp
|
||||||
|
****************************************************************/
|
||||||
|
#include <sys/EfiCdefs.h>
|
||||||
|
|
||||||
|
/* Try to deduce arith.h from arithmetic properties. */
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
static int dalign;
|
||||||
|
|
||||||
|
typedef struct Akind {
|
||||||
|
char *name;
|
||||||
|
int kind;
|
||||||
|
} Akind;
|
||||||
|
|
||||||
|
static Akind IEEE_LITTLE_ENDIAN = { "IEEE_LITTLE_ENDIAN", 1 };
|
||||||
|
static Akind IEEE_BIG_ENDIAN = { "IEEE_BIG_ENDIAN", 2 };
|
||||||
|
static Akind IBM = { "IBM", 3 };
|
||||||
|
static Akind VAX = { "VAX", 4 };
|
||||||
|
static Akind CRAY = { "CRAY", 5};
|
||||||
|
|
||||||
|
static Akind *
|
||||||
|
Lcheck()
|
||||||
|
{
|
||||||
|
union {
|
||||||
|
double d;
|
||||||
|
long L[2];
|
||||||
|
} u;
|
||||||
|
struct {
|
||||||
|
double d;
|
||||||
|
long L;
|
||||||
|
} x[2];
|
||||||
|
|
||||||
|
if (sizeof(x) > 2*(sizeof(double) + sizeof(long)))
|
||||||
|
dalign = 1;
|
||||||
|
u.L[0] = u.L[1] = 0;
|
||||||
|
u.d = 1e13;
|
||||||
|
if (u.L[0] == 1117925532 && u.L[1] == -448790528)
|
||||||
|
return &IEEE_BIG_ENDIAN;
|
||||||
|
if (u.L[1] == 1117925532 && u.L[0] == -448790528)
|
||||||
|
return &IEEE_LITTLE_ENDIAN;
|
||||||
|
if (u.L[0] == -2065213935 && u.L[1] == 10752)
|
||||||
|
return &VAX;
|
||||||
|
if (u.L[0] == 1267827943 && u.L[1] == 704643072)
|
||||||
|
return &IBM;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Akind *
|
||||||
|
icheck()
|
||||||
|
{
|
||||||
|
union {
|
||||||
|
double d;
|
||||||
|
int L[2];
|
||||||
|
} u;
|
||||||
|
struct {
|
||||||
|
double d;
|
||||||
|
int L;
|
||||||
|
} x[2];
|
||||||
|
|
||||||
|
if (sizeof(x) > 2*(sizeof(double) + sizeof(int)))
|
||||||
|
dalign = 1;
|
||||||
|
u.L[0] = u.L[1] = 0;
|
||||||
|
u.d = 1e13;
|
||||||
|
if (u.L[0] == 1117925532 && u.L[1] == -448790528)
|
||||||
|
return &IEEE_BIG_ENDIAN;
|
||||||
|
if (u.L[1] == 1117925532 && u.L[0] == -448790528)
|
||||||
|
return &IEEE_LITTLE_ENDIAN;
|
||||||
|
if (u.L[0] == -2065213935 && u.L[1] == 10752)
|
||||||
|
return &VAX;
|
||||||
|
if (u.L[0] == 1267827943 && u.L[1] == 704643072)
|
||||||
|
return &IBM;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *emptyfmt = ""; /* avoid possible warning message with printf("") */
|
||||||
|
|
||||||
|
static Akind *
|
||||||
|
ccheck()
|
||||||
|
{
|
||||||
|
union {
|
||||||
|
double d;
|
||||||
|
long L;
|
||||||
|
} u;
|
||||||
|
long Cray1;
|
||||||
|
|
||||||
|
/* Cray1 = 4617762693716115456 -- without overflow on non-Crays */
|
||||||
|
Cray1 = printf(emptyfmt) < 0 ? 0 : 4617762;
|
||||||
|
if (printf(emptyfmt, Cray1) >= 0)
|
||||||
|
Cray1 = 1000000*Cray1 + 693716;
|
||||||
|
if (printf(emptyfmt, Cray1) >= 0)
|
||||||
|
Cray1 = 1000000*Cray1 + 115456;
|
||||||
|
u.d = 1e13;
|
||||||
|
if (u.L == Cray1)
|
||||||
|
return &CRAY;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
fzcheck()
|
||||||
|
{
|
||||||
|
double a, b;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
a = 1.;
|
||||||
|
b = .1;
|
||||||
|
for(i = 155;; b *= b, i >>= 1) {
|
||||||
|
if (i & 1) {
|
||||||
|
a *= b;
|
||||||
|
if (i == 1)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b = a * a;
|
||||||
|
return b == 0.;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
Akind *a = 0;
|
||||||
|
int Ldef = 0;
|
||||||
|
FILE *f;
|
||||||
|
|
||||||
|
#ifdef WRITE_ARITH_H /* for Symantec's buggy "make" */
|
||||||
|
f = fopen("arith.h", "w");
|
||||||
|
if (!f) {
|
||||||
|
printf("Cannot open arith.h\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
f = stdout;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (sizeof(double) == 2*sizeof(long))
|
||||||
|
a = Lcheck();
|
||||||
|
else if (sizeof(double) == 2*sizeof(int)) {
|
||||||
|
Ldef = 1;
|
||||||
|
a = icheck();
|
||||||
|
}
|
||||||
|
else if (sizeof(double) == sizeof(long))
|
||||||
|
a = ccheck();
|
||||||
|
if (a) {
|
||||||
|
fprintf(f, "#define %s\n#define Arith_Kind_ASL %d\n",
|
||||||
|
a->name, a->kind);
|
||||||
|
if (Ldef)
|
||||||
|
fprintf(f, "#define Long int\n#define Intcast (int)(long)\n");
|
||||||
|
if (dalign)
|
||||||
|
fprintf(f, "#define Double_Align\n");
|
||||||
|
if (sizeof(char*) == 8)
|
||||||
|
fprintf(f, "#define X64_bit_pointers\n");
|
||||||
|
#ifndef NO_LONG_LONG
|
||||||
|
if (sizeof(long long) < 8)
|
||||||
|
#endif
|
||||||
|
fprintf(f, "#define NO_LONG_LONG\n");
|
||||||
|
if (a->kind <= 2 && fzcheck())
|
||||||
|
fprintf(f, "#define Sudden_Underflow\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
fprintf(f, "/* Unknown arithmetic */\n");
|
||||||
|
return 1;
|
||||||
|
}
|
@ -2,7 +2,7 @@
|
|||||||
# A simple, basic, application showing how the Hello application could be
|
# A simple, basic, application showing how the Hello application could be
|
||||||
# built using the "Standard C Libraries" from StdLib.
|
# built using the "Standard C Libraries" from StdLib.
|
||||||
#
|
#
|
||||||
# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
|
# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
|
||||||
# This program and the accompanying materials
|
# This program and the accompanying materials
|
||||||
# are licensed and made available under the terms and conditions of the BSD License
|
# are licensed and made available under the terms and conditions of the BSD License
|
||||||
# which accompanies this distribution. The full text of the license may be found at
|
# which accompanies this distribution. The full text of the license may be found at
|
||||||
@ -21,7 +21,7 @@
|
|||||||
ENTRY_POINT = ShellCEntryLib
|
ENTRY_POINT = ShellCEntryLib
|
||||||
|
|
||||||
#
|
#
|
||||||
# VALID_ARCHITECTURES = IA32 X64 IPF
|
# VALID_ARCHITECTURES = IA32 X64
|
||||||
#
|
#
|
||||||
|
|
||||||
[Sources]
|
[Sources]
|
||||||
@ -35,8 +35,3 @@
|
|||||||
[LibraryClasses]
|
[LibraryClasses]
|
||||||
LibC
|
LibC
|
||||||
LibStdio
|
LibStdio
|
||||||
DevShell
|
|
||||||
|
|
||||||
|
|
||||||
[BuildOptions]
|
|
||||||
MSFT:*_*_IA32_CC_FLAGS = /Oi-
|
|
||||||
|
@ -1369,9 +1369,9 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
|
|||||||
{
|
{
|
||||||
struct sockaddr_hci *addr = (struct sockaddr_hci *)addr_ret;
|
struct sockaddr_hci *addr = (struct sockaddr_hci *)addr_ret;
|
||||||
#if defined(__NetBSD__) || defined(__DragonFly__)
|
#if defined(__NetBSD__) || defined(__DragonFly__)
|
||||||
char *straddr = PyBytes_AS_STRING(args);
|
char *straddr = PyBytes_AS_STRING(args);
|
||||||
|
|
||||||
_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
|
_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
|
||||||
if (straddr == NULL) {
|
if (straddr == NULL) {
|
||||||
PyErr_SetString(socket_error, "getsockaddrarg: "
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
||||||
"wrong format");
|
"wrong format");
|
||||||
@ -2824,7 +2824,7 @@ static PyObject *
|
|||||||
sock_sendto(PySocketSockObject *s, PyObject *args)
|
sock_sendto(PySocketSockObject *s, PyObject *args)
|
||||||
{
|
{
|
||||||
Py_buffer pbuf;
|
Py_buffer pbuf;
|
||||||
PyObject *addro = NULL;
|
PyObject *addro;
|
||||||
char *buf;
|
char *buf;
|
||||||
Py_ssize_t len;
|
Py_ssize_t len;
|
||||||
sock_addr_t addrbuf;
|
sock_addr_t addrbuf;
|
||||||
|
Reference in New Issue
Block a user