Changeset 11918 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 6, 2006, 2:43:44 PM (19 years ago)

Author:

hyatt

Message:

Land all the changes to make JSCore build again on windows.

Location:

trunk/JavaScriptCore

Files:

• kjs/JSLock.cpp (modified) (1 diff)
• kjs/array_object.cpp (modified) (1 diff)
• kjs/collector.cpp (modified) (3 diffs)
• kjs/date_object.cpp (modified) (5 diffs)
• kjs/identifier.cpp (modified) (1 diff)
• kjs/internal.cpp (modified) (1 diff)
• kjs/interpreter.cpp (modified) (2 diffs)
• kjs/interpreter.h (modified) (1 diff)
• kjs/math_object.cpp (modified) (1 diff)
• kxmlcore/Assertions.h (modified) (9 diffs)
• kxmlcore/FastMalloc.cpp (modified) (1 diff)
• kxmlcore/FastMallocInternal.h (modified) (2 diffs)
• kxmlcore/TCSystemAlloc.cpp (modified) (1 diff)
• pcre/pcre.h (modified) (1 diff)
• pcre/pcre_compile.c (modified) (2 diffs)
• pcre/pcre_exec.c (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSLock.cpp

@@ -72 +72 @@
 void JSLock::lock()
 {
+  // FIXME: Hack-o-rama. To prevent construction of a global object with a null prototype (4342216),
+  // we need to intialize our constants before the first object is constructed. InterpreterImp::lock()
+  // is a good place to do this because you have to call it before doing any allocations. Once we change our 
+  // implementation to use immediate values, we should remove this code.
+  ConstantValues::initIfNeeded();
 }
 

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -38 +38 @@
 #include <stdio.h>
 #include <assert.h>
+
+template class KJS::JSObject * const & KXMLCore::identityExtract<class KJS::JSObject *>(class KJS::JSObject * const &);
 
 using namespace KJS;

trunk/JavaScriptCore/kjs/collector.cpp

@@ -43 +43 @@
 #elif WIN32
 
+#undef ERROR
 #include <windows.h>
 
@@ -159 +160 @@
 allocateNewBlock:
     // didn't find one, need to allocate a new block
-
     size_t numBlocks = heap.numBlocks;
     if (usedBlocks == numBlocks) {
@@ -591 +591 @@
 }
 
-#if APPLE_CHANGES
+#if __APPLE__
 
 static const char *className(JSCell *val)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -60 +60 @@
 #define isfinite(x) _finite(x)
 #define strncasecmp(x, y, z) strnicmp(x, y, z)
-#endif
+#define snprintf _snprintf
+#endif
+
+inline int gmtoffset(const tm& t)
+{
+#if WIN32
+    // FIXME: This might not be completely correct if the time is not the current timezone.
+    return -(timezone / 60 - (t.tm_isdst > 0 ? 60 : 0 )) * 60;
+#else
+    return t.tm_gmtoff;
+#endif
+}
 
 namespace KJS {
@@ -219 +230 @@
 {
     char buffer[100];
-    if (t.tm_gmtoff == 0) {
+    if (gmtoffset(t) == 0) {
         snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT", t.tm_hour, t.tm_min, t.tm_sec);
     } else {
-        int offset = abs(t.tm_gmtoff);
+        int offset = abs(gmtoffset(t));
         snprintf(buffer, sizeof(buffer), "%02d:%02d:%02d GMT%c%02d%02d",
             t.tm_hour, t.tm_min, t.tm_sec,
-            t.tm_gmtoff < 0 ? '-' : '+', offset / (60*60), (offset / 60) % 60);
+            gmtoffset(t) < 0 ? '-' : '+', offset / (60*60), (offset / 60) % 60);
     }
     return UString(buffer);
@@ -548 +559 @@
   double ms = milli - tv * msPerSecond;
 
-  tm t;
-  utc ? gmtime_r(&tv, &t) : localtime_r(&tv, &t);
+  tm t = *(utc ? gmtime(&tv) : localtime(&tv));
   // We had an out of range year. Restore the year (plus/minus offset
   // found by calculating tm_year) and fix the week day calculation.
@@ -770 +780 @@
 {
     time_t t = time(0);
-    tm ts;
-    localtime_r(&t, &ts);
+    tm ts = *localtime(&t);
     return jsString(formatDate(ts) + " " + formatTime(ts));
 }
@@ -900 +909 @@
     if (!utc) { 
         time_t tval = mktime(t) + (time_t)((ms + yearOffset) / 1000);  
-        struct tm t3;  
-        localtime_r(&tval, &t3);  
+        tm t3 = *localtime(&tval);  
         t->tm_isdst = t3.tm_isdst;  
     }

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -41 +41 @@
 #include <string.h> // for strlen
 #include <new> // for placement new
+
+template struct KJS::UString::Rep * const & KXMLCore::identityExtract<struct KJS::UString::Rep *>(struct KJS::UString::Rep * const &);
 
 namespace KXMLCore {

trunk/JavaScriptCore/kjs/internal.cpp

@@ -52 +52 @@
 #define copysign(a, b) _copysign(a, b)
 #endif
+
+template void * const & KXMLCore::extractFirst<struct std::pair<void *,void *>>(struct std::pair<void *, void *> const &);
 
 extern int kjsyyparse();

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -308 +308 @@
 #endif
 
-#if APPLE_CHANGES
 static bool printExceptions = false;
 
@@ -321 +320 @@
 }
 
-
+#if __APPLE__
 void *Interpreter::createLanguageInstanceForValue(ExecState *exec, int language, JSObject *value, const Bindings::RootObject *origin, const Bindings::RootObject *current)
 {

trunk/JavaScriptCore/kjs/interpreter.h

@@ -389 +389 @@
      */
     virtual bool isSafeScript (const Interpreter *target) { return true; }
-    
+  
+#if __APPLE__
     virtual void *createLanguageInstanceForValue(ExecState*, int language, JSObject* value, const Bindings::RootObject* origin, const Bindings::RootObject* current);
+#endif
 
     // This is a workaround to avoid accessing the global variables for these identifiers in

trunk/JavaScriptCore/kjs/math_object.cpp

@@ -263 +263 @@
   case MathObjectImp::Random:
       if (!randomSeeded) {
-          sranddev();
+          srand(time(0));
           randomSeeded = true;
       }

trunk/JavaScriptCore/kxmlcore/Assertions.h

@@ -36 +36 @@
 // Defining any of the symbols explicitly prevents this from having any effect.
 
+#ifdef WIN32
+#define ASSERT_DISABLED 1 // FIXME: We have to undo all the assert macros, since they are currently in a .mm file and use obj-c.
+#else
 #ifdef NDEBUG
 #define ASSERTIONS_DISABLED_DEFAULT 1
 #else
 #define ASSERTIONS_DISABLED_DEFAULT 0
+#endif
 #endif
 
@@ -62 +66 @@
 #endif
 
+#ifdef __GNUC__
+#define KXMLCORE_PRETTY_FUNCTION __PRETTY_FUNCTION__
+#else
+#define KXMLCORE_PRETTY_FUNCTION __FUNCTION__
+#endif
+
 // These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled.
 
@@ -75 +85 @@
     KXCLogChannelState state;
 } KXCLogChannel;
-    
+
 void KXCReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
 void KXCReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...);
@@ -96 +106 @@
 
 #define ASSERT(assertion) ((void)0)
-#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) ((void)0)
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs, ...) ((void)0)
 #define ASSERT_NOT_REACHED() ((void)0)
 
@@ -103 +113 @@
 #define ASSERT(assertion) do \
     if (!(assertion)) { \
-        KXCReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion); \
+        KXCReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion); \
         CRASH(); \
     } \
 while (0)
