Merge branch 'master' of https://github.com/CosmosOS/Cosmos

EDK3D-dev · Aug 10, 2017 · 7eac7ba · 7eac7ba
2 parents ac525c2 + d839da5
commit 7eac7ba
Show file tree

Hide file tree

Showing 35 changed files with 55 additions and 27 deletions.
diff --git a/Build/Tools/7zip/7za.exe b/Build/Tools/7zip/7za.exe
diff --git a/Build/Tools/NAsm/nasm.exe b/Build/Tools/NAsm/nasm.exe
diff --git a/Build/Tools/NAsm/ndisasm.exe b/Build/Tools/NAsm/ndisasm.exe
diff --git a/Build/Tools/VSIXBootstrapper.exe b/Build/Tools/VSIXBootstrapper.exe
diff --git a/Build/Tools/cygwin/cygiconv-2.dll b/Build/Tools/cygwin/cygiconv-2.dll
diff --git a/Build/Tools/cygwin/cygintl-3.dll b/Build/Tools/cygwin/cygintl-3.dll
diff --git a/Build/Tools/cygwin/cygwin1.dll b/Build/Tools/cygwin/cygwin1.dll
diff --git a/Build/Tools/cygwin/ld.exe b/Build/Tools/cygwin/ld.exe
diff --git a/Build/Tools/cygwin/objdump.exe b/Build/Tools/cygwin/objdump.exe
diff --git a/Build/Tools/gdb.exe b/Build/Tools/gdb.exe
diff --git a/Build/Tools/mkisofs/mkisofs.exe b/Build/Tools/mkisofs/mkisofs.exe
diff --git a/Build/Tools/nuget.exe b/Build/Tools/nuget.exe
diff --git a/Build/Tools/syslinux.exe b/Build/Tools/syslinux.exe
diff --git a/Build/Tools/vswhere.exe b/Build/Tools/vswhere.exe
diff --git a/Resources/Dependencies/ApprovalTests.3.0.10/ApprovalTests.dll b/Resources/Dependencies/ApprovalTests.3.0.10/ApprovalTests.dll
diff --git a/Resources/Dependencies/ApprovalUtilities.3.0.10/ApprovalUtilities.Net45.dll b/Resources/Dependencies/ApprovalUtilities.3.0.10/ApprovalUtilities.Net45.dll
diff --git a/Resources/Dependencies/ApprovalUtilities.3.0.10/ApprovalUtilities.dll b/Resources/Dependencies/ApprovalUtilities.3.0.10/ApprovalUtilities.dll
diff --git a/Resources/Dependencies/Dapper/Dapper.dll b/Resources/Dependencies/Dapper/Dapper.dll
diff --git a/Resources/Dependencies/Dapper/DapperExtensions.dll b/Resources/Dependencies/Dapper/DapperExtensions.dll
diff --git a/Resources/Dependencies/Dapper/SQLinq.Dapper.dll b/Resources/Dependencies/Dapper/SQLinq.Dapper.dll
diff --git a/Resources/Dependencies/Dapper/SQLinq.dll b/Resources/Dependencies/Dapper/SQLinq.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.AvalonEdit.dll b/Resources/Dependencies/ILSpy/ICSharpCode.AvalonEdit.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.Decompiler.dll b/Resources/Dependencies/ILSpy/ICSharpCode.Decompiler.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.NRefactory.CSharp.dll b/Resources/Dependencies/ILSpy/ICSharpCode.NRefactory.CSharp.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.NRefactory.VB.dll b/Resources/Dependencies/ILSpy/ICSharpCode.NRefactory.VB.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.NRefactory.dll b/Resources/Dependencies/ILSpy/ICSharpCode.NRefactory.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.TreeView.dll b/Resources/Dependencies/ILSpy/ICSharpCode.TreeView.dll
diff --git a/Resources/Dependencies/ILSpy/ILSpy.BamlDecompiler.Plugin.dll b/Resources/Dependencies/ILSpy/ILSpy.BamlDecompiler.Plugin.dll
diff --git a/Resources/Dependencies/ILSpy/ILSpy.exe b/Resources/Dependencies/ILSpy/ILSpy.exe
diff --git a/Resources/Dependencies/ILSpy/Mono.Cecil.Pdb.dll b/Resources/Dependencies/ILSpy/Mono.Cecil.Pdb.dll
diff --git a/Resources/Dependencies/ILSpy/Mono.Cecil.dll b/Resources/Dependencies/ILSpy/Mono.Cecil.dll
diff --git a/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj b/Tests/Cosmos.TestRunner.UnitTest/Cosmos.TestRunner.UnitTest.csproj
@@ -7,9 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-        <PackageReference Include="NUnit" Version="3.7.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+        <PackageReference Include="NUnit" Version="3.7.1" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/appveyor.yml b/appveyor.yml
@@ -10,49 +10,49 @@ build_script:
     rem %APPVEYOR_BUILD_FOLDER%
 
 
