Bug 666049 - Remove JSFloat64, float64 and float32 r=luke
authorPaul Biggar <pbiggar@mozilla.com>
Tue, 21 Jun 2011 15:07:02 -0700
changeset 79476 0a6e289031711fc14cdc30fe07cb6b4cbce7a224
parent 79475 eb2c7a5485ecb291d5c13f86c046f5a780b63bb4
child 79477 c4e4af6b7ae42c8a59516935f18a47875211f2df
push id21408
push userkhuey@mozilla.com
push dateTue, 01 Nov 2011 14:32:20 +0000
treeherdermozilla-central@cd9add22f090 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs666049
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 666049 - Remove JSFloat64, float64 and float32 r=luke
js/jsd/jsd_step.c
js/src/jscompat.h
js/src/jsotypes.h
js/src/jspubtd.h
js/src/jstypes.h
--- a/js/jsd/jsd_step.c
+++ b/js/jsd/jsd_step.c
@@ -185,17 +185,17 @@ JSBool
                         }
                         /* make sure we're called for the return too. */
                         hookresult = JS_TRUE;
                     } else if (!pdata->recurseDepth && pdata->lastCallStart) {
                         int64 now, ll_delta;
                         jsdouble delta;
                         now = JS_Now();
                         ll_delta = now - pdata->lastCallStart;
-                        delta = (JSFloat64) ll_delta;
+                        delta = ll_delta;
                         delta /= 1000.0;
                         pdata->totalExecutionTime += delta;
                         /* minExecutionTime starts as 0, so we need to overwrite
                          * it on the first call always. */
                         if ((0 == pdata->callCount) ||
                             delta < pdata->minExecutionTime)
                         {
                             pdata->minExecutionTime = delta;
@@ -209,17 +209,17 @@ JSBool
                          * return, and use the running total instead of the
                          * delta calculated above. */
                         if (jsdc->lastReturnTime)
                         {
                             /* Add last chunk to running time, and use total
                              * running time as 'delta'. */
                             ll_delta = now - jsdc->lastReturnTime;
                             pdata->runningTime += ll_delta;
-                            delta = (JSFloat64) pdata->runningTime;
+                            delta = pdata->runningTime;
                             delta /= 1000.0;
                         }
                         
                         pdata->totalOwnExecutionTime += delta;
                         /* See minExecutionTime comment above. */
                         if ((0 == pdata->callCount) ||
                             delta < pdata->minOwnExecutionTime)
                         {
--- a/js/src/jscompat.h
+++ b/js/src/jscompat.h
@@ -45,10 +45,9 @@
  * the NSPR typedef names may be.
  */
 #include "jstypes.h"
 
 typedef JSIntn intN;
 typedef JSUintn uintN;
 typedef JSUword jsuword;
 typedef JSWord jsword;
-typedef float float32;
 #endif /* jscompat_h___ */
--- a/js/src/jsotypes.h
+++ b/js/src/jsotypes.h
@@ -88,11 +88,9 @@ typedef signed char int8;
 typedef JSInt64 int64;
 
 /* /usr/include/model.h on HP-UX defines int8, int16, and int32 */
 typedef JSInt32 int32;
 typedef JSInt16 int16;
 typedef JSInt8 int8;
 #endif /* AIX && HAVE_SYS_INTTYPES_H */
 
-typedef JSFloat64 float64;
-
 #endif /* !defined(PROTYPES_H) */
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -91,17 +91,17 @@ typedef ptrdiff_t jsid;
 # define JSID_BITS(id) (id)
 #endif
 
 JS_BEGIN_EXTERN_C
 
 /* Scalar typedefs. */
 typedef JSInt32   jsint;
 typedef JSUint32  jsuint;
-typedef float64   jsdouble;
+typedef double    jsdouble;
 typedef JSInt32   jsrefcount;   /* PRInt32 if JS_THREADSAFE, see jslock.h */
 
 #ifdef WIN32
 typedef wchar_t   jschar;
 #else
 typedef JSUint16  jschar;
 #endif
 
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -336,23 +336,16 @@ JS_BEGIN_EXTERN_C
 **      define them to be wider (e.g., 32 or even 64 bits). These types are
 **      never valid for fields of a structure.
 ************************************************************************/
 
 typedef int JSIntn;
 typedef unsigned int JSUintn;
 
 /************************************************************************
-** TYPES:       JSFloat64
-** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits.
-************************************************************************/
-typedef double          JSFloat64;
-
-/************************************************************************
 ** TYPES:       JSSize
 ** DESCRIPTION:
 **  A type for representing the size of objects.
 ************************************************************************/
 typedef size_t JSSize;
 
 /************************************************************************
 ** TYPES:       JSPtrDiff