Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin' into mcjit
  • Loading branch information
brixen committed Feb 5, 2016
2 parents 80c1296 + e401fc7 commit 0cde6d993d96409c7665402cc231e8081c389d63
Showing with 7,480 additions and 8,166 deletions.
  1. +2 −1 .gitignore
  2. +1 −1 Gemfile.lock
  3. +3 −13 Rakefile
  4. +10 −11 configure
  5. 0 {kernel/bootstrap → core}/alias.rb
  6. +132 −124 {kernel → core}/alpha.rb
  7. +1 −8 {kernel/common → core}/argf.rb
  8. +140 −4 {kernel/common → core}/array.rb
  9. +0 −1 {kernel/bootstrap → core}/array_mirror.rb
  10. 0 {kernel/bootstrap → core}/atomic.rb
  11. +5 −6 {kernel/common → core}/autoload.rb
  12. +4 −4 {kernel/common → core}/backtrace.rb
  13. +69 −102 kernel/common/eval.rb → core/basic_object.rb
  14. +25 −1 {kernel/bootstrap → core}/bignum.rb
  15. +2 −2 {kernel/common → core}/binding.rb
  16. +90 −29 {kernel/common → core}/block_environment.rb
  17. +36 −0 {kernel/bootstrap → core}/byte_array.rb
  18. +0 −1 {kernel/bootstrap → core}/call_custom_cache.rb
  19. +0 −2 {kernel/bootstrap → core}/call_site.rb
  20. +0 −32 {kernel/common → core}/capi.rb
  21. +4 −5 {kernel/bootstrap → core}/channel.rb
  22. +0 −1 {kernel/bootstrap → core}/character.rb
  23. +12 −0 {kernel/common → core}/class.rb
  24. +18 −0 core/code_db.rb
  25. +232 −28 {kernel/common → core}/code_loader.rb
  26. 0 {kernel/bootstrap → core}/compact_lookup_table.rb
  27. 0 {kernel/common → core}/comparable.rb
  28. +65 −3 {kernel/common → core}/compiled_code.rb
  29. +7 −6 {kernel/common → core}/complex.rb
  30. +0 −9 {kernel/common → core}/complexifier.rb
  31. +0 −2 {kernel/bootstrap → core}/configuration.rb
  32. 0 {kernel/delta → core}/console.rb
  33. +0 −2 {kernel/bootstrap → core}/constant_cache.rb
  34. +32 −0 {kernel/common → core}/constant_scope.rb
  35. 0 {kernel/bootstrap → core}/constant_table.rb
  36. +0 −1 {kernel/common → core}/continuation.rb
  37. 0 {kernel/delta → core}/converter_paths.rb
  38. +39 −0 {kernel/common → core}/ctype.rb
  39. 0 {kernel/common → core}/delegated_method.rb
  40. +10 −0 core/deprecations.rb
  41. +49 −4 {kernel/common → core}/dir.rb
  42. +0 −15 {kernel/common → core}/dir_glob.rb
  43. +25 −6 {kernel/common → core}/encoding.rb
  44. 0 {kernel/common → core}/enumerable.rb
  45. 0 {kernel/common → core}/enumerable_helper.rb
  46. +0 −10 {kernel/common → core}/enumerator.rb
  47. +0 −4 {kernel/common → core}/env.rb
  48. +0 −2 {kernel/common → core}/errno.rb
  49. +16 −1 {kernel/common → core}/exception.rb
  50. +18 −1 {kernel/common → core}/executable.rb
  51. +12 −0 {kernel/common → core}/false.rb
  52. +507 −0 core/ffi.rb
  53. +0 −2 {kernel/common → core}/fiber.rb
  54. +13 −90 {kernel/common → core}/file.rb
  55. +25 −0 {kernel/common → core}/file_test.rb
  56. +62 −1 {kernel/bootstrap → core}/fixnum.rb
  57. +0 −3 {kernel/common → core}/float.rb
  58. 0 {kernel/delta → core}/fsevent.rb
  59. +43 −0 {kernel/common → core}/gc.rb
  60. +0 −2 {kernel/common → core}/global.rb
  61. +4 −3 {kernel/common → core}/hash.rb
  62. 0 {kernel/common → core}/hook.rb
  63. 0 {kernel/common → core}/identity_map.rb
  64. +0 −21 {kernel/common → core}/immediate.rb
  65. +0 −2 {kernel/common → core}/integer.rb
  66. +157 −6 {kernel/common → core}/io.rb
  67. 0 {kernel/bootstrap → core}/iseq.rb
  68. 0 {kernel/bootstrap → core}/jit.rb
  69. +180 −24 {kernel/common → core}/kernel.rb
  70. +317 −0 core/library.rb
  71. +134 −0 core/load_order.txt
  72. 0 {kernel/common → core}/loaded_features.rb
  73. +1 −3 {kernel → core}/loader.rb
  74. 0 {kernel/common → core}/location.rb
  75. 0 {kernel/bootstrap → core}/logger.rb
  76. +11 −0 {kernel/bootstrap → core}/lookup_table.rb
  77. 0 {kernel/common → core}/lru_cache.rb
  78. 0 {kernel/common → core}/main.rb
  79. 0 {kernel/common → core}/marshal.rb
  80. +208 −0 core/match_data.rb
  81. +38 −71 {kernel/common → core}/math.rb
  82. 0 {kernel/common → core}/method.rb
  83. 0 {kernel/common → core}/method_equality.rb
  84. +57 −0 {kernel/bootstrap → core}/method_table.rb
  85. +0 −2 {kernel/delta → core}/metrics.rb
  86. 0 {kernel/bootstrap → core}/mirror.rb
  87. 0 {kernel/common → core}/missing_method.rb
  88. +103 −148 {kernel/common → core}/module.rb
  89. 0 {kernel/bootstrap → core}/mono_inline_cache.rb
  90. 0 {kernel/common → core}/mutex.rb
  91. 0 {kernel/common → core}/native_method.rb
  92. +21 −0 {kernel/bootstrap → core}/nil.rb
  93. 0 {kernel/common → core}/numeric.rb
  94. 0 {kernel/common → core}/numeric_mirror.rb
  95. 0 {kernel/common → core}/object_space.rb
  96. +9 −2 {kernel/delta → core}/options.rb
  97. 0 {kernel/delta → core}/pack.rb
  98. +457 −0 core/pointer.rb
  99. 0 {kernel/platform → core}/pointer_accessors.rb
  100. 0 {kernel/bootstrap → core}/poly_inline_cache.rb
  101. +36 −0 {kernel/common → core}/proc.rb
  102. 0 {kernel/common → core}/proc_mirror.rb
  103. +14 −40 {kernel/common → core}/process.rb
  104. +0 −10 {kernel/common → core}/process_mirror.rb
  105. 0 {kernel/common → core}/random.rb
  106. 0 {kernel/common → core}/range.rb
  107. 0 {kernel/common → core}/range_mirror.rb
  108. +5 −2 {kernel/common → core}/rational.rb
  109. +1 −8 {kernel/common → core}/rationalizer.rb
  110. +254 −0 core/rbconfig.rb
  111. +66 −269 {kernel/common → core}/regexp.rb
  112. 0 {kernel/bootstrap → core}/respond_to_cache.rb
  113. +169 −2 {kernel/bootstrap → core}/rubinius.rb
  114. 0 {kernel/delta → core}/ruby_constants.rb
  115. 0 {kernel/delta → core}/runtime.rb
  116. +0 −11 {kernel/common → core}/signal.rb
  117. 0 {kernel/common → core}/splitter.rb
  118. +0 −62 {kernel/common → core}/sprinter.rb
  119. +296 −0 core/stat.rb
  120. +0 −1 {kernel/delta → core}/stats.rb
  121. +183 −9 {kernel/common → core}/string.rb
  122. 0 {kernel/common → core}/string_mirror.rb
  123. +2 −2 {kernel/common → core}/struct.rb
  124. +30 −0 {kernel/common → core}/symbol.rb
  125. +175 −14 {kernel/bootstrap → core}/thread.rb
  126. 0 {kernel/common → core}/thread_group.rb
  127. 0 {kernel/common → core}/thread_group_mirror.rb
  128. 0 {kernel/bootstrap → core}/thread_mirror.rb
  129. +23 −0 core/throw_catch.rb
  130. +0 −1 {kernel/bootstrap → core}/thunk.rb
  131. +41 −5 {kernel/common → core}/time.rb
  132. +16 −0 {kernel/common → core}/true.rb
  133. +138 −0 {kernel/bootstrap → core}/tuple.rb
  134. +125 −3 {kernel/common → core}/type.rb
  135. 0 {kernel/common → core}/undefined.rb
  136. +53 −0 {kernel/common → core}/variable_scope.rb
  137. +0 −1 {kernel/bootstrap → core}/vm.rb
  138. +0 −1 {kernel/bootstrap → core}/weakref.rb
  139. +1,817 −0 core/zed.rb
  140. +1 −1 gems_list.txt
  141. +0 −129 kernel/bootstrap/array.rb
  142. +0 −40 kernel/bootstrap/basic_object.rb
  143. +0 −66 kernel/bootstrap/block_environment.rb
  144. +0 −14 kernel/bootstrap/class.rb
  145. +0 −68 kernel/bootstrap/compiled_code.rb
  146. +0 −36 kernel/bootstrap/constant_scope.rb
  147. +0 −52 kernel/bootstrap/dir.rb
  148. +0 −22 kernel/bootstrap/encoding.rb
  149. +0 −5 kernel/bootstrap/exception.rb
  150. +0 −21 kernel/bootstrap/executable.rb
  151. +0 −15 kernel/bootstrap/false.rb
  152. +0 −44 kernel/bootstrap/gc.rb
  153. +0 −160 kernel/bootstrap/io.rb
  154. +0 −108 kernel/bootstrap/kernel.rb
  155. +0 −55 kernel/bootstrap/load_order.txt
  156. +0 −36 kernel/bootstrap/proc.rb
  157. +0 −16 kernel/bootstrap/process.rb
  158. +0 −69 kernel/bootstrap/regexp.rb
  159. +0 −103 kernel/bootstrap/stat.rb
  160. +0 −175 kernel/bootstrap/string.rb
  161. +0 −31 kernel/bootstrap/symbol.rb
  162. +0 −40 kernel/bootstrap/time.rb
  163. +0 −20 kernel/bootstrap/true.rb
  164. +0 −129 kernel/bootstrap/type.rb
  165. +0 −56 kernel/bootstrap/variable_scope.rb
  166. +0 −31 kernel/common/basic_object.rb
  167. +0 −27 kernel/common/bignum.rb
  168. +0 −39 kernel/common/byte_array.rb
  169. +0 −11 kernel/common/channel.rb
  170. +0 −65 kernel/common/fixnum.rb
  171. +0 −916 kernel/common/hash_hamt.rb
  172. +0 −94 kernel/common/load_order.txt
  173. +0 −15 kernel/common/lookup_table.rb
  174. +0 −57 kernel/common/method_table.rb
  175. +0 −21 kernel/common/nil.rb
  176. +0 −223 kernel/common/stat.rb
  177. +0 −166 kernel/common/thread.rb
  178. +0 −43 kernel/common/throw_catch.rb
  179. +0 −150 kernel/common/tuple.rb
  180. +0 −9 kernel/delta/class.rb
  181. +0 −237 kernel/delta/code_loader.rb
  182. +0 −55 kernel/delta/ctype.rb
  183. +0 −7 kernel/delta/deprecations.rb
  184. +0 −17 kernel/delta/exception.rb
  185. +0 −20 kernel/delta/ffi.rb
  186. +0 −19 kernel/delta/file.rb
  187. +0 −26 kernel/delta/file_test.rb
  188. +0 −173 kernel/delta/kernel.rb
  189. +0 −23 kernel/delta/load_order.txt
  190. +0 −56 kernel/delta/math.rb
  191. +0 −216 kernel/delta/module.rb
  192. +0 −370 kernel/delta/rubinius.rb
  193. +0 −13 kernel/delta/signal.rb
  194. +0 −104 kernel/delta/struct.rb
  195. +0 −6 kernel/delta/thread.rb
  196. +0 −55 kernel/platform/enum.rb
  197. +0 −11 kernel/platform/env.rb
  198. +0 −260 kernel/platform/ffi.rb
  199. +0 −10 kernel/platform/file.rb
  200. +0 −393 kernel/platform/library.rb
  201. +0 −11 kernel/platform/load_order.txt
  202. +0 −46 kernel/platform/math.rb
  203. +0 −451 kernel/platform/pointer.rb
  204. +0 −109 kernel/platform/posix.rb
  205. +0 −312 kernel/platform/struct.rb
  206. +0 −9 kernel/platform/union.rb
  207. +3 −256 library/rbconfig.rb
  208. +0 −13 library/rbconfig/datadir.rb
  209. +0 −1 library/rubinius/.gitignore
  210. +8 −1 library/rubinius/configuration.rb
  211. +1 −1 rakelib/configure.rb
  212. +143 −86 rakelib/{kernel.rake → core.rake}
  213. +8 −9 rakelib/install.rake
  214. +0 −1 rakelib/preinstall_gems.rb
  215. +3 −16 rakelib/vm.rake
  216. +2 −1 scripts/llvm.sh
  217. +13 −0 spec/ruby/core/module/define_method_spec.rb
  218. +147 −0 vm/builtin/code_db.cpp
  219. +50 −0 vm/builtin/code_db.hpp
  220. +44 −2 vm/builtin/compiled_code.cpp
  221. +3 −1 vm/builtin/compiled_code.hpp
  222. +6 −1 vm/builtin/constant_table.cpp
  223. +1 −1 vm/builtin/ffi_pointer.cpp
  224. +1 −1 vm/builtin/location.cpp
  225. +51 −21 vm/builtin/method_table.cpp
  226. +16 −6 vm/builtin/method_table.hpp
  227. +9 −6 vm/builtin/module.cpp
  228. +4 −2 vm/builtin/module.hpp
  229. +28 −17 vm/builtin/system.cpp
  230. +2 −2 vm/builtin/system.hpp
  231. +6 −2 vm/builtin/thread.cpp
  232. +5 −2 vm/builtin/thread.hpp
  233. +1 −1 vm/builtin/variable_scope.cpp
  234. +1 −1 vm/call_frame.cpp
  235. +5 −2 vm/capi/capi.cpp
  236. +1 −0 vm/codegen/config_vars.rb
  237. +26 −52 vm/environment.cpp
  238. +2 −2 vm/environment.hpp
  239. +8 −4 vm/global_cache.cpp
  240. +2 −0 vm/globals.hpp
  241. +1 −0 vm/instructions.cpp
  242. +10 −1 vm/instructions.def
  243. +2 −1 vm/jit/llvm/inline.cpp
  244. +1 −0 vm/jit/llvm/state.cpp
  245. +2 −1 vm/jit/llvm/state.hpp
  246. +7 −1 vm/jit/llvm/util.cpp
  247. +2 −1 vm/jit/llvm/visit.hpp
  248. +4 −0 vm/ontology.cpp
