From cffbe7fd0ede76a9e0277c525f494e5e96267775 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Fri, 4 Mar 2016 10:05:24 -0800 Subject: Fix two sos issues. ARM Disassemble problem and reenterency bug on Windows. --- src/ToolBox/SOS/Strike/exts.cpp | 9 ++++++++- src/ToolBox/SOS/lldbplugin/services.cpp | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src/ToolBox/SOS') diff --git a/src/ToolBox/SOS/Strike/exts.cpp b/src/ToolBox/SOS/Strike/exts.cpp index 5084d0aa98..804363a9a1 100644 --- a/src/ToolBox/SOS/Strike/exts.cpp +++ b/src/ToolBox/SOS/Strike/exts.cpp @@ -191,6 +191,8 @@ void CleanupEventCallbacks() } } +bool g_Initialized = false; + extern "C" HRESULT CALLBACK @@ -202,7 +204,12 @@ DebugExtensionInitialize(PULONG Version, PULONG Flags) *Version = DEBUG_EXTENSION_VERSION(1, 0); *Flags = 0; - + + if (g_Initialized) + { + return S_OK; + } + g_Initialized = true; if ((Hr = DebugCreate(__uuidof(IDebugClient), (void **)&DebugClient)) != S_OK) diff --git a/src/ToolBox/SOS/lldbplugin/services.cpp b/src/ToolBox/SOS/lldbplugin/services.cpp index e66f29be6a..21d1a2c13c 100644 --- a/src/ToolBox/SOS/lldbplugin/services.cpp +++ b/src/ToolBox/SOS/lldbplugin/services.cpp @@ -560,7 +560,7 @@ LLDBServices::Disassemble( hr = E_FAIL; goto exit; } - cch = snprintf(buffer, bufferSize, "%016lx ", offset); + cch = snprintf(buffer, bufferSize, "%016llx ", (unsigned long long)offset); buffer += cch; bufferSize -= cch; -- cgit v1.2.3