From bf4d47073a245bd0f181dfb86a15a53005b25daf Mon Sep 17 00:00:00 2001
From: zesstra <zesstra@zesstra.de>
Date: Sat, 18 Apr 2009 00:08:51 +0200
Subject: [PATCH] Fix for float corruption in restore_svalue().

We use 32 bit mantissas and 16 bit exponents for our floats. Ensure to
write and read fixed-width types in save_svalue() and restore_svalue().
Fixes #627, where restore_svalue() interpreted the 16bit integer for the
exponent as 32bit integer, resulting in data corruption if the exponent
was negative.

Signed-off-by: zesstra <zesstra@zesstra.de>
---
 src/object.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/object.c b/src/object.c
index b3a8516..59068f4 100644
--- a/src/object.c
+++ b/src/object.c
@@ -6310,9 +6310,9 @@ save_svalue (svalue_t *v, char delimiter, Bool writable)
         char *source, c;
 
         source = number_buffer;
-        (void)sprintf(source, "%.12e=%"PRIxPHINT":%"PRIxPINT
-                     , READ_DOUBLE(v), v->x.exponent & 0xffff
-                     , v->u.mantissa);
+        (void)sprintf(source, "%.12e=%"PRIx16":%"PRIx32
+                     , READ_DOUBLE(v), (int16_t)v->x.exponent
+                     , (int32_t)v->u.mantissa);
         c = *source++;
         do L_PUTC(c) while ( '\0' != (c = *source++) );
         L_PUTC(delimiter);
@@ -8386,8 +8386,12 @@ restore_svalue (svalue_t *svp, char **pt, char delimiter)
         if ( NULL != (cp = strchr(cp, '=')) &&  restore_ctx->restored_host == CURRENT_HOST)
         {
             cp++;
-            if (sscanf(cp, "%"SCNxPHINT":%"SCNxPINT, &svp->x.exponent, &svp->u.mantissa) != 2)
+            int32_t mantissa;
+            int16_t exponent;
+            if (sscanf(cp, "%"SCNx16":%"SCNx32, &exponent, &mantissa) != 2)
                 return 0;
+            svp->x.exponent=exponent;
+            svp->u.mantissa=mantissa;
         }
         else
         {
-- 
1.6.1

From b2409c1685880f1d21bbf0fcbc3d983c8a2c3ebd Mon Sep 17 00:00:00 2001
From: zesstra <zesstra@zesstra.de>
Date: Sat, 18 Apr 2009 01:12:45 +0200
Subject: [PATCH 2/3] Changed Defines for FLOAT_FORMAT_0 to functions.

The defines READ_DOUBLE, SPLIT_DOUBLe and STORE_DOUBLE were exchanged
by static inline functions.
STORE_DOUBLE_USED is not needed anymore and defined empty.
Additionally, SPLIT_DOUBLE returns now the mantissa as p_int instead of long.

Signed-off-by: zesstra <zesstra@zesstra.de>
---
 src/svalue.h |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/svalue.h b/src/svalue.h
index 7ade63b..4797e83 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -408,21 +408,24 @@ double READ_DOUBLE(struct svalue *svalue_pnt)
 
 #define FLOAT_FORMAT_0
 
-#define READ_DOUBLE(svalue_pnt) ( ldexp( (double)((svalue_pnt)->u.mantissa) , \
-                (svalue_pnt)->x.exponent-31 ) )
-
+static INLINE double READ_DOUBLE(svalue_t *sv) {
+    return ldexp( (double)(sv->u.mantissa), sv->x.exponent - 31 );
+}
 /* if your machine doesn't use the exponent to designate powers of two,
-   the use of ldexp in SPLIT_DOUBLE won't work; you'll have to mulitply
+   the use of ldexp in SPLIT_DOUBLE won't work; you'll have to multiply
    with 32768. in this case */
 
-#define SPLIT_DOUBLE(double_value, int_pnt) \
-( (long)ldexp( frexp( (double_value), (int_pnt) ), 31) )
+static INLINE p_int SPLIT_DOUBLE(double doublevalue, int *int_p) {
+    return (p_int)ldexp( frexp( doublevalue, int_p ), 31);
+}
 
-#define STORE_DOUBLE_USED int __store_double_int_;
-#define STORE_DOUBLE(dest, double_value) (\
-((dest)->u.mantissa = SPLIT_DOUBLE((double_value), &__store_double_int_)),\
- (dest)->x.exponent = (short)__store_double_int_\
-)
+// STORE_DOUBLE_USED is not needed anymore and defined empty.
+#define STORE_DOUBLE_USED
+static INLINE void STORE_DOUBLE(svalue_t *dest, double doublevalue) {
+    int exponent;
+    dest->u.mantissa = SPLIT_DOUBLE(doublevalue, &exponent);
+    dest->x.exponent = (ph_int)exponent;
+}
 
 #endif /* ifndef STORE_DOUBLE */
 
-- 
1.6.1

