Skip to content

Commit

Permalink
Renamed ObjectMemory to Memory.
Browse files Browse the repository at this point in the history
The Memory class will consolidate all aspects of managed memory in the
Rubinius machine, not just 'Object' memory. There is a counterpart of
Memory, as SystemMemory, to manage requesting memory from the underlying
system (most likely the OS).
  • Loading branch information
brixen committed Feb 7, 2016
1 parent 6bb4288 commit 8f4c978
Show file tree
Hide file tree
Showing 153 changed files with 269 additions and 269 deletions.
2 changes: 1 addition & 1 deletion vm/arguments.cpp
@@ -1,5 +1,5 @@
#include "arguments.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "state.hpp"
#include "vm.hpp"

Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/access_variable.cpp
@@ -1,6 +1,6 @@
#include "arguments.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/access_variable.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/alias.cpp
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/alias.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/array.cpp
Expand Up @@ -2,7 +2,7 @@
#include "configuration.hpp"
#include "dispatch.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/array.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/atomic.cpp
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/atomic.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/autoload.cpp
@@ -1,5 +1,5 @@
#include "helpers.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/autoload.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/basic_object.cpp
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/basic_object.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/bignum.cpp
@@ -1,6 +1,6 @@
#include "configuration.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/array.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/block_as_method.cpp
Expand Up @@ -2,7 +2,7 @@
#include "call_frame.hpp"
#include "configuration.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/block_as_method.hpp"
#include "builtin/block_environment.hpp"
Expand Down
6 changes: 3 additions & 3 deletions vm/builtin/block_environment.cpp
Expand Up @@ -4,7 +4,7 @@
#include "instruments/tooling.hpp"
#include "object_utils.hpp"
#include "on_stack.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/block_environment.hpp"
#include "builtin/class.hpp"
Expand Down Expand Up @@ -224,7 +224,7 @@ namespace rubinius {
/* The references in args are not visible to the GC and
* there's not a simple mechanism to manage that now.
*/
ObjectMemory::GCInhibit inhibitor(state);
Memory::GCInhibit inhibitor(state);

if(!(obj = obj->send(state, call_frame, G(sym_to_ary)))) {
return false;
Expand Down Expand Up @@ -284,7 +284,7 @@ namespace rubinius {
/* The references in args are not visible to the GC and
* there's not a simple mechanism to manage that now.
*/
ObjectMemory::GCInhibit inhibitor(state);
Memory::GCInhibit inhibitor(state);

kw_result = dispatch.send(state, call_frame, args);
}
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/byte_array.cpp
@@ -1,6 +1,6 @@
#include "alloc.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/byte_array.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/call_custom_cache.cpp
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/call_custom_cache.hpp"
#include "builtin/call_unit.hpp"
Expand Down
4 changes: 2 additions & 2 deletions vm/builtin/call_site.cpp
Expand Up @@ -3,7 +3,7 @@
#include "global_cache.hpp"
#include "lookup_data.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/class.hpp"
#include "builtin/call_custom_cache.hpp"
Expand Down Expand Up @@ -57,7 +57,7 @@ namespace rubinius {
/* The references in args are not visible to the GC and
* there's not a simple mechanism to manage that now.
*/
ObjectMemory::GCInhibit inhibitor(state);
Memory::GCInhibit inhibitor(state);

ret = G(rubinius)->send(state, call_frame, state->symbol("bind_call"), ary);
}
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/call_unit.cpp
@@ -1,7 +1,7 @@
#include "arguments.hpp"
#include "call_frame.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/call_unit.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/call_unit_adapter.cpp
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/call_unit_adapter.hpp"
#include "builtin/call_unit.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/channel.cpp
@@ -1,6 +1,6 @@
#include "object_utils.hpp"
#include "on_stack.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "thread_phase.hpp"

#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/character.cpp
Expand Up @@ -3,7 +3,7 @@
#include "transcoder.h"

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/byte_array.hpp"
#include "builtin/character.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/class.cpp
@@ -1,6 +1,6 @@
#include "configuration.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/array.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/class.hpp
Expand Up @@ -2,7 +2,7 @@
#define RBX_BUILTIN_CLASS_HPP

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/object.hpp"
#include "builtin/fixnum.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/code_db.cpp
@@ -1,6 +1,6 @@
#include "signature.h"

#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"
#include "ontology.hpp"
#include "marshal.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/compact_lookup_table.cpp
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/array.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/compiled_code.cpp
Expand Up @@ -4,7 +4,7 @@
#include "configuration.hpp"
#include "instruments/timing.hpp"
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "on_stack.hpp"

#include "builtin/call_site.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/compiled_code.hpp
Expand Up @@ -2,7 +2,7 @@
#define RBX_BUILTIN_COMPILEDCODE_HPP

#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/constant_scope.hpp"
#include "builtin/executable.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/constant_cache.cpp
@@ -1,5 +1,5 @@
#include "object_utils.hpp"
#include "object_memory.hpp"
#include "memory.hpp"

#include "builtin/constant_cache.hpp"
#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/constant_cache.hpp
Expand Up @@ -2,7 +2,7 @@
#define RBX_BUILTIN_CONSTANT_CACHE_HPP

#include "machine_code.hpp"
#include "object_memory.hpp"
#include "memory.hpp"
#include "object_utils.hpp"

#include "builtin/constant_scope.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/constant_scope.cpp
@@ -1,4 +1,4 @@
#include "object_memory.hpp"
#include "memory.hpp"
#include "call_frame.hpp"

#include "builtin/class.hpp"
Expand Down
2 changes: 1 addition & 1 deletion vm/builtin/constant_scope.hpp