Initial pass at Windows support.

All tests now pass with the new ABI on x86-64, with the new ABI.  Some
of the code is ugly and other platforms are probably broken.

Author: davidchisnall

CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 
-project(libobjc)
-enable_language(ASM)
+project(libobjc C ASM CXX)
 
 INCLUDE (CheckCXXSourceCompiles)
 
@@ -10,13 +9,15 @@ macro(install_symlink filepath sympath)
 	install(CODE "message(\"-- Symlinking: ${sympath} -> ${filepath}\")")
 endmacro(install_symlink)
 
-set(CMAKE_C_FLAGS_DEBUG "-g -O0 -fno-inline ${CMAKE_C_FLAGS_DEBUG}")
+set(CMAKE_C_FLAGS_DEBUG "/Z7 -O0 -Xclang -fno-inline ${CMAKE_C_FLAGS_DEBUG}")
+set(CMAKE_SHARED_LINKER_FLAGS "/DEBUG /INCREMENTAL:NO ${CMAKE_SHARED_LINKER_FLAGS}")
 set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
-set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
 set(libobjc_VERSION 4.6)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHas -Xclang -fexceptions -Xclang -fobjc-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHas")
 # Build configuration
 add_definitions( -DGNUSTEP -D__OBJC_RUNTIME_INTERNAL__=1)
 
@@ -37,7 +38,6 @@ set(libobjc_C_SRCS
 	category_loader.c
 	class_table.c
 	dtable.c
-	eh_personality.c
 	encoding2.c
 	hooks.c
 	ivar.c
@@ -68,10 +68,16 @@ set(libobjc_HDRS
 	objc/objc.h
 	objc/runtime-deprecated.h
 	objc/runtime.h
-	objc/slot.h
-)
+	objc/slot.h)
+
+# Windows does not use DWARF EH
+if (WIN32)
+	list(APPEND libobjc_CXX_SRCS eh_win32_msvc.cc)
+else ()
+	list(APPEND libobjc_C_SRCS eh_personality.c)
+	set(libobjcxx_CXX_SRCS objcxx_eh.cc)
+endif (WIN32)
 
-set(libobjcxx_CXX_SRCS objcxx_eh.cc)
 
 # For release builds, we disable spamming the terminal with warnings about
 # selector type mismatches
@@ -154,10 +160,26 @@ endif ()
 
 set(INSTALL_TARGETS objc)
 
+# On Windows, CMake adds /TC to the clang-cl flags and doesn't provide a way to
+# tell it not to.  We fix this by telling clang do disregard that option,
+# unconditionally (which means that it still defaults to C for .c files).
+set(ENV{CCC_OVERRIDE_OPTIONS} "x/TC x/Gm-")
+
+set_source_files_properties(
+	${libobjc_ASM_SRCS}
+	LANGUAGE C
+	COMPILE_FLAGS "${CMAKE_OBJC_FLAGS} -Xclang -x -Xclang assembler-with-cpp"
+)
+
+set_source_files_properties(
+	${libobjc_CXX_SRCS}
+	LANGUAGE CXX
+	COMPILE_FLAGS "${CMAKE_CXX_FLAGS}"
+)
+
 set_source_files_properties(
 	${libobjc_OBJC_SRCS}
-	PROPERTIES LANGUAGE C
-	COMPILE_FLAGS "${CMAKE_OBJC_FLAGS}"
+	COMPILE_FLAGS "${CMAKE_OBJC_FLAGS} -Xclang -x -Xclang objective-c"
 )
 
 #