@@ -82,7 +82,8 @@ Gemfile.installed.lock
# rubysl-digest installs this header
vm/include/capi/ruby/digest.h

/kernel/signature.rb
/core/signature.rb
/core/build_config.rb

# Generated documentation
doc/generated/vm
@@ -16,7 +16,7 @@ GEM
rubinius-toolset (~> 3)
rubinius-compiler (3.0)
rubinius-instructions (3.0)
rubinius-melbourne (3.0)
rubinius-melbourne (3.1)
rubinius-processor (3.0)
rubinius-toolset (3.0)

@@ -157,7 +157,7 @@ task :rebuild => %w[clean build]
desc 'Remove rubinius build files'
task :clean => %w[
vm:clean
kernel:clean
core:clean
clean:crap
]

@@ -176,16 +176,6 @@ namespace :clean do
end
end

desc "Run the Rubinius documentation website"
task :docs do
require 'kernel/delta/options'
require 'rbconfig'
require 'webrick'
require 'lib/rubinius/documentation'

Rubinius::Documentation.main
end

desc "Run specs in default (configured) mode but do not rebuild on failure"
task :spec => %w[build vm:test] do
clean_environment
@@ -200,11 +190,11 @@ task :ci do
Rake::Task["spec"].invoke
end

desc "Print list of items marked to-do in kernel/ (@todo|TODO)"
desc "Print list of items marked to-do in core/ (@todo|TODO)"
task :todos do