-#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) do \
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs, ...) do \
     if (!(assertion)) { \
-        KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion, formatAndArgs); \
+        KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion, formatAndArgs); \
         CRASH(); \
     } \
 while (0)
 #define ASSERT_NOT_REACHED() do { \
-    KXCReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, 0); \
+    KXCReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, 0); \
     CRASH(); \
 } while (0)
@@ -130 +140 @@
 #define ASSERT_ARG(argName, assertion) do \
     if (!(assertion)) { \
-        KXCReportArgumentAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #argName, #assertion); \
+        KXCReportArgumentAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #argName, #assertion); \
         CRASH(); \
     } \
@@ -140 +150 @@
 
 #if FATAL_DISABLED
-#define FATAL(formatAndArgs...) ((void)0)
+#define FATAL(formatAndArgs, ...) ((void)0)
 #else
-#define FATAL(formatAndArgs...) do { \
-    KXCReportFatalError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs); \
+#define FATAL(formatAndArgs, ...) do { \
+    KXCReportFatalError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, formatAndArgs); \
     CRASH(); \
 } while (0)
@@ -151 +161 @@
 
 #if ERROR_DISABLED
-#define ERROR(formatAndArgs...) ((void)0)
+#define ERROR(formatAndArgs, ...) ((void)0)
 #else
