VM: lets merge entry_points.hpp with vm.hpp, so you have one less header

file to worry about

GNUmakefile

@@ -104,7 +104,6 @@ ifdef CONFIG
 		vm/image.hpp \
 		vm/callbacks.hpp \
 		vm/dispatch.hpp \
-		vm/entry_points.hpp \
 		vm/safepoints.hpp \
 		vm/vm.hpp \
 		vm/allot.hpp \

vm/entry_points.hpp

@@ -1,8 +0,0 @@
-namespace factor {
-
-typedef void (*c_to_factor_func_type)(cell quot);
-typedef void (*unwind_native_frames_func_type)(cell quot, cell to);
-typedef cell (*get_fpu_state_func_type)();
-typedef void (*set_fpu_state_func_type)(cell state);
-
-}

vm/master.hpp

@@ -122,7 +122,6 @@ namespace factor { struct factor_vm; }
 #include "image.hpp"
 #include "callbacks.hpp"
 #include "dispatch.hpp"
-#include "entry_points.hpp"
 #include "safepoints.hpp"
 #include "vm.hpp"
 #include "allot.hpp"

vm/vm.hpp

@@ -2,6 +2,11 @@ using namespace std;
 
 namespace factor {
 
+typedef void (*c_to_factor_func_type)(cell quot);
+typedef void (*unwind_native_frames_func_type)(cell quot, cell to);
+typedef cell (*get_fpu_state_func_type)();
+typedef void (*set_fpu_state_func_type)(cell state);
+
 struct growable_array;
 struct code_root;