Moved oop.[ch]pp to memory/header.[ch]pp.

brixen · brixen · commit 87128dbb45ac · 2016-07-25T21:49:07.000-07:00
First, OOP is obscure to newcomers wouldn't have any basis to know what an
object-oriented pointer (really a "tagged pointer") is. Second, with the
addition of non-OO managed memory objects, the name is no longer accurate.
MemoryHeader is both descriptive and accurate.
diff --git a/machine/builtin/object.hpp b/machine/builtin/object.hpp
@@ -4,9 +4,10 @@
 #include <vector>
 
 #include "defines.hpp"
+#include "memory/header.hpp"
+
 #include "vm.hpp"
 #include "state.hpp"
-#include "oop.hpp"
 #include "type_info.hpp"
 #include "executor.hpp"
 
diff --git a/machine/builtin/string.hpp b/machine/builtin/string.hpp
@@ -9,7 +9,7 @@
 #include "configuration.hpp"
 #include "object_utils.hpp"
 #include "memory.hpp"
-#include "oop.hpp"
+#include "memory/header.hpp"
 
 #include <ctype.h> // For isdigit and friends
 #include <errno.h> // For ERANGE
diff --git a/machine/defines.hpp b/machine/defines.hpp
@@ -4,16 +4,15 @@
 /**
  *  @file   defines.hpp
  *
- *  Notably here, Symbols, Fixnums and true/false/nil are actually
- *  stored directly in the pointer value (and distinguished by the
- *  tag, see oop.hpp) but provided we do not attempt to dereference
- *  it, we can ALSO define a class and treat the pointer values as
- *  if they were real pointers to real objects of that class where
- *  typing is concerned. In the "instance methods", the this pointer
- *  is still the correct pointer value and can thus be used for the
- *  calculations needed.
+ *  Notably here, Symbols, Fixnums and true/false/nil are actually stored
+ *  directly in the pointer value (and distinguished by the tag, see
+ *  memory/header.hpp) but provided we do not attempt to dereference it, we
+ *  can ALSO define a class and treat the pointer values as if they were real
+ *  pointers to real objects of that class where typing is concerned. In the
+ *  "instance methods", the this pointer is still the correct pointer value
+ *  and can thus be used for the calculations needed.
  *
- *  @see   oop.hpp
+ *  @see   memory/header.hpp
  */
 
 #include <stdint.h>
diff --git a/machine/drivers/cli.cpp b/machine/drivers/cli.cpp
@@ -6,10 +6,11 @@
 #include <llvm/Support/ManagedStatic.h>
 
 #include "environment.hpp"
-#include "oop.hpp"
 #include "type_info.hpp"
 #include "exception.hpp"
 
+#include "memory/header.hpp"
+
 #include "config.h"
 #include "paths.h"
 
diff --git a/machine/global_cache.hpp b/machine/global_cache.hpp
@@ -1,7 +1,8 @@
 #ifndef RBX_VM_GLOBAL_CACHE_HPP
 #define RBX_VM_GLOBAL_CACHE_HPP
 
-#include "oop.hpp"
+#include "memory/header.hpp"
+
 #include "object_utils.hpp"
 #include "builtin/compiled_code.hpp"
 #include "builtin/symbol.hpp"
diff --git a/machine/include/capi/capi_oop.h b/machine/include/capi/capi_oop.h
@@ -41,7 +41,7 @@
  * value. Passing Fixnums through means that all the Fixnum conversions
  * do not have to be reimplemented for the C-API.
  *
- * The tags break down as follows (@see machine/oop.hpp for more details):
+ * The tags break down as follows (@see machine/memory/header.hpp for more details):
  *
  *   00 0 0000   Qfalse
  *   xx x xxx1   Fixnum
diff --git a/machine/memory.hpp b/machine/memory.hpp
@@ -2,9 +2,10 @@
 #define RBX_OBJECTMEMORY_H
 
 #include "defines.hpp"
+#include "memory/header.hpp"
+
 #include "type_info.hpp"
 #include "object_position.hpp"
-#include "oop.hpp"
 #include "metrics.hpp"
 #include "configuration.hpp"
 
diff --git a/machine/memory/gc.hpp b/machine/memory/gc.hpp
@@ -3,7 +3,8 @@
 
 #include <list>
 
-#include "oop.hpp"
+#include "memory/header.hpp"
+
 #include "shared_state.hpp"
 
 #include "builtin/object.hpp"
diff --git a/machine/memory/header.cpp b/machine/memory/header.cpp
@@ -1,10 +1,11 @@
 #include "util/atomic.hpp"
 
+#include "memory/header.hpp"
+
 #include "bug.hpp"
 #include "configuration.hpp"
 #include "memory.hpp"
 #include "on_stack.hpp"
-#include "oop.hpp"
 #include "thread_phase.hpp"
 
 #include "builtin/object.hpp"
diff --git a/machine/memory/header.hpp b/machine/memory/header.hpp
diff --git a/machine/memory/inflated_headers.cpp b/machine/memory/inflated_headers.cpp
@@ -1,4 +1,5 @@
-#include "oop.hpp"
+#include "memory/header.hpp"
+
 #include "vm.hpp"
 #include "state.hpp"
 #include "memory.hpp"
diff --git a/machine/memory/root.hpp b/machine/memory/root.hpp
@@ -4,8 +4,9 @@
 
 #include <stdexcept>
 
+#include "memory/header.hpp"
+
 #include "linkedlist.hpp"
-#include "oop.hpp"
 #include "defines.hpp"
 
 #include "util/thread.hpp"
diff --git a/machine/symbol_table.hpp b/machine/symbol_table.hpp
@@ -1,7 +1,8 @@
 #ifndef RBX_SYMBOLTABLE_HPP
 #define RBX_SYMBOLTABLE_HPP
 
-#include "oop.hpp"
+#include "memory/header.hpp"
+
 #include "defines.hpp"
 #include "diagnostics.hpp"
 
diff --git a/machine/test/test_memory_header.hpp b/machine/test/test_memory_header.hpp
@@ -1,6 +1,6 @@
 #include "machine/test/test.hpp"
 
-#include "oop.hpp"
+#include "memory/header.hpp"
 
 #include <cxxtest/TestSuite.h>
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`* value. Passing Fixnums through means that all the Fixnum conversions`
`42`	`42`	`* do not have to be reimplemented for the C-API.`
`43`	`43`	`*`
`44`		`- * The tags break down as follows (@see machine/oop.hpp for more details):`
	`44`	`+ * The tags break down as follows (@see machine/memory/header.hpp for more details):`
`45`	`45`	`*`
`46`	`46`	`* 00 0 0000 Qfalse`
`47`	`47`	`* xx x xxx1 Fixnum`