Skip to content

Commit

Permalink
Ongoing work for making serial console working.
Browse files Browse the repository at this point in the history
  • Loading branch information
mterwoord committed Dec 30, 2014
1 parent 563431d commit 507365d
Show file tree
Hide file tree
Showing 30 changed files with 700 additions and 326 deletions.
14 changes: 9 additions & 5 deletions Demos/Guess/Guess.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProjectGuid>{5b2c0369-7a84-4113-892c-f71b50e1da12}</ProjectGuid>
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Guess</Name>
<BinFormat>elf</BinFormat>
<BinFormat>bin</BinFormat>
<RootNamespace>Guess</RootNamespace>
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
Expand All @@ -32,7 +32,7 @@
<Deployment>ISO</Deployment>
<Launch>VMware</Launch>
<DebugEnabled>True</DebugEnabled>
<TraceAssemblies>User</TraceAssemblies>
<TraceAssemblies>All</TraceAssemblies>
<PXE_Deployment>PXE</PXE_Deployment>
<PXE_Launch>None</PXE_Launch>
<PXE_DebugEnabled>False</PXE_DebugEnabled>
Expand Down Expand Up @@ -66,7 +66,7 @@
<VMware_OutputPath>bin\Debug\</VMware_OutputPath>
<VMware_Framework>MicrosoftNET</VMware_Framework>
<VMware_UseInternalAssembler>False</VMware_UseInternalAssembler>
<VMware_TraceAssemblies>User</VMware_TraceAssemblies>
<VMware_TraceAssemblies>All</VMware_TraceAssemblies>
<VMware_EnableGDB>False</VMware_EnableGDB>
<VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
<ISO_Deployment>ISO</ISO_Deployment>
Expand Down Expand Up @@ -129,6 +129,8 @@
<ISO_VisualStudioDebugPort>Pipe: Cosmos\Serial</ISO_VisualStudioDebugPort>
<PXE_ShowLaunchConsole>False</PXE_ShowLaunchConsole>
<PXE_VisualStudioDebugPort>Pipe: Cosmos\Serial</PXE_VisualStudioDebugPort>
<StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
<VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Profile>VMware</Profile>
Expand All @@ -148,7 +150,7 @@
<Deployment>ISO</Deployment>
<Launch>VMware</Launch>
<DebugEnabled>True</DebugEnabled>
<TraceAssemblies>User</TraceAssemblies>
<TraceAssemblies>All</TraceAssemblies>
<PXE_Deployment>PXE</PXE_Deployment>
<PXE_Launch>None</PXE_Launch>
<PXE_DebugEnabled>False</PXE_DebugEnabled>
Expand Down Expand Up @@ -182,7 +184,7 @@
<VMware_OutputPath>bin\Debug\</VMware_OutputPath>
<VMware_Framework>MicrosoftNET</VMware_Framework>
<VMware_UseInternalAssembler>False</VMware_UseInternalAssembler>
<VMware_TraceAssemblies>User</VMware_TraceAssemblies>
<VMware_TraceAssemblies>All</VMware_TraceAssemblies>
<VMware_EnableGDB>False</VMware_EnableGDB>
<VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
<ISO_Deployment>ISO</ISO_Deployment>
Expand Down Expand Up @@ -251,6 +253,8 @@
<VMware_ShowLaunchConsole>False</VMware_ShowLaunchConsole>
<ISO_ShowLaunchConsole>False</ISO_ShowLaunchConsole>
<PXE_ShowLaunchConsole>False</PXE_ShowLaunchConsole>
<StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
<VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
</PropertyGroup>
<ItemGroup>
<Content Include="Cosmos.bxrc">
Expand Down
3 changes: 3 additions & 0 deletions Setup/Cosmos.iss
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,9 @@ Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{ce2a2d0f-
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{a64d0fcc-8dcc-439a-9b16-3c43128aad51}; ValueType: none; Flags: uninsdeletekey
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{a64d0fcc-8dcc-439a-9b16-3c43128aad51}; ValueType: string; ValueData: {{a82b45e9-2a89-43bd-925d-c7f0edd212aa}
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{a64d0fcc-8dcc-439a-9b16-3c43128aad51}; ValueName: Name; ValueType: string; ValueData: Cosmos.VS.Windows.StackTW
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{681a4da7-ba11-4c26-80a9-b39734a95b1c}; ValueType: none; Flags: uninsdeletekey
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{681a4da7-ba11-4c26-80a9-b39734a95b1c}; ValueType: string; ValueData: {{a82b45e9-2a89-43bd-925d-c7f0edd212aa}
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\ToolWindows\{{681a4da7-ba11-4c26-80a9-b39734a95b1c}; ValueName: Name; ValueType: string; ValueData: Cosmos.VS.Windows.ConsoleTW

; mark our msbuild file as safe
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\MSBuild\SafeImports; ValueType: string; ValueName: Cosmos1; ValueData: {pf32}\MSBuild\Cosmos\Cosmos.targets; Flags: uninsdeletevalue
Expand Down
58 changes: 30 additions & 28 deletions Users/Matthijs/DebugCompiler/Program.ExtractMap.cs
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
//using System;
//using System.Collections.Generic;
//using System.Diagnostics;
//using System.Linq;
//using System.Text;
//using System.Threading.Tasks;
//using Cosmos.Build.MSBuild;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Cosmos.Build.MSBuild;

//namespace DebugCompiler
//{
// internal class Program
// {
// public static void Main()
// {
// var task = new ExtractMapFromElfFile
// {
// CosmosBuildDir = @"c:\Data\Sources\Cosmos\Build",
// DebugInfoFile = @"c:\Data\Sources\Cosmos\source2\Users\Kudzu\Breakpoints\bin\Debug\Kudzu.Breakpoints.cdb",
// InputFile = @"c:\Data\Sources\Cosmos\source2\Users\Kudzu\Breakpoints\bin\Debug\Kudzu.Breakpoints.bin",
// WorkingDir = @"c:\Data\Sources\Cosmos\source2\Users\Kudzu\Breakpoints\bin\Debug\"
// };
// var sw = Stopwatch.StartNew();
// task.UseConsoleForLog = true;
// task.Execute();
// sw.Stop();
// Console.WriteLine("Took {0}", sw.Elapsed);
// }
// }
//}
namespace DebugCompiler
{
internal class Program
{
public static void Main()
{
//var task = new ExtractMapFromElfFile
var task = new ReadNAsmMapToDebugInfo()
{
//CosmosBuildDir = @"c:\Data\Sources\Cosmos\Build",
//InputFile = @"c:\Data\Sources\Cosmos\source2\Users\Kudzu\Breakpoints\bin\Debug\Kudzu.Breakpoints.bin",
//WorkingDir = @"c:\Data\Sources\Cosmos\source2\Users\Kudzu\Breakpoints\bin\Debug\"
DebugInfoFile = @"c:\Data\Sources\Cosmos\source2\Users\Kudzu\Breakpoints\bin\Debug\Kudzu.Breakpoints.cdb",
InputBaseDir = @"e:\OpenSource\Cosmos\Demos\Guess\bin\Debug"
};
var sw = Stopwatch.StartNew();
//task.UseConsoleForLog = true;
task.Execute();
sw.Stop();
Console.WriteLine("Took {0}", sw.Elapsed);
}
}
}
Loading

0 comments on commit 507365d

Please sign in to comment.