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

file to worry about

diff --git a/GNUmakefile b/GNUmakefile
index 8478e646c2125717aa86cb6a839abffb2cf42866..e5a6d5dee87264d25624bfb87157ba5f29651eb7 100644 (file)
--- a/GNUmakefile
+++ b/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 \

diff --git a/vm/entry_points.hpp b/vm/entry_points.hpp
deleted file mode 100644 (file)
index 1529878..0000000
--- a/vm/entry_points.hpp
+++ /dev/null
@@ -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);
-
-}

diff --git a/vm/master.hpp b/vm/master.hpp
index dcfc4ff5795feb361fdbc616f7916785b505db15..a657093fdf43d2ed9a0e071a15001ecf04ccb3d4 100644 (file)
--- a/vm/master.hpp
+++ b/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"

diff --git a/vm/vm.hpp b/vm/vm.hpp
index b5a5a21873b02fc2ebefe748de04d0f9439c58d3..06fafa0cfc96125f0a1862d83a873cc2d1752edd 100644 (file)
--- a/vm/vm.hpp
+++ b/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;