Skip to content

Commit

Permalink
Restructured layout of JIT files.
Browse files Browse the repository at this point in the history
  • Loading branch information
brixen committed Mar 26, 2016
1 parent 636abb1 commit 93228c4
Show file tree
Hide file tree
Showing 67 changed files with 130 additions and 130 deletions.
2 changes: 1 addition & 1 deletion machine/builtin/block_environment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "builtin/variable_scope.hpp"

#ifdef ENABLE_LLVM
#include "llvm/state.hpp"
#include "jit/llvm/state.hpp"
#endif

#include <iostream>
Expand Down
6 changes: 3 additions & 3 deletions machine/builtin/compiled_code.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion machine/builtin/jit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "builtin/list.hpp"

#ifdef ENABLE_LLVM
#include "llvm/state.hpp"
#include "jit/llvm/state.hpp"
#endif

namespace rubinius {
Expand Down
6 changes: 3 additions & 3 deletions machine/builtin/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion machine/call_frame.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <ostream>

#ifdef ENABLE_LLVM
#include "llvm/jit_runtime.hpp"
#include "jit/llvm/runtime.hpp"
#endif

namespace rubinius {
Expand Down
20 changes: 10 additions & 10 deletions machine/drivers/compile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion machine/environment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions machine/llvm/autotypes.cpp → machine/jit/llvm/autotypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions machine/llvm/jit_block.cpp → machine/jit/llvm/block.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion machine/llvm/jit_block.hpp → machine/jit/llvm/block.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "llvm/jit_builder.hpp"
#include "jit/llvm/builder.hpp"

namespace rubinius {
namespace jit {
Expand Down
10 changes: 5 additions & 5 deletions machine/llvm/jit_builder.cpp → machine/jit/llvm/builder.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 4 additions & 4 deletions machine/llvm/jit_builder.hpp → machine/jit/llvm/builder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions machine/llvm/jit_compiler.cpp → machine/jit/llvm/compiler.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <llvm/CodeGen/MachineCodeInfo.h>

#include "llvm/jit_context.hpp"
#include "jit/llvm/context.hpp"

namespace llvm {
class Function;
Expand Down
12 changes: 6 additions & 6 deletions machine/llvm/jit_context.cpp → machine/jit/llvm/context.cpp
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions machine/llvm/jit_context.hpp → machine/jit/llvm/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "llvm/opcode_iter.hpp"
#include "jit/llvm/opcode_iter.hpp"

#include <list>
#include <map>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//

#include "llvm/detection.hpp"
#include "jit/llvm/detection.hpp"

//===----------------------------------------------------------------------===//
//
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions machine/llvm/inline.cpp → machine/jit/llvm/inline.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion machine/llvm/inline.hpp → machine/jit/llvm/inline.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "llvm/jit_operations.hpp"
#include "jit/llvm/operations.hpp"

#include "builtin/access_variable.hpp"
#include "builtin/iseq.hpp"
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "llvm/jit_inline_method.hpp"
#include "jit/llvm/inline_method_builder.hpp"

namespace rubinius {
class JITStackArgs;
Expand Down
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "llvm/types.hpp"
#include "jit/llvm/types.hpp"

namespace rubinius {
class LocalInfo {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Impl