@@ -186,40 +208,55 @@ set(ENABLE_OBJCXX true CACHE BOOL
 
 set(CXXRT_IS_STDLIB false)
 
-add_library(objc SHARED ${libobjc_C_SRCS} ${libobjc_ASM_SRCS} ${libobjc_OBJC_SRCS})
+add_custom_command(OUTPUT block_trampolines.obj
+	COMMAND ${CMAKE_C_COMPILER} -c "${CMAKE_SOURCE_DIR}/block_trampolines.S" -o "${CMAKE_BINARY_DIR}/block_trampolines.obj"
+	MAIN_DEPENDENCY block_trampolines.S
+)
+add_custom_command(OUTPUT objc_msgSend.obj
+	COMMAND ${CMAKE_C_COMPILER} -c "${CMAKE_SOURCE_DIR}/objc_msgSend.S" -o "${CMAKE_BINARY_DIR}/objc_msgSend.obj"
+	MAIN_DEPENDENCY objc_msgSend.S
+	DEPENDS objc_msgSend.aarch64.S objc_msgSend.arm.S objc_msgSend.mips.S objc_msgSend.x86-32.S objc_msgSend.x86-64.S
+)
+
+
+add_library(objc SHARED ${libobjc_C_SRCS} ${libobjc_ASM_SRCS} ${libobjc_OBJC_SRCS} block_trampolines.obj objc_msgSend.obj)
 
 if (ENABLE_OBJCXX)
-	message(STATUS "Testing C++ interop")
-	# Try to find libcxxrt.so.  We can link to this to provide the C++ ABI
-	# layer, if it exists.
-	test_cxx(cxxrt false)
-	# If it doesn't, then look for GNU libsupc++.so instead (either works,
-	# they're ABI compatible).
-	if (NOT CXX_RUNTIME)
-		test_cxx(supc++ false)
-	endif (NOT CXX_RUNTIME)
-	if (NOT CXX_RUNTIME)
-		test_cxx(c++abi false)
-	endif (NOT CXX_RUNTIME)
-
-	# If we have a C++ ABI library, then we can produce a single libobjc that
-	# works for Objective-C and Objective-C++.  If not, then we need to provide
-	# a separate libobjcxx.
-	if (CXX_RUNTIME)
-		message(STATUS "Using ${CXX_RUNTIME} as the C++ runtime library")
-	else()
-		message(STATUS "Testing C++ standard library")
-		try_compile(USERUNTIME 
-			"${CMAKE_BINARY_DIR}/CMake"
-			"${CMAKE_SOURCE_DIR}/CMake"
-			test_cxx_runtime)
-		if (${USERUNTIME})
-			message(STATUS "libobjc will depend on C++ standard library")
-			set(CXXRT_IS_STDLIB true)
+	if (WIN32)
+		message(STATUS "Using MSVC-compatible exception model")
+	else ()
+		message(STATUS "Testing C++ interop")
+		# Try to find libcxxrt.so.  We can link to this to provide the C++ ABI
+		# layer, if it exists.
+		test_cxx(cxxrt false)
+		# If it doesn't, then look for GNU libsupc++.so instead (either works,
+		# they're ABI compatible).
+		if (NOT CXX_RUNTIME)
+			test_cxx(supc++ false)
+		endif (NOT CXX_RUNTIME)
+		if (NOT CXX_RUNTIME)
+			test_cxx(c++abi false)
+		endif (NOT CXX_RUNTIME)
+
+		# If we have a C++ ABI library, then we can produce a single libobjc that
+		# works for Objective-C and Objective-C++.  If not, then we need to provide
+		# a separate libobjcxx.
+		if (CXX_RUNTIME)
+			message(STATUS "Using ${CXX_RUNTIME} as the C++ runtime library")
 		else()
-			message(STATUS "No useable C++ runtime found")
-			set(ENABLE_OBJCXX false)
-		endif()
+			message(STATUS "Testing C++ standard library")
+			try_compile(USERUNTIME 
+				"${CMAKE_BINARY_DIR}/CMake"
+				"${CMAKE_SOURCE_DIR}/CMake"
+				test_cxx_runtime)
+			if (${USERUNTIME})
+				message(STATUS "libobjc will depend on C++ standard library")
+				set(CXXRT_IS_STDLIB true)
+			else()
+				message(STATUS "No useable C++ runtime found")
+				set(ENABLE_OBJCXX false)
+			endif()
+		endif ()
 	endif ()
 endif (ENABLE_OBJCXX)
 
@@ -231,8 +268,8 @@ if (ENABLE_OBJCXX)
 		set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
 		target_link_libraries(objc ${CXX_RUNTIME})
 	endif()
-	set(libobjc_CXX_SRCS ${libobjcxx_CXX_SRCS})
-	target_sources(objc PRIVATE ${libobjcxx_CXX_SRCS})
+	list(APPEND libobjc_CXX_SRCS ${libobjcxx_CXX_SRCS})
+	target_sources(objc PRIVATE ${libobjc_CXX_SRCS})
 endif()
 
 
@@ -264,8 +301,6 @@ if (BUILD_STATIC_LIBOBJC)
 	list(APPEND INSTALL_TARGETS objc-static)
 endif ()
 
-
-
 # Explicitly link libgc if we are compiling with gc support.
 if (LIBGC)
 	target_link_libraries(objc ${LIBGC})

NSBlocks.m

@@ -1,14 +1,14 @@
-#import "objc/runtime.h"
-#import "class.h"
-#import "loader.h"
-#import "lock.h"
-#import "objc/blocks_runtime.h"
-#import "dtable.h"
+#include "objc/runtime.h"
+#include "class.h"
+#include "loader.h"
+#include "lock.h"
+#include "objc/blocks_runtime.h"
+#include "dtable.h"
 #include <assert.h>
 
-struct objc_class _NSConcreteGlobalBlock;
-struct objc_class _NSConcreteStackBlock;
-struct objc_class _NSConcreteMallocBlock;
+PUBLIC struct objc_class _NSConcreteGlobalBlock;
+PUBLIC struct objc_class _NSConcreteStackBlock;
+PUBLIC struct objc_class _NSConcreteMallocBlock;
 
 static struct objc_class _NSConcreteGlobalBlockMeta;
 static struct objc_class _NSConcreteStackBlockMeta;
@@ -40,6 +40,7 @@ static void createNSBlockSubclass(Class superclass, Class newClass,
 #define NEW_CLASS(super, sub) \
 	createNSBlockSubclass(super, &sub, &sub ## Meta, #sub)
 
+PUBLIC
 BOOL objc_create_block_classes_as_subclasses_of(Class super)
 {
 	if (_NSBlock.super_class != NULL) { return NO; }

Test/CMakeLists.txt

@@ -3,6 +3,16 @@
 # the installed version
 
 
+# On Windows, CMake adds /TC to the clang-cl flags and doesn't provide a way to
+# tell it not to.  We fix this by telling clang do disregard that option,
+# unconditionally (which means that it still defaults to C for .c files).
+set(ENV{CCC_OVERRIDE_OPTIONS} "x/TC x/TP")
+set(INCREMENTAL " ")
+if (MSVC)
+	set(CMAKE_EXE_LINKER_FLAGS "/DEBUG /INCREMENTAL:NO ${CMAKE_EXE_LINKER_FLAGS}")
+	set(INCREMENTAL "/INCREMENTAL:NO")
+endif ()
+
 # List of single-file tests.
 set(TESTS
 	alias.m
@@ -14,10 +24,8 @@ set(TESTS
 	BlockImpTest.m
 	BlockTest_arc.m
 	ConstantString.m
-	BoxedForeignException.m
 	Category.m
 	ExceptionTest.m
-	ForeignException.m
 	Forward.m
 	ManyManySelectors.m
 	NestedExceptions.m
@@ -43,24 +51,33 @@ set(TESTS
 	setSuperclass.m
 )
 
+if (WIN32)
+else ()
+	list(APPEND TESTS
+	BoxedForeignException.m
+	ForeignException.m
+	)
+endif ()
+
 # List of single-file tests that won't work with the legacy ABI and so
 # shouldn't be run in legacy mode.
 set(NEW_TESTS
 	category_properties.m
 )
 
+remove_definitions(-D__OBJC_RUNTIME_INTERNAL__=1)
 
 add_library(test_runtime_legacy OBJECT Test.m)
 set_target_properties(test_runtime_legacy PROPERTIES
 	INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}"
-	COMPILE_FLAGS "-fblocks -fobjc-runtime=gnustep-1.7"
+	COMPILE_FLAGS "-Xclang -fblocks -fobjc-runtime=gnustep-1.7"
 	LINKER_LANGUAGE C
 )
 
 add_library(test_runtime OBJECT Test.m)
 set_target_properties(test_runtime PROPERTIES
 	INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}"
-	COMPILE_FLAGS "-fblocks -fobjc-runtime=gnustep-2.0"
+	COMPILE_FLAGS "-Xclang -fblocks -fobjc-runtime=gnustep-2.0"
 	LINKER_LANGUAGE C
 )
 
@@ -71,14 +88,14 @@ function(addtest_flags TEST_NAME FLAGS TEST_SOURCE)
 	if (${TEST_NAME} MATCHES ".*_arc")
 		# Only compile the main file with ARC
 		set_source_files_properties(${TEST_SOURCE}
-			COMPILE_FLAGS "-fobjc-arc")
+			COMPILE_FLAGS "-Xclang -fobjc-arc")
 	endif()
 	add_executable(${TEST_NAME} ${TEST_SOURCE})
 	add_test(${TEST_NAME} ${TEST_NAME})
 	set(ARC "")
 	set_target_properties(${TEST_NAME} PROPERTIES
 		INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}"
-		COMPILE_FLAGS "-fblocks ${FLAGS}"
+		COMPILE_FLAGS "-Xclang -fblocks ${FLAGS}"
 		LINKER_LANGUAGE C
 	)
 	set_property(TEST ${TEST_NAME} PROPERTY
@@ -114,5 +131,5 @@ endforeach()
 addtest_variants("CXXExceptions" "CXXException.m;CXXException.cc" true)
 addtest_variants("ForwardDeclareProtocolAccess" "ForwardDeclareProtocolAccess.m;ForwardDeclareProtocol.m" true)
 if (ENABLE_OBJCXX)
-addtest_variants(ObjCXXEHInterop "ObjCXXEHInterop.mm;ObjCXXEHInterop.m" true)
+	addtest_variants(ObjCXXEHInterop "ObjCXXEHInterop.mm;ObjCXXEHInterop.m" true)
 endif()

Test/ManyManySelectors.m

@@ -4,8 +4,6 @@
 #include <string.h>
 
 #include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 
 
 static BOOL methodCalled = NO;

Test/NestedExceptions.m

@@ -26,6 +26,7 @@ int main(void)
 		assert(x == e1);
 		@try {
 			a = e2;
+			@throw a;
 		}
 		@catch (id y)
 		{

Test/PropertyAttributeTest.m

@@ -39,7 +39,7 @@ int main()
 	assert(strcmp(property_getAttributes(property), "Ti,VvarName") == 0);
 	free(properties);
 
-	objc_property_t *clsproperties = class_copyPropertyList(object_getClass([helloclass class]), &outCount);
+	properties = class_copyPropertyList(object_getClass([helloclass class]), &outCount);
 	assert(outCount == 1);
 	property = properties[0];
 	assert(strcmp(property_getName(property), "clsProp") == 0);

Test/RuntimeTest.m

@@ -1,7 +1,11 @@
 #include "Test.h"
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#ifdef _WIN32
+#	define sleep Sleep
+#else
+#	include <unistd.h>
+#endif
 
 static int exitStatus = 0;
 
@@ -125,10 +129,11 @@ - (BOOL) basicThrowAndCatchException
 	@catch (id e)
 	{
 		test(e == exceptionObj);
+		return YES;
 	}
-	@finally
+	@catch(...)
 	{
-		return YES;
+		return NO;
 	}
 	return NO;
 }

Test/objc_msgSend.m

@@ -10,7 +10,6 @@
 
 //#define assert(x) if (!(x)) { printf("Failed %d\n", __LINE__); }
 
-id objc_msgSend(id, SEL, ...);
 
 typedef struct { int a,b,c,d,e; } s;
 @interface Fake
@@ -81,13 +80,14 @@ - (s)sret
 + (void)printf: (const char*)str, ...
 {
 	va_list ap;
-	char *s;
+	char s[100];
 
 	va_start(ap, str);
 
-	vasprintf(&s, str, ap);
+	vsnprintf(&s, 100, str, ap);
 	va_end(ap);
-	//fprintf(stderr, "String: '%s'\n", s);
+	fprintf(stderr, "String: '%s'\n", s);
+	vfprintf(stderr, s, ap);
 	assert(strcmp(s, "Format string 42 42.000000\n") ==0);
 }
 + (void)initialize
@@ -174,6 +174,7 @@ IMP forward(id o, SEL s)
 }
 
 
+
 int main(void)
 {
 	__objc_msg_forward2 = forward;