From 987af120d81d7763d9fdd929a5fe5046b2f51c68 Mon Sep 17 00:00:00 2001 From: Joshua Warner Date: Tue, 19 Feb 2013 22:12:28 -0700 Subject: [PATCH] move codegen headers to include/ --- {src => include/avian/vm}/codegen/assembler.h | 4 ++-- {src => include/avian/vm}/codegen/compiler.h | 0 {src => include/avian/vm}/codegen/lir-ops.inc.cpp | 0 {src => include/avian/vm}/codegen/lir.h | 0 {src => include/avian/vm}/codegen/promise.h | 0 {src => include/avian/vm}/codegen/registers.h | 0 {src => include/avian/vm}/codegen/targets.h | 2 +- src/codegen/arm/assembler.cpp | 4 ++-- src/codegen/compiler.cpp | 6 +++--- src/codegen/compiler/context.h | 4 ++-- src/codegen/compiler/regalloc.h | 4 ++-- src/codegen/compiler/value.h | 5 ++--- src/codegen/powerpc/assembler.cpp | 4 ++-- src/codegen/registers.cpp | 2 +- src/codegen/targets.cpp | 3 ++- src/codegen/x86/assembler.cpp | 4 ++-- src/compile.cpp | 7 ++++--- unittest/codegen/assembler-test.cpp | 6 +++--- 18 files changed, 28 insertions(+), 27 deletions(-) rename {src => include/avian/vm}/codegen/assembler.h (98%) rename {src => include/avian/vm}/codegen/compiler.h (100%) rename {src => include/avian/vm}/codegen/lir-ops.inc.cpp (100%) rename {src => include/avian/vm}/codegen/lir.h (100%) rename {src => include/avian/vm}/codegen/promise.h (100%) rename {src => include/avian/vm}/codegen/registers.h (100%) rename {src => include/avian/vm}/codegen/targets.h (95%) diff --git a/src/codegen/assembler.h b/include/avian/vm/codegen/assembler.h similarity index 98% rename from src/codegen/assembler.h rename to include/avian/vm/codegen/assembler.h index 21301fd71f..593e0e6fe7 100644 --- a/src/codegen/assembler.h +++ b/include/avian/vm/codegen/assembler.h @@ -14,8 +14,8 @@ #include "system.h" #include "zone.h" -#include "codegen/lir.h" -#include "codegen/promise.h" +#include +#include namespace avian { namespace codegen { diff --git a/src/codegen/compiler.h b/include/avian/vm/codegen/compiler.h similarity index 100% rename from src/codegen/compiler.h rename to include/avian/vm/codegen/compiler.h diff --git a/src/codegen/lir-ops.inc.cpp b/include/avian/vm/codegen/lir-ops.inc.cpp similarity index 100% rename from src/codegen/lir-ops.inc.cpp rename to include/avian/vm/codegen/lir-ops.inc.cpp diff --git a/src/codegen/lir.h b/include/avian/vm/codegen/lir.h similarity index 100% rename from src/codegen/lir.h rename to include/avian/vm/codegen/lir.h diff --git a/src/codegen/promise.h b/include/avian/vm/codegen/promise.h similarity index 100% rename from src/codegen/promise.h rename to include/avian/vm/codegen/promise.h diff --git a/src/codegen/registers.h b/include/avian/vm/codegen/registers.h similarity index 100% rename from src/codegen/registers.h rename to include/avian/vm/codegen/registers.h diff --git a/src/codegen/targets.h b/include/avian/vm/codegen/targets.h similarity index 95% rename from src/codegen/targets.h rename to include/avian/vm/codegen/targets.h index 1d146e4b4d..e3ffbd981a 100644 --- a/src/codegen/targets.h +++ b/include/avian/vm/codegen/targets.h @@ -11,7 +11,7 @@ #ifndef AVIAN_CODEGEN_TARGETS_H #define AVIAN_CODEGEN_TARGETS_H -#include "codegen/assembler.h" +#include namespace avian { namespace codegen { diff --git a/src/codegen/arm/assembler.cpp b/src/codegen/arm/assembler.cpp index c15007835f..2298fb50d6 100644 --- a/src/codegen/arm/assembler.cpp +++ b/src/codegen/arm/assembler.cpp @@ -8,8 +8,8 @@ There is NO WARRANTY for this software. See license.txt for details. */ -#include "codegen/assembler.h" -#include "codegen/registers.h" +#include +#include #include "alloc-vector.h" #include "util/abort.h" diff --git a/src/codegen/compiler.cpp b/src/codegen/compiler.cpp index 23c62a8b5e..d67b979406 100644 --- a/src/codegen/compiler.cpp +++ b/src/codegen/compiler.cpp @@ -12,9 +12,9 @@ #include "util/runtime-array.h" -#include "codegen/compiler.h" -#include "codegen/assembler.h" -#include "codegen/promise.h" +#include +#include +#include #include "codegen/compiler/regalloc.h" #include "codegen/compiler/context.h" diff --git a/src/codegen/compiler/context.h b/src/codegen/compiler/context.h index 974de8e17a..58118b57dc 100644 --- a/src/codegen/compiler/context.h +++ b/src/codegen/compiler/context.h @@ -11,8 +11,8 @@ #ifndef AVIAN_CODEGEN_COMPILER_CONTEXT_H #define AVIAN_CODEGEN_COMPILER_CONTEXT_H -#include "codegen/assembler.h" -#include "codegen/compiler.h" +#include +#include #include "codegen/compiler/regalloc.h" diff --git a/src/codegen/compiler/regalloc.h b/src/codegen/compiler/regalloc.h index cfbf154f1f..c121614799 100644 --- a/src/codegen/compiler/regalloc.h +++ b/src/codegen/compiler/regalloc.h @@ -13,8 +13,8 @@ #include "common.h" -#include "codegen/lir.h" -#include "codegen/registers.h" +#include +#include class Aborter; diff --git a/src/codegen/compiler/value.h b/src/codegen/compiler/value.h index 9cdac0bba3..60fe0461a3 100644 --- a/src/codegen/compiler/value.h +++ b/src/codegen/compiler/value.h @@ -11,9 +11,8 @@ #ifndef AVIAN_CODEGEN_COMPILER_VALUE_H #define AVIAN_CODEGEN_COMPILER_VALUE_H -#include "codegen/lir.h" - -#include "codegen/compiler.h" +#include +#include namespace avian { namespace codegen { diff --git a/src/codegen/powerpc/assembler.cpp b/src/codegen/powerpc/assembler.cpp index 426891d475..f45819d869 100644 --- a/src/codegen/powerpc/assembler.cpp +++ b/src/codegen/powerpc/assembler.cpp @@ -8,8 +8,8 @@ There is NO WARRANTY for this software. See license.txt for details. */ -#include "codegen/assembler.h" -#include "codegen/registers.h" +#include +#include #include "alloc-vector.h" #include "util/abort.h" diff --git a/src/codegen/registers.cpp b/src/codegen/registers.cpp index 6e8dea822a..c3bf451176 100644 --- a/src/codegen/registers.cpp +++ b/src/codegen/registers.cpp @@ -8,7 +8,7 @@ There is NO WARRANTY for this software. See license.txt for details. */ -#include "codegen/registers.h" +#include namespace avian { namespace codegen { diff --git a/src/codegen/targets.cpp b/src/codegen/targets.cpp index 2df6636120..4b9d44fc7e 100644 --- a/src/codegen/targets.cpp +++ b/src/codegen/targets.cpp @@ -8,7 +8,8 @@ There is NO WARRANTY for this software. See license.txt for details. */ -#include "codegen/targets.h" +#include + #include "environment.h" namespace avian { diff --git a/src/codegen/x86/assembler.cpp b/src/codegen/x86/assembler.cpp index 5e3fa6aa3c..9c19bc2544 100644 --- a/src/codegen/x86/assembler.cpp +++ b/src/codegen/x86/assembler.cpp @@ -12,8 +12,8 @@ #include "target.h" #include "alloc-vector.h" -#include "codegen/assembler.h" -#include "codegen/registers.h" +#include +#include #include "util/runtime-array.h" #include "util/abort.h" diff --git a/src/compile.cpp b/src/compile.cpp index 5b9245df15..63ff48ec94 100644 --- a/src/compile.cpp +++ b/src/compile.cpp @@ -13,11 +13,12 @@ #include "alloc-vector.h" #include "process.h" #include "target.h" -#include "codegen/assembler.h" -#include "codegen/compiler.h" -#include "codegen/targets.h" #include "arch.h" +#include +#include +#include + #include "util/runtime-array.h" using namespace vm; diff --git a/unittest/codegen/assembler-test.cpp b/unittest/codegen/assembler-test.cpp index 3fe8a07427..760e770bd8 100644 --- a/unittest/codegen/assembler-test.cpp +++ b/unittest/codegen/assembler-test.cpp @@ -15,9 +15,9 @@ #include "system.h" #include "target.h" -#include "codegen/assembler.h" -#include "codegen/targets.h" -#include "codegen/lir.h" +#include +#include +#include #include "test-harness.h"