moved global state from debug into vm

diff --git a/vm/debug.cpp b/vm/debug.cpp
index 870c817a2b91741150443e41b2b2928dee9885e1..5d033fd90e36b0095fbac9ad3b3b1fdae6057328 100755 (executable)
--- a/vm/debug.cpp
+++ b/vm/debug.cpp
@@ -3,8 +3,6 @@
 namespace factor
 {
 
-static bool fep_disabled;
-static bool full_output;
 
 void factorvm::print_chars(string* str)
 {
@@ -346,8 +344,6 @@ void dump_objects(cell type)
        return vm->dump_objects(type);
 }
 
-cell look_for;
-cell obj;
 
 void factorvm::find_data_references_step(cell *scan)
 {

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 8eda721992cb0d27c2bc6179b8bbfa0a55d0b4ed..4ad83b86beefc24dd197c28aeb50c62d608924fc 100644 (file)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -252,6 +252,10 @@ struct factorvm {
        template <typename TYPE> TYPE *reallot_array(TYPE *array_, cell capacity);
 
        //debug
+       bool fep_disabled;
+       bool full_output;
+       cell look_for;
+       cell obj;
        void print_chars(string* str);
        void print_word(word* word, cell nesting);
        void print_factor_string(string* str);
@@ -1073,7 +1077,6 @@ inline cell tag_boolean(cell untagged)
        return vm->tag_boolean(untagged);
 }
 
-
 // next method here: