Permalink
Browse files

Merge in latest code

  • Loading branch information...
charsleysa committed Jan 21, 2017
2 parents 17bd541 + 831c86c commit f6dc5b999b93901da302e3731d0e503403b1b8c5
Showing 559 changed files with 12,684 additions and 10,462 deletions.
@@ -9,17 +9,11 @@ set GIT="%ProgramFiles%\Git\bin\git.exe"
rmdir /q /s source
mkdir source
-%GIT% clone --branch v1.6.1-mosa --depth 1 https://github.com/mosa/dnlib.git source/dnlib
-%GIT% clone --branch v2.10.0.beta1-mosa --depth 1 https://github.com/mosa/dockpanelsuite.git source/dockpanelsuite
+%GIT% clone --branch v1.6.0-mosa --depth 1 https://github.com/mosa/dnlib.git source/dnlib
%MSBUILD% /nologo /m /p:BuildInParallel=true /p:Configuration=Release /p:Platform="Any CPU" source/dnlib\dnlib.sln
-cd source/dockpanelsuite
-CALL all.bat
-cd ..
-
copy dnlib\Release\bin\dnlib.dll ..
-copy dockpanelsuite\bin\net40\WeifenLuo.WinFormsUI.Docking.dll ..
pause
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
@@ -13,7 +13,7 @@ xUnit.Net - Unit testing tool for the .NET Framework
Farm-Fresh Web Icons
- http://www.fatcow.com/free-icons
- Creative Commons Attribution 3.0 License
-- Used in the MOSA Tool Graphical User Interfaces
+- Used in the MOSA Tool graphical user interface and icons
dnlib (dnlib.dll)
- https://bitbucket.org/0xd4d/dnlib
@@ -23,9 +23,14 @@ dnlib (dnlib.dll)
SharpDisasm
-- https://github.com/spazzarama/SharpDisasm
-- Simplified BSD License
--- Used in MOSA for debugging & diagnostic purposes
+-- Used in MOSA for debugging & diagnostics
MetroFramework
--- https://github.com/thielj/MetroFramework
+-- https://github.com/dennismagno/metroframework-modern-ui
-- The MIT License
--- Used for MOSA Launcher
+-- Used in MOSA Launcher
+
+LZF
+-- https://csharplzfcompression.codeplex.com
+-- Simplified BSD License
+-- Used in MOSA for simple compression/decompression
Binary file not shown.
View
Binary file not shown.
View
@@ -1 +1 @@
-start ..\bin\Mosa.Tool.Launcher.exe -q -a --vmdk ..\bin\Mosa.CoolWorld.x86.exe
+start ..\bin\Mosa.Tool.Launcher.exe -q -a --vmdk -map ..\bin\Mosa.CoolWorld.x86.exe
View
@@ -1,3 +0,0 @@
-start ..\bin\Mosa.Tool.Launcher.exe -q -a -qemu -map -asm -debugger -tcpserver -threading-off ..\bin\Mosa.UnitTest.x86.exe
-
-rem start ..\bin\Mosa.Tool.Debugger.exe
View
@@ -0,0 +1,3 @@
+start ..\bin\Mosa.Tool.Launcher.exe -q -a -qemu -map -asm -debugger -tcpserver -threading-off -all-optimization-off -symbols x-base 0x00300000 -qemu-gdb -gdb ..\bin\Mosa.UnitTests.x86.exe
+
+rem start ..\bin\Mosa.Tool.Debugger.exe
View
@@ -1 +1 @@
-start bin\Mosa.Tool.Launcher.exe -qemu bin\Mosa.CoolWorld.x86.exe
+start bin\Mosa.Tool.Launcher.exe -qemu bin\Mosa.HelloWorld.x86.exe
View
@@ -1,7 +1,5 @@
[![Build status][build-status-image]][build-status] [![License][github-license]][github-license-link] [![Issues][github-issues]][github-issues-link] [![Stars][github-stars]][github-stars-link] [![Forks][github-forks]][github-forks-link] [![Gitter Chat][gitter-image]][gitter-chat]
-[![Issue Stats][pull-requests-image]][pull-requests] [![Issue Stats][issues-closed-image]][issues-closed]
-
[![Bountysource][bounty-image]][bounty-issues]
[build-status-image]: https://ci.appveyor.com/api/projects/status/gmeosk7sa6su8rb3/branch/master?svg=true
@@ -70,8 +68,15 @@ The [EditorConfig](http://editorconfig.org/) plugin is recommended for MOSA cont
**Linux**
+
+
Install [Mono](http://www.mono-project.com) and [Qemu](http://wiki.qemu.org/Main_Page).
+The minimum supported version of Mono is 4.4, this is not in some distributions repositories and must be added manually.
+A tutorial on how to do this can be found at the following URL.
+[http://www.mono-project.com/download/#download-lin](http://www.mono-project.com/download/#download-lin)
+
+If using the APT package manager you can use the following command to quickly set up QEMU and Mono
<pre>
sudo apt-get -y install mono-devel qemu
</pre>
View
@@ -0,0 +1,3 @@
+This directory contains useful scripts for compiling and using the MOSA tools.
+
+**** INCOMPLETE ***
View
@@ -383,6 +383,9 @@
<setting name="Cleaning_RemoveEndOfFileTrailingNewLine" serializeAs="String">
<value>False</value>
</setting>
+ <setting name="Digging_PrimarySortOrder" serializeAs="String">
+ <value>0</value>
+ </setting>
<setting name="Cleaning_UpdateFileHeaderCSharp" serializeAs="String">
<value>// Copyright (c) MOSA Project. Licensed under the New BSD License.
</value>
@@ -9,7 +9,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<AssemblyName>mscorlib</AssemblyName>
<DelaySign>false</DelaySign>
- <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<OutputType>Library</OutputType>
<RootNamespace>System</RootNamespace>
<NoWarn>0169;0649;1685</NoWarn>
View
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 12.0.31101.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{AB88960E-B233-475B-96E4-8C10EEF8622C}"
EndProject
@@ -108,7 +108,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.UnitTest.Collection.xU
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.Workspace.UnitTest.Debug", "Mosa.Workspace.UnitTest.Debug\Mosa.Workspace.UnitTest.Debug.csproj", "{1717C7EB-06ED-434B-BA3C-E46C9644EEDF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.UnitTest.x86", "Mosa.UnitTest.x86\Mosa.UnitTest.x86.csproj", "{44725E46-513F-4CFB-8196-2191399C514B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.UnitTests.x86", "Mosa.UnitTests.x86\Mosa.UnitTests.x86.csproj", "{44725E46-513F-4CFB-8196-2191399C514B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.BootLoader.x86", "Mosa.BootLoader.x86\Mosa.BootLoader.x86.csproj", "{EA460394-B868-45FB-8B7F-4096550B3113}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.Tool.Disassembler.Intel", "Mosa.Tool.Disassembler.Intel\Mosa.Tool.Disassembler.Intel.csproj", "{D9A2A321-F63A-495D-905F-EF7C84E4BB81}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.Utility.RSP", "Mosa.Utility.RSP\Mosa.Utility.RSP.csproj", "{5B810793-78E2-413C-CC05-FCDD12B7DB04}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.Workspace.GDB.Debug", "Mosa.Workspace.GDB.Debug\Mosa.Workspace.GDB.Debug.csproj", "{1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -575,6 +583,54 @@ Global
{44725E46-513F-4CFB-8196-2191399C514B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{44725E46-513F-4CFB-8196-2191399C514B}.Release|x86.ActiveCfg = Release|Any CPU
{44725E46-513F-4CFB-8196-2191399C514B}.Release|x86.Build.0 = Release|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Debug|x86.Build.0 = Debug|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Release|x86.ActiveCfg = Release|Any CPU
+ {EA460394-B868-45FB-8B7F-4096550B3113}.Release|x86.Build.0 = Release|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Debug|x86.Build.0 = Debug|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Release|x86.ActiveCfg = Release|Any CPU
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81}.Release|x86.Build.0 = Release|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Debug|x86.Build.0 = Debug|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Release|x86.ActiveCfg = Release|Any CPU
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04}.Release|x86.Build.0 = Release|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Debug|x86.Build.0 = Debug|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Release|x86.ActiveCfg = Release|Any CPU
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -623,6 +679,10 @@ Global
{B0776C9D-7F3D-4E6E-8C5D-5F735326C7D7} = {88D3D1D0-85D2-4301-A9EA-3F964CB05415}
{2A98B95B-B900-485C-85F7-7CD2944612C0} = {88D3D1D0-85D2-4301-A9EA-3F964CB05415}
{1717C7EB-06ED-434B-BA3C-E46C9644EEDF} = {AC7C3CDA-E0E8-408C-BB32-DBCBB905E3E1}
- {44725E46-513F-4CFB-8196-2191399C514B} = {88D3D1D0-85D2-4301-A9EA-3F964CB05415}
+ {44725E46-513F-4CFB-8196-2191399C514B} = {1AB7FA6A-829C-4DCF-BCA6-A27156D8DA26}
+ {EA460394-B868-45FB-8B7F-4096550B3113} = {1AB7FA6A-829C-4DCF-BCA6-A27156D8DA26}
+ {D9A2A321-F63A-495D-905F-EF7C84E4BB81} = {D032B24A-CE3A-4881-BACE-CC4FE0AFD69D}
+ {5B810793-78E2-413C-CC05-FCDD12B7DB04} = {90065B0F-1BFE-40D8-AED5-11096B2535B0}
+ {1717C7EB-06ED-434B-BA3C-E4FF9644EEDF} = {AC7C3CDA-E0E8-408C-BB32-DBCBB905E3E1}
EndGlobalSection
EndGlobal
@@ -1,43 +1,57 @@
// Copyright (c) MOSA Project. Licensed under the New BSD License.
using Mosa.Kernel.x86;
+using Mosa.Runtime.Plug;
-namespace Mosa.UnitTest.x86
+namespace Mosa.BootLoader.x86
{
/// <summary>
///
/// </summary>
public static class Boot
{
+ [Method("Mosa.Runtime.StartUp.SetInitialMemory")]
+ public static void SetInitialMemory()
+ {
+ KernelMemory.SetInitialMemory(Address.GCInitialMemory_BootLoader, 0x01000000);
+ }
+
private static uint counter = 0;
/// <summary>
/// Main
/// </summary>
public static void Main()
{
- Kernel.x86.Kernel.Setup();
+ IDT.SetInterruptHandler(null);
+ Panic.Setup();
+ Debugger.Setup(Serial.COM1);
+
+ // Initialize interrupts
+ PIC.Setup();
+ IDT.Setup();
+ GDT.Setup();
+
+ Runtime.Internal.Setup();
IDT.SetInterruptHandler(ProcessInterrupt);
- EnterUnitTestMode();
+ EnterTestReadyLoop();
}
- public static void EnterUnitTestMode()
+ public static void EnterTestReadyLoop()
{
Screen.Color = 0x0;
Screen.Clear();
Screen.GotoTop();
Screen.Color = 0x0E;
- Screen.Write("MOSA OS Version 1.4 - Unit Test Mode Kernel");
+ Screen.Write("MOSA OS Version 1.6 - Bootloader");
Screen.NextLine();
Screen.NextLine();
UnitTestQueue.Setup();
UnitTestRunner.Setup();
- DebugClient.Setup(Serial.COM1);
-
UnitTestRunner.EnterTestReadyLoop();
}
@@ -66,10 +80,5 @@ public static void ProcessInterrupt(uint interrupt, uint errorCode)
Screen.Color = col;
Screen.BackgroundColor = back;
}
-
- private static void ForceTestCollection()
- {
- Mosa.UnitTest.Collection.OptimizationTest.OptimizationTest1();
- }
}
}
Oops, something went wrong.

0 comments on commit f6dc5b9

Please sign in to comment.