vbox的更動 21113 路徑 trunk/src/libs/xpcom18a4/xpcom

時間撮記:

2009-7-1 上午11:48:47 (15 年 以前)

作者:

vboxsync

訊息:

xpcom: first go at making xpcom bitness-safe

位置:

trunk/src/libs/xpcom18a4/xpcom

檔案:

• base/nscore.h (修改) (2 筆差異)
• ds/nsCheapSets.h (修改) (2 筆差異)
• ds/nsVoidArray.h (修改) (1 筆差異)
• io/nsFastLoadService.cpp (修改) (2 筆差異)

trunk/src/libs/xpcom18a4/xpcom/base/nscore.h

@@ -431 +431 @@
 #endif
  
+#ifndef VBOX
 /* 
  * Use these macros to do 64bit safe pointer conversions.
@@ -437 +438 @@
 #define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
 #define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
+#else /* VBOX */
+// This stuff is (contrary to the comment) totally 64bit unsafe, so strip
+// it down to only do one direction, which is used by the hashing code.
+#define NS_PTR_TO_INT32(x) ((PRInt32)((char *)(x) - (char *)0))
+#endif /* VBOX */
 
 /*

trunk/src/libs/xpcom18a4/xpcom/ds/nsCheapSets.h

@@ -83 +83 @@
 
 private:
-  typedef unsigned long PtrBits;
+  typedef PRUint64 PtrBits;
 
   /** Get the hash pointer (or null if we're not a hash) */
@@ -156 +156 @@
 
 private:
-  typedef unsigned long PtrBits;
+  typedef PRUint64 PtrBits;
 
   /** Get the hash pointer (or null if we're not a hash) */

trunk/src/libs/xpcom18a4/xpcom/ds/nsVoidArray.h

@@ -376 +376 @@
 
 private:
-  typedef unsigned long PtrBits;
+  typedef PRUint64 PtrBits;
 
   PRBool HasSingleChild() const

trunk/src/libs/xpcom18a4/xpcom/io/nsFastLoadService.cpp

@@ -395 +395 @@
         return rv;
 
+#ifndef VBOX
     mChecksumTable.Put(&key, NS_INT32_TO_PTR(checksum));
+#else /* VBOX */
+    mChecksumTable.Put(&key, (void *)checksum);
+#endif /* VBOX */
     *aChecksum = checksum;
     return NS_OK;
@@ -418 +422 @@
 
     nsCStringKey key(path);
+#ifndef VBOX
     mChecksumTable.Put(&key, NS_INT32_TO_PTR(checksum));
+#else /* VBOX */
+    mChecksumTable.Put(&key, (void *)checksum);
+#endif /* VBOX */
     return NS_OK;
 }