# create array with files to be checked
filesA = Dir['kernel/**/*.*']
filesA = Dir['core/*.*']

# search for @todo or TODO
filesA.sort!.each do |filename|
@@ -20,7 +20,7 @@ end

root = File.expand_path File.dirname(__FILE__)

require File.join(root, "kernel", "delta", "options")
require File.join(root, "core", "options")

class Configure

@@ -90,7 +90,7 @@ class Configure
@libdir = nil
@encdir = nil
@runtimedir = nil
@kerneldir = nil
@coredir = nil
@sitedir = nil
@vendordir = nil
@mandir = nil
@@ -227,15 +227,15 @@ class Configure

@libdir = dir + "/library"
@runtimedir = dir + "/runtime"
@kerneldir = dir + "/kernel"
@coredir = dir + "/core"
@sitedir = dir + "/site"
@vendordir = dir + "/vendor"
end

@bindir = @prefixdir + "/bin" unless @bindir
@libdir = @prefixdir + "/library" unless @libdir
@runtimedir = @prefixdir + "/runtime" unless @runtimedir
@kerneldir = @prefixdir + "/kernel" unless @kerneldir
@coredir = @prefixdir + "/core" unless @coredir
@sitedir = @prefixdir + "/site" unless @sitedir
@vendordir = @prefixdir + "/vendor" unless @vendordir
@mandir = @prefixdir + "/man" unless @mandir
@@ -244,7 +244,7 @@ class Configure

