mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

softfloat: Apply patch corresponding to rebasing to softfloat-2a

Browse Source 
This commit applies the changes to master which correspond to
replacing commit 158142c2c2 with a set of changes made by:
 * taking the SoftFloat-2a release
 * mechanically transforming the block comment style
 * reapplying Fabrice's original changes from 158142c2c2

This commit was created by:
 diff -u 158142c2c2 import-sf-2a
 patch  -p1 --fuzz 10 <../relicense-patch.txt
(where import-sf-2a is the branch resulting from the changes above).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1421073508-23909-2-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2015-01-12 14:38:25 +00:00
parent 83761b9244
commit a7d1ac78e0
4 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fpu/softfloat-macros.h
View File

@ -4,10 +4,10 @@
* Derived from SoftFloat. * Derived from SoftFloat.
*/ */
/*============================================================================ /*
===============================================================================
This C source fragment is part of the SoftFloat IEC/IEEE Floating-point This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
Arithmetic Package, Release 2b. Arithmetic Package, Release 2a.
Written by John R. Hauser. This work was made possible in part by the Written by John R. Hauser. This work was made possible in part by the
International Computer Science Institute, located at Suite 600, 1947 Center International Computer Science Institute, located at Suite 600, 1947 Center
@ -16,24 +16,22 @@ National Science Foundation under grant MIP-9311980. The original version
of this code was written as part of a project to build a fixed-point vector of this code was written as part of a project to build a fixed-point vector
processor in collaboration with the University of California at Berkeley, processor in collaboration with the University of California at Berkeley,
overseen by Profs. Nelson Morgan and John Wawrzynek. More information overseen by Profs. Nelson Morgan and John Wawrzynek. More information
is available through the Web page `http://www.cs.berkeley.edu/~jhauser/ is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
arithmetic/SoftFloat.html'. arithmetic/SoftFloat.html'.
THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort has THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort
been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO
AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES, PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
INSTITUTE (possibly via similar legal notice) AGAINST ALL LOSSES, COSTS, OR
OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
Derivative works are acceptable, even for commercial purposes, so long as Derivative works are acceptable, even for commercial purposes, so long as
(1) the source code for the derivative work includes prominent notice that (1) they include prominent notice that the work is derivative, and (2) they
the work is derivative, and (2) the source code includes prominent notice with include prominent notice akin to these four paragraphs for those parts of
these four paragraphs for those parts of this code that are retained. this code that are retained.
=============================================================================*/ ===============================================================================
*/
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
| This macro tests for minimum version of the GNU C compiler. | This macro tests for minimum version of the GNU C compiler.
@ -107,10 +105,10 @@ static inline void shift64RightJamming(uint64_t a, int_fast16_t count, uint64_t
| 63 bits of the extra result are all zero if and only if _all_but_the_last_ | 63 bits of the extra result are all zero if and only if _all_but_the_last_
| bits shifted off were all zero. This extra result is stored in the location | bits shifted off were all zero. This extra result is stored in the location
| pointed to by `z1Ptr'. The value of `count' can be arbitrarily large. | pointed to by `z1Ptr'. The value of `count' can be arbitrarily large.
| (This routine makes more sense if `a0' and `a1' are considered to form | (This routine makes more sense if `a0' and `a1' are considered to form a
| a fixed-point value with binary point between `a0' and `a1'. This fixed- | fixed-point value with binary point between `a0' and `a1'. This fixed-point
| point value is shifted right by the number of bits given in `count', and | value is shifted right by the number of bits given in `count', and the
| the integer part of the result is returned at the location pointed to by | integer part of the result is returned at the location pointed to by
| `z0Ptr'. The fractional part of the result may be slightly corrupted as | `z0Ptr'. The fractional part of the result may be slightly corrupted as
| described above, and is returned at the location pointed to by `z1Ptr'.) | described above, and is returned at the location pointed to by `z1Ptr'.)
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/

30
fpu/softfloat-specialize.h
View File

@ -4,10 +4,10 @@
* Derived from SoftFloat. * Derived from SoftFloat.
*/ */
/*============================================================================ /*
===============================================================================
This C source fragment is part of the SoftFloat IEC/IEEE Floating-point This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
Arithmetic Package, Release 2b. Arithmetic Package, Release 2a.
Written by John R. Hauser. This work was made possible in part by the Written by John R. Hauser. This work was made possible in part by the
International Computer Science Institute, located at Suite 600, 1947 Center International Computer Science Institute, located at Suite 600, 1947 Center
@ -16,24 +16,22 @@ National Science Foundation under grant MIP-9311980. The original version
of this code was written as part of a project to build a fixed-point vector of this code was written as part of a project to build a fixed-point vector
processor in collaboration with the University of California at Berkeley, processor in collaboration with the University of California at Berkeley,
overseen by Profs. Nelson Morgan and John Wawrzynek. More information overseen by Profs. Nelson Morgan and John Wawrzynek. More information
is available through the Web page `http://www.cs.berkeley.edu/~jhauser/ is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
arithmetic/SoftFloat.html'. arithmetic/SoftFloat.html'.
THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort has THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort
been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO
AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES, PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
Derivative works are acceptable, even for commercial purposes, so long as Derivative works are acceptable, even for commercial purposes, so long as
(1) the source code for the derivative work includes prominent notice that (1) they include prominent notice that the work is derivative, and (2) they
the work is derivative, and (2) the source code includes prominent notice with include prominent notice akin to these four paragraphs for those parts of
these four paragraphs for those parts of this code that are retained. this code that are retained.
=============================================================================*/ ===============================================================================
*/
#if defined(TARGET_MIPS) || defined(TARGET_SH4) || defined(TARGET_UNICORE32) #if defined(TARGET_MIPS) || defined(TARGET_SH4) || defined(TARGET_UNICORE32)
#define SNAN_BIT_IS_ONE 1 #define SNAN_BIT_IS_ONE 1

38
fpu/softfloat.c
View File

@ -4,10 +4,10 @@
* Derived from SoftFloat. * Derived from SoftFloat.
*/ */
/*============================================================================ /*
===============================================================================
This C source file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic This C source file is part of the SoftFloat IEC/IEEE Floating-point
Package, Release 2b. Arithmetic Package, Release 2a.
Written by John R. Hauser. This work was made possible in part by the Written by John R. Hauser. This work was made possible in part by the
International Computer Science Institute, located at Suite 600, 1947 Center International Computer Science Institute, located at Suite 600, 1947 Center
@ -16,24 +16,22 @@ National Science Foundation under grant MIP-9311980. The original version
of this code was written as part of a project to build a fixed-point vector of this code was written as part of a project to build a fixed-point vector
processor in collaboration with the University of California at Berkeley, processor in collaboration with the University of California at Berkeley,
overseen by Profs. Nelson Morgan and John Wawrzynek. More information overseen by Profs. Nelson Morgan and John Wawrzynek. More information
is available through the Web page `http://www.cs.berkeley.edu/~jhauser/ is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
arithmetic/SoftFloat.html'. arithmetic/SoftFloat.html'.
THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort has THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort
been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO
AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES, PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
Derivative works are acceptable, even for commercial purposes, so long as Derivative works are acceptable, even for commercial purposes, so long as
(1) the source code for the derivative work includes prominent notice that (1) they include prominent notice that the work is derivative, and (2) they
the work is derivative, and (2) the source code includes prominent notice with include prominent notice akin to these four paragraphs for those parts of
these four paragraphs for those parts of this code that are retained. this code that are retained.
=============================================================================*/ ===============================================================================
*/
/* softfloat (and in particular the code in softfloat-specialize.h) is /* softfloat (and in particular the code in softfloat-specialize.h) is
* target-dependent and needs the TARGET_* macros. * target-dependent and needs the TARGET_* macros.
@ -529,9 +527,9 @@ static inline float64 packFloat64(flag zSign, int_fast16_t zExp, uint64_t zSig)
| the inexact exception raised if the abstract input cannot be represented | the inexact exception raised if the abstract input cannot be represented
| exactly. However, if the abstract value is too large, the overflow and | exactly. However, if the abstract value is too large, the overflow and
| inexact exceptions are raised and an infinity or maximal finite value is | inexact exceptions are raised and an infinity or maximal finite value is
| returned. If the abstract value is too small, the input value is rounded | returned. If the abstract value is too small, the input value is rounded to
| to a subnormal number, and the underflow and inexact exceptions are raised | a subnormal number, and the underflow and inexact exceptions are raised if
| if the abstract input cannot be represented exactly as a subnormal double- | the abstract input cannot be represented exactly as a subnormal double-
| precision floating-point number. | precision floating-point number.
| The input significand `zSig' has its binary point between bits 62 | The input significand `zSig' has its binary point between bits 62
| and 61, which is 10 bits to the left of the usual location. This shifted | and 61, which is 10 bits to the left of the usual location. This shifted

32
include/fpu/softfloat.h
View File

@ -4,10 +4,10 @@
* Derived from SoftFloat. * Derived from SoftFloat.
*/ */
/*============================================================================ /*
===============================================================================
This C header file is part of the SoftFloat IEC/IEEE Floating-point Arithmetic This C header file is part of the SoftFloat IEC/IEEE Floating-point
Package, Release 2b. Arithmetic Package, Release 2a.
Written by John R. Hauser. This work was made possible in part by the Written by John R. Hauser. This work was made possible in part by the
International Computer Science Institute, located at Suite 600, 1947 Center International Computer Science Institute, located at Suite 600, 1947 Center
@ -16,24 +16,22 @@ National Science Foundation under grant MIP-9311980. The original version
of this code was written as part of a project to build a fixed-point vector of this code was written as part of a project to build a fixed-point vector
processor in collaboration with the University of California at Berkeley, processor in collaboration with the University of California at Berkeley,
overseen by Profs. Nelson Morgan and John Wawrzynek. More information overseen by Profs. Nelson Morgan and John Wawrzynek. More information
is available through the Web page `http://www.cs.berkeley.edu/~jhauser/ is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
arithmetic/SoftFloat.html'. arithmetic/SoftFloat.html'.
THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort has THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort
been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO
AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES, PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
Derivative works are acceptable, even for commercial purposes, so long as Derivative works are acceptable, even for commercial purposes, so long as
(1) the source code for the derivative work includes prominent notice that (1) they include prominent notice that the work is derivative, and (2) they
the work is derivative, and (2) the source code includes prominent notice with include prominent notice akin to these four paragraphs for those parts of
these four paragraphs for those parts of this code that are retained. this code that are retained.
=============================================================================*/ ===============================================================================
*/
#ifndef SOFTFLOAT_H #ifndef SOFTFLOAT_H
#define SOFTFLOAT_H #define SOFTFLOAT_H