moved global state from dispatch into vm

diff --git a/vm/dispatch.cpp b/vm/dispatch.cpp
index 1721efe181bd5bdbd03774e53eb2c1e2f31cc945..25f7a2f2ec579893d024a647554e09418631b89c 100755 (executable)
--- a/vm/dispatch.cpp
+++ b/vm/dispatch.cpp
@@ -3,9 +3,6 @@
 namespace factor
 {
 
-cell megamorphic_cache_hits;
-cell megamorphic_cache_misses;
-
 cell factorvm::search_lookup_alist(cell table, cell klass)
 {
        array *elements = untag<array>(table);

diff --git a/vm/dispatch.hpp b/vm/dispatch.hpp
index 75368191a775c5e1aac7721ac332860719dc3094..f5648c7ebeab000eac1b13d33d69f4aad7f6c984 100644 (file)
--- a/vm/dispatch.hpp
+++ b/vm/dispatch.hpp
@@ -1,9 +1,6 @@
 namespace factor
 {
 
-extern cell megamorphic_cache_hits;
-extern cell megamorphic_cache_misses;
-
 cell lookup_method(cell object, cell methods);
 PRIMITIVE(lookup_method);
 

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 4ad83b86beefc24dd197c28aeb50c62d608924fc..8a0808397dd08fb070c0d69ba737517a700de7b7 100644 (file)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -559,6 +559,8 @@ struct factorvm {
        inline void vmprim_quot_compiled_p();
 
        //dispatch
+       cell megamorphic_cache_hits;
+       cell megamorphic_cache_misses;
        cell search_lookup_alist(cell table, cell klass);
        cell search_lookup_hash(cell table, cell klass, cell hashcode);
        cell nth_superclass(tuple_layout *layout, fixnum echelon);