From 83efc3844b800e9d5a29a46dbf9ad565405929d1 Mon Sep 17 00:00:00 2001
From: zesstra <zesstra@zesstra.de>
Date: Sun, 19 Apr 2009 19:44:09 +0200
Subject: [PATCH 3/3] Use LOAD_ macros in F_FLOAT.

The compiler stores float literals with PUT_INT32 and PUT_SHORT. Reading
them from the bytecode was done by memcpy(). Some conditional compilation
was required to read the correct datatypes. This patch implements an old
TODO and makes F_FLOAT use the LOAD_INT32 and LOAD_SHORT macros from
bytecode.h.

Signed-off-by: zesstra <zesstra@zesstra.de>
---
 src/interpret.c |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/interpret.c b/src/interpret.c
index ea2f5c7..8722d64 100644
--- a/src/interpret.c
+++ b/src/interpret.c
@@ -8525,31 +8525,19 @@ again:
          * TODO: This code makes heavy assumptions about data sizes and
          * TODO:: layout. E.g. there need not be a 16-Bit integral type
          * TODO:: available.
-         * TODO: It should be rewritten to use the LOAD_ macros (but
-         * TODO:: then the compiler needs to use them, too.
+         * TODO: short doesn't to be a 16 bit wide type (which the float format
+         * TODO:: expects). LOAD_INT16 would be nice (change in compiler as well).
          */
 
-#if SIZEOF_CHAR_P == 4
-        sp++;
-        sp->type = T_FLOAT;
-
-        memcpy((char *)&sp->u.mantissa, pc, sizeof(sp->u.mantissa));
-        memcpy((char *)&sp->x.exponent, pc + sizeof(sp->u.mantissa), sizeof(sp->x.exponent));
-        pc += sizeof(sp->u.mantissa)+sizeof(sp->x.exponent);
-#else
         int32 mantissa;
-        /* TODO: int16 */ short exponent;
+        short exponent;
 
         sp++;
         sp->type = T_FLOAT;
-
-        memcpy((char *)&mantissa, pc, sizeof(mantissa));
+        LOAD_INT32(mantissa, pc);
+        LOAD_SHORT(exponent, pc);
         sp->u.mantissa = mantissa;
-
-        memcpy((char *)&exponent, pc + sizeof(mantissa), sizeof(exponent));
         sp->x.exponent = exponent;
-        pc += sizeof(mantissa)+sizeof(exponent);
-#endif
         break;
     }
 
-- 
1.6.1

From f0750f4f3556b9634930fe66ed6408b84812dddc Mon Sep 17 00:00:00 2001
From: zesstra <zesstra@zesstra.de>
Date: Wed, 6 May 2009 21:52:14 +0200
Subject: [PATCH 5/5] Changed restore_svalue() to recognize "inf" and "nan".

C99 specifies to represent 'infinity' and 'NaN' by "[-]inf" or "[-]infinity"
and a string starting with "nan". If restore_svalue() stumbles upon
such data (e.g. "inf=ffff:59995fd0") it tries to restore exponent and
mantissa and ignores "inf"/"infinity"/"nan".

Signed-off-by: zesstra <zesstra@zesstra.de>
---
 src/object.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/object.c b/src/object.c
index 59068f4..5420173 100644
--- a/src/object.c
+++ b/src/object.c
@@ -8359,6 +8359,7 @@ restore_svalue (svalue_t *svp, char **pt, char delimiter)
     case '-':  /* A number */
     case '0': case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9':
+    case 'i': case 'n':    // for infinity and NaN (C99).
       {
         char c, *numstart = cp;
         int nega = 0;
@@ -8371,7 +8372,8 @@ restore_svalue (svalue_t *svp, char **pt, char delimiter)
         }
 
         while(lexdigit(c = *cp++)) l = (((l << 2) + l) << 1) + (c - '0');
-        if (c != '.')
+        if (c != '.'
+            && c != 'i' && c != 'n')    // for infinity/NaN in floats
         {
             put_number(svp, nega ? -l : l);
             *pt = cp;
@@ -8381,9 +8383,15 @@ restore_svalue (svalue_t *svp, char **pt, char delimiter)
         /* If a float was written by the same host type as we are using,
          * restore the internal representation.
          * Otherwise, parse the float normally.
+         * C99 specifies to write "[-]infinity" or "[-]inf" for infinity and
+         * a string starting with 'nan' for NaN. We should restore such values
+         * the most meaningful way possible (use mantissa + exponent in any case).
          */
         svp->type = T_FLOAT;
-        if ( NULL != (cp = strchr(cp, '=')) &&  restore_ctx->restored_host == CURRENT_HOST)
+        if ( NULL != (cp = strchr(cp, '=')) &&  
+            (restore_ctx->restored_host == CURRENT_HOST
+             || strstr(numstart, "inf") != NULL
+             || strstr(numstart, "nan") != NULL) )
         {
             cp++;
             int32_t mantissa;
-- 
1.6.1