Skip to content
Permalink
Browse files

- Updated Visual Studio Project (#640)

  • Loading branch information...
tgiphil committed Jun 22, 2019
1 parent 474997e commit 6b870efa2d6b52f7c85a8f2918fe7b79e79d5aeb
@@ -1,2 +1,4 @@
cd Source
CALL Compile-Debug.bat
cd Inno-Setup-Script
CALL Create-Installer.bat
@@ -22,7 +22,7 @@ DefaultDirName={pf}\{#MyAppName}
DisableDirPage=yes
DisableReadyPage=yes
DefaultGroupName={#MyAppName}
OutputDir=..\..\bin\MOSA Installer
OutputDir=..\..\bin
OutputBaseFilename=MOSA-Installer
SolidCompression=yes
MinVersion=0,6.0
@@ -2,17 +2,18 @@
<package >
<metadata>
<id>Mosa.ClassLib</id>
<version>1.0.0.1</version>
<version>1.0.0.5</version>
<title>Mosa.ClassLib Library</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>MOSA common libraries</description>
<summary>MOSA Common Library</summary>
<description>MOSA Common Library</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2017</copyright>
<copyright>Copyright © 2019</copyright>
<tags>MOSA Compiler</tags>
</metadata>
<files>
@@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Mosa.ClassLib")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

@@ -1,6 +1,5 @@
// Copyright (c) MOSA Project. Licensed under the New BSD License.

using Mosa.ClassLib;
using Mosa.Runtime;
using Mosa.Runtime.x86;
using System;
@@ -315,7 +314,6 @@ private static void ProcessCommand()
case DebugCode.ClearMemory: ClearMemory(); return;
case DebugCode.HardJump: HardJump(); return;
case DebugCode.ExecuteUnitTest: QueueUnitTest(); return;
case DebugCode.GetMemoryCRC: GetMemoryCRC(); return;
default: return;
}
}
@@ -399,11 +397,10 @@ private static void CompressedWriteMemory()
uint address = GetDataUInt32(0);
uint length = GetDataUInt32(4);
uint size = GetDataUInt32(8);
uint uncompresscrc = GetDataUInt32(12);

LZF.Decompress(new IntPtr(Address.DebuggerBuffer + HeaderSize), length, new IntPtr(address), size);
//uint uncompresscrc = GetDataUInt32(12);

uint computedcrc = ComputeMemoryCRC(address, size);
LZF.Decompress(new IntPtr(Address.DebuggerBuffer + HeaderSize), length, new IntPtr(address), size);

Screen.Goto(15, 0);
Screen.ClearRow();
@@ -419,12 +416,13 @@ private static void CompressedWriteMemory()
Screen.Write(" Size: ");
Screen.Write(size, 10, 5);
Screen.Write(" CRC: ");
Screen.Write(uncompresscrc, 16, 8);

if (uncompresscrc == computedcrc)
Screen.Write(" OK");
else
Screen.Write(" BAD");
//Screen.Write(uncompresscrc, 16, 8);

//if (uncompresscrc == computedcrc)
// Screen.Write(" OK");
//else
// Screen.Write(" BAD");

SendResponse(id, DebugCode.CompressedWriteMemory);
}
@@ -454,31 +452,6 @@ private static void ClearMemory()
SendResponse(id, DebugCode.ClearMemory);
}

private static void GetMemoryCRC()
{
uint id = GetID();
uint start = GetDataUInt32(0);
uint length = GetDataUInt32(4);

uint crc = ComputeMemoryCRC(start, length);

SendResponseStart(id, DebugCode.GetMemoryCRC, 4);
SendInteger(crc);
}

private static uint ComputeMemoryCRC(uint start, uint length)
{
uint crc = CRC.InitialCRC;

for (uint i = 0; i < length; i++)
{
byte b = Intrinsic.Load8(new IntPtr(start), i);
crc = CRC.Update(crc, b);
}

return crc;
}

