Restructured layout of JIT files.

rubinius · Mar 26, 2016 · 93228c4 · 93228c4
1 parent 636abb1
commit 93228c4
Show file tree

Hide file tree

Showing 67 changed files with 130 additions and 130 deletions.
diff --git a/machine/builtin/block_environment.cpp b/machine/builtin/block_environment.cpp
@@ -22,7 +22,7 @@
 #include "builtin/variable_scope.hpp"
 
 #ifdef ENABLE_LLVM
-#include "llvm/state.hpp"
+#include "jit/llvm/state.hpp"
 #endif
 
 #include <iostream>

diff --git a/machine/builtin/compiled_code.cpp b/machine/builtin/compiled_code.cpp
@@ -26,9 +26,9 @@
 #include <ostream>
 
 #ifdef ENABLE_LLVM
-#include "llvm/state.hpp"
-#include "llvm/jit_compiler.hpp"
-#include "llvm/jit_runtime.hpp"
+#include "jit/llvm/state.hpp"
+#include "jit/llvm/compiler.hpp"
+#include "jit/llvm/runtime.hpp"
 #endif
 
 namespace rubinius {

diff --git a/machine/builtin/jit.cpp b/machine/builtin/jit.cpp
@@ -6,7 +6,7 @@
 #include "builtin/list.hpp"
 
 #ifdef ENABLE_LLVM
-#include "llvm/state.hpp"
+#include "jit/llvm/state.hpp"
 #endif
 
 namespace rubinius {

diff --git a/machine/builtin/system.cpp b/machine/builtin/system.cpp
@@ -64,9 +64,9 @@
 #endif
 
 #ifdef ENABLE_LLVM
-#include "llvm/state.hpp"
-#include "llvm/jit_context.hpp"
-#include "llvm/jit_compiler.hpp"
+#include "jit/llvm/state.hpp"
+#include "jit/llvm/context.hpp"
+#include "jit/llvm/compiler.hpp"
 #endif
 
 #include "missing/setproctitle.h"

diff --git a/machine/call_frame.hpp b/machine/call_frame.hpp
@@ -12,7 +12,7 @@
 #include <ostream>
 
 #ifdef ENABLE_LLVM
-#include "llvm/jit_runtime.hpp"
+#include "jit/llvm/runtime.hpp"
 #endif
 
 namespace rubinius {

diff --git a/machine/drivers/compile.cpp b/machine/drivers/compile.cpp
@@ -24,16 +24,16 @@
 #include <llvm/Support/MemoryBuffer.h>
 #include <llvm/Bitcode/ReaderWriter.h>
 #include <llvm/TypeSymbolTable.h>
-#include "llvm/Analysis/Verifier.h"
-#include "llvm/Analysis/LoopPass.h"
-#include "llvm/Analysis/CallGraph.h"
-#include "llvm/Target/TargetData.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/LinkAllPasses.h"
-#include "llvm/ModuleProvider.h"
-#include "llvm/ExecutionEngine/JIT.h"
-#include "llvm/ExecutionEngine/Interpreter.h"
-#include "llvm/ExecutionEngine/GenericValue.h"
+#include <llvm/Analysis/Verifier.h>
+#include <llvm/Analysis/LoopPass.h>
+#include <llvm/Analysis/CallGraph.h>
+#include <llvm/Target/TargetData.h>
+#include <llvm/Target/TargetMachine.h>
+#include <llvm/LinkAllPasses.h>
+#include <llvm/ModuleProvider.h>
+#include <llvm/ExecutionEngine/JIT.h>
+#include <llvm/ExecutionEngine/Interpreter.h>
+#include <llvm/ExecutionEngine/GenericValue.h>
 #include <llvm/Support/CommandLine.h>
 #include <llvm/Target/TargetOptions.h>
 #include <llvm/Transforms/Utils/Cloning.h>

diff --git a/machine/environment.cpp b/machine/environment.cpp
@@ -25,7 +25,7 @@
 #include "logger.hpp"
 
 #ifdef ENABLE_LLVM
-#include "llvm/state.hpp"
+#include "jit/llvm/state.hpp"
 #if RBX_LLVM_API_VER == 208
 #include <llvm/System/Threading.h>
 #elif RBX_LLVM_API_VER == 209

diff --git a/machine/llvm/autotypes.cpp → machine/jit/llvm/autotypes.cpp b/machine/llvm/autotypes.cpp → machine/jit/llvm/autotypes.cpp
@@ -40,9 +40,9 @@ namespace llvm {
 
 namespace autogen_types {
 #ifdef IS_64BIT_ARCH
-#include "llvm/types64.cpp.gen"
+#include "jit/llvm/types64.cpp.gen"
 #else
-#include "llvm/types32.cpp.gen"
+#include "jit/llvm/types32.cpp.gen"
 #endif
 }
 

diff --git a/machine/llvm/basic_block.hpp → machine/jit/llvm/basic_block.hpp b/machine/llvm/basic_block.hpp → machine/jit/llvm/basic_block.hpp
@@ -1,7 +1,7 @@
 #ifndef VM_LLVM_BASIC_BLOCK_HPP
 #define VM_LLVM_BASIC_BLOCK_HPP
 
-#include "llvm/state.hpp"
+#include "jit/llvm/state.hpp"
 
 namespace rubinius {
   struct JITBasicBlock {

diff --git a/machine/llvm/jit_block.cpp → machine/jit/llvm/block.cpp b/machine/llvm/jit_block.cpp → machine/jit/llvm/block.cpp
@@ -1,8 +1,8 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/jit_block.hpp"
-#include "llvm/jit_context.hpp"
-#include "llvm/method_info.hpp"
+#include "jit/llvm/block.hpp"
+#include "jit/llvm/context.hpp"
+#include "jit/llvm/method_info.hpp"
 
 #include "call_frame.hpp"
 #include "stack_variables.hpp"

diff --git a/machine/llvm/jit_block.hpp → machine/jit/llvm/block.hpp b/machine/llvm/jit_block.hpp → machine/jit/llvm/block.hpp
@@ -1,4 +1,4 @@
-#include "llvm/jit_builder.hpp"
+#include "jit/llvm/builder.hpp"
 
 namespace rubinius {
 namespace jit {

diff --git a/machine/llvm/jit_builder.cpp → machine/jit/llvm/builder.cpp b/machine/llvm/jit_builder.cpp → machine/jit/llvm/builder.cpp
@@ -1,13 +1,13 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/jit_builder.hpp"
+#include "jit/llvm/builder.hpp"
 #include "call_frame.hpp"
 #include "machine_code.hpp"
 
-#include "llvm/jit_context.hpp"
-#include "llvm/jit_visit.hpp"
-#include "llvm/control_flow.hpp"
-#include "llvm/cfg.hpp"
+#include "jit/llvm/context.hpp"
+#include "jit/llvm/visit.hpp"
+#include "jit/llvm/control_flow.hpp"
+#include "jit/llvm/cfg.hpp"
 
 #include "instruments/tooling.hpp"
 #include <llvm/Analysis/CaptureTracking.h>

diff --git a/machine/llvm/jit_builder.hpp → machine/jit/llvm/builder.hpp b/machine/llvm/jit_builder.hpp → machine/jit/llvm/builder.hpp
@@ -4,10 +4,10 @@
 #include "unwind_info.hpp"
 #include "machine_code.hpp"
 
-#include "llvm/jit_context.hpp"
-#include "llvm/basic_block.hpp"
-#include "llvm/inline_block.hpp"
-#include "llvm/offset.hpp"
+#include "jit/llvm/context.hpp"
+#include "jit/llvm/basic_block.hpp"
+#include "jit/llvm/inline_block.hpp"
+#include "jit/llvm/offset.hpp"
 #if RBX_LLVM_API_VER >= 303
 #include <llvm/IR/IRBuilder.h>
 #elif RBX_LLVM_API_VER >= 302

diff --git a/machine/llvm/cfg.hpp → machine/jit/llvm/cfg.hpp b/machine/llvm/cfg.hpp → machine/jit/llvm/cfg.hpp
diff --git a/machine/llvm/jit_compiler.cpp → machine/jit/llvm/compiler.cpp b/machine/llvm/jit_compiler.cpp → machine/jit/llvm/compiler.cpp
@@ -1,7 +1,7 @@
 #ifdef ENABLE_LLVM
 
 #include "machine_code.hpp"
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/context.hpp"
 
 #include "builtin/fixnum.hpp"
 #include "builtin/constant_scope.hpp"
@@ -43,14 +43,14 @@
 
 #include <sys/time.h>
 
-#include "llvm/state.hpp"
-#include "llvm/jit_compiler.hpp"
-#include "llvm/jit_method.hpp"
-#include "llvm/jit_block.hpp"
+#include "jit/llvm/state.hpp"
+#include "jit/llvm/compiler.hpp"
+#include "jit/llvm/method.hpp"
+#include "jit/llvm/block.hpp"
 
-#include "llvm/method_info.hpp"
+#include "jit/llvm/method_info.hpp"
 
-#include "llvm/passes.hpp"
+#include "jit/llvm/passes.hpp"
 #include "instructions_util.hpp"
 #include "dtrace/dtrace.h"
 

diff --git a/machine/llvm/jit_compiler.hpp → machine/jit/llvm/compiler.hpp b/machine/llvm/jit_compiler.hpp → machine/jit/llvm/compiler.hpp
@@ -3,7 +3,7 @@
 
 #include <llvm/CodeGen/MachineCodeInfo.h>
 
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/context.hpp"
 
 namespace llvm {
   class Function;

diff --git a/machine/llvm/jit_context.cpp → machine/jit/llvm/context.cpp b/machine/llvm/jit_context.cpp → machine/jit/llvm/context.cpp
@@ -1,11 +1,11 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/state.hpp"
-#include "llvm/jit_context.hpp"
-#include "llvm/jit_runtime.hpp"
-#include "llvm/jit_memory_manager.hpp"
-#include "llvm/passes.hpp"
-#include "llvm/jit_builder.hpp"
+#include "jit/llvm/state.hpp"
+#include "jit/llvm/context.hpp"
+#include "jit/llvm/runtime.hpp"
+#include "jit/llvm/memory_manager.hpp"
+#include "jit/llvm/passes.hpp"
+#include "jit/llvm/builder.hpp"
 
 #include "machine_code.hpp"
 

diff --git a/machine/llvm/jit_context.hpp → machine/jit/llvm/context.hpp b/machine/llvm/jit_context.hpp → machine/jit/llvm/context.hpp
@@ -9,8 +9,8 @@
 #include <llvm/LLVMContext.h>
 #endif
 
-#include "llvm/state.hpp"
-#include "llvm/jit_memory_manager.hpp"
+#include "jit/llvm/state.hpp"
+#include "jit/llvm/memory_manager.hpp"
 
 namespace rubinius {
   class JITMethodInfo;

diff --git a/machine/llvm/control_flow.hpp → machine/jit/llvm/control_flow.hpp b/machine/llvm/control_flow.hpp → machine/jit/llvm/control_flow.hpp
@@ -1,4 +1,4 @@
-#include "llvm/opcode_iter.hpp"
+#include "jit/llvm/opcode_iter.hpp"
 
 #include <list>
 #include <map>

diff --git a/machine/llvm/detection.cpp → machine/jit/llvm/detection.cpp b/machine/llvm/detection.cpp → machine/jit/llvm/detection.cpp
@@ -13,7 +13,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/detection.hpp"
+#include "jit/llvm/detection.hpp"
 
 //===----------------------------------------------------------------------===//
 //

diff --git a/machine/llvm/detection.hpp → machine/jit/llvm/detection.hpp b/machine/llvm/detection.hpp → machine/jit/llvm/detection.hpp
diff --git a/machine/llvm/disassembler.cpp → machine/jit/llvm/disassembler.cpp b/machine/llvm/disassembler.cpp → machine/jit/llvm/disassembler.cpp
@@ -1,7 +1,7 @@
 #ifdef ENABLE_LLVM
 
 #include "config.h"
-#include "llvm/disassembler.hpp"
+#include "jit/llvm/disassembler.hpp"
 #include <llvm/Support/Host.h>
 #if RBX_LLVM_API_VER >= 303
 #include <llvm/IR/Instructions.h>

diff --git a/machine/llvm/disassembler.hpp → machine/jit/llvm/disassembler.hpp b/machine/llvm/disassembler.hpp → machine/jit/llvm/disassembler.hpp
diff --git a/machine/llvm/inline.cpp → machine/jit/llvm/inline.cpp b/machine/llvm/inline.cpp → machine/jit/llvm/inline.cpp
@@ -1,12 +1,12 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/inline.hpp"
-#include "llvm/jit_inline_method.hpp"
-#include "llvm/jit_inline_block.hpp"
-#include "llvm/jit_runtime.hpp"
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/inline.hpp"
+#include "jit/llvm/inline_method_builder.hpp"
+#include "jit/llvm/inline_block_builder.hpp"
+#include "jit/llvm/runtime.hpp"
+#include "jit/llvm/context.hpp"
 
-#include "llvm/stack_args.hpp"
+#include "jit/llvm/stack_args.hpp"
 
 #include "builtin/alias.hpp"
 #include "builtin/method_table.hpp"

diff --git a/machine/llvm/inline.hpp → machine/jit/llvm/inline.hpp b/machine/llvm/inline.hpp → machine/jit/llvm/inline.hpp
@@ -1,4 +1,4 @@
-#include "llvm/jit_operations.hpp"
+#include "jit/llvm/operations.hpp"
 
 #include "builtin/access_variable.hpp"
 #include "builtin/iseq.hpp"

diff --git a/machine/llvm/inline_block.cpp → machine/jit/llvm/inline_block.cpp b/machine/llvm/inline_block.cpp → machine/jit/llvm/inline_block.cpp
@@ -1,8 +1,8 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/state.hpp"
+#include "jit/llvm/state.hpp"
 
-#include "llvm/inline_block.hpp"
+#include "jit/llvm/inline_block.hpp"
 #include "builtin/compiled_code.hpp"
 
 namespace rubinius {

diff --git a/machine/llvm/inline_block.hpp → machine/jit/llvm/inline_block.hpp b/machine/llvm/inline_block.hpp → machine/jit/llvm/inline_block.hpp
@@ -1,8 +1,8 @@
 #ifndef VM_LLVM_INLINE_BLOCK_HPP
 #define VM_LLVM_INLINE_BLOCK_HPP
 
-#include "llvm/state.hpp"
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/state.hpp"
+#include "jit/llvm/context.hpp"
 
 namespace rubinius {
   class JITMethodInfo;

diff --git a/machine/llvm/jit_inline_block.cpp → machine/jit/llvm/inline_block_builder.cpp b/machine/llvm/jit_inline_block.cpp → machine/jit/llvm/inline_block_builder.cpp
@@ -1,9 +1,9 @@
 #ifdef ENABLE_LLVM
 
 #include <sys/param.h>
-#include "llvm/jit_inline_block.hpp"
-#include "llvm/stack_args.hpp"
-#include "llvm/method_info.hpp"
+#include "jit/llvm/inline_block_builder.hpp"
+#include "jit/llvm/stack_args.hpp"
+#include "jit/llvm/method_info.hpp"
 
 #include "call_frame.hpp"
 

diff --git a/machine/llvm/jit_inline_block.hpp → machine/jit/llvm/inline_block_builder.hpp b/machine/llvm/jit_inline_block.hpp → machine/jit/llvm/inline_block_builder.hpp
@@ -1,4 +1,4 @@
-#include "llvm/jit_inline_method.hpp"
+#include "jit/llvm/inline_method_builder.hpp"
 
 namespace rubinius {
   class JITStackArgs;

diff --git a/machine/llvm/jit_inline_method.cpp → machine/jit/llvm/inline_method_builder.cpp b/machine/llvm/jit_inline_method.cpp → machine/jit/llvm/inline_method_builder.cpp
@@ -1,7 +1,7 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/jit_inline_method.hpp"
-#include "llvm/method_info.hpp"
+#include "jit/llvm/inline_method_builder.hpp"
+#include "jit/llvm/method_info.hpp"
 
 #include "call_frame.hpp"
 

diff --git a/machine/llvm/jit_inline_method.hpp → machine/jit/llvm/inline_method_builder.hpp b/machine/llvm/jit_inline_method.hpp → machine/jit/llvm/inline_method_builder.hpp
@@ -1,7 +1,7 @@
 #ifndef RBX_LLVM_INLINE_METHOD_HPP
 #define RBX_LLVM_INLINE_METHOD_HPP
 
-#include "llvm/jit_method.hpp"
+#include "jit/llvm/method.hpp"
 
 namespace rubinius {
 namespace jit {

diff --git a/machine/llvm/inline_policy.hpp → machine/jit/llvm/inline_policy.hpp b/machine/llvm/inline_policy.hpp → machine/jit/llvm/inline_policy.hpp
@@ -3,7 +3,7 @@
 
 #include "machine_code.hpp"
 #include "instructions_util.hpp"
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/context.hpp"
 #include "machine/logger.hpp"
 
 namespace rubinius {

diff --git a/machine/llvm/inline_primitive.cpp → machine/jit/llvm/inline_primitive.cpp b/machine/llvm/inline_primitive.cpp → machine/jit/llvm/inline_primitive.cpp
@@ -1,7 +1,7 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/inline.hpp"
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/inline.hpp"
+#include "jit/llvm/context.hpp"
 
 // We use the i64 and i32 versions here. We do the bounds checking
 // manually later on, because using i63 / i31 is buggy in LLVM, also

diff --git a/machine/llvm/local_info.hpp → machine/jit/llvm/local_info.hpp b/machine/llvm/local_info.hpp → machine/jit/llvm/local_info.hpp
@@ -1,4 +1,4 @@
-#include "llvm/types.hpp"
+#include "jit/llvm/types.hpp"
 
 namespace rubinius {
   class LocalInfo {

diff --git a/machine/llvm/jit_memory_manager.cpp → machine/jit/llvm/memory_manager.cpp b/machine/llvm/jit_memory_manager.cpp → machine/jit/llvm/memory_manager.cpp
@@ -82,7 +82,7 @@ SOFTWARE.
 #include <stdio.h>
 #include <fcntl.h>
 
-#include "llvm/jit_memory_manager.hpp"
+#include "jit/llvm/memory_manager.hpp"
 
 //===----------------------------------------------------------------------===//
 // Memory Block Implementation.

diff --git a/machine/llvm/jit_memory_manager.hpp → machine/jit/llvm/memory_manager.hpp b/machine/llvm/jit_memory_manager.hpp → machine/jit/llvm/memory_manager.hpp
diff --git a/machine/llvm/jit_method.cpp → machine/jit/llvm/method.cpp b/machine/llvm/jit_method.cpp → machine/jit/llvm/method.cpp
@@ -1,9 +1,9 @@
 #ifdef ENABLE_LLVM
 
-#include "llvm/jit_method.hpp"
-#include "llvm/jit_context.hpp"
+#include "jit/llvm/method.hpp"
+#include "jit/llvm/context.hpp"
 
-#include "llvm/method_info.hpp"
+#include "jit/llvm/method_info.hpp"
 
 #include "call_frame.hpp"
 #include "machine_code.hpp"

diff --git a/machine/llvm/jit_method.hpp → machine/jit/llvm/method.hpp b/machine/llvm/jit_method.hpp → machine/jit/llvm/method.hpp
@@ -1,7 +1,7 @@
 #ifndef RBX_LLVM_JIT_METHOD_HPP
 #define RBX_LLVM_JIT_METHOD_HPP
 
-#include "llvm/jit_builder.hpp"
+#include "jit/llvm/builder.hpp"
 
 namespace rubinius {
 namespace jit {