Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[debugger]Componentize debugger #54887

Merged
merged 37 commits into from
Jul 1, 2021
Merged

[debugger]Componentize debugger #54887

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
b4eaff3
First version of componentize debugger
thaystg Jun 22, 2021
3911ba4
Trying to save history of debugger-agent.h
thaystg Jun 22, 2021
3b33a77
adding debugger-agent.h as a new file
thaystg Jun 22, 2021
ebf7cfb
Fixing compilation
thaystg Jun 22, 2021
12a02eb
Fixing wasm compilation
thaystg Jun 22, 2021
ffa2ba8
Fixing wasm compilation.
thaystg Jun 22, 2021
02f75d9
Running wasm app.
thaystg Jun 22, 2021
f786976
Unrelated change.
thaystg Jun 23, 2021
44a84be
Fixing debugging console app
thaystg Jun 23, 2021
079a006
Fixing compilation on linux
thaystg Jun 23, 2021
06c3999
Merge remote-tracking branch 'origin/main' into thays_componentize_de…
thaystg Jun 24, 2021
31069c3
Fixing wasm debugger.
thaystg Jun 28, 2021
98b0ad6
Remove unused callbacks
thaystg Jun 28, 2021
bab6889
Moving mini-wasm-debugger to component folder.
thaystg Jun 28, 2021
0d4dfa2
Fixing wasm debugger.
thaystg Jun 29, 2021
4206b4b
Fix non wasm compilation
thaystg Jun 29, 2021
570998e
Fixing compilation on other platforms.
thaystg Jun 29, 2021
6a9dd8c
Removing more code from component callback.
thaystg Jun 29, 2021
abaa9d5
Transforming more functions into static.
thaystg Jun 29, 2021
06e80d9
Merge remote-tracking branch 'origin/main' into thays_componentize_de…
thaystg Jun 29, 2021
6cbce7c
Fix compilation.
thaystg Jun 29, 2021
bef0f11
Moving more files to component folder.
thaystg Jun 29, 2021
6c8fea8
moving files.
thaystg Jun 29, 2021
7691f3e
Fix android compilation.
thaystg Jun 29, 2021
4131d9a
Fix wasm compilation.
thaystg Jun 30, 2021
aff7dba
Try to fix windows compilation.
thaystg Jun 30, 2021
e4303f5
Changing what @lambdageek suggested.
thaystg Jun 30, 2021
ca2b371
Changing what @lamdbageek suggested.
thaystg Jun 30, 2021
5cbd9ef
Not used anymore.
thaystg Jun 30, 2021
e011e5b
Using the same function to initialize wasm and non-wasm debugger.
thaystg Jun 30, 2021
9404119
Rollback exported function name.
thaystg Jun 30, 2021
2775fd0
Changing where components are initialized.
thaystg Jun 30, 2021
0ead04d
set sdb options before component startup.
thaystg Jun 30, 2021
5e5fe29
Fixing console debug.
thaystg Jun 30, 2021
7421325
Fix ios compilation.
thaystg Jun 30, 2021
a2e9249
Fix calling parse_options without parameters.
thaystg Jul 1, 2021
be85f16
Last @lambdageek suggestions.
thaystg Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@
<PlatformManifestFileEntry Include="libmono-component-hot_reload-stub-static.a" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-hot_reload-static.lib" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-hot_reload-stub-static.lib" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger.dll" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger.so" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger.dylib" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger-static.a" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger-stub-static.a" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger-static.lib" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-component-debugger-stub-static.lib" IsNative="true" />
<!-- Mono WASM-specific files -->
<PlatformManifestFileEntry Include="libmono-ee-interp.a" IsNative="true" />
<PlatformManifestFileEntry Include="libmono-icall-table.a" IsNative="true" />
Expand Down
4 changes: 2 additions & 2 deletions src/mono/dlls/mscordbi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ if (CLR_CMAKE_HOST_UNIX)
append("-Wno-strict-prototypes -Wno-deprecated -Wno-pointer-arith" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
endif (CLR_CMAKE_HOST_UNIX)

add_library(mscordbi SHARED "${mscorbi_sources};${PROJECT_SOURCE_DIR}/../../mono/mini/debugger-protocol.c;${PROJECT_SOURCE_DIR}/../../../coreclr/pal/prebuilt/idl/xcordebug_i.cpp;${PROJECT_SOURCE_DIR}/../../../coreclr/pal/prebuilt/idl/cordebug_i.cpp")
add_library(mscordbi SHARED "${mscorbi_sources};${PROJECT_SOURCE_DIR}/../../mono/component/debugger-protocol.c;${PROJECT_SOURCE_DIR}/../../../coreclr/pal/prebuilt/idl/xcordebug_i.cpp;${PROJECT_SOURCE_DIR}/../../../coreclr/pal/prebuilt/idl/cordebug_i.cpp")

#SET(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})

set_source_files_properties(${PROJECT_SOURCE_DIR}/../../mono/mini/debugger-protocol.c PROPERTIES LANGUAGE CXX)
set_source_files_properties(${PROJECT_SOURCE_DIR}/../../mono/component/debugger-protocol.c PROPERTIES LANGUAGE CXX)

set(COREDBI_LIBRARIES
utilcodestaticnohost
Expand Down
2 changes: 1 addition & 1 deletion src/mono/dlls/mscordbi/cordb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "corhdr.h"
#include "xcordebug.h"

#include <mono/mini/debugger-protocol.h>
#include <mono/component/debugger-protocol.h>
#include <mono/utils/mono-publib.h>

#include "arraylist.h"
Expand Down
22 changes: 22 additions & 0 deletions src/mono/mono/component/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set(MONO_EVENTPIPE_GEN_INCLUDE_PATH "${CMAKE_CURRENT_BINARY_DIR}/eventpipe")

set(MONO_HOT_RELOAD_COMPONENT_NAME "hot_reload")
set(MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME "diagnostics_tracing")
set(MONO_DEBUGGER_COMPONENT_NAME "debugger")

# a list of every component.
set(components "")
Expand All @@ -14,6 +15,27 @@ set(components "")
# component_name-sources list for each component, and a
# component_name-stub-sources list for the component stub.

# debugger
list(APPEND components
${MONO_DEBUGGER_COMPONENT_NAME}
)
set(${MONO_DEBUGGER_COMPONENT_NAME}-sources
${MONO_COMPONENT_PATH}/debugger.c
${MONO_COMPONENT_PATH}/debugger.h
${MONO_COMPONENT_PATH}/debugger-agent.c
${MONO_COMPONENT_PATH}/debugger-agent.h
${MONO_COMPONENT_PATH}/debugger-engine.c
${MONO_COMPONENT_PATH}/debugger-engine.h
${MONO_COMPONENT_PATH}/debugger-state-machine.h
${MONO_COMPONENT_PATH}/debugger-state-machine.c
${MONO_COMPONENT_PATH}/mini-wasm-debugger.c
${MONO_COMPONENT_PATH}/debugger-protocol.h
${MONO_COMPONENT_PATH}/debugger-protocol.c
)
set(${MONO_DEBUGGER_COMPONENT_NAME}-stub-sources
${MONO_COMPONENT_PATH}/debugger-stub.c
)

# hot_reload
list(APPEND components
${MONO_HOT_RELOAD_COMPONENT_NAME}
Expand Down
Loading