Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into metadata
  • Loading branch information
charsleysa committed Dec 3, 2014
2 parents 8e97fc5 + 64957bc commit b25f7dd
Show file tree
Hide file tree
Showing 78 changed files with 1,478 additions and 965 deletions.
25 changes: 17 additions & 8 deletions .gitignore
@@ -1,6 +1,18 @@
*.pdb
*.vcproj.*.user
*.resharper.user
# User-specific files

*.suo
*.user
*.userosscache
*.sln.docstates

# Build results

[Oo]bj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/

*.[Oo]bj
*.suo
*.ncb
*.aps
Expand All @@ -12,7 +24,7 @@
*.pidb
*.userprefs
*.FileListAbsolute.txt
*.Cache
*.[Cc]ache
*.tlog
*.vs10x
*.exe.manifest
Expand All @@ -21,9 +33,6 @@
*.vsp
Thumbs.db
build.force
obj
/bin
/Bin
/bin2
/tmp
/tags

9 changes: 9 additions & 0 deletions Readme.md
@@ -1,3 +1,12 @@
[![Build status][build-status-image]][build-status] [![Issue Stats][pull-requests-image]][pull-requests] [![Issue Stats][issues-closed-image]][issues-closed]

[build-status-image]: https://ci.appveyor.com/api/projects/status/dq5e28x88m6h044i/branch/master?svg=true
[build-status]: https://ci.appveyor.com/project/mosa/mosa-project/branch/master
[pull-requests-image]: http://www.issuestats.com/github/mosa/mosa-project/badge/pr
[pull-requests]: http://www.issuestats.com/github/mosa/mosa-project
[issues-closed-image]: http://www.issuestats.com/github/mosa/mosa-project/badge/issue
[issues-closed]: http://www.issuestats.com/github/mosa/mosa-project

MOSA is an open source software project aiming to create a high quality, cross-platform, optimizing .NET compiler designed specifically to support a managed operating system based on the .NET framework.

The MOSA project consists of:
Expand Down
5 changes: 2 additions & 3 deletions Source/Mosa.Compiler.Common/Mosa.Compiler.Common.csproj
Expand Up @@ -42,6 +42,7 @@
<Compile Include="BitArrayExtension.cs" />
<Compile Include="AssemblyLoadException.cs" />
<Compile Include="InvalidCompilerException.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SortedSetExtension.cs" />
<Compile Include="NotImplementCompilerException.cs" />
<Compile Include="CompilerException.cs" />
Expand All @@ -54,9 +55,7 @@
<Compile Include="StreamExtension.cs" />
<Compile Include="Tuple.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
Expand Down
33 changes: 33 additions & 0 deletions Source/Mosa.Compiler.Common/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Mosa.Compiler.Common.Properties")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("MOSA Project")]
[assembly: AssemblyProduct("Mosa.Compiler.Common.Properties")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("78febd05-3e04-4fd5-a1c6-16582f5b1e77")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("MOSA Project")]
[assembly: AssemblyProduct("MOSA Test")]
[assembly: AssemblyProduct("Mosa.Compiler.Framework.xUnit")]
[assembly: AssemblyCopyright("Copyright © MOSA Project 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/BaseCompiler.cs
Expand Up @@ -8,9 +8,9 @@
* Phil Garcia (tgiphil) <phil@thinkedge.com>
*/

using Mosa.Compiler.Trace;
using Mosa.Compiler.Linker;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/BaseCompilerStage.cs
Expand Up @@ -8,9 +8,9 @@
* Phil Garcia (tgiphil) <phil@thinkedge.com>
*/

using Mosa.Compiler.Trace;
using Mosa.Compiler.Linker;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System.Diagnostics;

namespace Mosa.Compiler.Framework
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/BaseMethodCompiler.cs
Expand Up @@ -10,9 +10,9 @@

using Mosa.Compiler.Framework.Analysis;
using Mosa.Compiler.Framework.Stages;
using Mosa.Compiler.Trace;
using Mosa.Compiler.Linker;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System;
using System.Collections.Generic;
using System.Diagnostics;
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs
Expand Up @@ -10,8 +10,8 @@

using Mosa.Compiler.Common;
using Mosa.Compiler.Framework.IR;
using Mosa.Compiler.Trace;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System.Collections.Generic;
using System.Diagnostics;

Expand Down
Binary file not shown.
Expand Up @@ -86,6 +86,7 @@
<Compile Include="Analysis\IDominanceAnalysis.cs" />
<Compile Include="BaseCallingConventionExtended.cs" />
<Compile Include="DelegatePatcher.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="MosaCompiler.cs" />
<Compile Include="InstructionSize.cs" />
<Compile Include="Intrinsics\GetObjectAddress.cs" />
Expand Down Expand Up @@ -346,7 +347,6 @@
<Compile Include="IR\TwoOperandInstruction.cs" />
<Compile Include="IR\ZeroExtendedMove.cs" />
<Compile Include="IVisitor.cs" />
<Compile Include="Stages\FlowGraphVisualizationStage.cs" />
<Compile Include="CIL\NopInstruction.cs" />
<Compile Include="InstructionSet.cs" />
<Compile Include="InstructionData.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/MosaCompiler.cs
Expand Up @@ -7,9 +7,9 @@
* Phil Garcia (tgiphil) <phil@thinkedge.com>
*/

using Mosa.Compiler.Trace;
using Mosa.Compiler.Linker;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System;
using System.Collections.Generic;
using System.IO;
Expand Down
Expand Up @@ -9,8 +9,8 @@
*/

using Mosa.Compiler.Framework.Platform;
using Mosa.Compiler.Trace;
using Mosa.Compiler.Linker;
using Mosa.Compiler.Trace;
using System;
using System.Diagnostics;
using System.IO;
Expand Down
173 changes: 0 additions & 173 deletions Source/Mosa.Compiler.Framework/Stages/FlowGraphVisualizationStage.cs

This file was deleted.

Expand Up @@ -8,8 +8,8 @@
*/

using Mosa.Compiler.Framework.IR;
using Mosa.Compiler.Trace;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System.Collections.Generic;
using System.Diagnostics;

Expand Down
Expand Up @@ -21,7 +21,6 @@ protected override void Run()
using (var file = new FileStream(CompilerOptions.OutputFile, FileMode.Create))
{
Linker.Emit(file);
file.Close();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/Stages/PlugStage.cs
Expand Up @@ -7,8 +7,8 @@
* Phil Garcia (tgiphil) <phil@thinkedge.com>
*/

using Mosa.Compiler.Trace;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.Trace;
using System;

namespace Mosa.Compiler.Framework.Stages
Expand Down

0 comments on commit b25f7dd

Please sign in to comment.