Index: configure
===================================================================
--- configure	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ configure	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -6184,5 +6184,5 @@
 
 
-ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/examples/Makefile src/tests/Makefile src/prelude/Makefile src/libcfa/Makefile"
+ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/benchmark/Makefile src/examples/Makefile src/tests/Makefile src/prelude/Makefile src/libcfa/Makefile"
 
 
@@ -6945,4 +6945,5 @@
     "src/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/driver/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/benchmark/Makefile") CONFIG_FILES="$CONFIG_FILES src/benchmark/Makefile" ;;
     "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
     "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
Index: configure.ac
===================================================================
--- configure.ac	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ configure.ac	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -190,4 +190,5 @@
 	src/driver/Makefile
 	src/Makefile
+	src/benchmark/Makefile
 	src/examples/Makefile
 	src/tests/Makefile
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/ResolvExpr/Resolver.cc	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -449,4 +449,5 @@
 			TypeSubstitution sub = makeGenericSubstitutuion( sit );
 			StructDecl * st = sit->get_baseStruct();
+			if(st->get_members().empty()) return;
 			// want to resolve each initializer to the members of the struct,
 			// but if there are more initializers than members we should stop
@@ -458,4 +459,5 @@
 			TypeSubstitution sub = makeGenericSubstitutuion( uit );
 			UnionDecl * un = uit->get_baseUnion();
+			if(un->get_members().empty()) return;
 			// only resolve to the first member of a union
 			resolveSingleAggrInit( *un->get_members().begin(), init, initEnd, sub );