private static void QueueUnitTest()
{
uint id = GetID();
@@ -105,10 +105,6 @@
<Compile Include="Logger.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mosa.ClassLib\Mosa.ClassLib.csproj">
<Project>{27a3c89c-1967-45ff-a77e-94f44995c42c}</Project>
<Name>Mosa.ClassLib</Name>
</ProjectReference>
<ProjectReference Include="..\Mosa.Korlib\Mosa.Korlib.csproj">
<Project>{631bc4f3-e2d8-4319-814c-13904caa17ce}</Project>
<Name>Mosa.Korlib</Name>
@@ -2,23 +2,23 @@
<package >
<metadata>
<id>Mosa.Kernel.x86</id>
<version>1.0.0.1</version>
<version>1.0.0.5</version>
<title>Mosa.Kernel.x86 Library</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>MOSA kernel for x86</description>
<summary>MOSA Kernel for x86</summary>
<description>MOSA Kernel for x86</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2017</copyright>
<copyright>Copyright © 2019</copyright>
<tags>MOSA Compiler</tags>
<dependencies>
<dependency id="Mosa.Korlib" version="1.0.0.1" />
<dependency id="Mosa.ClassLib" version="1.0.0.1" />
<dependency id="Mosa.Runtime" version="1.0.0.1" />
<dependency id="Mosa.Runtime.x86" version="1.0.0.1" />
<dependency id="Mosa.Korlib" version="1.0.0.5" />
<dependency id="Mosa.Runtime" version="1.0.0.5" />
<dependency id="Mosa.Runtime.x86" version="1.0.0.5" />
</dependencies>
</metadata>
<files>
@@ -2,17 +2,18 @@
<package >
<metadata minClientVersion="3.3.0">
<id>Mosa.Korlib</id>
<version>1.0.0.1</version>
<version>1.0.0.5</version>
<title>Mosa.Korlib Library</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>MOSA Corlib</summary>
<description>MOSA implementation of corlib</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2017</copyright>
<copyright>Copyright © 2019</copyright>
<tags>MOSA Compiler corlib</tags>
</metadata>
<files>
@@ -2,21 +2,22 @@
<package >
<metadata>
<id>Mosa.Runtime.x86</id>
<version>1.0.0.1</version>
<version>1.0.0.5</version>
<title>Mosa.Runtime.x64 Library</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>MOSA runtime libraries for x64 platform</description>
<summary>MOSA x64 Runtime Library</summary>
<description>MOSA Runtime Libraries x64 Platform</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2017</copyright>
<copyright>Copyright © 2019</copyright>
<tags>MOSA Compiler</tags>
<dependencies>
<dependency id="Mosa.Korlib" version="1.0.0.1" />
<dependency id="Mosa.Runtime" version="1.0.0.1" />
<dependency id="Mosa.Korlib" version="1.0.0.5" />
<dependency id="Mosa.Runtime" version="1.0.0.5" />
</dependencies>
</metadata>
<files>
@@ -2,21 +2,22 @@
<package >
<metadata>
<id>Mosa.Runtime.x86</id>
<version>1.0.0.1</version>
<version>1.0.0.5</version>
<title>Mosa.Runtime.x86 Library</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>MOSA x86 Runtime Library</summary>
<description>MOSA runtime libraries for x86 platform</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2017</copyright>
<copyright>Copyright © 2019</copyright>
<tags>MOSA Compiler</tags>
<dependencies>
<dependency id="Mosa.Korlib" version="1.0.0.1" />
<dependency id="Mosa.Runtime" version="1.0.0.1" />
<dependency id="Mosa.Korlib" version="1.0.0.5" />
<dependency id="Mosa.Runtime" version="1.0.0.5" />
</dependencies>
</metadata>
<files>
@@ -2,20 +2,21 @@
<package >
<metadata>
<id>Mosa.Runtime</id>
<version>1.0.0.1</version>
<version>1.0.0.5</version>
<title>Mosa.Runtime Library</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>MOSA runtime libraries</description>
<summary>MOSA Runtime Library</summary>
<description>MOSA Runtime Library</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2017</copyright>
<copyright>Copyright © 2019</copyright>
<tags>MOSA Compiler</tags>
<dependencies>
<dependency id="Mosa.Korlib" version="1.0.0.1" />
<dependency id="Mosa.Korlib" version="1.0.0.5" />
</dependencies>
</metadata>
<files>
@@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("MOSA Project")]
[assembly: AssemblyProduct("Mosa.Tool.Explorer")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

@@ -2,14 +2,15 @@
<package >
<metadata>
<id>Mosa.Tools.Package</id>
<version>$version$</version>
<version>1.0.0.5</version>
<title>Mosa.Tools.Package</title>
<authors>MOSA Project</authors>
<owners>MOSA Project</owners>
<license type="expression">BSD-3-Clause-Clear</license>
<projectUrl>http://www.mosa-project.org</projectUrl>
<iconUrl>https://raw.githubusercontent.com/mosa/MOSA-Project/master/Source/Art/Mosa%20Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>MOSA Tools Package</summary>
<description>MOSA Tools Package</description>
<releaseNotes></releaseNotes>
<copyright>Copyright © 2019</copyright>
@@ -23,6 +24,7 @@
<file src="..\..\bin\Mosa.Compiler.Common.dll" target="tools" />
<file src="..\..\bin\Mosa.Compiler.Framework.dll" target="tools" />
<file src="..\..\bin\Mosa.Compiler.MosaTypeSystem.dll" target="tools" />
<file src="..\..\bin\Mosa.Compiler.Extension.Dwarf.dll" target="tools" />
<file src="..\..\bin\Mosa.DeviceSystem.dll" target="tools" />
<file src="..\..\bin\Mosa.FileSystem.dll" target="tools" />
<file src="..\..\bin\Mosa.Platform.ARMv6.dll" target="tools" />
@@ -40,11 +42,12 @@
<file src="..\..\bin\Mosa.Utility.RSP.dll" target="tools" />
<file src="..\..\bin\Mosa.Tool.Compiler.exe" target="tools" />
<file src="..\..\bin\SharpDisasm.dll" target="tools" />
<file src="..\..\bin\CommandLine.dll" target="tools" />
<file src="..\..\bin\Priority Queue.dll" target="tools" />
<file src="..\..\bin\MetroFramework.dll" target="tools" />
<file src="..\..\bin\MetroFramework.Design.dll" target="tools" />
<file src="..\..\bin\MetroFramework.Fonts.dll" target="tools" />
<file src="..\..\bin\WeifenLuo.WinFormsUI.Docking.dll" target="tools" />
<file src="..\..\bin\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll" target="tools" />
<file src="..\..\bin\CommandLine.dll" target="tools" />
</files>
</package>
@@ -4,29 +4,29 @@

namespace Mosa.Starter.x86
{
public static class Boot
{
public static void Main()
{
Mosa.Kernel.x86.Kernel.Setup();
public static class Boot
{
public static void Main()
{
Mosa.Kernel.x86.Kernel.Setup();

IDT.SetInterruptHandler(ProcessInterrupt);
IDT.SetInterruptHandler(ProcessInterrupt);

Screen.Clear();
Screen.Goto(0, 0);
Screen.Color = Color.White;
Screen.Clear();
Screen.Goto(0, 0);
Screen.Color = ScreenColor.White;

Program.Setup();
Program.Setup();

while (true)
{
Program.Loop();
}
}
while (true)
{
Program.Loop();
}
}

public static void ProcessInterrupt(uint interrupt, uint errorCode)
{
Program.OnInterrupt();
}
}
public static void ProcessInterrupt(uint interrupt, uint errorCode)
{
Program.OnInterrupt();
}
}
}
@@ -85,6 +85,17 @@
<Private>True</Private>
</Reference>
<Reference Include="Mosa.Runtime.x86, Version=0.0.0.0, Culture=neutral">
<HintPath>..\packages\Mosa.Runtime.x86.1.0.0.0\lib\Mosa.Runtime.x86.dll</HintPath>
<Reference Include="Mosa.Kernel.x86, Version=0.0.0.0, Culture=neutral">
<HintPath>..\packages\Mosa.Kernel.x86.1.0.0.5\lib\net472\Mosa.Kernel.x86.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mosa.Runtime, Version=0.0.0.0, Culture=neutral">
<HintPath>..\packages\Mosa.Runtime.1.0.0.5\lib\net472\Mosa.Runtime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mosa.Runtime.x86, Version=0.0.0.0, Culture=neutral">
<HintPath>..\packages\Mosa.Runtime.x86.1.0.0.5\lib\net472\Mosa.Runtime.x86.dll</HintPath>
<HintPath>..\packages\Mosa.Runtime.x86.1.0.0.1\lib\net472\Mosa.Runtime.x86.dll</HintPath>
<Private>True</Private>
</Reference>
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Mosa.ClassLib" version="1.0.0.1" targetFramework="net472" />
<package id="Mosa.Kernel.x86" version="1.0.0.1" targetFramework="net472" />
<package id="Mosa.Korlib" version="1.0.0.1" targetFramework="net472" />
<package id="Mosa.Runtime" version="1.0.0.1" targetFramework="net472" />
<package id="Mosa.Runtime.x86" version="1.0.0.1" targetFramework="net472" />
<package id="Mosa.Tools.Package" version="1.0.0" targetFramework="net472" />
<package id="Mosa.Korlib" version="1.0.0.5" targetFramework="net472" />
<package id="Mosa.Kernel.x86" version="1.0.0.5" targetFramework="net472" />
<package id="Mosa.Runtime" version="1.0.0.5" targetFramework="net472" />
<package id="Mosa.Runtime.x86" version="1.0.0.5" targetFramework="net472" />
<package id="Mosa.Tools.Package" version="1.0.0.5" targetFramework="net472" />
</packages>

0 comments on commit 6b870ef

Please sign in to comment.
You can’t perform that action at this time.