This commit is contained in:
kudzu_cp 2012-08-02 18:56:52 +00:00
parent 7abc6290c5
commit 97d03bd1e9
5 changed files with 23 additions and 23 deletions

View file

@ -557,17 +557,17 @@ namespace Cosmos.Debug.Common
/// Create a new LOCAL_ARGUMENT_INFO object.
/// </summary>
/// <param name="mETHODLABELNAME">Initial value of the METHODLABELNAME property.</param>
/// <param name="iSARGUMENT">Initial value of the ISARGUMENT property.</param>
/// <param name="isArgument">Initial value of the IsArgument property.</param>
/// <param name="iNDEXINMETHOD">Initial value of the INDEXINMETHOD property.</param>
/// <param name="oFFSET">Initial value of the OFFSET property.</param>
/// <param name="nAME">Initial value of the NAME property.</param>
/// <param name="tYPENAME">Initial value of the TYPENAME property.</param>
/// <param name="id">Initial value of the ID property.</param>
public static LOCAL_ARGUMENT_INFO CreateLOCAL_ARGUMENT_INFO(global::System.String mETHODLABELNAME, global::System.Int16 iSARGUMENT, global::System.Int32 iNDEXINMETHOD, global::System.Int32 oFFSET, global::System.String nAME, global::System.String tYPENAME, global::System.Guid id)
public static LOCAL_ARGUMENT_INFO CreateLOCAL_ARGUMENT_INFO(global::System.String mETHODLABELNAME, global::System.Boolean isArgument, global::System.Int32 iNDEXINMETHOD, global::System.Int32 oFFSET, global::System.String nAME, global::System.String tYPENAME, global::System.Guid id)
{
LOCAL_ARGUMENT_INFO lOCAL_ARGUMENT_INFO = new LOCAL_ARGUMENT_INFO();
lOCAL_ARGUMENT_INFO.METHODLABELNAME = mETHODLABELNAME;
lOCAL_ARGUMENT_INFO.ISARGUMENT = iSARGUMENT;
lOCAL_ARGUMENT_INFO.IsArgument = isArgument;
lOCAL_ARGUMENT_INFO.INDEXINMETHOD = iNDEXINMETHOD;
lOCAL_ARGUMENT_INFO.OFFSET = oFFSET;
lOCAL_ARGUMENT_INFO.NAME = nAME;
@ -608,24 +608,24 @@ namespace Cosmos.Debug.Common
/// </summary>
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
[DataMemberAttribute()]
public global::System.Int16 ISARGUMENT
public global::System.Boolean IsArgument
{
get
{
return _ISARGUMENT;
return _IsArgument;
}
set
{
OnISARGUMENTChanging(value);
ReportPropertyChanging("ISARGUMENT");
_ISARGUMENT = StructuralObject.SetValidValue(value);
ReportPropertyChanged("ISARGUMENT");
OnISARGUMENTChanged();
OnIsArgumentChanging(value);
ReportPropertyChanging("IsArgument");
_IsArgument = StructuralObject.SetValidValue(value);
ReportPropertyChanged("IsArgument");
OnIsArgumentChanged();
}
}
private global::System.Int16 _ISARGUMENT;
partial void OnISARGUMENTChanging(global::System.Int16 value);
partial void OnISARGUMENTChanged();
private global::System.Boolean _IsArgument;
partial void OnIsArgumentChanging(global::System.Boolean value);
partial void OnIsArgumentChanged();
/// <summary>
/// No Metadata Documentation available.

View file

@ -42,7 +42,7 @@
<PropertyRef Name="ID" />
</Key>
<Property Name="METHODLABELNAME" Type="nvarchar" Nullable="false" MaxLength="512" />
<Property Name="ISARGUMENT" Type="smallint" Nullable="false" />
<Property Name="IsArgument" Type="bit" Nullable="false" />
<Property Name="INDEXINMETHOD" Type="int" Nullable="false" />
<Property Name="OFFSET" Type="int" Nullable="false" />
<Property Name="NAME" Type="nvarchar" Nullable="false" MaxLength="64" />
@ -103,7 +103,7 @@
<PropertyRef Name="ID" />
</Key>
<Property Name="METHODLABELNAME" Type="String" Nullable="false" MaxLength="512" Unicode="true" FixedLength="false" />
<Property Name="ISARGUMENT" Type="Int16" Nullable="false" />
<Property Name="IsArgument" Type="Boolean" Nullable="false" />
<Property Name="INDEXINMETHOD" Type="Int32" Nullable="false" />
<Property Name="OFFSET" Type="Int32" Nullable="false" />
<Property Name="NAME" Type="String" Nullable="false" MaxLength="64" Unicode="true" FixedLength="false" />
@ -162,7 +162,7 @@
<MappingFragment StoreEntitySet="LOCAL_ARGUMENT_INFO">
<ScalarProperty Name="ID" ColumnName="ID" />
<ScalarProperty Name="METHODLABELNAME" ColumnName="METHODLABELNAME" />
<ScalarProperty Name="ISARGUMENT" ColumnName="ISARGUMENT" />
<ScalarProperty Name="IsArgument" ColumnName="IsArgument" />
<ScalarProperty Name="INDEXINMETHOD" ColumnName="INDEXINMETHOD" />
<ScalarProperty Name="OFFSET" ColumnName="OFFSET" />
<ScalarProperty Name="NAME" ColumnName="NAME" />

View file

@ -2,7 +2,7 @@
-- --------------------------------------------------
-- Entity Designer DDL Script for SQL Server 2005, 2008, and Azure
-- --------------------------------------------------
-- Date Created: 08/02/2012 14:51:27
-- Date Created: 08/02/2012 14:55:28
-- Generated from EDMX file: D:\source\Cosmos\source2\Debug\Cosmos.Debug.Common\DebugModel.edmx
-- --------------------------------------------------
@ -70,7 +70,7 @@ GO
-- Creating table 'LOCAL_ARGUMENT_INFO'
CREATE TABLE [dbo].[LOCAL_ARGUMENT_INFO] (
[METHODLABELNAME] nvarchar(512) NOT NULL,
[ISARGUMENT] smallint NOT NULL,
[IsArgument] bit NOT NULL,
[INDEXINMETHOD] int NOT NULL,
[OFFSET] int NOT NULL,
[NAME] nvarchar(64) NOT NULL,

View file

@ -67,8 +67,8 @@ namespace Cosmos.Debug.VSDebugEngine {
if (xSymbolInfo != null) {
using (var xDB = xProcess.mDebugInfoDb.DB()) {
var xAllInfos = xDB.LOCAL_ARGUMENT_INFO.Where(q => q.METHODLABELNAME == xSymbolInfo.METHODNAME).ToArray();
mLocalInfos = xAllInfos.Where(q => q.ISARGUMENT == 0).ToArray();
mArgumentInfos = xAllInfos.Where(q => q.ISARGUMENT != 0).ToArray();
mLocalInfos = xAllInfos.Where(q => !q.IsArgument).ToArray();
mArgumentInfos = xAllInfos.Where(q => q.IsArgument).ToArray();
}
m_numLocals = mLocalInfos.Length;
m_numParameters = mArgumentInfos.Length;

View file

@ -86,7 +86,7 @@ namespace Cosmos.IL2CPU.X86 {
foreach (var xLocal in xBody.LocalVariables) {
var xInfo = new LOCAL_ARGUMENT_INFO {
METHODLABELNAME = xMethodLabel,
ISARGUMENT = 0,
IsArgument = false,
INDEXINMETHOD = xLocal.LocalIndex,
NAME = "Local" + xLocal.LocalIndex,
OFFSET = 0 - (int)ILOp.GetEBPOffsetForLocalForDebugger(aMethod, xLocal.LocalIndex),
@ -120,7 +120,7 @@ namespace Cosmos.IL2CPU.X86 {
if (!aMethod.MethodBase.IsStatic) {
mLocals_Arguments_Infos.Add(new LOCAL_ARGUMENT_INFO {
METHODLABELNAME = xMethodLabel,
ISARGUMENT = 1,
IsArgument = true,
NAME = "this:" + IL.Ldarg.GetArgumentDisplacement(aMethod, 0),
INDEXINMETHOD = 0,
OFFSET = IL.Ldarg.GetArgumentDisplacement(aMethod, 0),
@ -139,7 +139,7 @@ namespace Cosmos.IL2CPU.X86 {
xOffset -= (int)Cosmos.IL2CPU.X86.ILOp.Align(Cosmos.IL2CPU.X86.ILOp.SizeOfType(xParams[i].ParameterType), 4) - 4;
mLocals_Arguments_Infos.Add(new LOCAL_ARGUMENT_INFO {
METHODLABELNAME = xMethodLabel,
ISARGUMENT = 1,
IsArgument = true,
INDEXINMETHOD = (int)(i + xIdxOffset),
NAME = xParams[i].Name,
OFFSET = xOffset,