-#define ERROR(formatAndArgs...) KXCReportError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs)
+#define ERROR(formatAndArgs, ...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, formatAndArgs)
 #endif
 
@@ -159 +169 @@
 
 #if LOG_DISABLED
-#define LOG(channel, formatAndArgs...) ((void)0)
+#define LOG(channel, formatAndArgs, ...) ((void)0)
 #else
-#define LOG(channel, formatAndArgs...) KXCLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
+#define LOG(channel, formatAndArgs, ...) KXCLog(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
 #define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
 #define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel

trunk/JavaScriptCore/kxmlcore/FastMalloc.cpp

@@ -96 +96 @@
 }
 
+#ifndef WIN32
 void fastMallocRegisterThread(pthread_t thread) 
 {
 }
+#endif
 
 } // namespace KJS

trunk/JavaScriptCore/kxmlcore/FastMallocInternal.h

@@ -24 +24 @@
 #define KXMLCORE_FAST_MALLOC_INTERNAL_H
 
+#ifndef WIN32
+
 #include <pthread.h>
 
@@ -30 +32 @@
 }
 
+#endif
+
 #endif //  KXMLCORE_FAST_MALLOC_INTERNAL_H

trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp

@@ -39 +39 @@
 #include <sys/types.h>
 #endif
+#ifndef WIN32
 #include <unistd.h>
+#include <sys/mman.h>
+#endif
 #include <fcntl.h>
-#include <sys/mman.h>
 #include "TCSystemAlloc.h"
 #include "TCSpinLock.h"

trunk/JavaScriptCore/pcre/pcre.h

@@ -70 +70 @@
 
 #define PCRE_UTF16          1
-
-/* Win32 uses DLL by default; it needs special stuff for exported functions. */
-
-#ifdef _WIN32
-#  ifdef PCRE_DEFINITION
-#    ifdef DLL_EXPORT
-#      define PCRE_DATA_SCOPE __declspec(dllexport)
-#    endif
-#  else
-#    ifndef PCRE_STATIC
-#      define PCRE_DATA_SCOPE extern __declspec(dllimport)
-#    endif
-#  endif
-#endif
 
 /* For other operating systems, we use the standard "extern". */

trunk/JavaScriptCore/pcre/pcre_compile.c

@@ -1357 +1357 @@
 #if PCRE_UTF16
 
-static inline BOOL strequal(const pcre_uchar *str1, int len, const char *str2)
+static __inline BOOL strequal(const pcre_uchar *str1, int len, const char *str2)
 {
   int i;
@@ -4894 +4894 @@
           ++ptr;
           }
-        int i;
-        for (i = 0; i < _pcre_utf8_table1_size; i++)
-          if (c <= _pcre_utf8_table1[i]) break;
-        length += i;
-        lastitemlength += i;
+        
+        {
+          int i;
+          for (i = 0; i < _pcre_utf8_table1_size; i++)
+            if (c <= _pcre_utf8_table1[i]) break;
+          length += i;
+          lastitemlength += i;
+        }
       }
 #else

trunk/JavaScriptCore/pcre/pcre_exec.c

@@ -1808 +1808 @@
       GETUTF8CHARLEN(fc, ecode, length);
 #if PCRE_UTF16
-      int dc;
-      ecode += length;
-      switch (md->end_subject - eptr)
-      {
-        case 0:
-          RRETURN(MATCH_NOMATCH);
-        case 1:
-          dc = *eptr++;
-          if (IS_LEADING_SURROGATE(dc))
+      {
+        int dc;
+        ecode += length;
+        switch (md->end_subject - eptr)
+        {
+          case 0:
             RRETURN(MATCH_NOMATCH);
-          break;
-        default:
-          GETCHARINC(dc, eptr);
-      }
-      if (fc != dc) RRETURN(MATCH_NOMATCH);
+          case 1:
+            dc = *eptr++;
+            if (IS_LEADING_SURROGATE(dc))
+              RRETURN(MATCH_NOMATCH);
+            break;
+          default:
+            GETCHARINC(dc, eptr);
+        }
+        if (fc != dc) RRETURN(MATCH_NOMATCH);
+     }  
 #else
       if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
@@ -1946 +1948 @@
 #ifdef SUPPORT_UTF8
 #if PCRE_UTF16
-      length = 1;
+
+          length = 1;
       GETUTF8CHARLEN(fc, ecode, length);
+          {
       int utf16Length; // don't initialize on this line as workaround for Win32 compile problem
       utf16Length = fc > 0xFFFF ? 2 : 1;
@@ -2051 +2055 @@
         }
         /* Control never gets here */
+          }
 #else
     if (utf8)