move headers from src to src/avian

This is necessary to avoid name conflicts on various platforms.  For
example, iOS has its own util.h, and Windows has a process.h.  By
including our version as e.g. "avian/util.h", we avoid confusion with
the system version.

classpath/java-util-zip.cpp

@@ -10,7 +10,7 @@
 
 #include "stdlib.h"
 #include "string.h"
-#include "zlib-custom.h"
+#include "avian/zlib-custom.h"
 
 #include "jni.h"
 #include "jni-util.h"

include/avian/tools/object-writer/tools.h

@@ -15,7 +15,7 @@
 
 #include <avian/util/string.h>
 
-#include "environment.h"
+#include "avian/environment.h"
 
 namespace avian {
 

include/avian/util/stream.h

@@ -11,7 +11,7 @@
 #ifndef STREAM_H
 #define STREAM_H
 
-#include "common.h"
+#include "avian/common.h"
 
 namespace vm {
 

include/avian/vm/codegen/assembler.h

@@ -12,7 +12,7 @@
 #define AVIAN_CODEGEN_ASSEMBLER_H
 
 #include <avian/vm/system/system.h>
-#include "zone.h"
+#include "avian/zone.h"
 
 #include <avian/vm/codegen/lir.h>
 #include <avian/vm/codegen/promise.h>

include/avian/vm/codegen/compiler.h

@@ -12,7 +12,7 @@
 #define AVIAN_CODEGEN_COMPILER_H
 
 #include <avian/vm/system/system.h>
-#include "zone.h"
+#include "avian/zone.h"
 #include "assembler.h"
 
 namespace avian {

include/avian/vm/codegen/promise.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_PROMISE_H
 #define AVIAN_CODEGEN_PROMISE_H
 
-#include "allocator.h"
+#include "avian/allocator.h"
 
 namespace avian {
 namespace codegen {

include/avian/vm/codegen/registers.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_REGISTERS_H
 #define AVIAN_CODEGEN_REGISTERS_H
 
-#include "common.h"
+#include "avian/common.h"
 
 namespace avian {
 namespace codegen {

include/avian/vm/heap/heap.h

@@ -12,7 +12,7 @@
 #define HEAP_H
 
 #include <avian/vm/system/system.h>
-#include "allocator.h"
+#include "avian/allocator.h"
 
 namespace vm {
 

include/avian/vm/system/system.h

@@ -11,8 +11,8 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include "common.h"
-#include "allocator.h"
+#include "avian/common.h"
+#include "avian/allocator.h"
 #include <avian/util/abort.h>
 
 namespace vm {

src/arm.S

@@ -9,7 +9,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "types.h"
+#include "avian/types.h"
    
 .text
 

src/avian/alloc-vector.h

@@ -12,7 +12,7 @@
 #define VECTOR_H
 
 #include <avian/vm/system/system.h>
-#include "target.h"
+#include "avian/target.h"
 
 #include <avian/util/math.h>
 

src/avian/allocator.h

@@ -11,7 +11,7 @@
 #ifndef ALLOCATOR_H
 #define ALLOCATOR_H
 
-#include "common.h"
+#include "avian/common.h"
 
 namespace vm {
 

src/avian/arch.h

@@ -19,7 +19,7 @@
 #  undef interface
 #endif
 
-#include "common.h"
+#include "avian/common.h"
 
 extern "C" void NO_RETURN
 vmJump(void* address, void* frame, void* stack, void* thread,

src/avian/arm.h

@@ -11,8 +11,8 @@
 #ifndef ARM_H
 #define ARM_H
 
-#include "types.h"
-#include "common.h"
+#include "avian/types.h"
+#include "avian/common.h"
 #include <avian/util/runtime-array.h>
 
 #ifdef __APPLE__

src/avian/bootimage.h

@@ -11,10 +11,10 @@
 #ifndef BOOTIMAGE_H
 #define BOOTIMAGE_H
 
-#include "common.h"
+#include "avian/common.h"
 #include "java-common.h"
-#include "target.h"
-#include "machine.h"
+#include "avian/target.h"
+#include "avian/machine.h"
 
 #include <avian/util/math.h>
 

src/avian/common.h

@@ -20,7 +20,7 @@
 #include "stddef.h"
 #include "string.h"
 #include "stdio.h"
-#include "types.h"
+#include "avian/types.h"
 #include "math.h"
 
 #ifdef _MSC_VER

src/avian/finder.h

@@ -11,9 +11,9 @@
 #ifndef FINDER_H
 #define FINDER_H
 
-#include "common.h"
+#include "avian/common.h"
 #include <avian/vm/system/system.h>
-#include "allocator.h"
+#include "avian/allocator.h"
 
 namespace vm {
 

src/avian/heapwalk.h

@@ -11,7 +11,7 @@
 #ifndef HEAPWALK_H
 #define HEAPWALK_H
 
-#include "common.h"
+#include "avian/common.h"
 #include "java-common.h"
 
 namespace vm {

src/avian/jnienv.h

@@ -11,7 +11,7 @@
 #ifndef JNIENV_H
 #define JNIENV_H
 
-#include "machine.h"
+#include "avian/machine.h"
 
 #define BOOTSTRAP_PROPERTY "avian.bootstrap"
 #define CRASHDIR_PROPERTY "avian.crash.dir"

src/avian/lzma-util.h

@@ -11,10 +11,10 @@
 #ifndef LZMA_UTIL_H
 #define LZMA_UTIL_H
 
-#include "lzma.h"
+#include "avian/lzma.h"
 #include "C/Types.h"
 #include <avian/vm/system/system.h>
-#include "allocator.h"
+#include "avian/allocator.h"
 
 namespace vm {
 

src/avian/lzma.h

@@ -12,7 +12,7 @@
 #define LZMA_H
 
 #include <avian/vm/system/system.h>
-#include "allocator.h"
+#include "avian/allocator.h"
 
 namespace vm {
 

src/avian/machine.h

@@ -11,14 +11,14 @@
 #ifndef MACHINE_H
 #define MACHINE_H
 
-#include "common.h"
+#include "avian/common.h"
 #include "java-common.h"
 #include <avian/vm/system/system.h>
 #include <avian/vm/heap/heap.h>
-#include "finder.h"
-#include "processor.h"
-#include "constants.h"
-#include "arch.h"
+#include "avian/finder.h"
+#include "avian/processor.h"
+#include "avian/constants.h"
+#include "avian/arch.h"
 
 using namespace avian::util;
 

src/avian/powerpc.h

@@ -11,8 +11,8 @@
 #ifndef POWERPC_H
 #define POWERPC_H
 
-#include "types.h"
-#include "common.h"
+#include "avian/types.h"
+#include "avian/common.h"
 
 #ifdef __APPLE__
 #  include "mach/mach_types.h"

src/avian/process.h

@@ -11,10 +11,10 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
-#include "common.h"
+#include "avian/common.h"
 #include <avian/vm/system/system.h>
-#include "machine.h"
-#include "constants.h"
+#include "avian/machine.h"
+#include "avian/constants.h"
 
 namespace vm {
 

src/avian/processor.h

@@ -11,12 +11,12 @@
 #ifndef PROCESSOR_H
 #define PROCESSOR_H
 
-#include "common.h"
+#include "avian/common.h"
 #include <avian/vm/system/system.h>
 #include <avian/vm/heap/heap.h>
 #include "bootimage.h"
-#include "heapwalk.h"
-#include "zone.h"
+#include "avian/heapwalk.h"
+#include "avian/zone.h"
 
 namespace avian {
 namespace codegen {

src/avian/target.h

@@ -11,8 +11,8 @@
 #ifndef TARGET_H
 #define TARGET_H
 
-#include "target-fields.h"
-#include "common.h"
+#include "avian/target-fields.h"
+#include "avian/common.h"
 
 namespace vm {
 

src/avian/util.h

@@ -11,8 +11,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include "machine.h"
-#include "zone.h"
+#include "avian/machine.h"
+#include "avian/zone.h"
 
 namespace vm {
 

src/avian/x86.h

@@ -11,8 +11,8 @@
 #ifndef X86_H
 #define X86_H
 
-#include "types.h"
-#include "common.h"
+#include "avian/types.h"
+#include "avian/common.h"
 
 #ifdef _MSC_VER
 #  include "windows.h"

src/avian/zone.h

@@ -12,7 +12,7 @@
 #define ZONE_H
 
 #include <avian/vm/system/system.h>
-#include "allocator.h"
+#include "avian/allocator.h"
 
 #include <avian/util/math.h>
 

src/builtin.cpp

@@ -8,10 +8,10 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "machine.h"
-#include "constants.h"
-#include "processor.h"
-#include "util.h"
+#include "avian/machine.h"
+#include "avian/constants.h"
+#include "avian/processor.h"
+#include "avian/util.h"
 
 #include <avian/util/runtime-array.h>
 

src/classpath-android.cpp

@@ -14,9 +14,9 @@ extern "C" int JNI_OnLoad(JavaVM*, void*);
 
 #define _POSIX_C_SOURCE 200112L
 #undef _GNU_SOURCE
-#include "machine.h"
-#include "classpath-common.h"
-#include "process.h"
+#include "avian/machine.h"
+#include "avian/classpath-common.h"
+#include "avian/process.h"
 
 using namespace vm;
 

src/classpath-avian.cpp

@@ -8,9 +8,9 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "machine.h"
-#include "classpath-common.h"
-#include "process.h"
+#include "avian/machine.h"
+#include "avian/classpath-common.h"
+#include "avian/process.h"
 
 #include <avian/util/runtime-array.h>
 

src/classpath-openjdk.cpp

@@ -8,10 +8,10 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "machine.h"
-#include "classpath-common.h"
-#include "util.h"
-#include "process.h"
+#include "avian/machine.h"
+#include "avian/classpath-common.h"
+#include "avian/util.h"
+#include "avian/process.h"
 
 #ifdef PLATFORM_WINDOWS
 

src/codegen/arm/assembler.cpp

@@ -11,7 +11,7 @@
 #include <avian/vm/codegen/assembler.h>
 #include <avian/vm/codegen/registers.h>
 
-#include "alloc-vector.h"
+#include "avian/alloc-vector.h"
 #include <avian/util/abort.h>
 
 #include <avian/util/runtime-array.h>

src/codegen/compiler.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include <avian/util/runtime-array.h>
 

src/codegen/compiler/event.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 #include <avian/util/runtime-array.h>
 #include <avian/util/math.h>
 

src/codegen/compiler/frame.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/frame.h"

src/codegen/compiler/promise.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/promise.h"

src/codegen/compiler/read.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/value.h"

src/codegen/compiler/regalloc.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include "codegen/compiler/regalloc.h"
 #include "codegen/compiler/context.h"

src/codegen/compiler/regalloc.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_COMPILER_REGALLOC_H
 #define AVIAN_CODEGEN_COMPILER_REGALLOC_H
 
-#include "common.h"
+#include "avian/common.h"
 
 #include <avian/vm/codegen/lir.h>
 #include <avian/vm/codegen/registers.h>

src/codegen/compiler/site.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/value.h"

src/codegen/compiler/value.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "target.h"
+#include "avian/target.h"
 
 #include "codegen/compiler/regalloc.h"
 #include "codegen/compiler/site.h"

src/codegen/powerpc/assembler.cpp

@@ -11,7 +11,7 @@
 #include <avian/vm/codegen/assembler.h>
 #include <avian/vm/codegen/registers.h>
 
-#include "alloc-vector.h"
+#include "avian/alloc-vector.h"
 #include <avian/util/abort.h>
 
 #define CAST1(x) reinterpret_cast<UnaryOperationType>(x)

src/codegen/targets.cpp

@@ -10,7 +10,7 @@
 
 #include <avian/vm/codegen/targets.h>
 
-#include "environment.h"
+#include "avian/environment.h"
 
 namespace avian {
 namespace codegen {

src/codegen/x86/assembler.cpp

@@ -8,9 +8,9 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "environment.h"
-#include "target.h"
-#include "alloc-vector.h"
+#include "avian/environment.h"
+#include "avian/target.h"
+#include "avian/alloc-vector.h"
 
 #include <avian/vm/codegen/assembler.h>
 #include <avian/vm/codegen/registers.h>

src/compile-arm.S

@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "types.h"
-#include "target-fields.h"
+#include "avian/types.h"
+#include "avian/target-fields.h"
 
 .text
 

src/compile-powerpc.S

@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "types.h"
-#include "target-fields.h"
+#include "avian/types.h"
+#include "avian/target-fields.h"
 
 .text
 

src/compile-x86.S

@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "types.h"
-#include "target-fields.h"
+#include "avian/types.h"
+#include "avian/target-fields.h"
 
 #define LOCAL(x) .L##x
 

src/compile.cpp

@@ -8,12 +8,12 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "machine.h"
-#include "util.h"
-#include "alloc-vector.h"
-#include "process.h"
-#include "target.h"
-#include "arch.h"
+#include "avian/machine.h"
+#include "avian/util.h"
+#include "avian/alloc-vector.h"
+#include "avian/process.h"
+#include "avian/target.h"
+#include "avian/arch.h"
 
 #include <avian/vm/codegen/assembler.h>
 #include <avian/vm/codegen/compiler.h>

src/embed.cpp

@@ -15,7 +15,7 @@
 #include <vector>
 #include <string>
 
-#include "embed.h"
+#include "avian/embed.h"
 
 #ifdef __x86_64__
 #  define BINARY_LOADER(x) _binary_loader_##x

src/embedded-loader.cpp

@@ -12,7 +12,7 @@
 #include <tchar.h>
 #include <stdint.h>
 
-#include "embed.h"
+#include "avian/embed.h"
 #include "jni.h"
 
 #if (defined __MINGW32__) || (defined _MSC_VER)

src/finder.cpp

@@ -12,9 +12,9 @@
 #include <avian/util/string.h>
 #include <avian/util/runtime-array.h>
 
-#include "zlib-custom.h"
-#include "finder.h"
-#include "lzma.h"
+#include "avian/zlib-custom.h"
+#include "avian/finder.h"
+#include "avian/lzma.h"
 
 
 using namespace vm;

src/heap/heap.cpp

@@ -10,8 +10,8 @@
 
 #include <avian/vm/heap/heap.h>
 #include <avian/vm/system/system.h>
-#include "common.h"
-#include "arch.h"
+#include "avian/common.h"
+#include "avian/arch.h"
 
 #include <avian/util/math.h>
 

src/heapdump.cpp

@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "machine.h"
-#include "heapwalk.h"
+#include "avian/machine.h"
+#include "avian/heapwalk.h"
 
 using namespace vm;
 

src/heapwalk.cpp

@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "machine.h"
-#include "heapwalk.h"
+#include "avian/machine.h"
+#include "avian/heapwalk.h"
 
 using namespace vm;
 

src/interpret.cpp

@@ -8,13 +8,13 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "common.h"
+#include "avian/common.h"
 #include <avian/vm/system/system.h>
-#include "constants.h"
-#include "machine.h"
-#include "processor.h"
-#include "process.h"
-#include "arch.h"
+#include "avian/constants.h"
+#include "avian/machine.h"
+#include "avian/processor.h"
+#include "avian/process.h"
+#include "avian/arch.h"
 
 #include <avian/util/runtime-array.h>
 

src/jnienv.cpp

@@ -8,11 +8,11 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "jnienv.h"
-#include "machine.h"
-#include "util.h"
-#include "processor.h"
-#include "constants.h"
+#include "avian/jnienv.h"
+#include "avian/machine.h"
+#include "avian/util.h"
+#include "avian/processor.h"
+#include "avian/constants.h"
 
 #include <avian/util/runtime-array.h>
 

src/machine.cpp

@@ -8,14 +8,14 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "jnienv.h"
-#include "machine.h"
-#include "util.h"
+#include "avian/jnienv.h"
+#include "avian/machine.h"
+#include "avian/util.h"
 #include <avian/util/stream.h>
-#include "constants.h"
-#include "processor.h"
-#include "arch.h"
-#include "lzma.h"
+#include "avian/constants.h"
+#include "avian/processor.h"
+#include "avian/arch.h"
+#include "avian/lzma.h"
 
 #include <avian/util/runtime-array.h>
 #include <avian/util/math.h>

src/main.cpp

@@ -14,7 +14,7 @@
 #include "jni.h"
 
 #include <avian/vm/system/system.h>
-#include "finder.h"
+#include "avian/finder.h"
 
 #include <avian/util/runtime-array.h>
 

src/powerpc.S

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "types.h"
+#include "avian/types.h"
 
 .text
 

src/process.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "process.h"
+#include "avian/process.h"
 
 #include <avian/util/runtime-array.h>
 

src/tools/bootimage-generator/main.cpp

@@ -9,17 +9,17 @@
    details. */
 
 #include <avian/vm/heap/heap.h>
-#include "heapwalk.h"
-#include "common.h"
-#include "machine.h"
-#include "util.h"
+#include "avian/heapwalk.h"
+#include "avian/common.h"
+#include "avian/machine.h"
+#include "avian/util.h"
 #include <avian/util/stream.h>
 #include <avian/vm/codegen/assembler.h>
 #include <avian/vm/codegen/promise.h>
-#include "target.h"
+#include "avian/target.h"
 #include <avian/tools/object-writer/tools.h>
 #include <avian/util/runtime-array.h>
-#include "lzma.h"
+#include "avian/lzma.h"
 
 // since we aren't linking against libstdc++, we must implement this
 // ourselves:

src/tools/type-generator/main.cpp

@@ -14,8 +14,8 @@
 #include "string.h"
 #include "errno.h"
 
-#include "constants.h"
-#include "finder.h"
+#include "avian/constants.h"
+#include "avian/finder.h"
 #include <avian/util/stream.h>
 
 #include "io.h"

src/util.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "util.h"
+#include "avian/util.h"
 
 using namespace vm;
 

src/vm/system/posix.cpp

@@ -48,7 +48,7 @@
 #include "stdint.h"
 #include "dirent.h"
 #include "sched.h"
-#include "arch.h"
+#include "avian/arch.h"
 #include <avian/vm/system/system.h>
 
 #include <avian/util/math.h>

src/vm/system/windows.cpp

@@ -23,7 +23,7 @@
 #undef max
 #undef min
 
-#include "arch.h"
+#include "avian/arch.h"
 #include <avian/vm/system/system.h>
 #include <avian/util/runtime-array.h>
 

src/x86.S

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include "types.h"
+#include "avian/types.h"
 
 #define LOCAL(x) .L##x
 

unittest/codegen/assembler-test.cpp

@@ -10,10 +10,10 @@
 
 #include <stdio.h>
 
-#include "common.h"
+#include "avian/common.h"
 #include <avian/vm/heap/heap.h>
 #include <avian/vm/system/system.h>
-#include "target.h"
+#include "avian/target.h"
 
 #include <avian/vm/codegen/assembler.h>
 #include <avian/vm/codegen/targets.h>

unittest/test-harness.cpp

@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include "common.h"
+#include "avian/common.h"
 #include "test-harness.h"
 
 // since we aren't linking against libstdc++, we must implement this