This commit is contained in:
kudzu_cp 2010-07-23 17:01:35 +00:00
parent b91fa86a97
commit 5c8b2de82f
2 changed files with 13 additions and 9 deletions

View file

@ -17,7 +17,7 @@ using System.IO;
using Cosmos.Compiler.Debug;
using System.Collections.Specialized;
using Cosmos.Debug.Common;
//using Cosmos.Build.Common;
using Cosmos.Build.Common;
namespace Cosmos.Debug.VSDebugEngine
{
@ -35,7 +35,7 @@ namespace Cosmos.Debug.VSDebugEngine
internal uint? mCurrentAddress = null;
internal string mISO;
private readonly NameValueCollection mDebugInfo;
//protected TargetHost mTargetHost;
protected TargetHost mTargetHost;
protected void LaunchQEMU(bool aGDB) {
var xDebugConnectorStr = "-serial tcp:127.0.0.1:4444";
@ -125,10 +125,10 @@ namespace Cosmos.Debug.VSDebugEngine
mProcessStartInfo = new ProcessStartInfo(Path.Combine(PathUtilities.GetVSIPDir(), "Cosmos.Debug.HostProcess.exe"));
if (StringComparer.InvariantCultureIgnoreCase.Equals(mDebugInfo["BuildTarget"], "qemu")) {
// mTargetHost = TargetHost.QEMU;
mTargetHost = TargetHost.QEMU;
LaunchQEMU(xGDBDebugStub);
} else if (StringComparer.InvariantCultureIgnoreCase.Equals(mDebugInfo["BuildTarget"], "VMWareWorkstation")) {
//assemblyref://FSharp.CoremTargetHost = TargetHost.VMWareWorkstation;
mTargetHost = TargetHost.VMWareWorkstation;
LaunchVMWareWorkstation(xGDBDebugStub);
} else {
throw new Exception("Invalid BuildTarget value: '" + mDebugInfo["BuildTarget"] + "'!");
@ -366,11 +366,11 @@ namespace Cosmos.Debug.VSDebugEngine
// that allows VS to "see" that. Here we resume it.
mProcess.StandardInput.WriteLine();
//if (mTargetHost == TargetHost.QEMU) {
// // QEMU and Pipes - QEMU will stop and wait till we connect. It will not even show until we do.
// // We have to do this after we release the debug host though.
// mDebugEngine.DebugConnector.WaitConnect();
//}
if (mTargetHost == TargetHost.QEMU) {
// QEMU and Pipes - QEMU will stop and wait till we connect. It will not even show until we do.
// We have to do this after we release the debug host though.
mDebugEngine.DebugConnector.WaitConnect();
}
}
void mProcess_Exited(object sender, EventArgs e)

View file

@ -120,6 +120,10 @@
<Project>{9998B4EA-385E-4DA2-8905-2BBEB5B2C6E2}</Project>
<Name>Cosmos.Compiler.Debug</Name>
</ProjectReference>
<ProjectReference Include="..\..\Build\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
<Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
<Name>Cosmos.Build.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\Build\Cosmos.Build.Launch\Cosmos.Build.Launch.csproj">
<Project>{3B8CD27E-9E91-4472-A4D9-9B3D581A5316}</Project>
<Name>Cosmos.Build.Launch</Name>