remove vm from code paths, to match namespacing

include/avian/codegen/assembler.h

@@ -11,11 +11,11 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_H
 #define AVIAN_CODEGEN_ASSEMBLER_H
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/zone.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/promise.h>
 
 namespace avian {
 namespace codegen {

include/avian/codegen/compiler.h

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

include/avian/heap/heap.h

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

makefile

@@ -1108,7 +1108,7 @@ vm-depends := $(generated-code) \
 	$(shell find src include -name '*.h' -or -name '*.inc.cpp')
 
 vm-sources = \
-	$(src)/vm/system/$(system).cpp \
+	$(src)/system/$(system).cpp \
 	$(src)/finder.cpp \
 	$(src)/machine.cpp \
 	$(src)/util.cpp \
@@ -1239,7 +1239,7 @@ boot-object = $(build)/boot.o
 generator-depends := $(wildcard $(src)/*.h)
 generator-sources = \
 	$(src)/tools/type-generator/main.cpp \
-	$(src)/vm/system/$(build-system).cpp \
+	$(src)/system/$(build-system).cpp \
 	$(src)/finder.cpp
 
 ifneq ($(lzma),)

src/avian/alloc-vector.h

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

src/avian/finder.h

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

src/avian/lzma-util.h

@@ -13,7 +13,7 @@
 
 #include "avian/lzma.h"
 #include "C/Types.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/allocator.h"
 
 namespace vm {

src/avian/lzma.h

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

src/avian/machine.h

@@ -13,8 +13,8 @@
 
 #include "avian/common.h"
 #include "java-common.h"
-#include <avian/vm/system/system.h>
-#include <avian/vm/heap/heap.h>
+#include <avian/system/system.h>
+#include <avian/heap/heap.h>
 #include "avian/finder.h"
 #include "avian/processor.h"
 #include "avian/constants.h"

src/avian/process.h

@@ -12,7 +12,7 @@
 #define PROCESS_H
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/machine.h"
 #include "avian/constants.h"
 

src/avian/processor.h

@@ -12,8 +12,8 @@
 #define PROCESSOR_H
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
-#include <avian/vm/heap/heap.h>
+#include <avian/system/system.h>
+#include <avian/heap/heap.h>
 #include "bootimage.h"
 #include "avian/heapwalk.h"
 #include "avian/zone.h"

src/avian/zone.h

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

src/codegen/compiler.cpp

@@ -12,10 +12,10 @@
 
 #include <avian/util/runtime-array.h>
 
-#include <avian/vm/codegen/compiler.h>
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/compiler.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/promise.h>
 
 #include "codegen/compiler/regalloc.h"
 #include "codegen/compiler/context.h"

src/codegen/compiler/context.cpp

@@ -11,7 +11,7 @@
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/resource.h"
 
-#include <avian/vm/codegen/architecture.h>
+#include <avian/codegen/architecture.h>
 
 namespace avian {
 namespace codegen {

src/codegen/compiler/context.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_COMPILER_CONTEXT_H
 #define AVIAN_CODEGEN_COMPILER_CONTEXT_H
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/compiler.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/compiler.h>
 #include <avian/util/list.h>
 
 #include "regalloc.h"

src/codegen/compiler/frame.cpp

@@ -13,7 +13,7 @@
 #include "codegen/compiler/context.h"
 #include "codegen/compiler/frame.h"
 
-#include <avian/vm/codegen/architecture.h>
+#include <avian/codegen/architecture.h>
 
 namespace avian {
 namespace codegen {

src/codegen/compiler/regalloc.h

@@ -13,8 +13,8 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/registers.h>
 
 namespace avian {
 
@@ -108,4 +108,4 @@ pickTarget(Context* c, Read* read, bool intersectRead,
 } // namespace codegen
 } // namespace avian
 
-#endif // AVIAN_CODEGEN_COMPILER_REGALLOC_H
+#endif // AVIAN_CODEGEN_COMPILER_REGALLOC_H

src/codegen/compiler/site.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_COMPILER_SITE_H
 #define AVIAN_CODEGEN_COMPILER_SITE_H
 
-#include <avian/vm/codegen/architecture.h>
+#include <avian/codegen/architecture.h>
 
 #include "codegen/compiler/value.h"
 #include "codegen/compiler/context.h"

src/codegen/compiler/value.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_COMPILER_VALUE_H
 #define AVIAN_CODEGEN_COMPILER_VALUE_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/compiler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/compiler.h>
 
 namespace avian {
 namespace codegen {
@@ -81,4 +81,4 @@ Value* value(Context* c, lir::ValueType type, Site* site = 0, Site* target = 0);
 } // namespace codegen
 } // namespace avian
 
-#endif // AVIAN_CODEGEN_COMPILER_VALUE_H
+#endif // AVIAN_CODEGEN_COMPILER_VALUE_H

src/codegen/registers.cpp

@@ -8,7 +8,7 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/registers.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/arm/assembler.cpp

@@ -10,9 +10,9 @@
 
 #include <avian/util/runtime-array.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/registers.h>
 
 #include "context.h"
 #include "block.h"

src/codegen/target/arm/block.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_BLOCK_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_BLOCK_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/arm/context.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_CONTEXT_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_CONTEXT_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 #include "avian/alloc-vector.h"
 
 namespace vm {

src/codegen/target/arm/encode.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_ENCODE_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_ENCODE_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/arm/fixup.h

@@ -13,8 +13,8 @@
 
 #include "avian/target.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 #include "avian/alloc-vector.h"
 
 namespace vm {

src/codegen/target/arm/multimethod.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_MULTIMETHOD_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_MULTIMETHOD_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 #define CAST1(x) reinterpret_cast<UnaryOperationType>(x)
 #define CAST2(x) reinterpret_cast<BinaryOperationType>(x)

src/codegen/target/arm/registers.h

@@ -11,8 +11,8 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_ARM_REGISTERS_H
 #define AVIAN_CODEGEN_ASSEMBLER_ARM_REGISTERS_H
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/powerpc/assembler.cpp

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

src/codegen/target/powerpc/context.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_POWERPC_CONTEXT_H
 #define AVIAN_CODEGEN_ASSEMBLER_POWERPC_CONTEXT_H
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 #include "avian/alloc-vector.h"
 
 #ifdef powerpc

src/codegen/target/x86/assembler.cpp

@@ -22,13 +22,13 @@
 #include <avian/util/abort.h>
 #include <avian/util/math.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/registers.h>
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/registers.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/promise.h>
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include "context.h"
 #include "block.h"

src/codegen/target/x86/block.cpp

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

src/codegen/target/x86/block.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_X86_BLOCK_H
 #define AVIAN_CODEGEN_ASSEMBLER_X86_BLOCK_H
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/x86/context.h

@@ -19,10 +19,10 @@
 
 #include "avian/alloc-vector.h"
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 namespace vm {
 class System;

src/codegen/target/x86/detect.h

@@ -11,7 +11,7 @@
 #ifndef AVIAN_CODEGEN_ASSEMBLER_X86_DETECT_H
 #define AVIAN_CODEGEN_ASSEMBLER_X86_DETECT_H
 
-#include <avian/vm/codegen/assembler.h>
+#include <avian/codegen/assembler.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/x86/encode.cpp

@@ -14,8 +14,8 @@
 #include <avian/util/abort.h>
 #include <avian/util/math.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/promise.h>
 
 #include "context.h"
 #include "encode.h"

src/codegen/target/x86/encode.h

@@ -15,7 +15,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 #include "registers.h"
 

src/codegen/target/x86/fixup.cpp

@@ -16,7 +16,7 @@
 #include "avian/zone.h"
 
 #include <avian/util/abort.h>
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include "context.h"
 #include "fixup.h"

src/codegen/target/x86/fixup.h

@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/promise.h>
 
 namespace vm {
 class System;

src/codegen/target/x86/multimethod.cpp

@@ -12,7 +12,7 @@
 
 #include <avian/util/abort.h>
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 #include "context.h"
 #include "operations.h"

src/codegen/target/x86/multimethod.h

@@ -13,7 +13,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 namespace avian {
 namespace codegen {

src/codegen/target/x86/operations.cpp

@@ -15,8 +15,8 @@
 
 #include <avian/util/abort.h>
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/promise.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/promise.h>
 
 #include "context.h"
 #include "encode.h"

src/codegen/target/x86/operations.h

@@ -13,7 +13,7 @@
 
 #include "avian/common.h"
 
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/lir.h>
 
 #include "context.h"
 

src/codegen/targets.cpp

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

src/compile.cpp

@@ -15,12 +15,12 @@
 #include "avian/target.h"
 #include "avian/arch.h"
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/compiler.h>
-#include <avian/vm/codegen/targets.h>
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/runtime.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/compiler.h>
+#include <avian/codegen/targets.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/runtime.h>
 
 #include <avian/util/runtime-array.h>
 #include <avian/util/list.h>

src/finder.cpp

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

src/heap/heap.cpp

@@ -8,8 +8,8 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/heap/heap.h>
-#include <avian/vm/system/system.h>
+#include <avian/heap/heap.h>
+#include <avian/system/system.h>
 #include "avian/common.h"
 #include "avian/arch.h"
 

src/interpret.cpp

@@ -9,7 +9,7 @@
    details. */
 
 #include "avian/common.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include "avian/constants.h"
 #include "avian/machine.h"
 #include "avian/processor.h"

src/main.cpp

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

src/system/posix.cpp

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

src/system/windows.cpp

@@ -24,7 +24,7 @@
 #undef min
 
 #include "avian/arch.h"
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 #include <avian/util/runtime-array.h>
 
 #if defined(WINAPI_FAMILY)

src/tools/audit-codegen/main.cpp

@@ -8,16 +8,16 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/system/system.h>
+#include <avian/system/system.h>
 
 #include <avian/util/arg-parser.h>
 
-#include <avian/vm/codegen/lir.h>
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/targets.h>
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/lir.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/targets.h>
+#include <avian/codegen/registers.h>
 
-#include <avian/vm/heap/heap.h>
+#include <avian/heap/heap.h>
 
 // since we aren't linking against libstdc++, we must implement this
 // ourselves:

src/tools/bootimage-generator/main.cpp

@@ -8,14 +8,14 @@
    There is NO WARRANTY for this software.  See license.txt for
    details. */
 
-#include <avian/vm/heap/heap.h>
+#include <avian/heap/heap.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 <avian/codegen/assembler.h>
+#include <avian/codegen/promise.h>
 #include "avian/target.h"
 #include <avian/tools/object-writer/tools.h>
 #include <avian/util/runtime-array.h>

unittest/codegen/assembler-test.cpp

@@ -11,14 +11,14 @@
 #include <stdio.h>
 
 #include "avian/common.h"
-#include <avian/vm/heap/heap.h>
-#include <avian/vm/system/system.h>
+#include <avian/heap/heap.h>
+#include <avian/system/system.h>
 #include "avian/target.h"
 
-#include <avian/vm/codegen/assembler.h>
-#include <avian/vm/codegen/architecture.h>
-#include <avian/vm/codegen/targets.h>
-#include <avian/vm/codegen/lir.h>
+#include <avian/codegen/assembler.h>
+#include <avian/codegen/architecture.h>
+#include <avian/codegen/targets.h>
+#include <avian/codegen/lir.h>
 
 #include "test-harness.h"
 

unittest/codegen/registers-test.cpp

@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include <avian/vm/codegen/registers.h>
+#include <avian/codegen/registers.h>
 
 #include "test-harness.h"