From 0497ade10bcc82822f9f6e511bcd4d459a79ff91 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@shill.local>
Date: Fri, 2 Oct 2009 09:37:04 -0500
Subject: [PATCH] vm: add assertions to tls_vm()

---
 vm/mach_signal.cpp   | 12 ++++++------
 vm/os-unix.cpp       |  4 +++-
 vm/os-windows-nt.cpp |  4 +++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/vm/mach_signal.cpp b/vm/mach_signal.cpp
index 261f0fb654..7793caa3be 100644
--- a/vm/mach_signal.cpp
+++ b/vm/mach_signal.cpp
@@ -29,8 +29,8 @@ http://www.wodeveloper.com/omniLists/macosx-dev/2000/June/msg00137.html */
 executing, the call frame of the current C primitive (if any) is rewound, and
 the appropriate Factor error is thrown from the top-most Factor frame. */
 void factor_vm::call_fault_handler(
-    exception_type_t exception,
-    exception_data_type_t code,
+	exception_type_t exception,
+	exception_data_type_t code,
 	MACH_EXC_STATE_TYPE *exc_state,
 	MACH_THREAD_STATE_TYPE *thread_state,
         MACH_FLOAT_STATE_TYPE *float_state)
@@ -69,10 +69,10 @@ void factor_vm::call_fault_handler(
 }
 
 static void call_fault_handler(exception_type_t exception,
-							   exception_data_type_t code,
-							   MACH_EXC_STATE_TYPE *exc_state,
-							   MACH_THREAD_STATE_TYPE *thread_state,
-							   MACH_FLOAT_STATE_TYPE *float_state)
+	exception_data_type_t code,
+	MACH_EXC_STATE_TYPE *exc_state,
+	MACH_THREAD_STATE_TYPE *thread_state,
+	MACH_FLOAT_STATE_TYPE *float_state)
 {
 	SIGNAL_VM_PTR()->call_fault_handler(exception,code,exc_state,thread_state,float_state);
 }
diff --git a/vm/os-unix.cpp b/vm/os-unix.cpp
index a19af0da07..d17dedf299 100644
--- a/vm/os-unix.cpp
+++ b/vm/os-unix.cpp
@@ -33,7 +33,9 @@ void register_vm_with_thread(factor_vm *vm)
 
 factor_vm *tls_vm()
 {
-	return (factor_vm*)pthread_getspecific(tlsKey);
+	factor_vm *vm = (factor_vm*)pthread_getspecific(tlsKey);
+	assert(vm != NULL);
+	return vm;
 }
 
 static void *null_dll;
diff --git a/vm/os-windows-nt.cpp b/vm/os-windows-nt.cpp
index 2ac619dabc..f3db47d32c 100755
--- a/vm/os-windows-nt.cpp
+++ b/vm/os-windows-nt.cpp
@@ -23,7 +23,9 @@ void register_vm_with_thread(factor_vm *vm)
 
 factor_vm *tls_vm()
 {
-	return (factor_vm*)TlsGetValue(dwTlsIndex);
+	factor_vm *vm = (factor_vm*)TlsGetValue(dwTlsIndex);
+	assert(vm != NULL);
+	return vm;
 }
 
 s64 current_micros()