move lots of source files around to match their actual placement in the original tree

CMakeLists.txt

@@ -64,119 +64,119 @@ add_executable(mwcc
         command_line/C++_Parser/Src/Library/WarningHelpers.c
 
         compiler_and_linker/unsorted/CCompiler.c
-        compiler_and_linker/unsorted/CParser.c
+        compiler_and_linker/FrontEnd/C/CParser.c
         compiler_and_linker/FrontEnd/Common/CompilerTools.c
         compiler_and_linker/unsorted/CodeGenOptPPC.c
-        compiler_and_linker/unsorted/IrOptimizer.c
-        compiler_and_linker/unsorted/CodeGen.c
+        compiler_and_linker/FrontEnd/Optimizer/IrOptimizer.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/CodeGen.c
         compiler_and_linker/FrontEnd/C/CPrep.c
         compiler_and_linker/FrontEnd/C/CScope.c
-        compiler_and_linker/unsorted/CMachine.c
-        compiler_and_linker/unsorted/CExpr.c
-        compiler_and_linker/unsorted/CFunc.c
-        compiler_and_linker/unsorted/CTemplateNew.c
-        compiler_and_linker/unsorted/CError.c
+        compiler_and_linker/BackEnd/PowerPC/CMachine.c
+        compiler_and_linker/FrontEnd/C/CExpr.c
+        compiler_and_linker/FrontEnd/C/CFunc.c
+        compiler_and_linker/FrontEnd/C/CTemplateNew.c
+        compiler_and_linker/FrontEnd/C/CError.c
         compiler_and_linker/unsorted/ObjGenMachO.c
-        compiler_and_linker/unsorted/CDecl.c
-        compiler_and_linker/unsorted/CMangler.c
-        compiler_and_linker/unsorted/CSOM.c
-        compiler_and_linker/unsorted/CABI.c
-        compiler_and_linker/unsorted/CInit.c
-        compiler_and_linker/unsorted/CClass.c
-        compiler_and_linker/unsorted/CIRTransform.c
+        compiler_and_linker/FrontEnd/C/CDecl.c
+        compiler_and_linker/FrontEnd/C/CMangler.c
+        compiler_and_linker/FrontEnd/C/CSOM.c
+        compiler_and_linker/FrontEnd/C/CABI.c
+        compiler_and_linker/FrontEnd/C/CInit.c
+        compiler_and_linker/FrontEnd/C/CClass.c
+        compiler_and_linker/FrontEnd/Common/CIRTransform.c
         compiler_and_linker/unsorted/CObjC.c
-        compiler_and_linker/unsorted/CInline.c
+        compiler_and_linker/FrontEnd/C/CInline.c
         compiler_and_linker/FrontEnd/C/CPrepTokenizer.c
-        compiler_and_linker/unsorted/CTemplateTools.c
-        compiler_and_linker/unsorted/IroPointerAnalysis.c
-        compiler_and_linker/unsorted/InstrSelection.c
-        compiler_and_linker/unsorted/IroFlowgraph.c
-        compiler_and_linker/unsorted/IroLinearForm.c
-        compiler_and_linker/unsorted/IroUtil.c
-        compiler_and_linker/unsorted/IroCSE.c
-        compiler_and_linker/unsorted/IroPropagate.c
-        compiler_and_linker/unsorted/IROUseDef.c
-        compiler_and_linker/unsorted/InlineAsmPPC.c
-        compiler_and_linker/unsorted/IroDump.c
-        compiler_and_linker/unsorted/IroTransform.c
-        compiler_and_linker/unsorted/IroVars.c
-        compiler_and_linker/unsorted/IroEval.c
-        compiler_and_linker/unsorted/IroJump.c
-        compiler_and_linker/unsorted/IroRangePropagation.c
-        compiler_and_linker/unsorted/IroEmptyLoop.c
-        compiler_and_linker/unsorted/IroUnrollLoop.c
-        compiler_and_linker/unsorted/IroLoop.c
-        compiler_and_linker/unsorted/IroExprRegeneration.c
-        compiler_and_linker/unsorted/IroSubable.c
-        compiler_and_linker/unsorted/RegisterInfo.c
-        compiler_and_linker/unsorted/TOC.c
-        compiler_and_linker/unsorted/StackFrame.c
+        compiler_and_linker/FrontEnd/C/CTemplateTools.c
+        compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/InstrSelection.c
+        compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.c
+        compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.c
+        compiler_and_linker/FrontEnd/Optimizer/IroUtil.c
+        compiler_and_linker/FrontEnd/Optimizer/IroCSE.c
+        compiler_and_linker/FrontEnd/Optimizer/IroPropagate.c
+        compiler_and_linker/FrontEnd/Optimizer/IROUseDef.c
+        compiler_and_linker/BackEnd/PowerPC/InlineAssembler/InlineAsmPPC.c
+        compiler_and_linker/FrontEnd/Optimizer/IroDump.c
+        compiler_and_linker/FrontEnd/Optimizer/IroTransform.c
+        compiler_and_linker/FrontEnd/Optimizer/IroVars.c
+        compiler_and_linker/FrontEnd/Optimizer/IroEval.c
+        compiler_and_linker/FrontEnd/Optimizer/IroJump.c
+        compiler_and_linker/FrontEnd/Optimizer/IroRangePropagation.c
+        compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.c
+        compiler_and_linker/FrontEnd/Optimizer/IroUnrollLoop.c
+        compiler_and_linker/FrontEnd/Optimizer/IroLoop.c
+        compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.c
+        compiler_and_linker/FrontEnd/Optimizer/IroSubable.c
+        compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/RegisterInfo.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/TOC.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/StackFrame.c
         compiler_and_linker/unsorted/Registers.c
         compiler_and_linker/unsorted/PCode.c
-        compiler_and_linker/unsorted/Switch.c
-        compiler_and_linker/unsorted/ValueNumbering.c
-        compiler_and_linker/unsorted/PCodeUtilities.c
-        compiler_and_linker/unsorted/Operands.c
-        compiler_and_linker/unsorted/Exceptions.c
-        compiler_and_linker/unsorted/uDump.c
-        compiler_and_linker/unsorted/COptimizer.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Switch.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/ValueNumbering.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeUtilities.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Operands.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Exceptions.c
+        compiler_and_linker/unsorted/DumpIR.c
+        compiler_and_linker/FrontEnd/Common/COptimizer.c
         compiler_and_linker/unsorted/GlobalOptimizer.c
-        compiler_and_linker/unsorted/PCodeListing.c
-        compiler_and_linker/unsorted/Peephole.c
-        compiler_and_linker/unsorted/Scheduler.c
-        compiler_and_linker/unsorted/Coloring.c
-        compiler_and_linker/unsorted/PCodeAssembly.c
-        compiler_and_linker/unsorted/Intrinsics.c
-        compiler_and_linker/unsorted/PPCError.c
-        compiler_and_linker/unsorted/CExpr2.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeListing.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Peephole.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/Scheduler.c
+        compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/Coloring.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeAssembly.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Intrinsics.c
+        compiler_and_linker/BackEnd/PowerPC/PPCError.c
+        compiler_and_linker/FrontEnd/C/CExpr2.c
         compiler_and_linker/unsorted/CInt64.c
-        compiler_and_linker/unsorted/CPrec.c
-        compiler_and_linker/unsorted/CBrowse.c
-        compiler_and_linker/unsorted/CPreprocess.c
-        compiler_and_linker/unsorted/FuncLevelAsmPPC.c
-        compiler_and_linker/unsorted/CException.c
-        compiler_and_linker/unsorted/CTemplateClass.c
+        compiler_and_linker/FrontEnd/C/CPrec.c
+        compiler_and_linker/FrontEnd/C/CBrowse.c
+        compiler_and_linker/FrontEnd/C/CPreprocess.c
+        compiler_and_linker/BackEnd/PowerPC/InlineAssembler/FuncLevelAsmPPC.c
+        compiler_and_linker/FrontEnd/C/CException.c
+        compiler_and_linker/FrontEnd/C/CTemplateClass.c
         compiler_and_linker/unsorted/ScanFloat.c
-        compiler_and_linker/unsorted/CExprConvMatch.c
-        compiler_and_linker/unsorted/CRTTI.c
+        compiler_and_linker/FrontEnd/C/CExprConvMatch.c
+        compiler_and_linker/FrontEnd/C/CRTTI.c
         compiler_and_linker/unsorted/CObjCModern.c
-        compiler_and_linker/unsorted/InlineAsm.c
+        compiler_and_linker/BackEnd/PowerPC/InlineAssembler/InlineAsm.c
         compiler_and_linker/unsorted/Unmangle.c
         compiler_and_linker/unsorted/MachO.c
         compiler_and_linker/unsorted/GenStabs.c
-        compiler_and_linker/unsorted/CTemplateFunc.c
-        compiler_and_linker/unsorted/IroMalloc.c
-        compiler_and_linker/unsorted/PCodeInfo.c
-        compiler_and_linker/unsorted/StructMoves.c
-        compiler_and_linker/unsorted/FunctionCalls.c
-        compiler_and_linker/unsorted/IroBitVect.c
+        compiler_and_linker/FrontEnd/C/CTemplateFunc.c
+        compiler_and_linker/FrontEnd/Optimizer/IroMalloc.c
+        compiler_and_linker/BackEnd/PowerPC/PCode/PCodeInfo.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/StructMoves.c
+        compiler_and_linker/BackEnd/PowerPC/CodeGenerator/FunctionCalls.c
+        compiler_and_linker/FrontEnd/Optimizer/IroBitVect.c
         compiler_and_linker/unsorted/OpcodeInfo.c
         compiler_and_linker/unsorted/InlineAsmRegistersPPC.c
         compiler_and_linker/unsorted/InlineAsmMnemonicsPPC.c
         compiler_and_linker/unsorted/InlineAsmRegisters.c
-        compiler_and_linker/unsorted/Alias.c
-        compiler_and_linker/unsorted/LoopDetection.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/Alias.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/LoopDetection.c
         compiler_and_linker/unsorted/CopyPropagation.c
-        compiler_and_linker/unsorted/CodeMotion.c
-        compiler_and_linker/unsorted/StrengthReduction.c
-        compiler_and_linker/unsorted/LoopOptimization.c
-        compiler_and_linker/unsorted/ConstantPropagation.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/CodeMotion.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/StrengthReduction.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/LoopOptimization.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/ConstantPropagation.c
         compiler_and_linker/unsorted/AddPropagation.c
         compiler_and_linker/unsorted/UseDefChains.c
         compiler_and_linker/unsorted/LoadDeletion.c
-        compiler_and_linker/unsorted/VectorArraysToRegs.c
+        compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/VectorArraysToRegs.c
         compiler_and_linker/unsorted/LiveVariables.c
-        compiler_and_linker/unsorted/MachineSimulation604.c
-        compiler_and_linker/unsorted/MachineSimulation603.c
-        compiler_and_linker/unsorted/MachineSimulationAltiVec.c
-        compiler_and_linker/unsorted/MachineSimulation7400.c
-        compiler_and_linker/unsorted/MachineSimulation603e.c
-        compiler_and_linker/unsorted/MachineSimulation750.c
-        compiler_and_linker/unsorted/MachineSimulation601.c
-        compiler_and_linker/unsorted/MachineSimulation821.c
-        compiler_and_linker/unsorted/InterferenceGraph.c
-        compiler_and_linker/unsorted/SpillCode.c
-        compiler_and_linker/unsorted/GCCInlineAsm.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation604.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation603.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulationAltiVec.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation7400.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation603e.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation750.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation601.c
+        compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation821.c
+        compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/InterferenceGraph.c
+        compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/SpillCode.c
+        compiler_and_linker/BackEnd/PowerPC/InlineAssembler/GCCInlineAsm.c
         compiler_and_linker/unsorted/BitVectors.c
 
         command_line/C++_Parser/Src/Library/StaticParserGlue.c

command_line/CmdLine/Src/CLMain.c

@@ -121,7 +121,7 @@ static int RegisterStaticCmdLinePlugin(void) {
     return RegisterStaticPlugin(&clcb);
 }
 
-#include "command_line/CmdLine/Project/Resources/CLErrors.r"
+#include "../Project/Resources/CLErrors.r"
 
 static int RegisterCmdLineResources(void) {
     return RegisterResource("Command-line strings", 12000, STR12000);

compiler_and_linker/BackEnd/PowerPC/CodeGenerator/CodeGen.c

@@ -13,7 +13,7 @@
 #include "compiler/CPrepTokenizer.h"
 #include "compiler/Coloring.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/uDump.h"
+#include "compiler/DumpIR.h"
 #include "compiler/Exceptions.h"
 #include "compiler/InlineAsmPPC.h"
 #include "compiler/Intrinsics.h"

compiler_and_linker/BackEnd/PowerPC/InlineAssembler/FuncLevelAsmPPC.c

@@ -8,7 +8,7 @@
 #include "compiler/CodeGen.h"
 #include "compiler/Coloring.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/uDump.h"
+#include "compiler/DumpIR.h"
 #include "compiler/InlineAsmPPC.h"
 #include "compiler/InlineAsmRegisters.h"
 #include "compiler/ObjGenMachO.h"

compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c

@@ -1,22 +1,22 @@
 #include "cmdline.h"
 #include "parser.h"
 
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-common.h"
+#include "ParserGlue-mach-ppc-common.h"
 
 static Boolean useDefaultIncludes = 1;
 static Boolean useDefaultLibraries = 1;
 
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsCmdLine.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsCmdLineCompiler.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsCmdLineLinker.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsFrontEndC.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsDebugging.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsOptimizer.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsWarningC.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsBackEnd.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsProject.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsLinker.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsDumper.opt"
+#include "../../../Lib/mac-ppc-cc/OptsCmdLine.opt"
+#include "../../../Lib/mac-ppc-cc/OptsCmdLineCompiler.opt"
+#include "../../../Lib/mac-ppc-cc/OptsCmdLineLinker.opt"
+#include "../../../Lib/mac-ppc-cc/OptsFrontEndC.opt"
+#include "../../../Lib/mac-ppc-cc/OptsDebugging.opt"
+#include "../../../Lib/mac-ppc-cc/OptsOptimizer.opt"
+#include "../../../Lib/mac-ppc-cc/OptsWarningC.opt"
+#include "../../../Lib/mac-ppc-cc/OptsBackEnd.opt"
+#include "../../../Lib/mac-ppc-cc/OptsProject.opt"
+#include "../../../Lib/mac-ppc-cc/OptsLinker.opt"
+#include "../../../Lib/mac-ppc-cc/OptsDumper.opt"
 
 char *prefs[] = {
         "PPC CodeGen Mach-O",

compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c

@@ -139,7 +139,7 @@ int RegisterStaticLibImporterPlugin(void) {
     return RegisterStaticCompilerLinkerPlugin(&machlibimport_cb, &machlibimport_cl_cb);
 }
 
-#include "compiler_and_linker/Plugin_Tools/MacOS_PPC/Lib_Importer_Mach/Resources/Errors.r"
+#include "../../../../../Plugin_Tools/MacOS_PPC/Lib_Importer_Mach/Resources/Errors.r"
 
 int RegisterLibImporterResources(void) {
     return RegisterResource("Mach-O Lib Importer Errors", 911, STR911);

compiler_and_linker/FrontEnd/C/CExpr2.c

@@ -46,9 +46,9 @@ static CExprReplaceCB cexpr_rsearch_callback;
 static Type *cexpr_left_conversion_type;
 static Type *cexpr_right_conversion_type;
 
-static FuncArg mon_arg = {NULL, NULL, NULL, NULL, 0, 0, 0, 0};
-static FuncArg diadic_arg2 = {NULL, NULL, NULL, NULL, 0, 0, 0, 0};
-static FuncArg diadic_arg1 = {&diadic_arg1, NULL, NULL, NULL, 0, 0, 0, 0};
+static FuncArg mon_arg = {NULL, NULL, NULL, NULL, 0, 0, 0};
+static FuncArg diadic_arg2 = {NULL, NULL, NULL, NULL, 0, 0, 0};
+static FuncArg diadic_arg1 = {&diadic_arg1, NULL, NULL, NULL, 0, 0, 0};
 
 static void CExpr_RecSearchExprTree(ENode *expr) {
     ENodeList *list;

compiler_and_linker/FrontEnd/C/CParser.c

@@ -20,8 +20,8 @@
 #include "compiler/CTemplateTools.h"
 #include "compiler/CodeGen.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/IrOptimizer.h"
-#include "compiler/IroPointerAnalysis.h"
+#include "../Optimizer/IrOptimizer.h"
+#include "../Optimizer/IroPointerAnalysis.h"
 #include "compiler/ObjGenMachO.h"
 #include "compiler/objects.h"
 #include "compiler/scopes.h"

compiler_and_linker/FrontEnd/C/CPrep.c

@@ -14,7 +14,7 @@
 #include "compiler/CodeGen.h"
 #include "compiler/CompilerTools.h"
 #include "compiler/FuncLevelAsmPPC.h"
-#include "compiler/IroPointerAnalysis.h"
+#include "../Optimizer/IroPointerAnalysis.h"
 #include "compiler/ObjGenMachO.h"
 #include "compiler/objects.h"
 #include "compiler/scopes.h"

compiler_and_linker/FrontEnd/C/CSOM.c

@@ -138,7 +138,6 @@ static FuncArg SOMIDT_arg1 = {
     TYPE(&void_ptr),
     0,
     0,
-    0,
     0
 };
 

compiler_and_linker/FrontEnd/Common/COptimizer.c

@@ -14,7 +14,7 @@
 #include "compiler/CodeGen.h"
 #include "compiler/Switch.h"
 #include "compiler/Exceptions.h"
-#include "compiler/IrOptimizer.h"
+#include "../Optimizer/IrOptimizer.h"
 #include "cos.h"
 
 COptBlock *basicblocks;

compiler_and_linker/FrontEnd/Optimizer/IROUseDef.c

@@ -1,12 +1,12 @@
-#include "compiler/IROUseDef.h"
-#include "compiler/IRODump.h"
-#include "compiler/IROVars.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroTransform.h"
-#include "compiler/IroUtil.h"
+#include "IROUseDef.h"
+#include "IroDump.h"
+#include "IroVars.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroTransform.h"
+#include "IroUtil.h"
 #include "compiler/CompilerTools.h"
 #include "compiler/CError.h"
 #include "compiler/CFunc.h"

compiler_and_linker/FrontEnd/Optimizer/IROUseDef.h

@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROUSEDEF_H
 #define COMPILER_IROUSEDEF_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 #include "compiler/enode.h"
 
 #ifdef __MWERKS__

compiler_and_linker/FrontEnd/Optimizer/IrOptimizer.c

@@ -1,26 +1,26 @@
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 #include "compiler/CError.h"
 #include "compiler/CParser.h"
 #include "compiler/InlineAsmPPC.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroEval.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IroTransform.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroEval.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroSubable.h"
+#include "IroTransform.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/objects.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroJump.h"
-#include "compiler/IroRangePropagation.h"
-#include "compiler/IroEmptyLoop.h"
-#include "compiler/IroUnrollLoop.h"
-#include "compiler/IroLoop.h"
-#include "compiler/IroExprRegeneration.h"
+#include "IroPropagate.h"
+#include "IroPointerAnalysis.h"
+#include "IroJump.h"
+#include "IroRangePropagation.h"
+#include "IroEmptyLoop.h"
+#include "IroUnrollLoop.h"
+#include "IroLoop.h"
+#include "IroExprRegeneration.h"
 
 Boolean DoScalarize;
 Boolean DoLinearize;

compiler_and_linker/FrontEnd/Optimizer/IroBitVect.c

@@ -1,4 +1,4 @@
-#include "compiler/BitVector.h"
+#include "BitVector.h"
 #include "compiler/CompilerTools.h"
 
 void Bv_AllocVector(BitVector **bv, UInt32 size) {

compiler_and_linker/FrontEnd/Optimizer/IroCSE.c

@@ -1,13 +1,13 @@
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroSubable.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CError.h"
 #include "compiler/CExpr.h"
 #include "compiler/CInt64.h"

compiler_and_linker/FrontEnd/Optimizer/IroCSE.h

@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROCSE_H
 #define COMPILER_IROCSE_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 
 #ifdef __MWERKS__
 #pragma options align=mac68k

compiler_and_linker/FrontEnd/Optimizer/IroDump.c

@@ -1,14 +1,14 @@
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroUtil.h"
+#include "IroDump.h"
+#include "IroCSE.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CFunc.h"
 #include "compiler/CInt64.h"
 #include "compiler/CParser.h"
 #include "compiler/objects.h"
-#include "compiler/IroVars.h"
-#include "compiler/IroCSE.h"
 
 static FILE *DumpFile;
 static char *nodenames[MAXEXPR];

compiler_and_linker/FrontEnd/Optimizer/IroDump.h

@@ -1,8 +1,8 @@
 #ifndef COMPILER_IRODUMP_H
 #define COMPILER_IRODUMP_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 #include "compiler/enode.h"
 
 extern char *IRO_NodeName(ENodeType nodetype);

compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.c

@@ -1,10 +1,10 @@
-#include "compiler/IroEmptyLoop.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroLoop.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroEmptyLoop.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroLoop.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CInt64.h"
 
 // forward decls

compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROEMPTYLOOP_H
 #define COMPILER_IROEMPTYLOOP_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_FindEmptyLoops(void);
 

compiler_and_linker/FrontEnd/Optimizer/IroEval.c

@@ -1,13 +1,13 @@
-#include "compiler/IroEval.h"
+#include "IroEval.h"
 #include "compiler/CInt64.h"
 #include "compiler/CMachine.h"
 #include "compiler/CParser.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/enode.h"
 #include "compiler/objects.h"
 #include "compiler/types.h"

compiler_and_linker/FrontEnd/Optimizer/IroEval.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROEVAL_H
 #define COMPILER_IROEVAL_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_InitializeIsAssociativeENodeTypeArray(void);
 extern void IRO_TruncateValueToType(CInt64 *val, Type *type);

compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.c

@@ -1,13 +1,13 @@
-#include "compiler/IroExprRegeneration.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IroTransform.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroExprRegeneration.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroSubable.h"
+#include "IroTransform.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CDecl.h"
 #include "compiler/CExpr.h"
 #include "compiler/CFunc.h"

compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROEXPRREGENERATION_H
 #define COMPILER_IROEXPRREGENERATION_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_RegenerateExpressions(void);
 

compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.c

@@ -1,9 +1,9 @@
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
+#include "IroFlowgraph.h"
+#include "IroCSE.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
 #include "compiler/CError.h"
 #include "compiler/CFunc.h"
 #include "compiler/CompilerTools.h"

compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.h

@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROFLOWGRAPH_H
 #define COMPILER_IROFLOWGRAPH_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 #include "compiler/CError.h"
 #include "compiler/CompilerTools.h"
 

compiler_and_linker/FrontEnd/Optimizer/IroJump.c

@@ -1,8 +1,8 @@
-#include "compiler/IroJump.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroUtil.h"
+#include "IroJump.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroUtil.h"
 #include "compiler/CFunc.h"
 #include "compiler/Exceptions.h"
 

compiler_and_linker/FrontEnd/Optimizer/IroJump.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROJUMP_H
 #define COMPILER_IROJUMP_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern Boolean IRO_DoJumpChaining(void);
 extern void IRO_MakeReachable(IRONode *node);

compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.c

@@ -1,8 +1,8 @@
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroLinearForm.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CError.h"
 #include "compiler/CExpr.h"
 #include "compiler/CFunc.h"

compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROLINEARFORM_H
 #define COMPILER_IROLINEARFORM_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 #include "compiler/Switch.h"
 #include "compiler/enode.h"
 

compiler_and_linker/FrontEnd/Optimizer/IroLoop.c

@@ -1,12 +1,12 @@
-#include "compiler/IroLoop.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroLoop.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IroSubable.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CFunc.h"
 #include "compiler/CInt64.h"
 #include "compiler/CMachine.h"

compiler_and_linker/FrontEnd/Optimizer/IroLoop.h

@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROLOOP_H
 #define COMPILER_IROLOOP_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 
 typedef enum IROLoopIndFlags {
     LoopInd_HasMod = 1,

compiler_and_linker/FrontEnd/Optimizer/IroMalloc.c

@@ -1,4 +1,4 @@
-#include "compiler/IroMalloc.h"
+#include "IroMalloc.h"
 #include "compiler/CompilerTools.h"
 
 #define FLAGMASK 0xF

compiler_and_linker/FrontEnd/Optimizer/IroMalloc.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROMALLOC_H
 #define COMPILER_IROMALLOC_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern size_t IRO_msize(void *buf);
 extern void *IRO_malloc(size_t size);

compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.c

@@ -1,10 +1,10 @@
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroEval.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroPointerAnalysis.h"
+#include "IroEval.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CDecl.h"
 #include "compiler/CExpr.h"
 #include "compiler/CFunc.h"
@@ -17,7 +17,7 @@
 #include "compiler/CompilerTools.h"
 #include "compiler/objects.h"
 #include "compiler/scopes.h"
-#include "compiler_and_linker/unsorted/IroPointerAnalysisADTs.c"
+#include "IroPointerAnalysisADTs.c"
 
 // forward decls
 static Object *GetLocalObject(PALocalVar *local, Object *proc, Boolean flag);

compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROPOINTERANALYSIS_H
 #define COMPILER_IROPOINTERANALYSIS_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void PointerAnalysis_Setup(void);
 extern void PointerAnalysis_Cleanup(void);

compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysisADTs.c

@@ -1,5 +1,5 @@
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroMalloc.h"
 #include "compiler/CError.h"
 #include "compiler/CInt64.h"
 #include "compiler/CParser.h"