-    nuget restore "Cosmos/Builder.sln"
+    nuget restore "Builder.sln"
 
-    nuget restore "Cosmos/Build.sln"
+    nuget restore "Build.sln"
 
-    nuget restore "Cosmos/Test.sln"
+    nuget restore "Test.sln"
 
     
-    msbuild "Cosmos/Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false
+    msbuild "Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false
 
-    msbuild "Cosmos/Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Cosmos\Build\VSIP" /p:DeployExtension=false
+    msbuild "Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Build\VSIP" /p:DeployExtension=false
 
-    msbuild "Cosmos/Test.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug
+    msbuild "Test.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug
 
 
-    dotnet publish Cosmos/source/Cosmos.Build.MSBuild -f net462 -r win7-x86 -o "c:\CosmosRun\Build\VSIP\"
+    dotnet publish source\Cosmos.Build.MSBuild -f net462 -r win7-x86 -o "c:\CosmosRun\Build\VSIP\"
 
-    dotnet publish Cosmos/source/IL2CPU -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"
+    dotnet publish source\IL2CPU -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"
         
-    dotnet publish Cosmos/source/XSharp.Compiler -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\XSharp\"
+    dotnet publish source\XSharp.Compiler -f netcoreapp1.0 -r win7-x86 -o "c:\CosmosRun\Build\XSharp\"
 
-    xcopy /Y "Cosmos\Build\VSIP\Cosmos.Debug.Kernel.*" "c:\CosmosRun\Kernel\"
+    xcopy /Y "Build\VSIP\Cosmos.Debug.Kernel.*" "c:\CosmosRun\Kernel\"
     
-    xcopy /Y "Cosmos\Build\VSIP\Cosmos.Core.*" "c:\CosmosRun\Kernel\"
+    xcopy /Y "Build\VSIP\Cosmos.Core.*" "c:\CosmosRun\Kernel\"
     
-    xcopy /Y "Cosmos\Build\VSIP\Cosmos.HAL.*" "c:\CosmosRun\Kernel\"
+    xcopy /Y "Build\VSIP\Cosmos.HAL.*" "c:\CosmosRun\Kernel\"
     
-    xcopy /Y "Cosmos\Build\VSIP\Cosmos.System.*" "c:\CosmosRun\Kernel\"
+    xcopy /Y "Build\VSIP\Cosmos.System.*" "c:\CosmosRun\Kernel\"
     
-    xcopy /Y "Cosmos\Build\VSIP\Cosmos.Common.*" "c:\CosmosRun\Kernel\"
+    xcopy /Y "Build\VSIP\Cosmos.Common.*" "c:\CosmosRun\Kernel\"
 
-    xcopy /Y "Cosmos\Build\VSIP\Cosmos.Debug.GDB.exe" "c:\CosmosRun\Build\VSIP\"
+    xcopy /Y "Build\VSIP\Cosmos.Debug.GDB.exe" "c:\CosmosRun\Build\VSIP\"
 
-    xcopy /Y /S "Cosmos\Build\ISO" "c:\CosmosRun\Build\ISO\"
+    xcopy /Y /S "Build\ISO" "c:\CosmosRun\Build\ISO\"
 
-    xcopy /Y "Cosmos\Build\*.*" "c:\CosmosRun\Build\ISO\"
+    xcopy /Y "Build\*.*" "c:\CosmosRun\Build\ISO\"
 
-    xcopy /Y /S "Cosmos\Build\VMware\*" "c:\CosmosRun\Build\VMware\"
+    xcopy /Y /S "Build\VMware\*" "c:\CosmosRun\Build\VMware\"
 
