Permalink
Browse files

Sync (#13)

  • Loading branch information...
robot9706 committed Sep 18, 2017
1 parent 06ae922 commit 0ef312c8f664e97e3cd19cf21566de0ffb407bf6
Showing with 230 additions and 113 deletions.
  1. +1 −1 Demos/Run-CoolWorld.bat
  2. +1 −1 Demos/Run-HelloWorld.bat
  3. +1 −1 Demos/Run-TestWorld.bat
  4. +1 −1 Source/Mosa.Compiler.Framework/Stages/CILTransformationStage.cs
  5. +1 −1 Source/Mosa.Compiler.Framework/Stages/LongOperandStage.cs
  6. +7 −0 Source/Mosa.Tool.Compiler/Mosa.Tool.Compiler.csproj
  7. +13 −0 Source/Mosa.Tool.Compiler/packages.config
  8. +7 −0 Source/Mosa.Tool.CreateBootImage/Mosa.Tool.CreateBootImage.csproj
  9. +13 −0 Source/Mosa.Tool.CreateBootImage/packages.config
  10. +2 −2 Source/Mosa.Tool.Debugger/Mosa.Tool.Debugger.csproj
  11. +1 −1 Source/Mosa.Tool.Debugger/packages.config
  12. +8 −0 Source/Mosa.Tool.Disassembler.Intel/Mosa.Tool.Disassembler.Intel.csproj
  13. +13 −0 Source/Mosa.Tool.Disassembler.Intel/packages.config
  14. +7 −0 Source/Mosa.Tool.Explorer/Mosa.Tool.Explorer.csproj
  15. +13 −0 Source/Mosa.Tool.Explorer/packages.config
  16. +4 −4 Source/Mosa.Tool.GDBDebugger/Mosa.Tool.GDBDebugger.csproj
  17. +3 −3 Source/Mosa.Tool.GDBDebugger/packages.config
  18. +12 −6 Source/Mosa.Tool.Launcher/AdditionalFilesListControl.cs
  19. +8 −0 Source/Mosa.Tool.Launcher/GlobalSuppressions.cs
  20. +6 −6 Source/Mosa.Tool.Launcher/MainForm.Designer.cs
  21. +22 −47 Source/Mosa.Tool.Launcher/MainForm.cs
  22. +8 −0 Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj
  23. +13 −0 Source/Mosa.Tool.Launcher/packages.config
  24. +4 −4 Source/Mosa.UnitTest.Engine/UnitTestEngine.cs
  25. +7 −0 Source/Mosa.Utility.Launcher/Mosa.Utility.Launcher.csproj
  26. +32 −25 Source/Mosa.Utility.Launcher/Options.cs
  27. +8 −9 Source/Mosa.Utility.Launcher/Starter.cs
  28. +13 −0 Source/Mosa.Utility.Launcher/packages.config
  29. +1 −1 Tests/Build-BootLoader.bat
View
@@ -1 +1 @@
start ..\bin\Mosa.Tool.Launcher.exe -q -a --vmdk -map -asm -debuginfo ..\bin\Mosa.CoolWorld.x86.exe
start ..\bin\Mosa.Tool.Launcher.exe --q --a --map --asm --debuginfo ..\bin\Mosa.CoolWorld.x86.exe
View
@@ -1 +1 @@
start ..\bin\Mosa.Tool.Launcher.exe -q -a -qemu -map -debuginfo ..\bin\Mosa.HelloWorld.x86.exe
start ..\bin\Mosa.Tool.Launcher.exe --q --a --qemu --map --debuginfo ..\bin\Mosa.HelloWorld.x86.exe
View
@@ -1,2 +1,2 @@
start ..\bin\Mosa.Tool.Launcher.exe -q -a -qemu -map -asm -debuginfo --all-optimization-off -threading-off ..\bin\Mosa.TestWorld.x86.exe
start ..\bin\Mosa.Tool.Launcher.exe --q --a --qemu --map --asm --debuginfo --all-optimization-off --threading-off ..\bin\Mosa.TestWorld.x86.exe
@@ -2161,4 +2161,4 @@ private bool ReplaceWithInternalCall(InstructionNode node)
#endregion Internals
}
}
}
@@ -161,7 +161,7 @@ private void LoadInteger(InstructionNode node)
var context = new Context(node);
if (operand2.IsConstant && !operand2.IsLong && !operand1.IsStaticField)
if (operand2.IsConstant && !operand2.IsLong)
{
var target4 = CreateConstant((uint)(operand2.ConstantUnsignedLongInteger + 4));
@@ -70,6 +70,13 @@
<HintPath>..\packages\CommandLineParser.2.1.1-beta\lib\net45\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Compiler.cs">
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net461" />
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
<package id="System.Console" version="4.0.0" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
</packages>
@@ -66,6 +66,13 @@
<HintPath>..\packages\CommandLineParser.2.1.1-beta\lib\net45\CommandLine.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net461" />
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
<package id="System.Console" version="4.0.0" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
</packages>
@@ -50,8 +50,8 @@
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.16.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.3.0.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DockPanelSuite" version="2.16.1" targetFramework="net461" />
<package id="DockPanelSuite" version="3.0.0" targetFramework="net461" />
</packages>
@@ -110,6 +110,14 @@
<HintPath>..\packages\SharpDisasm.1.1.5\lib\net45\SharpDisasm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mosa.Compiler.Common\Mosa.Compiler.Common.csproj">
@@ -2,4 +2,17 @@
<packages>
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net461" />
<package id="SharpDisasm" version="1.1.5" targetFramework="net46" />
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
<package id="System.Console" version="4.0.0" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
</packages>
@@ -68,8 +68,15 @@
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -2,4 +2,17 @@
<packages>
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net461" />
<package id="SharpDisasm" version="1.1.5" targetFramework="net46" />
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
<package id="System.Console" version="4.0.0" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
</packages>
@@ -59,11 +59,11 @@
<HintPath>..\packages\SharpDisasm.1.1.5\lib\net45\SharpDisasm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.16.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.3.0.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=2.16.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2015.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=3.0.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2015.3.0.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DockPanelSuite" version="2.16.1" targetFramework="net461" />
<package id="DockPanelSuite.ThemeVS2015" version="2.16.1" targetFramework="net461" />
<package id="SharpDisasm" version="1.1.5" targetFramework="net46" />
<package id="CommandLineParser" version="2.1.1-beta" targetFramework="net461" />
<package id="DockPanelSuite" version="3.0.0" targetFramework="net461" />
<package id="DockPanelSuite.ThemeVS2015" version="3.0.0" targetFramework="net461" />
<package id="SharpDisasm" version="1.1.5" targetFramework="net46" />
</packages>
@@ -1,4 +1,6 @@
using MetroFramework.Controls;
// Copyright (c) MOSA Project. Licensed under the New BSD License.
using MetroFramework.Controls;
using System;
using System.Collections.Generic;
using System.Drawing;
@@ -8,7 +10,7 @@
namespace Mosa.Tool.Launcher
{
//Some code is from: https://www.codeproject.com/Articles/6646/In-place-editing-of-ListView-subitems
class AdditionalFilesListControl : MetroListView
internal class AdditionalFilesListControl : MetroListView
{
private struct NMHDR
{
@@ -21,7 +23,7 @@ private struct NMHDR
private ListViewItem.ListViewSubItem _selectedSubItem;
private int _selectedColumn;
private TextBox _editingControl;
private readonly TextBox _editingControl;
private const int WM_HSCROLL = 0x114;
private const int WM_VSCROLL = 0x115;
@@ -78,12 +80,16 @@ protected override void WndProc(ref Message msg)
case WM_SIZE:
HideItemEditor(false);
break;
case WM_NOTIFY:
NMHDR h = (NMHDR)Marshal.PtrToStructure(msg.LParam, typeof(NMHDR));
if (h.code == HDN_BEGINDRAG ||
h.code == HDN_ITEMCHANGINGA ||
h.code == HDN_ITEMCHANGINGW)
if (h.code == HDN_BEGINDRAG
|| h.code == HDN_ITEMCHANGINGA
|| h.code == HDN_ITEMCHANGINGW)
{
HideItemEditor(false);
}
break;
}
@@ -0,0 +1,8 @@
// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project.
// Project-level suppressions either have no target or are given
// a specific target and scoped to a namespace, type, member, etc.
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Maintainability", "RCS1168:Parameter name differs from base name.", Justification = "<Pending>", Scope = "member", Target = "~M:Mosa.Tool.Launcher.AdditionalFilesListControl.WndProc(System.Windows.Forms.Message@)")]

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 0ef312c

Please sign in to comment.