@encdir = @libdir + "/encoding/converter"

dirs = [@bindir, @libdir, @runtimedir, @kerneldir, @sitedir, @vendordir,
dirs = [@bindir, @libdir, @runtimedir, @coredir, @sitedir, @vendordir,
@mandir, @gemsdir, @includedir, @encdir]

parts = dirs.map { |d| d.split "/" }
@@ -1579,7 +1579,7 @@ int main() { return tgetnum(""); }
:libdir => @libdir,
:encdir => @encdir,
:runtimedir => @runtimedir,
:kerneldir => @kerneldir,
:coredir => @coredir,
:sitedir => @sitedir,
:vendordir => @vendordir,
:includedir => @includedir,
@@ -1607,9 +1607,7 @@ int main() { return tgetnum(""); }

write_config_rb @config, config_settings

lib_rubinius_dir = "#{@sourcedir}/library/rubinius"
FileUtils.mkdir_p lib_rubinius_dir unless File.directory? lib_rubinius_dir
FileUtils.cp @config, "#{lib_rubinius_dir}/build_config.rb"
FileUtils.cp @config, "#{@sourcedir}/core/build_config.rb"

# Write the config file used to build the C++ VM.
Dir.mkdir "vm/gen" unless File.directory? "vm/gen"
@@ -1621,7 +1619,8 @@ int main() { return tgetnum(""); }
#define RBX_BIN_PATH "#{@bindir}"
#define RBX_GEMS_PATH "#{@gemsdir}"
#define RBX_RUNTIME_PATH "#{@runtimedir}"
#define RBX_KERNEL_PATH "#{@kerneldir}"
#define RBX_KERNEL_PATH "#{@coredir}"
#define RBX_CORE_PATH "#{@coredir}"
#define RBX_LIB_PATH "#{@libdir}"
#define RBX_ENC_PATH "#{@encdir}"
#define RBX_HDR_PATH "#{@includedir}"
@@ -1908,7 +1907,7 @@ bin: #{@prefixdir}#{@bindir}
lib: #{@prefixdir}#{@libdir}
include: #{@prefixdir}#{@includedir}
runtime: #{@prefixdir}#{@runtimedir}
kernel: #{@prefixdir}#{@kerneldir}
core: #{@prefixdir}#{@coredir}
site: #{@prefixdir}#{@sitedir}
vendor: #{@prefixdir}#{@vendordir}
man: #{@prefixdir}#{@mandir}
File renamed without changes.
Loading

0 comments on commit 0cde6d9

Please sign in to comment.