-    xcopy /Y /S "Cosmos\Build\Tools" "c:\CosmosRun\Build\Tools\"
+    xcopy /Y /S "Build\Tools" "c:\CosmosRun\Build\Tools\"
 
-    xcopy /Y "Cosmos\source\Cosmos.Core.DebugStub\*.xs" "c:\CosmosRun\XSharp\DebugStub\"
+    xcopy /Y "source\Cosmos.Core.DebugStub\*.xs" "c:\CosmosRun\XSharp\DebugStub\"
 
-    xcopy /Y /S "Cosmos\Resources\Bochs\*.*" "%ProgramFiles(x86)%\Bochs-2.6.8\"
+    xcopy /Y /S "Resources\Bochs\*.*" "%ProgramFiles(x86)%\Bochs-2.6.8\"
 
 
     reg add HKLM\SOFTWARE\WOW6432Node\Cosmos /v UserKit /d c:\CosmosRun\
@@ -67,7 +67,7 @@ build_script:
 #  - Cosmos.TestRunner.UnitTest.dll
 
 test_script:
-- cmd: dotnet test Cosmos\Tests\Cosmos.TestRunner.UnitTest\Cosmos.TestRunner.UnitTest.csproj --logger "trx;LogFileName=c:\Cosmos\TestResult.xml"
+- cmd: dotnet test Tests\Cosmos.TestRunner.UnitTest\Cosmos.TestRunner.UnitTest.csproj --logger "trx;LogFileName=c:\Cosmos\TestResult.xml"
 
 on_finish:
 - ps: |

diff --git a/source/TheRingMaster/Program.cs b/source/TheRingMaster/Program.cs
@@ -6,6 +6,7 @@
 using System.Runtime.Loader;
 
 using Cosmos.Build.Common;
+using Cosmos.IL2CPU.API.Attribs;
 
 namespace TheRingMaster
 {
@@ -50,6 +51,8 @@ public static void Main(string[] args)
 
             void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = null)
             {
+                bool xDebugAllowed = false;
+
                 if (!RingCache.TryGetValue(aAssembly, out var xRing))
                 {
                     var xManifestName = aAssembly.GetManifestResourceNames()
@@ -72,10 +75,13 @@ void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = nul
 
                         xCfg.TryGetValue("Ring", out var xRingName);
 
-                        if (!Enum.TryParse(xRingName, out xRing))
+                        if (!Enum.TryParse(xRingName, true, out xRing))
                         {
                             throw new Exception("Unknown ring! Ring: " + xRingName);
                         }
+
+                        xCfg.TryGetValue("DebugRing", out var xDebugRing);
+                        xDebugAllowed = xDebugRing.ToLower() == "allowed";
                     }
                 }
 
@@ -90,7 +96,9 @@ void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = nul
                 // External ring, can be referenced by any ring
                 // OR
                 // One of the assemblies is Debug
-                if (aRing == xRing || xRing == Ring.External || aRing == Ring.Debug || xRing == Ring.Debug)
+                // OR
+                // Debug ring allowed
+                if (aRing == xRing || xRing == Ring.External || aRing == Ring.Debug || xRing == Ring.Debug || xDebugAllowed)
                 {
                     xValid = true;
                 }
@@ -116,6 +124,25 @@ void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = nul
                     throw new Exception(xExceptionMessage);
                 }
 
+                if (xRing != Ring.CPU && xRing != Ring.Plugs)
+                {
+                    foreach (var xModule in aAssembly.Modules)
+                    {
+                        // TODO: Check unsafe code
+                    }
+                }
+
+                foreach (var xType in aAssembly.GetTypes())
+                {
+                    if (xRing != Ring.Plugs)
+                    {
+                        if (xType.GetTypeInfo().GetCustomAttribute<Plug>() != null)
+                        {
+                            throw new Exception("Plugs are only allowed in the Plugs ring! Assembly: " + aAssembly.GetName().Name);
+                        }
+                    }
+                }
+
                 foreach (var xReference in aAssembly.GetReferencedAssemblies())
                 {
                     try

diff --git a/source/TheRingMaster/TheRingMaster.csproj b/source/TheRingMaster/TheRingMaster.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
+    <ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
   </ItemGroup>
 
 </Project>