Merge branch 'master' of github.com:D-Programming-Language/druntime

dlang · Sep 2, 2011 · 0b88c16 · 0b88c16
2 parents 42b53f5 + f24cfa3
commit 0b88c16
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/src/rt/arraybyte.d b/src/rt/arraybyte.d
@@ -87,9 +87,7 @@ body
         {
             auto n = aptr + (a.length & ~63);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
-            l |= (l << 16);
+            uint l = cast(ubyte)value * 0x01010101;
 
             if (((cast(uint) aptr | cast(uint) bptr) & 15) != 0)
             {
@@ -164,8 +162,7 @@ body
         {
             auto n = aptr + (a.length & ~31);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
+            uint l = cast(ubyte)value * 0x0101;
 
             asm
             {
@@ -523,9 +520,7 @@ T[] _arrayExpSliceAddass_g(T[] a, T value)
         {
             auto n = aptr + (a.length & ~63);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
-            l |= (l << 16);
+            uint l = cast(ubyte)value * 0x01010101;
 
             if (((cast(uint) aptr) & 15) != 0)
             {
@@ -595,8 +590,7 @@ T[] _arrayExpSliceAddass_g(T[] a, T value)
 
             auto n = aptr + (a.length & ~31);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
+            uint l = cast(ubyte)value * 0x0101;
 
             asm
             {
@@ -910,9 +904,7 @@ body
         {
             auto n = aptr + (a.length & ~63);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
-            l |= (l << 16);
+            uint l = cast(ubyte)value * 0x01010101;
 
             if (((cast(uint) aptr | cast(uint) bptr) & 15) != 0)
             {
@@ -987,8 +979,7 @@ body
         {
             auto n = aptr + (a.length & ~31);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
+            uint l = cast(ubyte)value * 0x0101;
 
             asm
             {
@@ -1138,9 +1129,7 @@ body
         {
             auto n = aptr + (a.length & ~63);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
-            l |= (l << 16);
+            uint l = cast(ubyte)value * 0x01010101;
 
             if (((cast(uint) aptr | cast(uint) bptr) & 15) != 0)
             {
@@ -1223,8 +1212,7 @@ body
         {
             auto n = aptr + (a.length & ~31);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
+            uint l = cast(ubyte)value * 0x0101;
 
             asm
             {
@@ -1547,9 +1535,7 @@ T[] _arrayExpSliceMinass_g(T[] a, T value)
         {
             auto n = aptr + (a.length & ~63);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
-            l |= (l << 16);
+            uint l = cast(ubyte)value * 0x01010101;
 
             if (((cast(uint) aptr) & 15) != 0)
             {
@@ -1619,8 +1605,7 @@ T[] _arrayExpSliceMinass_g(T[] a, T value)
 
             auto n = aptr + (a.length & ~31);
 
-            uint l = cast(ubyte) value;
-            l |= (l << 8);
+            uint l = cast(ubyte)value * 0x0101;
 
             asm
             {

diff --git a/win32.mak b/win32.mak
@@ -73,6 +73,7 @@ MANIFEST= \
 	src\core\sync\rwmutex.d \
 	src\core\sync\semaphore.d \
 	\
+	src\core\sys\osx\pthread.d \
 	src\core\sys\osx\mach\dyld.d \
 	src\core\sys\osx\mach\getsect.d \
 	src\core\sys\osx\mach\kern_return.d \
@@ -117,6 +118,7 @@ MANIFEST= \
 	src\core\sys\posix\sys\time.d \
 	src\core\sys\posix\sys\types.d \
 	src\core\sys\posix\sys\uio.d \
+	src\core\sys\posix\sys\un.d \
 	src\core\sys\posix\sys\wait.d \
 	\
 	src\core\sys\windows\dbghelp.d \