make radix callback on calling thread (#1234)

* make radix callback on calling thread * review comments * pass radix as zero when asking for return value
microsoft · Oct 20, 2021 · 7393b72 · 7393b72
1 parent 80a4800
commit 7393b72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs b/src/MIDebugEngine/Engine.Impl/DebuggedProcess.cs
@@ -1255,7 +1255,7 @@ private async Task HandleBreakModeEvent(ResultEventArgs results, BreakRequest br
                 if (!string.IsNullOrEmpty(resultVar))
                 {
                     ReturnValue = new VariableInformation("$ReturnValue", resultVar, cxt, Engine, (AD7Thread)thread.Client, isParameter: false);
-                    await ReturnValue.Eval();
+                    await ReturnValue.Eval(radix: 0);
                 }
                 _callback.OnStepComplete(thread);
             }

diff --git a/src/MIDebugEngine/Engine.Impl/Variables.cs b/src/MIDebugEngine/Engine.Impl/Variables.cs
@@ -60,7 +60,7 @@ internal SimpleVariableInformation(string name, bool isParam = false, string val
         internal async Task<VariableInformation> CreateMIDebuggerVariable(ThreadContext ctx, AD7Engine engine, AD7Thread thread)
         {
             VariableInformation vi = new VariableInformation(Name, Name, ctx, engine, thread, IsParameter);
-            await vi.Eval();
+            await vi.Eval(engine.CurrentRadix());
             return vi;
         }
     }
@@ -446,9 +446,10 @@ public void AsyncEval(IDebugEventCallback2 pExprCallback)
                 engineCallback = _engine.Callback;
             }
 
+            uint radix = _engine.CurrentRadix();
             Task evalTask = Task.Run(async () =>
             {
-                await Eval();
+                await Eval(radix);
             });
 
             Action<Task> onComplete = (Task t) =>
@@ -473,9 +474,10 @@ public void AsyncError(IDebugEventCallback2 pExprCallback, IDebugProperty2 error
 
         public void SyncEval(enum_EVALFLAGS dwFlags = 0, DAPEvalFlags dwDAPFlags = 0)
         {
+            uint radix = _engine.CurrentRadix();
             Task eval = Task.Run(async () =>
             {
-                await Eval(dwFlags, dwDAPFlags);
+                await Eval(radix, dwFlags, dwDAPFlags);
             });
             eval.Wait();
         }
@@ -493,11 +495,14 @@ public string EvalDependentExpression(string expr)
             return val;
         }
 
-        internal async Task Eval(enum_EVALFLAGS dwFlags = 0, DAPEvalFlags dwDAPFlags = 0)
+        internal async Task Eval(uint radix, enum_EVALFLAGS dwFlags = 0, DAPEvalFlags dwDAPFlags = 0)
         {
             this.VerifyNotDisposed();
 
-            await _engine.UpdateRadixAsync(_engine.CurrentRadix());    // ensure the radix value is up-to-date
+            if (radix != 0)
+            {
+                await _engine.UpdateRadixAsync(radix);    // ensure the radix value is up-to-date
+            }
 
             try
             {