diff --git a/builtins.cpp b/builtins.cpp
index 1d12f5f4..4582adab 100644
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -163,7 +163,9 @@ lLLVMTypeToISPCType(const llvm::Type *t, bool intAsUnsigned) {
intAsUnsigned);
if (eltType == NULL)
return NULL;
- return new ReferenceType(new ArrayType(eltType, at->getNumElements()),
+ // FIXME: this needs to be fixed when arrays can have
+ // over 4G elements...
+ return new ReferenceType(new ArrayType(eltType, (int)at->getNumElements()),
false);
}
}
diff --git a/ispc.vcxproj b/ispc.vcxproj
index 7594a3d4..5d012961 100755
--- a/ispc.vcxproj
+++ b/ispc.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -11,28 +11,34 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+ 4146;4800;4996;4355;4624;4005;4003;4018
+ 4146;4800;4996;4355;4624;4005;4003;4018
+
-
+
+ 4146;4800;4996;4355;4624;4005;4065
+ 4146;4800;4996;4355;4624;4005;4065
+
%LLVM_INSTALL_DIR%\bin\clang -m32 -emit-llvm builtins-c.c -c -o - | %LLVM_INSTALL_DIR%\bin\llvm-dis - | python bitcode2cpp.py builtins-c-32.c > gen-bitcode-c-32.cpp;
%LLVM_INSTALL_DIR%\bin\clang -m64 -emit-llvm builtins-c.c -c -o - | %LLVM_INSTALL_DIR%\bin\llvm-dis - | python bitcode2cpp.py builtins-c-64.c > gen-bitcode-c-64.cpp
@@ -49,12 +55,12 @@
-
-
+
+
-
-
+
+
@@ -76,32 +82,32 @@
Building gen-stdlib.cpp
-
-
- Document
- m4 builtins.m4 builtins-sse4.ll | python bitcode2cpp.py builtins-sse4.ll > gen-bitcode-sse4.cpp
- gen-bitcode-sse4.cpp
- builtins.m4;builtins-sse.ll
- m4 builtins.m4 builtins-sse4.ll | python bitcode2cpp.py builtins-sse4.ll > gen-bitcode-sse4.cpp
- gen-bitcode-sse4.cpp
- builtins.m4;builtins-sse.ll
- Building gen-bitcode-sse4.cpp
- Building gen-bitcode-sse4.cpp
-
-
-
-
- Document
- m4 builtins.m4 builtins-dispatch.ll | python bitcode2cpp.py builtins-dispatch.ll > gen-bitcode-dispatch.cpp
- gen-bitcode-dispatch.cpp
- builtins.m4
- m4 builtins.m4 builtins-dispatch.ll | python bitcode2cpp.py builtins-dispatch.ll > gen-bitcode-dispatch.cpp
- gen-bitcode-dispatch.cpp
- builtins.m4
- Building gen-bitcode-dispatch.cpp
- Building gen-bitcode-dispatch.cpp
-
-
+
+
+ Document
+ m4 builtins.m4 builtins-sse4.ll | python bitcode2cpp.py builtins-sse4.ll > gen-bitcode-sse4.cpp
+ gen-bitcode-sse4.cpp
+ builtins.m4;builtins-sse.ll
+ m4 builtins.m4 builtins-sse4.ll | python bitcode2cpp.py builtins-sse4.ll > gen-bitcode-sse4.cpp
+ gen-bitcode-sse4.cpp
+ builtins.m4;builtins-sse.ll
+ Building gen-bitcode-sse4.cpp
+ Building gen-bitcode-sse4.cpp
+
+
+
+
+ Document
+ m4 builtins.m4 builtins-dispatch.ll | python bitcode2cpp.py builtins-dispatch.ll > gen-bitcode-dispatch.cpp
+ gen-bitcode-dispatch.cpp
+ builtins.m4
+ m4 builtins.m4 builtins-dispatch.ll | python bitcode2cpp.py builtins-dispatch.ll > gen-bitcode-dispatch.cpp
+ gen-bitcode-dispatch.cpp
+ builtins.m4
+ Building gen-bitcode-dispatch.cpp
+ Building gen-bitcode-dispatch.cpp
+
+
Document
@@ -248,4 +254,4 @@
-
+
diff --git a/ispc_test.cpp b/ispc_test.cpp
index a1a6d3d3..385e7dc2 100644
--- a/ispc_test.cpp
+++ b/ispc_test.cpp
@@ -120,7 +120,7 @@ void *ISPCAlloc(void **handle, int64_t size, int32_t alignment) {
*handle = (void *)0xdeadbeef;
// leak time!
#ifdef ISPC_IS_WINDOWS
- return _aligned_malloc(size, alignment);
+ return _aligned_malloc((size_t)size, alignment);
#endif
#ifdef ISPC_IS_LINUX
return memalign(alignment, size);
diff --git a/ispc_test.vcxproj b/ispc_test.vcxproj
index e36275b8..1dd885bb 100755
--- a/ispc_test.vcxproj
+++ b/ispc_test.vcxproj
@@ -54,6 +54,7 @@
Disabled
LLVM_3_0;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(LLVM_INSTALL_DIR)/include
+ 4146;4355;4800
Console
@@ -72,6 +73,7 @@
true
LLVM_3_0;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
$(LLVM_INSTALL_DIR)/include
+ 4146;4355;4800
Console
diff --git a/simple.vcxproj b/simple.vcxproj
new file mode 100755
index 00000000..56e9074a
--- /dev/null
+++ b/simple.vcxproj
@@ -0,0 +1,164 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+ Document
+
+cl /E /TP %(Filename).vo | volta -O2 - -o %(Filename).obj -h %(Filename).h --arch=x86
+
+
+cl /E /TP %(Filename).vo | volta -O2 -o %(Filename).obj -h %(Filename).h
+
+ %(Filename).obj
+ %(Filename).obj
+
+cl /E /TP %(Filename).vo | volta -O2 - -o %(Filename).obj -h %(Filename).h --arch=x86
+
+
+cl /E /TP %(Filename).vo | volta -O2 - -o %(Filename).obj -h %(Filename).h
+
+ %(Filename).obj
+ %(Filename).obj
+
+
+
+ {947C5311-8B78-4D05-BEE4-BCF342D4B367}
+ Win32Proj
+ morph
+
+
+
+ Application
+ true
+ Unicode
+
+
+ Application
+ true
+ Unicode
+
+
+ Application
+ false
+ true
+ Unicode
+
+
+ Application
+ false
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+
+