This commit is contained in:
mterwoord_cp 2014-07-13 14:06:09 +00:00
parent 7d700a8d10
commit d76989ddd5
5 changed files with 8 additions and 21 deletions

View file

@ -126,7 +126,7 @@ namespace Cosmos.Build.MSBuild {
}
else
{
xGuid = Guid.NewGuid();
xGuid = DebugInfo.Guid_NewGuid();
}
xLabels.Add(new Label()
@ -139,19 +139,6 @@ namespace Cosmos.Build.MSBuild {
}
xDebugInfo.AddLabels(xLabels, true);
}
//// All labels are in DB, now go back and match up Method.LabelStart
//using (var xDB = xDebugInfo.DB())
//{
// //TODO: EF keeps all items in RAM, even after AcceptChanges.
// // Right now we only have a few hundred methods, but when this grows we
// // need to find a way around this. Future EF versions might addresst this better.
// // Current EF versions require us to destroy the context and create a new one.
// foreach (var xMethod in xDB.Methods)
// {
// //xMethod
// }
//}
}
return true;

View file

@ -1233,7 +1233,7 @@ namespace Cosmos.IL2CPU
var expectedDifference = aMethod.LocalVariablesSize;
foreach (var item in Assembler.Stack)
{
expectedDifference += item.Size;
expectedDifference += X86.IL.Ldarg.Align(item.Size, 4);
}
// if debugstub is active, emit a stack corruption detection. at this point EBP and ESP should have the same value.

View file

@ -19,7 +19,7 @@
<OutputPath>bin\Debug\</OutputPath>
<Framework>MicrosoftNET</Framework>
<UseInternalAssembler>False</UseInternalAssembler>
<EnableGDB>False</EnableGDB>
<EnableGDB>True</EnableGDB>
<DebugMode>Source</DebugMode>
<TraceMode>User</TraceMode>
<BuildTarget>PXE</BuildTarget>
@ -66,7 +66,7 @@
<VMware_Framework>MicrosoftNET</VMware_Framework>
<VMware_UseInternalAssembler>False</VMware_UseInternalAssembler>
<VMware_TraceAssemblies>All</VMware_TraceAssemblies>
<VMware_EnableGDB>False</VMware_EnableGDB>
<VMware_EnableGDB>True</VMware_EnableGDB>
<VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
<ISO_Deployment>ISO</ISO_Deployment>
<ISO_Launch>None</ISO_Launch>
@ -136,7 +136,7 @@
<Framework>MicrosoftNET</Framework>
<UseInternalAssembler>False</UseInternalAssembler>
<DebugMode>Source</DebugMode>
<EnableGDB>False</EnableGDB>
<EnableGDB>True</EnableGDB>
<TraceMode>
</TraceMode>
<VMWareFlavor>Workstation</VMWareFlavor>
@ -212,7 +212,7 @@
<VMware_OutputPath>bin\Debug\</VMware_OutputPath>
<VMware_Framework>MicrosoftNET</VMware_Framework>
<VMware_UseInternalAssembler>False</VMware_UseInternalAssembler>
<VMware_EnableGDB>False</VMware_EnableGDB>
<VMware_EnableGDB>True</VMware_EnableGDB>
<VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
<User001_Name>PXE with Slave (Kudzu)</User001_Name>
<User001_Description>Creates a PXE setup and hosts a DCHP and TFTP server to deploy directly to physical hardware. Allows debugging with a serial cable.</User001_Description>

View file

@ -15,7 +15,7 @@
// var task = new ExtractMapFromElfFile
// {
// CosmosBuildDir = @"c:\Data\Sources\Cosmos\Build",
// DebugInfoFile=@"c:\data\sources\dbg.cdb",
// 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\"
// };

View file

@ -154,7 +154,7 @@ namespace DebugCompiler
{
get
{
return new String[] {"FullPath"};
return new String[] { "FullPath" };
}
}