dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-21 21:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Bochs debugging support to Visual Studio Cosmos project (UI).

Browse source 
A new pane and associated launch type is added in the Cosmos project properties pane.
This commit is contained in:
BlueSkeye_cp 2012-09-20 09:41:02 +00:00
parent 277254ef5f
commit d64f99adf3
18 changed files with 355 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source2/Build/Cosmos.Build.Common/BuildProperties.cs
View file

@ -64,7 +64,7 @@ namespace Cosmos.Build.Common {
Launch = LaunchType.None;
} else if (aName == "Bochs") {
Description = "Use Bochs emulatior to deploy and debug.";
Description = "Use Bochs emulator to deploy and debug.";
Deployment = DeploymentType.ISO;
Launch = LaunchType.Bochs;
}
@ -202,5 +202,12 @@ namespace Cosmos.Build.Common {
get { return GetProperty(StartCosmosGDBString, false); }
set { SetProperty(StartCosmosGDBString, value); }
}
public const string EnableBochsDebugString = "EnableBochsDebug";
public Boolean EnableBochsDebug
{
get { return GetProperty(EnableBochsDebugString, false); }
set { SetProperty(EnableBochsDebugString, value); }
}
}
}

27
source2/Build/Cosmos.Build.Common/CosmosPaths.cs
View file

@ -25,11 +25,17 @@ namespace Cosmos.Build.Common {
}
static CosmosPaths() {
using (var xReg = Registry.LocalMachine.OpenSubKey(@"Software\Cosmos", false)) {
if (xReg == null) {
throw new Exception(@"HKEY_LOCAL_MACHINE\SOFTWARE\Cosmos was not found.");
using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32))
{
using (var xReg = baseKey.OpenSubKey(@"Software\Cosmos", false)) {
if (xReg == null) {
throw new Exception(@"HKEY_LOCAL_MACHINE\SOFTWARE\Cosmos was not found.");
}
UserKit = (string)xReg.GetValue("UserKit");
if (null == UserKit) {
throw new Exception(@"HKEY_LOCAL_MACHINE\SOFTWARE\Cosmos\@UserKit was not found.");
}
}
UserKit = (string)xReg.GetValue("UserKit");
}
Build = CheckPath(UserKit, @"Build");
Vsip = CheckPath(UserKit, @"Build\VSIP");
@ -41,9 +47,20 @@ namespace Cosmos.Build.Common {
using (var xReg = Registry.CurrentUser.OpenSubKey(@"Software\Cosmos", false)) {
if (xReg != null) {
DevKit = (string)xReg.GetValue("DevKit");
DebugStubSrc = CheckPath(DevKit, @"source2\Compiler\Cosmos.Compiler.DebugStub");
if (null == DevKit) {
throw new Exception(@"HKEY_LOCAL_MACHINE\SOFTWARE\Cosmos\@DevKit was not found.");
}
try { DebugStubSrc = CheckPath(DevKit, @"source2\Compiler\Cosmos.Compiler.DebugStub"); }
// Not finding this one is not an issue. We will fallback to already retrieved stun from UserKit
catch { }
}
}
}
/// <summary>This method is intentionally empty. It's sole purpose is to be able to trigger
/// class initialization in a controlled manner so as to intercept initializer thrown
/// exceptions.</summary>
public static void Initialize() {
}
}
}

19
source2/Build/Cosmos.Build.MSBuild/IL2CPUTask.cs
View file

