kernel/common/ar.rb kernel/common/argf.rb kernel/common/array.rb kernel/common/autoload.rb kernel/common/backtrace.rb kernel/common/bignum.rb kernel/common/binding.rb kernel/common/block_context.rb kernel/common/block_environment.rb kernel/common/breakpoint.rb kernel/common/bytearray.rb kernel/common/channel.rb kernel/common/class.rb kernel/common/comparable.rb kernel/common/compile.rb kernel/common/compiled_method.rb kernel/common/context.rb kernel/common/continuation.rb kernel/common/ctype.rb kernel/common/delegated_method.rb kernel/common/dir.rb kernel/common/dtrace.rb kernel/common/enumerable.rb kernel/common/env.rb kernel/common/errno.rb kernel/common/eval.rb kernel/common/exception.rb kernel/common/executable.rb kernel/common/file.rb kernel/common/filetest.rb kernel/common/fixnum.rb kernel/common/float.rb kernel/common/gem_prelude.rb kernel/common/global.rb kernel/common/hash.rb kernel/common/immediate.rb kernel/common/integer.rb kernel/common/io.rb kernel/common/iseq.rb kernel/common/kernel.rb kernel/common/list.rb kernel/common/lookuptable.rb kernel/common/marshal.rb kernel/common/math.rb kernel/common/method.rb kernel/common/method_context.rb kernel/common/method_table.rb kernel/common/misc.rb kernel/common/module.rb kernel/common/moment.rb kernel/common/numeric.rb kernel/common/object.rb kernel/common/objectspace.rb kernel/common/precision.rb kernel/common/proc.rb kernel/common/process.rb kernel/common/range.rb kernel/common/regexp.rb kernel/common/rubinius.rb kernel/common/sampler.rb kernel/common/selector.rb kernel/common/signal.rb kernel/common/sprintf.rb kernel/common/string.rb kernel/common/struct.rb kernel/common/symbol.rb kernel/common/thread.rb kernel/common/thread_group.rb kernel/common/throw_catch.rb kernel/common/time.rb kernel/common/tuple.rb kernel/common/vm.rb kernel/delta/ar.rb kernel/delta/array.rb kernel/delta/class.rb kernel/delta/file.rb kernel/delta/filetest.rb kernel/delta/io.rb kernel/delta/kernel.rb kernel/delta/math.rb kernel/delta/module.rb kernel/delta/object.rb kernel/delta/objectspace.rb kernel/delta/signal.rb kernel/delta/string.rb kernel/delta/struct.rb kernel/delta/thread.rb @@ -7,26 +7,6 @@ STDIN.setup STDERR.setup begin - Array.after_loaded - Module.after_loaded - - Class.after_loaded - Hash.after_loaded - Kernel.after_loaded - Math.after_loaded - FileTest.after_loaded - Thread.after_loaded - Struct.after_loaded - Signal.after_loaded - ObjectSpace.after_loaded - IO.after_loaded - IO::BidirectionalPipe.after_loaded - Object.after_loaded - File.after_loaded - String.after_loaded - - Ar.after_loaded - ENV = EnvironmentVariables.new # define a global "start time" to use for process calculation kernel/loader.rb @@ -252,25 +252,6 @@ class Module return func end - # Replaces the version above once Core has loaded. - def attach_function_cv(name, a3, a4, a5=nil) - if a5 - mname = a3 - args = a4 - ret = a5 - else - mname = name.to_sym - args = a3 - ret = a4 - end - - func = FFI.create_function @ffi_lib, name, args, ret - - raise FFI::NotFoundError.new(name, @ffi_lib) unless func - - metaclass.method_table[mname] = func - return func - end end ## kernel/platform/ffi.rb @@ -48,8 +48,8 @@ class Object end end -require File.dirname(__FILE__) + '/../../kernel/core/iseq' -require File.dirname(__FILE__) + '/../../kernel/core/compiled_method' +require File.dirname(__FILE__) + '/../../kernel/common/iseq' +require File.dirname(__FILE__) + '/../../kernel/common/compiled_method' require File.dirname(__FILE__) + '/../../vm/gen/simple_field' class String lib/compiler/mri_shim.rb @@ -130,7 +130,7 @@ namespace :kernel do end task :clean do - rm_rf %w[runtime/bootstrap runtime/platform runtime/core], + rm_rf %w[runtime/bootstrap runtime/platform runtime/common runtime/delta], :verbose => $verbose files_to_delete = [] rakelib/kernel.rake @@ -1,6 +1,5 @@ -require 'kernel/core/ar' - -Ar.after_loaded # HACK +require 'kernel/common/ar' +require 'kernel/delta/ar' def ar_add(ar_name, file_name) puts "ar_add #{ar_name} #{file_name}" if $verbose rakelib/rubinius.rb @@ -187,7 +187,7 @@ files EXTERNALS do |t| end file 'vm/primitives.o' => 'vm/codegen/field_extract.rb' -file 'vm/codegen/instructions_gen.rb' => 'kernel/core/iseq.rb' +file 'vm/codegen/instructions_gen.rb' => 'kernel/common/iseq.rb' file 'vm/instructions.rb' => 'vm/gen' file 'vm/instructions.rb' => 'vm/codegen/instructions_gen.rb' file 'vm/test/test_instructions.hpp' => 'vm/codegen/instructions_gen.rb' rakelib/vm.rake @@ -1,3 +1,4 @@ bootstrap platform -core +common +delta runtime/index @@ -6,7 +6,7 @@ require File.dirname(__FILE__) + '/../../lib/compiler/compiler' require File.dirname(__FILE__) + '/../../lib/compiler/generator' require File.dirname(__FILE__) + '/../../lib/compiler/bytecode' require File.dirname(__FILE__) + '/../../lib/compiler/text' -require File.dirname(__FILE__) + '/../../kernel/core/iseq' +require File.dirname(__FILE__) + '/../../kernel/common/iseq' class TestGenerator def initialize spec/compiler/spec_helper.rb @@ -11,7 +11,7 @@ class Object # for vm debugging def __show__; end end -require "#{File.dirname(__FILE__)}/../../kernel/core/iseq" +require "#{File.dirname(__FILE__)}/../../kernel/common/iseq" require 'rubygems' require 'parse_tree' vm/codegen/instructions_gen.rb @@ -10,7 +10,7 @@ using namespace std; using namespace rubinius; -static void load_root(Environment& env, std::string root) { +static void load_runtime_kernel(Environment& env, std::string root) { std::string dirs = root + "/index"; std::ifstream stream(dirs.c_str()); if(!stream) { @@ -38,10 +38,10 @@ int main(int argc, char** argv) { env.load_argv(argc, argv); try { - char* e = getenv("ROOT"); + char* e = getenv("RBX_RUNTIME"); if(!e) { - Assertion::raise("set ROOT to runtime (or equiv)"); + Assertion::raise("set RBX_RUNTIME to runtime (or equiv)"); } std::string root = std::string(e); @@ -50,7 +50,7 @@ int main(int argc, char** argv) { std::cout << "Loading platform.conf: " << root << "\n"; env.load_platform_conf(root); - load_root(env, std::string(root)); + load_runtime_kernel(env, std::string(root)); std::string loader = root + "/loader.rbc"; vm/drivers/cli.cpp @@ -1,5 +1,5 @@ # When you add an instruction here, you MUST also add it to the master -# list in kernel/core/iseq.rb +# list in kernel/common/iseq.rb # TODO: Change instructions_gen.rb so that it warns when instructions are missing. class Instructions vm/instructions.rb kernel/core/ar.rb kernel/core/argf.rb kernel/core/array.rb kernel/core/autoload.rb kernel/core/backtrace.rb kernel/core/bignum.rb kernel/core/binding.rb kernel/core/block_context.rb kernel/core/block_environment.rb kernel/core/breakpoint.rb kernel/core/bytearray.rb kernel/core/channel.rb kernel/core/class.rb kernel/core/comparable.rb kernel/core/compile.rb kernel/core/compiled_method.rb kernel/core/context.rb kernel/core/continuation.rb kernel/core/ctype.rb kernel/core/delegated_method.rb kernel/core/dir.rb kernel/core/dtrace.rb kernel/core/enumerable.rb kernel/core/env.rb kernel/core/errno.rb kernel/core/eval.rb kernel/core/exception.rb kernel/core/executable.rb kernel/core/file.rb kernel/core/filetest.rb kernel/core/fixnum.rb kernel/core/float.rb kernel/core/gem_prelude.rb kernel/core/global.rb kernel/core/hash.rb kernel/core/immediate.rb kernel/core/integer.rb kernel/core/io.rb kernel/core/iseq.rb kernel/core/kernel.rb kernel/core/list.rb kernel/core/lookuptable.rb kernel/core/marshal.rb kernel/core/math.rb kernel/core/method.rb kernel/core/method_context.rb kernel/core/method_table.rb kernel/core/misc.rb kernel/core/module.rb kernel/core/moment.rb kernel/core/numeric.rb kernel/core/object.rb kernel/core/objectspace.rb kernel/core/precision.rb kernel/core/proc.rb kernel/core/process.rb kernel/core/range.rb kernel/core/regexp.rb kernel/core/rubinius.rb kernel/core/sampler.rb kernel/core/selector.rb kernel/core/signal.rb kernel/core/sprintf.rb kernel/core/string.rb kernel/core/struct.rb kernel/core/symbol.rb kernel/core/thread.rb kernel/core/thread_group.rb kernel/core/throw_catch.rb kernel/core/time.rb kernel/core/tuple.rb kernel/core/vm.rb 26228cd480a5a0591e9452718f857d42aae0dab3 Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/c2ed45d720b260cbc1bad992f93c285d7160b337 c2ed45d720b260cbc1bad992f93c285d7160b337 2008-08-24T23:50:57-07:00 2008-08-24T23:00:41-07:00 Reorganized kernel/** into bootstrap, common, delta. a6584f3477534721685f4cae4d17f08ecccc9db4 Brian Ford bford@engineyard.com