Index: src/benchmark/CorCtxSwitch.c
===================================================================
--- src/benchmark/CorCtxSwitch.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
+++ src/benchmark/CorCtxSwitch.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -0,0 +1,67 @@
+#include <fstream>
+#include <stdlib>
+#include <threads>
+
+#include <unistd.h>					// sysconf
+#include <sys/times.h>					// times
+#include <time.h>
+
+inline unsigned long long int Time() {
+    timespec ts;
+    clock_gettime(
+#if defined( __linux__ )
+	 CLOCK_THREAD_CPUTIME_ID,
+#elif defined( __freebsd__ )
+	 CLOCK_PROF,
+#elif defined( __solaris__ )
+	 CLOCK_HIGHRES,
+#else
+    #error uC++ : internal error, unsupported architecture
+#endif
+	 &ts );
+    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
+} // Time
+
+struct GreatSuspender {
+	coroutine c;
+};
+
+DECL_COROUTINE(GreatSuspender);
+
+void ?{}( GreatSuspender * this ) {
+	prime(this);
+}
+
+void main( GreatSuspender * this )
+{
+	while( true ) {
+		suspend();
+	}
+}
+
+void resumer( GreatSuspender * this, const unsigned int NoOfTimes ) {
+	for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+		resume( this );
+	}
+}
+
+#ifndef N
+#define N 100000000
+#endif
+
+int main() {
+	const unsigned int NoOfTimes = N;
+	long long int StartTime, EndTime;
+
+	GreatSuspender s;
+
+	StartTime = Time();
+	// for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+	// 	resume( this_coroutine() );
+	// 	// resume( &s );	
+	// }
+	resumer( &s, NoOfTimes );
+	EndTime = Time();
+
+	sout | ( EndTime - StartTime ) / NoOfTimes | endl;
+}
Index: src/benchmark/Makefile.am
===================================================================
--- src/benchmark/Makefile.am	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
+++ src/benchmark/Makefile.am	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -0,0 +1,45 @@
+######################## -*- Mode: Makefile-Automake -*- ######################
+##
+## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+##
+## The contents of this file are covered under the licence agreement in the
+## file "LICENCE" distributed with Cforall.
+##
+## Makefile.am --
+##
+## Author           : Peter A. Buhr
+## Created On       : Sun May 31 09:08:15 2015
+## Last Modified By : Peter A. Buhr
+## Last Modified On : Mon Jan 25 22:31:42 2016
+## Update Count     : 25
+###############################################################################
+
+# applies to both programs
+CFLAGS =
+AM_CFLAGS = -g -Wall -Wno-unused-function -O2
+CC = @CFA_BINDIR@/cfa
+
+noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread
+
+bench :
+	@for ccflags in "-debug" "-nodebug"; do \
+		echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
+		${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
+		./a.out ; \
+	done ; \
+	rm -f ./a.out ;
+
+ctxswitch-coroutine:
+	${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 CorCtxSwitch.c
+	@for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+	@rm -f ./a.out
+
+ctxswitch-thread:
+	${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
+	@for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+	@rm -f ./a.out
+
Index: src/benchmark/Makefile.in
===================================================================
--- src/benchmark/Makefile.in	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
+++ src/benchmark/Makefile.in	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -0,0 +1,495 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+######################## -*- Mode: Makefile-Automake -*- ######################
+###############################################################################
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = bench$(EXEEXT) ctxswitch-coroutine$(EXEEXT) \
+	ctxswitch-thread$(EXEEXT)
+subdir = src/benchmark
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+bench_SOURCES = bench.c
+bench_OBJECTS = bench.$(OBJEXT)
+bench_LDADD = $(LDADD)
+ctxswitch_coroutine_SOURCES = ctxswitch-coroutine.c
+ctxswitch_coroutine_OBJECTS = ctxswitch-coroutine.$(OBJEXT)
+ctxswitch_coroutine_LDADD = $(LDADD)
+ctxswitch_thread_SOURCES = ctxswitch-thread.c
+ctxswitch_thread_OBJECTS = ctxswitch-thread.$(OBJEXT)
+ctxswitch_thread_LDADD = $(LDADD)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
+DIST_SOURCES = bench.c ctxswitch-coroutine.c ctxswitch-thread.c
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKEND_CC = @BACKEND_CC@
+CC = @CFA_BINDIR@/cfa
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFA_BACKEND_CC = @CFA_BACKEND_CC@
+CFA_BINDIR = @CFA_BINDIR@
+CFA_FLAGS = @CFA_FLAGS@
+CFA_INCDIR = @CFA_INCDIR@
+CFA_LIBDIR = @CFA_LIBDIR@
+CFA_PREFIX = @CFA_PREFIX@
+
+# applies to both programs
+CFLAGS = 
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MACHINE_TYPE = @MACHINE_TYPE@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = -g -Wall -Wno-unused-function -O2
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/benchmark/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/benchmark/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bench.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-coroutine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctxswitch-thread.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstPROGRAMS ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am
+
+
+bench :
+	@for ccflags in "-debug" "-nodebug"; do \
+		echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
+		${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
+		./a.out ; \
+	done ; \
+	rm -f ./a.out ;
+
+ctxswitch-coroutine:
+	${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 CorCtxSwitch.c
+	@for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+	@rm -f ./a.out
+
+ctxswitch-thread:
+	${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
+	@for number in 1 2 3 4 5 6 7 8 9 10; do \
+                ./a.out ; \
+        done
+	@rm -f ./a.out
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Index: src/benchmark/ThrdCtxSwitch.c
===================================================================
--- src/benchmark/ThrdCtxSwitch.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
+++ src/benchmark/ThrdCtxSwitch.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -0,0 +1,40 @@
+#include <fstream>
+#include <stdlib>
+#include <threads>
+
+#include <unistd.h>					// sysconf
+#include <sys/times.h>					// times
+#include <time.h>
+
+inline unsigned long long int Time() {
+    timespec ts;
+    clock_gettime(
+#if defined( __linux__ )
+	 CLOCK_THREAD_CPUTIME_ID,
+#elif defined( __freebsd__ )
+	 CLOCK_PROF,
+#elif defined( __solaris__ )
+	 CLOCK_HIGHRES,
+#else
+    #error uC++ : internal error, unsupported architecture
+#endif
+	 &ts );
+    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
+} // Time
+ 
+#ifndef N
+#define N 100000000
+#endif
+
+int main() {
+	const unsigned int NoOfTimes = N;
+	long long int StartTime, EndTime;
+
+	StartTime = Time();
+	for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
+		yield();
+	}
+	EndTime = Time();
+
+	sout | ( EndTime - StartTime ) / NoOfTimes | endl;
+}
Index: src/benchmark/bench.c
===================================================================
--- src/benchmark/bench.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
+++ src/benchmark/bench.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -0,0 +1,246 @@
+
+#include <fstream>
+#include <stdlib>
+#include <threads>
+
+#include <unistd.h>					// sysconf
+#include <sys/times.h>					// times
+#include <time.h>
+
+inline unsigned long long int Time() {
+    timespec ts;
+    clock_gettime(
+#if defined( __linux__ )
+	 CLOCK_THREAD_CPUTIME_ID,
+#elif defined( __freebsd__ )
+	 CLOCK_PROF,
+#elif defined( __solaris__ )
+	 CLOCK_HIGHRES,
+#else
+    #error uC++ : internal error, unsupported architecture
+#endif
+	 &ts );
+    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
+} // Time
+
+//=======================================
+// time struct
+//=======================================
+
+// prevent dead-code removal
+struct StructDummy {
+	volatile int i;
+};
+
+void ?{}(StructDummy * this) __attribute__(( noinline )) {
+	this->i = 2;
+}
+
+int get_i(StructDummy * this) {
+	return this->i;
+}
+
+forall( dtype T | { int get_i(T*); } )
+int bidirectional( StructDummy * this ) __attribute__(( noinline )) {
+	return get_i( this );
+}
+
+void BlockStructCreateDelete( int N ) {
+    long long int StartTime, EndTime;
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	StructDummy dummy;
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+void DynamicStructCreateDelete( int N ) {
+    long long int StartTime, EndTime;
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	StructDummy *dummy = new();
+	delete(dummy);
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+void StructBidirectional( int N ) {
+    long long int StartTime, EndTime;
+    StructDummy dummy;
+    volatile int rv __attribute__(( unused ));
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	rv = bidirectional( &dummy ); 
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+//=======================================
+// time coroutine
+//=======================================
+
+struct CoroutineDummy { coroutine c; };
+DECL_COROUTINE(CoroutineDummy);
+void main(CoroutineDummy * this) {}
+
+void ?{}(CoroutineDummy * this) {
+	prime(this);
+}
+
+void BlockCoroutineCreateDelete( int N ) {
+    long long int StartTime, EndTime;
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	CoroutineDummy dummy;
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+void DynamicCoroutineCreateDelete( int N ) {
+    long long int StartTime, EndTime;
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	CoroutineDummy * dummy = new();
+	delete(dummy);
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+struct CoroutineResume {
+    int N;
+    coroutine c;
+};
+
+DECL_COROUTINE(CoroutineResume);
+
+void ?{}(CoroutineResume* this, int N) {
+      this->N = N;
+	prime(this);
+}
+
+void main(CoroutineResume* this) {
+	for ( int i = 1; i <= this->N; i += 1 ) {
+		suspend();
+	}
+}
+
+void resumer(CoroutineResume* this) {
+	long long int StartTime, EndTime;
+
+	StartTime = Time();
+	for ( int i = 1; i <= this->N; i += 1 ) {
+		resume(this);
+	}
+	EndTime = Time();
+	sout | "\t " | ( EndTime - StartTime ) / this->N;
+}
+
+//=======================================
+// time task
+//=======================================
+
+struct ThreadDummy { thread t; };
+DECL_THREAD(ThreadDummy);
+void main(ThreadDummy * this) {}
+
+void BlockTaskCreateDelete( int N ) {
+    long long int StartTime, EndTime;
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	scoped(ThreadDummy) dummy;
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+void DynamicTaskCreateDelete( int N ) {
+    long long int StartTime, EndTime;
+
+    StartTime = Time();
+    for ( int i = 0; i < N; i += 1 ) {
+	scoped(ThreadDummy) * dummy = new();
+	delete(dummy);
+    }
+    EndTime = Time();
+    sout | "\t " | ( EndTime - StartTime ) / N;
+}
+
+struct ContextSwitch {
+    int N;
+    long long result;
+    thread t;
+};
+
+DECL_THREAD(ContextSwitch);
+
+void main(ContextSwitch * this) {    
+	long long int StartTime, EndTime;
+
+	StartTime = Time();
+	for ( int i = 1; i <= this->N; i += 1 ) {
+	    yield();
+	} // for
+	EndTime = Time();
+	this->result = ( EndTime - StartTime ) / this->N;
+}
+
+void ?{}(ContextSwitch * this, int N) {
+	this->N = N;
+}
+
+void ^?{}(ContextSwitch * this) {
+	sout | "\t " | this->result;
+}
+
+//=======================================
+// benchmark driver
+//=======================================
+
+
+int main() {
+	const int NoOfTimes =
+#if defined( __U_DEBUG__ )				// takes longer so run fewer iterations
+	100000;
+#else
+	1000000;
+#endif // __U_DEBUG__
+
+	sout | "\t\tcreate\tcreate\tcall/" | endl;
+	sout | "(nsecs)";
+	sout | "\t\tdelete/\tdelete/\tctx" | endl;
+	sout | "\t\tblock\tdynamic\tcycle" | endl;
+
+	sout | "object\t";
+	BlockStructCreateDelete( NoOfTimes );
+	DynamicStructCreateDelete( NoOfTimes );
+	StructBidirectional( NoOfTimes );
+	sout | endl;
+
+	sout | "coroutine";
+	BlockCoroutineCreateDelete( NoOfTimes );
+	DynamicCoroutineCreateDelete( NoOfTimes );
+	{
+		CoroutineResume resumer = { NoOfTimes };
+		resumer(&resumer);
+	}
+	sout | endl;
+
+	sout | "task\t";
+	BlockTaskCreateDelete( NoOfTimes );
+	DynamicTaskCreateDelete( NoOfTimes );
+	{
+		scoped(ContextSwitch) dummy = { (int)NoOfTimes };		// context switch
+	}
+	sout | "\t" | endl;
+}
Index: c/examples/Bench.c
===================================================================
--- src/examples/Bench.c	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ 	(revision )
@@ -1,246 +1,0 @@
-
-#include <fstream>
-#include <stdlib>
-#include <threads>
-
-#include <unistd.h>					// sysconf
-#include <sys/times.h>					// times
-#include <time.h>
-
-inline unsigned long long int Time() {
-    timespec ts;
-    clock_gettime(
-#if defined( __linux__ )
-	 CLOCK_THREAD_CPUTIME_ID,
-#elif defined( __freebsd__ )
-	 CLOCK_PROF,
-#elif defined( __solaris__ )
-	 CLOCK_HIGHRES,
-#else
-    #error uC++ : internal error, unsupported architecture
-#endif
-	 &ts );
-    return 1000000000LL * ts.tv_sec + ts.tv_nsec;
-} // Time
-
-//=======================================
-// time struct
-//=======================================
-
-// prevent dead-code removal
-struct StructDummy {
-	volatile int i;
-};
-
-void ?{}(StructDummy * this) __attribute__(( noinline )) {
-	this->i = 2;
-}
-
-int get_i(StructDummy * this) {
-	return this->i;
-}
-
-forall( dtype T | { int get_i(T*); } )
-int bidirectional( StructDummy * this ) __attribute__(( noinline )) {
-	return get_i( this );
-}
-
-void BlockStructCreateDelete( int N ) {
-    long long int StartTime, EndTime;
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	StructDummy dummy;
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-void DynamicStructCreateDelete( int N ) {
-    long long int StartTime, EndTime;
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	StructDummy *dummy = new();
-	delete(dummy);
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-void StructBidirectional( int N ) {
-    long long int StartTime, EndTime;
-    StructDummy dummy;
-    volatile int rv __attribute__(( unused ));
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	rv = bidirectional( &dummy ); 
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-//=======================================
-// time coroutine
-//=======================================
-
-struct CoroutineDummy { coroutine c; };
-DECL_COROUTINE(CoroutineDummy)
-void main(CoroutineDummy * this) {}
-
-void ?{}(CoroutineDummy * this) {
-	prime(this);
-}
-
-void BlockCoroutineCreateDelete( int N ) {
-    long long int StartTime, EndTime;
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	CoroutineDummy dummy;
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-void DynamicCoroutineCreateDelete( int N ) {
-    long long int StartTime, EndTime;
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	CoroutineDummy * dummy = new();
-	delete(dummy);
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-struct CoroutineResume {
-    int N;
-    coroutine c;
-};
-
-DECL_COROUTINE(CoroutineResume)
-
-void ?{}(CoroutineResume* this, int N) {
-      this->N = N;
-	prime(this);
-}
-
-void main(CoroutineResume* this) {
-	for ( int i = 1; i <= this->N; i += 1 ) {
-		suspend();
-	}
-}
-
-void resumer(CoroutineResume* this) {
-	long long int StartTime, EndTime;
-
-	StartTime = Time();
-	for ( int i = 1; i <= this->N; i += 1 ) {
-		resume(this);
-	}
-	EndTime = Time();
-	sout | "\t " | ( EndTime - StartTime ) / this->N;
-}
-
-//=======================================
-// time task
-//=======================================
-
-struct ThreadDummy { thread t; };
-DECL_THREAD(ThreadDummy)
-void main(ThreadDummy * this) {}
-
-void BlockTaskCreateDelete( int N ) {
-    long long int StartTime, EndTime;
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	scoped(ThreadDummy) dummy;
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-void DynamicTaskCreateDelete( int N ) {
-    long long int StartTime, EndTime;
-
-    StartTime = Time();
-    for ( int i = 0; i < N; i += 1 ) {
-	scoped(ThreadDummy) * dummy = new();
-	delete(dummy);
-    }
-    EndTime = Time();
-    sout | "\t " | ( EndTime - StartTime ) / N;
-}
-
-struct ContextSwitch {
-    int N;
-    long long result;
-    thread t;
-};
-
-DECL_THREAD(ContextSwitch)
-
-void main(ContextSwitch * this) {    
-	long long int StartTime, EndTime;
-
-	StartTime = Time();
-	for ( int i = 1; i <= this->N; i += 1 ) {
-	    yield();
-	} // for
-	EndTime = Time();
-	this->result = ( EndTime - StartTime ) / this->N;
-}
-
-void ?{}(ContextSwitch * this, int N) {
-	this->N = N;
-}
-
-void ^?{}(ContextSwitch * this) {
-	sout | "\t " | this->result;
-}
-
-//=======================================
-// benchmark driver
-//=======================================
-
-
-int main() {
-	const int NoOfTimes =
-#if defined( __U_DEBUG__ )				// takes longer so run fewer iterations
-	100000;
-#else
-	1000000;
-#endif // __U_DEBUG__
-
-	sout | "\t\tcreate\tcreate\tcall/" | endl;
-	sout | "(nsecs)";
-	sout | "\t\tdelete/\tdelete/\tctx" | endl;
-	sout | "\t\tblock\tdynamic\tcycle" | endl;
-
-	sout | "object\t";
-	BlockStructCreateDelete( NoOfTimes );
-	DynamicStructCreateDelete( NoOfTimes );
-	StructBidirectional( NoOfTimes );
-	sout | endl;
-
-	sout | "coroutine";
-	BlockCoroutineCreateDelete( NoOfTimes );
-	DynamicCoroutineCreateDelete( NoOfTimes );
-	{
-		CoroutineResume resumer = { NoOfTimes };
-		resumer(&resumer);
-	}
-	sout | endl;
-
-	sout | "task\t";
-	BlockTaskCreateDelete( NoOfTimes );
-	DynamicTaskCreateDelete( NoOfTimes );
-	{
-		scoped(ContextSwitch) dummy = { (int)NoOfTimes };		// context switch
-	}
-	sout | "\t" | endl;
-}
Index: src/libcfa/concurrency/CtxSwitch-x86_64.S
===================================================================
--- src/libcfa/concurrency/CtxSwitch-x86_64.S	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/libcfa/concurrency/CtxSwitch-x86_64.S	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -49,4 +49,7 @@
 	// Save volatile registers on the stack.
 
+	subq   $8,%rsp
+	stmxcsr 0(%rsp)         // 4 bytes
+	fnstcw  4(%rsp)         // 2 bytes
 	pushq %r15
 	pushq %r14
@@ -72,4 +75,7 @@
 	popq %r14
 	popq %r15
+	fldcw   4(%rsp)
+	ldmxcsr 0(%rsp)
+	addq $8,%rsp
 
 	// Return to thread.
Index: src/libcfa/concurrency/coroutines
===================================================================
--- src/libcfa/concurrency/coroutines	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/libcfa/concurrency/coroutines	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -30,5 +30,5 @@
 };
 
-#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this);
+#define DECL_COROUTINE(X) static inline coroutine* get_coroutine(X* this) { return &this->c; } void main(X* this)
 
 //-----------------------------------------------------------------------------
@@ -110,4 +110,22 @@
 }
 
+static inline void resume(coroutine * dst) {
+	coroutine * src = this_coroutine();		// optimization
+
+      // not resuming self ?
+	if ( src != dst ) {
+		assertf( dst->notHalted ,
+			"Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
+			"Possible cause is terminated coroutine's main routine has already returned.",
+			src->name, src, dst->name, dst );
+
+            // set last resumer
+		dst->last = src;
+	} // if
+
+      // always done for performance testing
+	CoroutineCtxSwitch( src, dst );
+}
+
 #endif //COROUTINES_H
 
Index: src/libcfa/concurrency/invoke.c
===================================================================
--- src/libcfa/concurrency/invoke.c	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/libcfa/concurrency/invoke.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -109,5 +109,7 @@
       struct FakeStack {
             void *fixedRegisters[5];			// fixed registers rbx, r12, r13, r14, r15
-            void *rturn;					// where to go on return from uSwitch
+            uint32_t mxcr;			            // SSE Status and Control bits (control bits are preserved across function calls)
+            uint16_t fcw;			            // X97 FPU control word (preserved across function calls)
+            void *rturn;				      // where to go on return from uSwitch
             void *dummyReturn;				// NULL return address to provide proper alignment
       };
@@ -120,4 +122,6 @@
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[0] = this;
       ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fixedRegisters[1] = invoke;
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->mxcr = 0x1F80; //Vol. 2A 3-520
+      ((struct FakeStack *)(((struct machine_context_t *)stack->context)->SP))->fcw = 0x037F;  //Vol. 1 8-7 
 #else
       #error Only __i386__ and __x86_64__ is supported for threads in cfa
Index: src/libcfa/concurrency/kernel.c
===================================================================
--- src/libcfa/concurrency/kernel.c	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/libcfa/concurrency/kernel.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -43,5 +43,5 @@
 };
 
-DECL_COROUTINE(processorCtx_t)
+DECL_COROUTINE(processorCtx_t);
 
 #define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]
Index: src/libcfa/concurrency/threads
===================================================================
--- src/libcfa/concurrency/threads	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/libcfa/concurrency/threads	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -32,5 +32,5 @@
 };
 
-#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this);
+#define DECL_THREAD(X) thread* get_thread(X* this) { return &this->t; } void main(X* this)
 
 forall( dtype T | is_thread(T) )
Index: src/libcfa/containers/vector
===================================================================
--- src/libcfa/containers/vector	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/libcfa/containers/vector	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -118,9 +118,9 @@
 }
 
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline const T* cbegin(const vector(T, allocator_t)* this)
-{
-	return data(&this->storage);
-}
+// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
+// static inline const T* cbegin(const vector(T, allocator_t)* this)
+// {
+// 	return data(&this->storage);
+// }
 
 forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
@@ -130,9 +130,9 @@
 }
 
-forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
-static inline const T* cend(const vector(T, allocator_t)* this)
-{
-	return data(&this->storage) + this->size;
-}
+// forall(otype T, otype allocator_t | allocator_c(T, allocator_t))
+// static inline const T* cend(const vector(T, allocator_t)* this)
+// {
+// 	return data(&this->storage) + this->size;
+// }
 
 //------------------------------------------------------------------------------
Index: src/prelude/Makefile.am
===================================================================
--- src/prelude/Makefile.am	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/prelude/Makefile.am	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -29,12 +29,8 @@
 # create forward declarations for gcc builtins
 builtins.cf : builtins.c
-	${AM_V_GEN}if [ -e $< ] ; then \
-		@BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
-	fi
+	${AM_V_GEN}@BACKEND_CC@ -E -P $^ | sed -f prototypes.sed > $@
 
 builtins.c : builtins.def prototypes.awk
-	${AM_V_GEN}if [ -e $< ] ; then \
-		@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
-	fi
+	${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
 
 builtins.def :
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/prelude/Makefile.in	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -425,12 +425,8 @@
 # create forward declarations for gcc builtins
 builtins.cf : builtins.c
-	${AM_V_GEN}if [ -e $< ] ; then \
-		@BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
-	fi
+	${AM_V_GEN}@BACKEND_CC@ -E -P $^ | sed -f prototypes.sed > $@
 
 builtins.c : builtins.def prototypes.awk
-	${AM_V_GEN}if [ -e $< ] ; then \
-		@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
-	fi
+	${AM_V_GEN}@BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
 
 builtins.def :
Index: src/prelude/prototypes.sed
===================================================================
--- src/prelude/prototypes.sed	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
+++ src/prelude/prototypes.sed	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -0,0 +1,6 @@
+s/; /;\n/g  			#Make multi declaration lines into multiple lines
+/targetm/s/.*//
+/_Decimal/s/.*//
+s/void (const char \*)0();//	
+s/\"//g 			#Remove extraenous quotes in declarations
+s/\(__builtin_\) /\1/		#Remove extraenous spaces in declarations 
Index: src/tests/thread.c
===================================================================
--- src/tests/thread.c	(revision fa2de9578cda12bc9dfa0f3bc8f2c87a3754e630)
+++ src/tests/thread.c	(revision 7a560c17e09d86c2f09afb972b0b4d224a0be91c)
@@ -7,6 +7,6 @@
 struct Second { thread t; simple_lock* lock; };
 
-DECL_THREAD(First)
-DECL_THREAD(Second)
+DECL_THREAD(First);
+DECL_THREAD(Second);
 
 void ?{}( First * this, simple_lock* lock ) { this->lock = lock; }