Merge pull request #1421 from microsoft/main

Merge main into release_mdd

Author: WardenGnaw

src/MIDebugEngine/AD7.Impl/AD7Engine.cs

@@ -189,7 +189,7 @@ public int Attach(IDebugProgram2[] portProgramArray, IDebugProgramNode2[] progra
         {
             Debug.Assert(_ad7ProgramId == Guid.Empty);
 
-            Logger.LoadMIDebugLogger();
+            Logger.EnsureInitialized();
 
             if (celtPrograms != 1)
             {
@@ -539,7 +539,7 @@ int IDebugEngineLaunch2.LaunchSuspended(string pszServer, IDebugPort2 port, stri
             Debug.Assert(_ad7ProgramId == Guid.Empty);
 
             // Check if the logger was enabled late.
-            Logger.LoadMIDebugLogger();
+            Logger.EnsureInitialized();
 
             process = null;
 

src/MIDebugEngine/Engine.Impl/Disassembly.cs

@@ -308,8 +308,21 @@ private void DeleteRangeFromCache(DisassemblyBlock block)
         // this is inefficient so we try and grab everything in one gulp
         internal static async Task<DisasmInstruction[]> Disassemble(DebuggedProcess process, ulong startAddr, ulong endAddr)
         {
-            string cmd = "-data-disassemble -s " + EngineUtils.AsAddr(startAddr, process.Is64BitArch) + " -e " + EngineUtils.AsAddr(endAddr, process.Is64BitArch) + " -- 2";
-            Results results = await process.CmdAsync(cmd, ResultClass.None);
+            string cmd;
+            string startAddrStr;
+            string endAddrStr;
+            int i = 0;
+            Results results;
+            do
+            {
+                startAddrStr = EngineUtils.AsAddr(startAddr, process.Is64BitArch);
+                endAddrStr = EngineUtils.AsAddr(endAddr, process.Is64BitArch);
+                cmd = "-data-disassemble -s " + startAddrStr + " -e " + endAddrStr + " -- 2";
+                results = await process.CmdAsync(cmd, ResultClass.None);
+                --startAddr;
+                ++i;
+            } while (results.ResultClass != ResultClass.done && i < process.MaxInstructionSize);
+            
             if (results.ResultClass != ResultClass.done)
             {
                 return null;