@ -85,10 +85,28 @@ namespace Cosmos.Build.MSBuild {
}
return null;
}
private bool EnsureCosmosPathsInitialization() {
try {
CosmosPaths.Initialize();
return true;
} catch (Exception e)
{
StringBuilder builder = new StringBuilder();
builder.Append("Error while initializing Cosmos paths");
for (Exception scannedException = e; null != scannedException; scannedException = scannedException.InnerException)
{
builder.Append(" | " + scannedException.Message);
}
LogError(builder.ToString());
return false;
}
}
protected bool Initialize() {
// Add UserKit dirs for asms to load from.
mSearchDirs.Add(Path.GetDirectoryName(typeof(IL2CPU).Assembly.Location));
if (!EnsureCosmosPathsInitialization()) { return false; }
mSearchDirs.Add(CosmosPaths.UserKit);
mSearchDirs.Add(CosmosPaths.Kernel);
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
@ -135,7 +153,6 @@ namespace Cosmos.Build.MSBuild {
}
public bool Execute() {
//System.Diagnostics.Debugger.Launch();
try {
LogMessage("Executing IL2CPU on assembly");
if (!Initialize()) {

89
source2/Debug/Cosmos.Debug.Common/BochsSupport.cs Normal file
View file

@ -0,0 +1,89 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using Microsoft.Win32;
namespace Cosmos.Debug.Common
{
/// <summary>An helper class that is used from both Cosmos.VS.Package and Cosmos.VS.DebugEngine for
/// Bochs emulator support.</summary>
public static class BochsSupport
{
static BochsSupport()
{
FindBochsExe();
}
/// <summary>Get a flag that tell whether Bochs is enabled on this system.</summary>
public static bool BochsEnabled
{
get { return (null != BochsExe); }
}
/// <summary>Get a descriptor for the Bochs emulator with debugger support program. The return value
/// is a null reference if Bochs is not installed.</summary>
public static FileInfo BochsDebugExe
{
get;
private set;
}
/// <summary>Get a descriptor for the Bochs emulator program. The return value is a null reference if
/// Bochs is not installed.</summary>
public static FileInfo BochsExe
{
get;
private set;
}
/// <summary>Retrieve installation path for Bochs and initialize the <see cref="BochsExe"/> property.
/// Search is performed using the registry and rely on the shell command defined for the
/// BochsConfigFile.</summary>
private static void FindBochsExe()
{
try
{
using (var runCommandRegistryKey = Registry.ClassesRoot.OpenSubKey(@"BochsConfigFile\shell\Run\command", false))
{
if (null == runCommandRegistryKey) { return; }
string commandLine = (string)runCommandRegistryKey.GetValue(null, null);
if (null != commandLine) { commandLine = commandLine.Trim(); }
if (string.IsNullOrEmpty(commandLine)) { return; }
// Now perform some parsing on command line to discover full exe path.
string candidateFilePath;
int commandLineLength = commandLine.Length;
if ('"' == commandLine[0])
{
// Seek for a non escaped double quote.
int lastDoubleQuoteIndex = 1;
for (; lastDoubleQuoteIndex < commandLineLength; lastDoubleQuoteIndex++)
{
if ('"' != commandLine[lastDoubleQuoteIndex]) { continue; }
if ('\\' != commandLine[lastDoubleQuoteIndex - 1]) { break; }
}
if (lastDoubleQuoteIndex >= commandLineLength) { return; }
candidateFilePath = commandLine.Substring(1, lastDoubleQuoteIndex - 1);
}
else
{
// Seek for first separator character.
int firstSeparatorIndex = 0;
for (; firstSeparatorIndex < commandLineLength; firstSeparatorIndex++)
{
if (char.IsSeparator(commandLine[firstSeparatorIndex])) { break; }
}
if (firstSeparatorIndex >= commandLineLength) { return; }
candidateFilePath = commandLine.Substring(0, firstSeparatorIndex);
}
if (!File.Exists(candidateFilePath)) { return; }
BochsExe = new FileInfo(candidateFilePath);
BochsDebugExe = new FileInfo(Path.Combine(BochsExe.Directory.FullName, "bochsdbg.exe"));
return;
}
}
catch { return; }
}
}
}

1
source2/Debug/Cosmos.Debug.Common/Cosmos.Debug.Common.csproj
View file

@ -96,6 +96,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BochsSupport.cs" />
<Compile Include="Consts.cs" />
<Compile Include="DebugConnector.cs" />
<Compile Include="DebugConnectorPipeServer.cs" />

13
source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
View file

@ -104,7 +104,12 @@ namespace Cosmos.Debug.VSDebugEngine {
mDbgConnector = null;
string xPort = mDebugInfo[BuildProperties.VisualStudioDebugPortString];
var xParts = xPort.Split(' ');
var xParts = (null == xPort) ? null : xPort.Split(' ');
if ((null == xParts) || (2 > xParts.Length)) {
throw new Exception(string.Format(
"The '{0}' Cosmos project file property is either ill-formed or missing.",
BuildProperties.VisualStudioDebugPortString));
}
string xPortType = xParts[0].ToLower();
string xPortParam = xParts[1].ToLower();
@ -168,6 +173,9 @@ namespace Cosmos.Debug.VSDebugEngine {
mHost = new Host.Slave(mDebugInfo, xUseGDB);
break;
case LaunchType.Bochs:
// The project has been created on another machine or Bochs has been uninstalled since the project has
// been created.
if (!BochsSupport.BochsEnabled) { throw new Exception(ResourceStrings.BochsIsNotInstalled); }
string bochsConfigurationFileName = mDebugInfo[BuildProperties.BochsEmulatorConfigurationFileString];
if (string.IsNullOrEmpty(bochsConfigurationFileName)) {
bochsConfigurationFileName = BuildProperties.BochsDefaultConfigurationFileName;
@ -181,6 +189,9 @@ namespace Cosmos.Debug.VSDebugEngine {
// TODO : What if the configuration file doesn't exist ? This will throw a FileNotFoundException in
// the Bochs class constructor. Is this appropriate behavior ?
mHost = new Host.Bochs(mDebugInfo, xUseGDB, bochsConfigurationFile);
((Host.Bochs)mHost).FixBochsConfiguration(new KeyValuePair<string, string>[]
{ new KeyValuePair<string, string>("IsoFileName", mISO) }
);
break;
default:
throw new Exception("Invalid Launch value: '" + mLaunch + "'.");

4
source2/Debug/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
View file

@ -181,8 +181,4 @@
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>

109
source2/Debug/Cosmos.Debug.VSDebugEngine/Host/Bochs.cs
View file

@ -1,9 +1,4 @@
// DO NOT remove this line. Consider commenting it out. When the symbol is enabled the Bochs debug
// enbabled version will be launched instead of the regular one. The debug enabled version breaks
// in Bochs internal debugger as soon as the emulator starts. You must use the 'c' (continue) command
// in the Bochs console for the emulation to proceed.
// #define USE_BOCHSDBG
using System;
using System;
using System.Collections.Specialized;
using System.Collections.Generic;
using System.Diagnostics;
@ -13,26 +8,19 @@ using System.Text;
using Microsoft.Win32;
using Cosmos.Build.Common;
using Cosmos.Debug.Common;
namespace Cosmos.Debug.VSDebugEngine.Host
{
/// <summary>This class handles interactions with the Bochs emulation environment.</summary>
public class Bochs : Base
{
/// <summary>The Bochs runtime.</summary>
private static FileInfo _bochsExe;
#if USE_BOCHSDBG
/// <summary>The Bochs runtime with internal debugger enabled.</summary>
private static FileInfo _bochsDebugExe;
#endif
/// <summary>The emulator process once started.</summary>
private static Process _bochsProcess;
/// <summary>The configuration file to be used when launching the Bochs virtual machine.</summary>
private FileInfo _bochsConfigurationFile;
static Bochs()
{
FindBochsExe();
}
private bool _useDebugVersion;
/// <summary>Instanciation occurs when debugging engine is invoked to launch the process in suspended
/// mode. Bochs process will eventually be launched later when debugging engine is instructed to
@ -43,53 +31,32 @@ namespace Cosmos.Debug.VSDebugEngine.Host
if (null == configurationFile) { throw new ArgumentNullException("configurationFile"); }
if (!configurationFile.Exists) { throw new FileNotFoundException("Configuration file doesn't exist."); }
_bochsConfigurationFile = configurationFile;
bool parseSucceeded = bool.TryParse(aParams[BuildProperties.EnableBochsDebugString], out _useDebugVersion);
return;
}
/// <summary>Get a flag that tell whether Bochs is enabled on this system.</summary>
public bool BochsEnabled
/// <summary>Fix the content of the configuration file, replacing each of the symbolic variable occurence
/// with its associated value.</summary>
/// <param name="symbols">A set of key/value pairs where the key is the name of a variable. The value is
/// used for variable replacement. Variables are case sensistive.</param>
internal void FixBochsConfiguration(KeyValuePair<string, string>[] symbols)
{
get { return (null != _bochsExe); }
}
if ((null == symbols) || (0 == symbols.Length)) { return; }
string content;
using (StreamReader reader = new StreamReader(File.Open(_bochsConfigurationFile.FullName, FileMode.Open, FileAccess.Read)))
{
content = reader.ReadToEnd();
}
foreach (KeyValuePair<string, string> pair in symbols)
{
string variableName = string.Format("$({0})", pair.Key);
/// <summary>Retrieve installation path for Bochs and initialize the <see cref="_bochsExe"/> field.
/// Search is performed using the registry and rely on the shell command defined for the
/// BochsConfigFile.</summary>
private static void FindBochsExe()
{
using (var runCommandRegistryKey = Registry.ClassesRoot.OpenSubKey(@"BochsConfigFile\shell\Run\command", false)) {
if (null == runCommandRegistryKey) { return; }
string commandLine = (string)runCommandRegistryKey.GetValue(null, null);
if (null != commandLine) { commandLine = commandLine.Trim(); }
if (string.IsNullOrEmpty(commandLine)) { return; }
// Now perform some parsing on command line to discover full exe path.
string candidateFilePath;
int commandLineLength = commandLine.Length;
if ('"' == commandLine[0]) {
// Seek for a non escaped double quote.
int lastDoubleQuoteIndex = 1;
for (; lastDoubleQuoteIndex < commandLineLength; lastDoubleQuoteIndex++) {
if ('"' != commandLine[lastDoubleQuoteIndex]) { continue; }
if ('\\' != commandLine[lastDoubleQuoteIndex - 1]) { break; }
}
if (lastDoubleQuoteIndex >= commandLineLength) { return; }
candidateFilePath = commandLine.Substring(1, lastDoubleQuoteIndex - 1);
content.Replace(variableName, pair.Value);
}
else {
// Seek for first separator character.
int firstSeparatorIndex = 0;
for(; firstSeparatorIndex < commandLineLength; firstSeparatorIndex++) {
if (char.IsSeparator(commandLine[firstSeparatorIndex])) { break; }
}
if (firstSeparatorIndex >= commandLineLength) { return; }
candidateFilePath = commandLine.Substring(0, firstSeparatorIndex);
using (StreamWriter writer = new StreamWriter(File.Open(_bochsConfigurationFile.FullName, FileMode.Create, FileAccess.Write)))
{
writer.Write(content);
}
if (!File.Exists(candidateFilePath)) { return; }
_bochsExe = new FileInfo(candidateFilePath);
#if USE_BOCHSDBG
_bochsDebugExe = new FileInfo(Path.Combine(_bochsExe.Directory.FullName, "bochsdbg.exe"));
#endif
return;
}
}
/// <summary>Initialize and start the Bochs process.</summary>
@ -97,37 +64,39 @@ namespace Cosmos.Debug.VSDebugEngine.Host
{
_bochsProcess = new Process();
ProcessStartInfo _bochsStartInfo = _bochsProcess.StartInfo;
#if USE_BOCHSDBG
_bochsStartInfo.FileName = _bochsDebugExe.FullName;
#else
_bochsStartInfo.FileName = _bochsExe.FullName;
#endif
_bochsStartInfo.FileName = (_useDebugVersion && BochsSupport.BochsDebugExe.Exists)
? BochsSupport.BochsDebugExe.FullName
: BochsSupport.BochsExe.FullName;
// Start Bochs without displaying the configuration interface (-q) and using the specified
// configuration file (-f). The user is intended to edit the configuration file coming with
// the Cosmos project whenever she wants to modify the environment.
_bochsStartInfo.Arguments = string.Format("-q -f \"{0}\"", _bochsConfigurationFile.FullName);
_bochsStartInfo.WorkingDirectory = _bochsConfigurationFile.Directory.FullName;
_bochsStartInfo.UseShellExecute = false;
// Register for process completion event so that we can funnel it to any code that
// subscribed to this event in our base class.
_bochsProcess.EnableRaisingEvents = true;
_bochsProcess.Exited += delegate(object sender, EventArgs e)
{
if (null != OnShutDown) { OnShutDown(sender, e); }
};
_bochsProcess.Exited += ExitCallback;
_bochsProcess.Start();
return;
}
private void ExitCallback(object sender, EventArgs e)
{
if (null != OnShutDown) { try { OnShutDown(sender, e); } catch { } }
}
public override void Stop()
{
// TODO BlueSkeye : How are we supposed to stop the bochs process ?
CleanUp();
if (null != _bochsProcess) { try { _bochsProcess.Kill(); } catch { } }
CleanUp();
}
private void CleanUp()
{
// TODO BlueSkeye : What kind of garbage may Bochs have left for us to clean ?
_bochsProcess.Exited -= ExitCallback;
// TODO BlueSkeye : What kind of garbage may Bochs have left for us to clean ?
}
}
}

11
source2/Debug/Cosmos.Debug.VSDebugEngine/ResourceStrings.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.1
// Runtime Version:4.0.30319.276
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -60,6 +60,15 @@ namespace Cosmos.Debug.VSDebugEngine {
}
}
/// <summary>
/// Looks up a localized string similar to The Bochs emulator doesn&apos;t seem to be installed on this machine..
/// </summary>
internal static string BochsIsNotInstalled {
get {
return ResourceManager.GetString("BochsIsNotInstalled", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Cosmos Debug Engine.
/// </summary>

7
source2/Debug/Cosmos.Debug.VSDebugEngine/ResourceStrings.resx
View file

@ -112,11 +112,14 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BochsIsNotInstalled" xml:space="preserve">
<value>The Bochs emulator doesn't seem to be installed on this machine.</value>
</data>
<data name="EngineName" xml:space="preserve">
<value>Cosmos Debug Engine</value>
</data>

35
source2/VSIP/Cosmos.VS.Package/CosmosPage.Designer.cs generated
View file

@ -68,6 +68,8 @@
this.lboxDeployment = new System.Windows.Forms.ListBox();
this.tabLaunch = new System.Windows.Forms.TabPage();
this.lboxLaunch = new System.Windows.Forms.ListBox();
this.tabBochs = new System.Windows.Forms.TabPage();
this.checkEnableBochsDebug = new System.Windows.Forms.CheckBox();
this.tabVMware = new System.Windows.Forms.TabPage();
this.checkEnableGDB = new System.Windows.Forms.CheckBox();
this.checkStartCosmosGDB = new System.Windows.Forms.CheckBox();
@ -99,6 +101,7 @@
this.tabUSB.SuspendLayout();
this.tabISO.SuspendLayout();
this.tabSlave.SuspendLayout();
this.tabBochs.SuspendLayout();
this.SuspendLayout();
//
// panel1
@ -138,6 +141,7 @@
this.TabControl1.Controls.Add(this.tabDeployment);
this.TabControl1.Controls.Add(this.tabLaunch);
this.TabControl1.Controls.Add(this.tabVMware);
this.TabControl1.Controls.Add(this.tabBochs);
this.TabControl1.Controls.Add(this.tabPXE);
this.TabControl1.Controls.Add(this.tabUSB);
this.TabControl1.Controls.Add(this.tabISO);
@ -546,6 +550,27 @@
this.lboxLaunch.Sorted = true;
this.lboxLaunch.TabIndex = 3;
//
// tabBochs
//
this.tabBochs.Controls.Add(this.checkEnableBochsDebug);
this.tabBochs.Location = new System.Drawing.Point(4, 22);
this.tabBochs.Name = "tabBochs";
this.tabBochs.Padding = new System.Windows.Forms.Padding(3);
this.tabBochs.Size = new System.Drawing.Size(627, 387);
this.tabBochs.TabIndex = 5;
this.tabBochs.Text = "Bochs";
this.tabBochs.UseVisualStyleBackColor = true;
//
// checkEnableBochsDebug
//
this.checkEnableBochsDebug.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkEnableBochsDebug.Location = new System.Drawing.Point(9, 12);
this.checkEnableBochsDebug.Name = "checkEnableBochsDebug";
this.checkEnableBochsDebug.Size = new System.Drawing.Size(218, 20);
this.checkEnableBochsDebug.TabIndex = 25;
this.checkEnableBochsDebug.Text = "Enable Bochs Debugger";
this.checkEnableBochsDebug.UseVisualStyleBackColor = true;
//
// tabVMware
//
this.tabVMware.Controls.Add(this.checkEnableGDB);
@ -609,7 +634,7 @@
this.tabPXE.Name = "tabPXE";
this.tabPXE.Padding = new System.Windows.Forms.Padding(3);
this.tabPXE.Size = new System.Drawing.Size(627, 387);
this.tabPXE.TabIndex = 5;
this.tabPXE.TabIndex = 6;
this.tabPXE.Text = "PXE";
this.tabPXE.UseVisualStyleBackColor = true;
//
@ -636,7 +661,7 @@
this.tabUSB.Name = "tabUSB";
this.tabUSB.Padding = new System.Windows.Forms.Padding(3);
this.tabUSB.Size = new System.Drawing.Size(627, 387);
this.tabUSB.TabIndex = 6;
this.tabUSB.TabIndex = 7;
this.tabUSB.Text = "USB";
this.tabUSB.UseVisualStyleBackColor = true;
//
@ -656,7 +681,7 @@
this.tabISO.Name = "tabISO";
this.tabISO.Padding = new System.Windows.Forms.Padding(3);
this.tabISO.Size = new System.Drawing.Size(627, 387);
this.tabISO.TabIndex = 7;
this.tabISO.TabIndex = 8;
this.tabISO.Text = "ISO";
this.tabISO.UseVisualStyleBackColor = true;
//
@ -733,6 +758,8 @@
this.panlDebugSettings.PerformLayout();
this.tabDeployment.ResumeLayout(false);
this.tabLaunch.ResumeLayout(false);
this.tabBochs.ResumeLayout(false);
this.tabBochs.PerformLayout();
this.tabVMware.ResumeLayout(false);
this.tabVMware.PerformLayout();
this.tabPXE.ResumeLayout(false);
@ -779,6 +806,8 @@
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.CheckBox checkIgnoreDebugStubAttribute;
private System.Windows.Forms.TabPage tabBochs;
private System.Windows.Forms.CheckBox checkEnableBochsDebug;
private System.Windows.Forms.TabPage tabVMware;
private System.Windows.Forms.CheckBox checkEnableGDB;
private System.Windows.Forms.CheckBox checkStartCosmosGDB;

44
source2/VSIP/Cosmos.VS.Package/CosmosPage.cs
View file

@ -45,8 +45,11 @@ namespace Cosmos.VS.Package {
}
protected ProfilePresets mPresets = new ProfilePresets();
protected int mVMwareDebugPipe;
/// <summary>The index in the <see cref="cmboVisualStudioDebugPort"/> combo for the pipe name used by both
/// Bochs and VMware environment to communicate with Vsiual Studio debugger.</summary>
protected int mVMwareAndBochsDebugPipe;
protected bool mShowTabBochs;
protected bool mShowTabDebug;
protected bool mShowTabDeployment;
protected bool mShowTabLaunch;
@ -81,6 +84,7 @@ namespace Cosmos.VS.Package {
RemoveTab(tabUSB);
RemoveTab(tabISO);
RemoveTab(tabSlave);
RemoveTab(tabBochs);
if (mShowTabDebug) {
TabControl1.TabPages.Add(tabDebug);
@ -108,6 +112,9 @@ namespace Cosmos.VS.Package {
if (mShowTabSlave) {
TabControl1.TabPages.Add(tabSlave);
}
if (mShowTabBochs) {
TabControl1.TabPages.Add(tabBochs);
}
if (TabControl1.TabPages.Contains(xTab)) {
TabControl1.SelectedTab = xTab;
@ -133,11 +140,18 @@ namespace Cosmos.VS.Package {
chckEnableDebugStub.Checked = true;
cmboCosmosDebugPort.Enabled = false;
cmboVisualStudioDebugPort.Enabled = false;
cmboVisualStudioDebugPort.SelectedIndex = mVMwareDebugPipe;
cmboVisualStudioDebugPort.SelectedIndex = mVMwareAndBochsDebugPipe;
} else if (mProps.Profile == "PXE") {
chckEnableDebugStub.Checked = false;
} else if (mProps.Profile == "Bochs") {
mShowTabBochs = true;
chckEnableDebugStub.Checked = true;
cmboCosmosDebugPort.Enabled = false;
cmboVisualStudioDebugPort.Enabled = false;
cmboVisualStudioDebugPort.SelectedIndex = mVMwareAndBochsDebugPipe;
}
}
@ -173,6 +187,7 @@ namespace Cosmos.VS.Package {
checkUseInternalAssembler.Checked = mProps.UseInternalAssembler;
checkEnableGDB.Checked = mProps.EnableGDB;
checkStartCosmosGDB.Checked = mProps.StartCosmosGDB;
checkEnableBochsDebug.Checked = mProps.EnableBochsDebug;
// Locked to COM1 for now.
cmboCosmosDebugPort.SelectedIndex = 0;
@ -199,6 +214,7 @@ namespace Cosmos.VS.Package {
//
mShowTabVMware = mProps.Launch == LaunchType.VMware;
mShowTabSlave = mProps.Launch == LaunchType.Slave;
mShowTabBochs = (LaunchType.Bochs == mProps.Launch);
//
UpdateTabs();
}
@ -274,6 +290,18 @@ namespace Cosmos.VS.Package {
if (xValue != mProps.Launch) {
mProps.Launch = xValue;
IsDirty = true;
// Bochs requires an ISO. Force Deployment property.
if (LaunchType.Bochs == xValue) {
if (DeploymentType.ISO != mProps.Deployment) {
foreach (EnumValue scannedValue in lboxDeployment.Items)
{
if (DeploymentType.ISO == (DeploymentType)scannedValue.Value) {
lboxDeployment.SelectedItem = scannedValue;
break;
}
}
}
}
}
};
#endregion
@ -400,6 +428,16 @@ namespace Cosmos.VS.Package {
IsDirty = true;
}
};
checkEnableBochsDebug.CheckedChanged += delegate(Object sender, EventArgs e)
{
bool x = checkEnableBochsDebug.Checked;
if (x != mProps.EnableBochsDebug)
{
mProps.EnableBochsDebug = x;
IsDirty = true;
}
};
}
void butnProfileRename_Click(object sender, EventArgs e) {
@ -532,7 +570,7 @@ namespace Cosmos.VS.Package {
cmboVisualStudioDebugPort.Items.Clear();
FillComPorts(cmboVisualStudioDebugPort.Items);
mVMwareDebugPipe = cmboVisualStudioDebugPort.Items.Add(@"Pipe: Cosmos\Serial");
mVMwareAndBochsDebugPipe = cmboVisualStudioDebugPort.Items.Add(@"Pipe: Cosmos\Serial");
comboDebugMode.Items.AddRange(EnumValue.GetEnumValues(typeof(Cosmos.Build.Common.DebugMode), false));
comboTraceMode.Items.AddRange(EnumValue.GetEnumValues(typeof(TraceAssemblies), false));

3
source2/VSIP/Cosmos.VS.Package/ProfilePresets.cs
View file

@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using Cosmos.Debug.Common;
namespace Cosmos.VS.Package {
public class ProfilePresets : Dictionary<string, string> {
public ProfilePresets() {
@ -10,6 +12,7 @@ namespace Cosmos.VS.Package {
Add("USB", "USB Bootable Drive");
Add("PXE", "PXE Network Boot");
Add("VMware", "VMware");
if (BochsSupport.BochsEnabled) { Add("Bochs", "Bochs"); }
}
}
}

1
source2/VSIP/Cosmos.VS.Package/Templates/Projects/Cosmos/Cosmos.vstemplate
View file

@ -10,6 +10,7 @@
</TemplateData>
<TemplateContent>
<Project File="CosmosProject.Cosmos" ReplaceParameters="true">
<ProjectItem SubType="Content" TargetFileName="Cosmos.bxrc">Cosmos.bxrc</ProjectItem>
</Project>
</TemplateContent>
</VSTemplate>

4
source2/VSIP/Cosmos.VS.Package/Templates/Projects/CosmosProject (C#)/Proj/CosmosProj.vstemplate
View file

@ -12,7 +12,9 @@
<ProvideDefaultName>true</ProvideDefaultName>-->
</TemplateData>
<TemplateContent>
<Project File="CosmosProject.Cosmos" ReplaceParameters="true"/>
<Project File="CosmosProject.Cosmos" ReplaceParameters="true">
<ProjectItem SubType="Content" TargetFileName="Cosmos.bxrc" ReplaceParameters="false">Cosmos.bxrc</ProjectItem>
</Project>
</TemplateContent>
<WizardExtension>
<Assembly>Cosmos.VS.Package, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f4d94ac959d59ec3</Assembly>

1
source2/VSIP/Cosmos.VS.Wizards/Cosmos.VS.Wizards.csproj
View file

@ -64,6 +64,7 @@
<EmbeddedResource Include="CosmosProject.Cosmos" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Cosmos.bxrc" />
<None Include="Key.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

44
source2/VSIP/Cosmos.VS.Wizards/Cosmos.bxrc Normal file
View file

@ -0,0 +1,44 @@
# configuration file generated by Bochs
plugin_ctrl: unmapped=1, biosdev=1, speaker=1, extfpuirq=1, parallel=1, serial=1, gameport=1
config_interface: win32config
display_library: win32
memory: host=256, guest=256
romimage: file="C:\Program Files (x86)\Bochs-2.6/BIOS-bochs-latest"
vgaromimage: file="C:\Program Files (x86)\Bochs-2.6/VGABIOS-lgpl-latest"
boot: cdrom
floppy_bootsig_check: disabled=0
# no floppya
# no floppyb
ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
ata0-master: type=cdrom, path=".\$CosmosProjectName$.iso", status=inserted, biosdetect=auto, model="Generic 1234"
ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15
ata2: enabled=0
ata3: enabled=0
pci: enabled=1, chipset=i440fx
vga: extension=vbe, update_freq=5
cpu: count=1, ips=4000000, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
cpuid: family=6, model=0x03, stepping=3, mmx=1, apic=xapic, sse=sse2, sse4a=0, sep=1, aes=0, xsave=0, xsaveopt=0, movbe=0, adx=0, smep=0, x86_64=1, 1g_pages=0, pcid=0, fsgsbase=0, mwait=1
cpuid: vendor_string="GenuineIntel"
cpuid: brand_string=" Intel(R) Pentium(R) 4 CPU "
print_timestamps: enabled=0
port_e9_hack: enabled=0
private_colormap: enabled=0
clock: sync=none, time0=local, rtc_sync=0
# no cmosimage
# no loader
log: -
logprefix: %t%e%d
panic: action=ask
error: action=report
info: action=report
debug: action=ignore
keyboard: type=mf, serial_delay=250, paste_delay=100000, keymap=
user_shortcut: keys=none
mouse: enabled=0, type=ps2, toggle=ctrl+mbutton
parport1: enabled=1, file=""
parport2: enabled=0
com1: enabled=1, mode=pipe-client, dev=\\.\pipe\Cosmos\Serial
com2: enabled=0
com3: enabled=0
com4: enabled=0

30
source2/VSIP/Cosmos.VS.Wizards/GenerateCosmosProjectWizard.cs
View file

@ -8,14 +8,18 @@ using EnvDTE;
namespace Cosmos.VS.Package.Templates {
public class GenerateCosmosProjectWizard : IWizard {
private const string BochsConfigurationFileName = "Cosmos.bxrc";
public void BeforeOpeningFile(EnvDTE.ProjectItem projectItem) {
}
private static string GetTemplateString() {
private static string GetTemplate(string templateName)
{
var xAsm = typeof(GenerateCosmosProjectWizard).Assembly;
using (var xStream = xAsm.GetManifestResourceStream(typeof(Cosmos.VS.Wizards.ResHelper), "CosmosProject.Cosmos")) {
using (var xStream = xAsm.GetManifestResourceStream(typeof(Cosmos.VS.Wizards.ResHelper), templateName))
{
if (xStream == null) {
MessageBox.Show("Could not find template manifest stream!");
MessageBox.Show("Could not find template manifest stream : " + templateName);
return null;
}
using (var xReader = new StreamReader(xStream)) {
@ -24,10 +28,18 @@ namespace Cosmos.VS.Package.Templates {
}
}
private static string GetBochsConfigurationFileTemplate() {
return GetTemplate(BochsConfigurationFileName);
}
private static string GetProjectFileTemplate() {
return GetTemplate("CosmosProject.Cosmos");
}
public void ProjectFinishedGenerating(EnvDTE.Project project) {
// add Cosmos template to solution
// read embedded template file
var xInputString = GetTemplateString();
var xInputString = GetProjectFileTemplate();
if (xInputString == null) {
return;
}
@ -60,6 +72,16 @@ namespace Cosmos.VS.Package.Templates {
}
}
// Copy Bochs configuration file.
xInputString = GetBochsConfigurationFileTemplate();
if (xInputString == null) {
return;
}
xInputString = xInputString.Replace("$CosmosProjectName$", project.Name + "Boot");
xFilename = Path.GetDirectoryName(project.FullName);
xFilename = Path.Combine(xFilename, BochsConfigurationFileName);
File.WriteAllText(xFilename, xInputString);
// set Cosmos Boot as startup project
project.DTE.Windows.Item(EnvDTE.Constants.vsWindowKindSolutionExplorer).Activate();
EnvDTE.UIHierarchy hierarchy = project.DTE.ActiveWindow.Object as EnvDTE.UIHierarchy;