From 41fa2deaec9904f8d8f4e8218f047d3b47835094 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Tue, 19 Jul 2011 01:54:59 +0000
Subject: [PATCH]

---
 .../AD7.Impl/AD7Process.cs                        |  4 ++--
 source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
index ac0f24696..c3200279f 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
@@ -506,8 +506,8 @@ namespace Cosmos.Debug.VSDebugEngine {
     }
 
     public void SendAssembly() {
-      DebugWindows.SendCommand(DwMsgType.AssemblySource, Encoding.ASCII.GetBytes("test"));
-      return;
+      //DebugWindows.SendCommand(DwMsgType.AssemblySource, Encoding.ASCII.GetBytes("test"));
+      //return;
 
       // Scan and make a list of labels that belong to this line of code
       int xIdx = mSourceMappings.Keys.IndexOf((uint)mCurrentAddress);
diff --git a/source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs b/source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs
index a8b76725c..40ef11878 100644
--- a/source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs
+++ b/source2/VSIP/Cosmos.VS.Windows/AssemblyUC.xaml.cs
@@ -49,14 +49,15 @@ namespace Cosmos.Cosmos_VS_Windows {
         if (aFilter) {
           if (xTestLine == "INT3") {
             continue;
-          } else if (xTestLine.StartsWith("; #")) {
-            // Comments which are signals for the parser
-            continue;
-          } else if (xTestLine.EndsWith("#:")) {
-            // Hidden labels (ASM stepping, only add noise for user)
-            continue;
           } else if (xTestLine.Length == 0) {
             continue;
+          } else {
+            var xParts = xTestLine.Split(' ');
+            if (xParts.Length > 1) {
+              if (xParts[1] == ";ASM") {
+                continue;
+              }
+            }
           }
           
           xDisplayLine = xDisplayLine.Trim();
@@ -86,6 +87,6 @@ namespace Cosmos.Cosmos_VS_Windows {
       mData = aData;
       Display(mFilter);
     }
-
+ 
   }
 }
\ No newline at end of file