X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_barrier.c;h=a94e40f157eb5d82c2b370886ce2022eb2d73d85;hb=774bac9fbb03ef8bf7c2ca2c79a8b87c9bc4c526;hp=ba88e2b69437cc7f860f2b11de8dcd1eca0c15cf;hpb=9feccf93cd8327d1d30a404a92f19716bf5a1e96;p=palacios.git

diff --git a/palacios/src/palacios/vmm_barrier.c b/palacios/src/palacios/vmm_barrier.c
index ba88e2b..a94e40f 100644
--- a/palacios/src/palacios/vmm_barrier.c
+++ b/palacios/src/palacios/vmm_barrier.c
@@ -198,9 +198,12 @@ int v3_wait_at_barrier(struct guest_info * core) {
     if (barrier->active == 0) {
 	return 0;
     }
-
-#ifdef V3_CONFIG_LAZY_FP_SWITCH
+#ifndef V3_CONFIG_FP_SWITCH
+    v3_get_fp_state(core); // snapshot FP state now
+#else
+#   ifdef V3_CONFIG_LAZY_FP_SWITCH
     v3_get_fp_state(core); // snapshot FP state now regardless of lazy eval
+#   endif
 #endif
 
     V3_Print(core->vm_info, core, "Core %d waiting at barrier\n", core->vcpu_id);
@@ -219,9 +222,13 @@ int v3_wait_at_barrier(struct guest_info * core) {
         // Barrier wait will spin if there is no competing work
 	v3_yield(core,-1);
     }
-    
-#ifdef V3_LAZY_FP_SWITCH
+
+#ifndef V3_CONFIG_FP_SWITCH    
+    core->fp_state.need_restore=1;  // restore FP on next entry
+#else
+#   ifdef V3_CONFIG_LAZY_FP_SWITCH
     core->fp_state.need_restore=1;  // restore FP on next entry
+#   endif
 #endif
 
     return 0;