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

Browse source
This commit is contained in:
kudzu_cp 2012-03-25 21:55:46 +00:00
parent 114ee39943
commit ff07240335
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source2/VSIP/Cosmos.VS.Windows/AsmLine.cs
View file

@ -9,6 +9,11 @@ namespace Cosmos.VS.Windows {
public class AsmCode : AsmLine { public class AsmCode : AsmLine {
protected string mText; protected string mText;
public string Text {
get { return mText; }
set { mText = value; }
}
public override string ToString() { public override string ToString() {
return mText; return mText;
} }

27
source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
@ -14,7 +15,7 @@ namespace Cosmos.VS.Windows {
/// ///
/// This class derives from the ToolWindowPane class provided from the MPF in order to use its /// This class derives from the ToolWindowPane class provided from the MPF in order to use its
/// implementation of the IVsUIElementPane interface. /// implementation of the IVsUIElementPane interface.
//
[Guid("f019fb29-c2c2-4d27-9abf-739533c939be")] [Guid("f019fb29-c2c2-4d27-9abf-739533c939be")]
public class AssemblyTW : ToolWindowPane2 { public class AssemblyTW : ToolWindowPane2 {
public AssemblyTW() { public AssemblyTW() {
@ -55,6 +56,12 @@ namespace Cosmos.VS.Windows {
} }
void butnStep_Click(object sender, RoutedEventArgs e) { void butnStep_Click(object sender, RoutedEventArgs e) {
var xCodeLinesQry = from x in mLines
where x is AsmCode
select (AsmCode)x;
var xCodeLines = xCodeLinesQry.Where(q => q.Text.ToUpper() != "INT3").ToArray();
var xCodeLine = xCodeLines[1];
MessageBox.Show(xCodeLine.Label.Label);
//Global.PipeUp.SendCommand(Cosmos.Debug.Consts.DwCmd.AsmStep, null); //Global.PipeUp.SendCommand(Cosmos.Debug.Consts.DwCmd.AsmStep, null);
} }
@ -90,12 +97,6 @@ namespace Cosmos.VS.Windows {
continue; continue;
} }
// Insert a blank line before labels, but not if its the top line
if (tblkSource.Inlines.Count > 0) {
tblkSource.Inlines.Add(new LineBreak());
mCode.AppendLine();
}
if (xLabelPrefix == null) { if (xLabelPrefix == null) {
var xLabelParts = xAsmLabel.Label.Split('.'); var xLabelParts = xAsmLabel.Label.Split('.');
xLabelPrefix = xLabelParts[0] + "."; xLabelPrefix = xLabelParts[0] + ".";
@ -107,7 +108,7 @@ namespace Cosmos.VS.Windows {
continue; continue;
} }
} }
xDisplayLine = "\t" + xLine.ToString(); xDisplayLine = xLine.ToString();
} }
// Replace all and not just labels so we get jumps, calls etc // Replace all and not just labels so we get jumps, calls etc
@ -116,6 +117,16 @@ namespace Cosmos.VS.Windows {
} }
} }
if (xLine is AsmLabel) {
// Insert a blank line before labels, but not if its the top line
if (tblkSource.Inlines.Count > 0) {
tblkSource.Inlines.Add(new LineBreak());
mCode.AppendLine();
}
} else {
xDisplayLine = "\t" + xDisplayLine;
}
// Even though our code is often the source of the tab, it makes // Even though our code is often the source of the tab, it makes
// more sense to do it this was because the number of space stays // more sense to do it this was because the number of space stays
// in one place and also lets us differentiate from natural spaces. // in one place and also lets us differentiate from natural spaces.