mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-18 03:51:19 -10:00
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02f1f54f2d | ||
|
|
8140399b53 | ||
|
|
ba27c129e6 | ||
|
|
361d7f340a | ||
|
|
e52df644ab | ||
|
|
9f2c5fdcb7 | ||
|
|
27850f9f8c | ||
|
|
5bbca1f930 | ||
|
|
ab15ba3d99 |
No files matched your search
+23
-23
@@ -18,11 +18,11 @@
|
||||
/acceptance-tests/profiler-stress* @BrzVlad @akoeplinger
|
||||
|
||||
/data @directhex @akoeplinger
|
||||
/data/gdb @vargaz
|
||||
/data/lldb @vargaz
|
||||
/data/gdb @lewurm @vargaz
|
||||
/data/lldb @lewurm @vargaz
|
||||
|
||||
/docs @marek-safar @akoeplinger
|
||||
/docs/riscv.md @alexrp
|
||||
/docs/riscv.md @alexrp @lewurm
|
||||
/docs/sources/mono-api-profiler.html @BrzVlad
|
||||
|
||||
/external @akoeplinger @marek-safar
|
||||
@@ -65,24 +65,24 @@
|
||||
/mcs/class/System/System.Security.Cryptography.X509Certificates @baulig @steveisok
|
||||
/mcs/class/System.Data* @egorbo @steveisok
|
||||
|
||||
/mcs/errors @marek-safar
|
||||
/mcs/ilasm @marek-safar
|
||||
/mcs/jay @marek-safar
|
||||
/mcs/mcs @marek-safar
|
||||
/mcs/tests @marek-safar
|
||||
/mcs/errors @marek-safar @lewurm
|
||||
/mcs/ilasm @marek-safar @lewurm
|
||||
/mcs/jay @marek-safar @lewurm
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/tests @marek-safar @lewurm
|
||||
|
||||
/mcs/tools @marek-safar @akoeplinger @steveisok
|
||||
/mcs/tools/gensources @kg @akoeplinger
|
||||
/mcs/tools/resx2sr @baulig
|
||||
/mcs/tools/upload-to-sentry @directhex @akoeplinger
|
||||
|
||||
/mono/arch @vargaz
|
||||
/mono/arch @vargaz @lewurm
|
||||
|
||||
/mono/btls @baulig @marek-safar
|
||||
/mono/dis @lambdageek @vargaz
|
||||
/mono/eglib @vargaz @lambdageek
|
||||
|
||||
/mono/benchmark @SamMonoRT
|
||||
/mono/benchmark @SamMonoRT @lewurm
|
||||
|
||||
/mono/metadata @vargaz @lambdageek @thaystg
|
||||
/mono/metadata/*profiler* @lambdageek
|
||||
@@ -99,14 +99,14 @@
|
||||
/mono/metadata/native-library* @vargaz @lambdageek @CoffeeFlux
|
||||
/mono/metadata/*-unix* @lambdageek @CoffeeFlux
|
||||
|
||||
/mono/mini @vargaz @lambdageek @SamMonoRT
|
||||
/mono/mini/*cfgdump* @vargaz
|
||||
/mono/mini/*exceptions* @vargaz @BrzVlad
|
||||
/mono/mini @vargaz @lewurm @lambdageek @SamMonoRT
|
||||
/mono/mini/*cfgdump* @lewurm @vargaz
|
||||
/mono/mini/*exceptions* @lewurm @vargaz @BrzVlad
|
||||
/mono/mini/*ppc* @lewurm @vargaz
|
||||
/mono/mini/*riscv* @alexrp @lewurm
|
||||
/mono/mini/*type-check* @lambdageek
|
||||
/mono/mini/*type-check* @lewurm @lambdageek
|
||||
/mono/mini/*llvm* @vargaz @imhameed
|
||||
/mono/mini/interp/* @BrzVlad
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/*profiler* @BrzVlad @lambdageek
|
||||
/mono/mini/debugger-agent.c @vargaz @thaystg @DavidKarlas @lambdageek
|
||||
|
||||
@@ -116,12 +116,12 @@
|
||||
|
||||
/mono/sgen @BrzVlad @lambdageek
|
||||
|
||||
/mono/tools/offsets-tool @rolfbjarne
|
||||
/mono/tools/offsets-tool @lewurm @rolfbjarne
|
||||
|
||||
/mono/utils @vargaz @lambdageek
|
||||
/mono/utils/atomic* @vargaz
|
||||
/mono/utils/mono-hwcap* @vargaz
|
||||
/mono/utils/mono-mem* @vargaz
|
||||
/mono/utils @vargaz @lewurm @lambdageek
|
||||
/mono/utils/atomic* @lewurm @vargaz
|
||||
/mono/utils/mono-hwcap* @lewurm @vargaz
|
||||
/mono/utils/mono-mem* @lewurm @vargaz
|
||||
/mono/utils/mono-merp* @alexischr @lambdageek
|
||||
/mono/utils/mono-state* @alexischr @lambdageek
|
||||
/mono/utils/mono-threads* @lambdageek @vargaz
|
||||
@@ -137,14 +137,14 @@
|
||||
|
||||
/runtime @akoeplinger @marek-safar
|
||||
|
||||
/samples @lambdageek
|
||||
/samples @lambdageek @lewurm
|
||||
/samples/profiler @BrzVlad @lambdageek
|
||||
/samples/size @alexrp @lambdageek
|
||||
|
||||
/scripts @akoeplinger @directhex
|
||||
/scripts/ci @akoeplinger @directhex
|
||||
|
||||
/sdks @marek-safar @vargaz @lambdageek
|
||||
/sdks @marek-safar @lewurm @vargaz @lambdageek
|
||||
/sdks/builds/android* @alexischr @jonpryor
|
||||
/sdks/builds/mxe* @alexischr @jonpryor
|
||||
/sdks/builds/ios* @vargaz @rolfbjarne
|
||||
@@ -158,5 +158,5 @@
|
||||
/tools @lambdageek @vargaz
|
||||
/tools/locale-builder @marek-safar @egorbo
|
||||
/tools/nuget-hash-extractor @marek-safar @radical @akoeplinger
|
||||
/tools/pedump @lambdageek
|
||||
/tools/pedump @lambdageek @lewurm
|
||||
/tools/sgen @brzvlad @vargaz @naricc
|
||||
@@ -43,5 +43,5 @@ Please paste the stack trace here if available.
|
||||
```
|
||||
|
||||
<!--
|
||||
You can join us on Discord (https://aka.ms/dotnet-discord) in the #monovm channel to discuss your reported issue
|
||||
You can join us at https://gitter.im/mono/mono to discuss your reported issue
|
||||
-->
|
||||
@@ -18,7 +18,6 @@
|
||||
*.vssscc
|
||||
*_i.c
|
||||
*_p.c
|
||||
*.mdb
|
||||
*.ncb
|
||||
*.suo
|
||||
*.tlb
|
||||
|
||||
@@ -76,7 +76,7 @@ The Licenses
|
||||
|
||||
These are the licenses used in Mono, the files are located:
|
||||
|
||||
### MIT License
|
||||
### MIT X11 License
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
|
||||
@@ -5,13 +5,7 @@ standards for C# and the Common Language Runtime.
|
||||
|
||||
The Mono project is part of the [.NET Foundation](https://www.dotnetfoundation.org/)
|
||||
|
||||
Join us on [Discord](https://aka.ms/dotnet-discord) in the `#monovm` channel:
|
||||
|
||||
<a href="https://aka.ms/dotnet-discord">
|
||||
<img src="https://img.shields.io/discord/732297728826277939?style=flat-square&label=Discord&logo=discord&logoColor=white&color=7289DA">
|
||||
</a>
|
||||
|
||||
### Contents
|
||||
[](https://gitter.im/mono/mono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
|
||||
1. [Compilation and Installation](#compilation-and-installation)
|
||||
2. [Using Mono](#using-mono)
|
||||
|
||||
+48
-4
@@ -1,6 +1,50 @@
|
||||
# Code of Conduct
|
||||
# Contributor Code of Conduct
|
||||
|
||||
This project has adopted the code of conduct defined by the Contributor Covenant
|
||||
to clarify expected behavior in our community.
|
||||
As contributors and maintainers of this project, and in the interest of
|
||||
fostering an open and welcoming community, we pledge to respect all people who
|
||||
contribute through reporting issues, posting feature requests, updating
|
||||
documentation, submitting pull requests or patches, and other activities.
|
||||
|
||||
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
|
||||
We are committed to making participation in this project a harassment-free
|
||||
experience for everyone, regardless of level of experience, gender, gender
|
||||
identity and expression, sexual orientation, disability, personal appearance,
|
||||
body size, race, ethnicity, age, religion, or nationality.
|
||||
|
||||
Examples of unacceptable behavior by participants include:
|
||||
|
||||
* The use of sexualized language or imagery
|
||||
* Personal attacks
|
||||
* Trolling or insulting/derogatory comments
|
||||
* Public or private harassment
|
||||
* Publishing other's private information, such as physical or electronic
|
||||
addresses, without explicit permission
|
||||
* Other unethical or unprofessional conduct
|
||||
|
||||
Project maintainers have the right and responsibility to remove, edit, or
|
||||
reject comments, commits, code, wiki edits, issues, and other contributions
|
||||
that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||
permanently any contributor for other behaviors that they deem inappropriate,
|
||||
threatening, offensive, or harmful.
|
||||
|
||||
By adopting this Code of Conduct, project maintainers commit themselves to
|
||||
fairly and consistently applying these principles to every aspect of managing
|
||||
this project. Project maintainers who do not follow or enforce the Code of
|
||||
Conduct may be permanently removed from the project team.
|
||||
|
||||
This Code of Conduct applies both within project spaces and in public spaces
|
||||
when an individual is representing the project or its community.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported by contacting a project maintainer at miguel@xamarin.com. All
|
||||
complaints will be reviewed and investigated and will result in a response that
|
||||
is deemed necessary and appropriate to the circumstances. Maintainers are
|
||||
obligated to maintain confidentiality with regard to the reporter of an
|
||||
incident.
|
||||
|
||||
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
||||
version 1.3.0, available at
|
||||
[http://contributor-covenant.org/version/1/3/0/][version]
|
||||
|
||||
[homepage]: http://contributor-covenant.org
|
||||
[version]: http://contributor-covenant.org/version/1/3/0/
|
||||
+20
-169
@@ -139,14 +139,13 @@ platform_ios=no
|
||||
host_darwin=no
|
||||
host_linux=no
|
||||
build_darwin=no
|
||||
host_sunos=no
|
||||
|
||||
case "$host" in
|
||||
wasm32*)
|
||||
CFLAGS="$CFLAGS -D_REENTRANT -D_GNU_SOURCE -s WASM=1"
|
||||
CPPFLAGS="$CPPFLAGS -D_REENTRANT -DUSE_MMAP -s WASM=1"
|
||||
libgc_threads=pthreads
|
||||
host_wasm=yes
|
||||
platform_wasm=yes
|
||||
# FIXME:
|
||||
RID="osx-x64"
|
||||
COREARCH="wasm32"
|
||||
@@ -321,11 +320,6 @@ case "$host" in
|
||||
# available during cross-compilation
|
||||
mono_cv_uscore=no
|
||||
fi
|
||||
case "$host" in
|
||||
*-musl)
|
||||
AC_DEFINE(MUSL, 1, [musl libc])
|
||||
;;
|
||||
esac
|
||||
case "$host" in
|
||||
*-tizen-linux-*)
|
||||
platform_tizen=yes
|
||||
@@ -398,23 +392,15 @@ case "$host" in
|
||||
use_sigposix=yes
|
||||
;;
|
||||
*-*-solaris*)
|
||||
CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DHOST_SOLARIS -D__EXTENSIONS__ -D_XPG4_2"
|
||||
CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DHOST_SOLARIS"
|
||||
need_link_unlink=yes
|
||||
libmono_cflags="-D_REENTRANT"
|
||||
libgc_threads=pthreads
|
||||
has_dtrace=yes
|
||||
use_sigposix=yes
|
||||
enable_solaris_tar_check=yes
|
||||
host_sunos=yes
|
||||
;;
|
||||
*-*-darwin*)
|
||||
# Temporary workaround for Apple Silicon
|
||||
# config.guess returns arm-apple-darwin20.0.0
|
||||
if test $ac_cv_host = arm-apple-darwin20.0.0 -o $ac_cv_target = arm-apple-darwin20.0.0; then
|
||||
echo "You are running on Apple Silicon, but using an old config.guess, invoke configure like this:"
|
||||
echo "Run configure using ./configure --host=aarch64-apple-darwin20.0.0 --target=aarch64-apple-darwin20.0.0"
|
||||
exit 1
|
||||
fi
|
||||
parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
|
||||
host_darwin=yes
|
||||
target_mach=yes
|
||||
@@ -456,10 +442,6 @@ case "$host" in
|
||||
platform_ios=yes
|
||||
has_dtrace=no
|
||||
;;
|
||||
aarch64*-darwin20*)
|
||||
# OSX/arm64
|
||||
support_boehm=no
|
||||
;;
|
||||
aarch64*-darwin*)
|
||||
platform_ios=yes
|
||||
;;
|
||||
@@ -595,7 +577,7 @@ AM_CONDITIONAL(HOST_SIGPOSIX, test x$use_sigposix = xyes)
|
||||
AM_CONDITIONAL(HOST_ANDROID, test x$platform_android = xyes)
|
||||
AM_CONDITIONAL(HOST_TIZEN, test x$platform_tizen = xyes)
|
||||
AM_CONDITIONAL(HOST_IOS, test x$platform_ios = xyes)
|
||||
AM_CONDITIONAL(HOST_WASM, test x$host_wasm = xyes)
|
||||
AM_CONDITIONAL(HOST_WASM, test x$platform_wasm = xyes)
|
||||
AM_CONDITIONAL(HOST_AIX, test x$host_aix = xyes)
|
||||
|
||||
if test -z "$HOST_DARWIN_TRUE"; then :
|
||||
@@ -776,7 +758,7 @@ AC_CHECK_HEADERS(elf.h)
|
||||
# for perf jit dump support
|
||||
AC_CHECK_HEADERS(sys/mman.h)
|
||||
if test "x$host_linux" = "xyes" -a x$ac_cv_header_sys_mman_h = xyes -a x$ac_cv_header_elf_h = xyes -a x$ac_cv_header_sys_syscall_h = xyes; then
|
||||
AC_DEFINE(ENABLE_JIT_DUMP, 1, [Enable jit dump support on Linux])
|
||||
AC_DEFINE(ENABLE_JIT_DUMP, 1, [Enable jit dump support on Linux])
|
||||
fi
|
||||
|
||||
# for support
|
||||
@@ -888,7 +870,7 @@ AC_ARG_ENABLE(visibility-hidden,
|
||||
WARN=''
|
||||
if test x"$GCC" = xyes; then
|
||||
WARN='-Wall -Wunused -Wmissing-declarations -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value -Wno-attributes'
|
||||
CFLAGS="$CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wno-format-zero-length -Wc++-compat"
|
||||
CFLAGS="$CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wno-format-zero-length"
|
||||
|
||||
# We require C99 with some GNU extensions, e.g. `linux` macro
|
||||
CFLAGS="$CFLAGS -std=gnu99"
|
||||
@@ -1125,10 +1107,7 @@ AC_ARG_WITH(csc, [ --with-csc=mcs,roslyn,default Configures the CSharp com
|
||||
|
||||
if test $csc_compiler = default; then
|
||||
if test $endian = big; then
|
||||
case "$host" in
|
||||
s390x*) csc_compiler=roslyn ;;
|
||||
*) csc_compiler=mcs
|
||||
esac
|
||||
csc_compiler=mcs
|
||||
elif test $endian = little; then
|
||||
case "$host" in
|
||||
powerpc*) csc_compiler=mcs ;;
|
||||
@@ -1219,7 +1198,6 @@ if test "x$crash_reporting" != "xyes"; then
|
||||
CFLAGS="$CFLAGS -DDISABLE_CRASH_REPORTING=1"
|
||||
CXXFLAGS="$CXXFLAGS -DDISABLE_CRASH_REPORTING=1"
|
||||
fi
|
||||
AM_CONDITIONAL(DISABLE_CRASH_REPORTING, test x$crash_reporting != xyes)
|
||||
|
||||
AC_ARG_ENABLE(monodroid, [ --enable-monodroid Enable runtime support for Monodroid (Xamarin.Android)], enable_monodroid=$enableval, enable_monodroid=no)
|
||||
AM_CONDITIONAL(ENABLE_MONODROID, test x$enable_monodroid = xyes)
|
||||
@@ -1314,12 +1292,6 @@ AC_ARG_WITH(spectre-mitigation, [ --with-spectre-mitigation=yes,no
|
||||
AC_ARG_WITH(spectre-indirect-branch-choice, [ --with-spectre-indirect-branch-choice=keep,thunk,inline,extern Convert indirect branches to the specified kind of thunk (defaults to inline)], [], [with_spectre_indirect_branch_choice=inline])
|
||||
AC_ARG_WITH(spectre-function-return-choice, [ --with-spectre-function-return-choice=keep,thunk,inline,extern Convert function return instructions to the specified kind of thunk (defaults to inline)], [], [with_spectre_function_return_choice=inline])
|
||||
|
||||
AC_ARG_WITH(static_icu, [ --with-static-icu=yes|no Integrate ICU statically into the runtime (defaults to no)],[
|
||||
if test x$with_static_icu = xyes ; then
|
||||
AC_DEFINE(STATIC_ICU,1,[Integrate ICU statically into the runtime.])
|
||||
fi
|
||||
], [with_static_icu=no])
|
||||
|
||||
dnl
|
||||
dnl Spectre compiler mitigation flag checks
|
||||
dnl
|
||||
@@ -1417,8 +1389,7 @@ if test x$with_runtime_preset = xnetcore; then
|
||||
mono_feature_disable_gac='yes'
|
||||
mono_feature_disable_perfcounters='yes'
|
||||
mono_feature_disable_attach='yes'
|
||||
mono_feature_disable_cfgdir_config='yes'
|
||||
if test "x$enable_monodroid" = "xno" -a "x$enable_monotouch" = "xno"; then
|
||||
if test "x$enable_monodroid" = "x" -a "x$enable_monotouch" = "x"; then
|
||||
mono_feature_disable_dllmap='yes' # FIXME: the mobile products use this
|
||||
fi
|
||||
disable_mono_native=yes
|
||||
@@ -1708,7 +1679,6 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"])
|
||||
AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes")
|
||||
AM_CONDITIONAL(STATIC_ICU, test "x$with_static_icu" = "xyes")
|
||||
AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL_INTERP, [test "x$with_testing_aot_full_interp" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" != "xno"])
|
||||
@@ -1795,7 +1765,9 @@ fi
|
||||
AM_CONDITIONAL(ENABLE_STATIC_GCC_LIBS, test "x$enable_static_gcc_libs" = "xyes")
|
||||
|
||||
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
|
||||
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, dllmap, reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, interpreter, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting, security, lldb, mdb, assert_messages, config, cfgdir_config, cleanup, sgen_marksweep_conc, sgen_split_nursery, sgen_gc_bridge, sgen_toggleref, sgen_debug_helpers, sgen_binary_protocol, sockets, gac, threads, processes, eventpipe.],
|
||||
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, dllmap,
|
||||
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, interpreter, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting,
|
||||
security, lldb, mdb, assert_messages, config, cfgdir_config, cleanup, sgen_marksweep_conc, sgen_split_nursery, sgen_gc_bridge, sgen_debug_helpers, sockets, gac, threads, processes.],
|
||||
[
|
||||
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
|
||||
eval "mono_feature_disable_$feature='yes'"
|
||||
@@ -1991,6 +1963,7 @@ if test "x$mono_feature_disable_sgen_marksweep_conc" = "xyes"; then
|
||||
AC_MSG_NOTICE([Disabled concurrent gc support in SGEN.])
|
||||
fi
|
||||
|
||||
|
||||
if test "x$mono_feature_disable_sgen_split_nursery" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_SPLIT_NURSERY, 1, [Disable minor=split support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled minor=split support in SGEN.])
|
||||
@@ -2001,21 +1974,11 @@ if test "x$mono_feature_disable_sgen_gc_bridge" = "xyes"; then
|
||||
AC_MSG_NOTICE([Disabled gc bridge support in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_toggleref" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_TOGGLEREF, 1, [Disable toggleref support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled toggleref support in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_debug_helpers" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_DEBUG_HELPERS, 1, [Disable debug helpers in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled debug helpers in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_binary_protocol" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_BINARY_PROTOCOL, 1, [Disable binary protocol logging in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled binary protocol logging in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sockets" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SOCKETS, 1, [Disable sockets])
|
||||
AC_MSG_NOTICE([Disabled sockets])
|
||||
@@ -2041,22 +2004,6 @@ if test "x$mono_feature_disable_processes" = "xyes"; then
|
||||
AC_MSG_NOTICE([Disabled process support])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_eventpipe" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_EVENTPIPE, 1, [Disable EventPipe support])
|
||||
AC_MSG_NOTICE([Disabled EventPipe support])
|
||||
enable_perftracing=no
|
||||
fi
|
||||
|
||||
if test x$enable_perftracing = x -a x$with_core = xonly; then
|
||||
if test -f $srcdir/mono/eventpipe/ep.h; then
|
||||
enable_perftracing=yes
|
||||
fi
|
||||
fi
|
||||
if test x$enable_perftracing = xyes; then
|
||||
AC_DEFINE(ENABLE_PERFTRACING,1,[Enables support for eventpipe library])
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_PERFTRACING, test x$enable_perftracing = xyes)
|
||||
|
||||
AC_ARG_ENABLE(executables, [ --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
|
||||
AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
|
||||
|
||||
@@ -2251,9 +2198,6 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_FUNC(futimes, [AC_DEFINE(HAVE_FUTIMES, 1, [futimes])])
|
||||
AC_CHECK_FUNC(futimens, [AC_DEFINE(HAVE_FUTIMENS, 1, [futimens])])
|
||||
|
||||
AC_CHECK_TYPES([clockid_t], [AC_DEFINE(HAVE_CLOCKID_T)], [],
|
||||
[#include <sys/types.h>])
|
||||
|
||||
dnl hires monotonic clock support
|
||||
AC_SEARCH_LIBS(clock_gettime, rt)
|
||||
AC_CHECK_FUNCS(clock_nanosleep)
|
||||
@@ -2312,13 +2256,14 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_FUNCS(getresuid)
|
||||
AC_CHECK_FUNCS(setresuid)
|
||||
AC_CHECK_FUNCS(kqueue)
|
||||
# IBM provides a compatibility library for offering this function.
|
||||
# IBM provides a compatibility library for i offering this function.
|
||||
# BSDs and others, have execinfo in base or packages.
|
||||
AC_SEARCH_LIBS(backtrace_symbols, execinfo util)
|
||||
# Two-step so it sets it in config.h
|
||||
AC_CHECK_FUNCS(backtrace_symbols)
|
||||
AC_CHECK_FUNCS(mkstemp)
|
||||
AC_CHECK_FUNCS(mmap)
|
||||
AC_CHECK_FUNCS(madvise)
|
||||
AC_CHECK_FUNCS(getrusage)
|
||||
AC_CHECK_FUNCS(getpriority)
|
||||
AC_CHECK_FUNCS(setpriority)
|
||||
@@ -2784,7 +2729,7 @@ if test x$host_win32 = xno; then
|
||||
dnl *** Checks for libxnet ***
|
||||
dnl *****************************
|
||||
case "${host}" in
|
||||
*solaris*)
|
||||
*solaris* )
|
||||
AC_MSG_CHECKING(for Solaris XPG4 support)
|
||||
if test -f /usr/lib/libxnet.so; then
|
||||
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
|
||||
@@ -2827,7 +2772,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS(pthread_np.h)
|
||||
AC_CHECK_FUNCS(pthread_mutex_timedlock)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_getname_np pthread_setname_np pthread_cond_timedwait_relative_np)
|
||||
AC_CHECK_FUNCS(pthread_kill pthread_jit_write_protect_np)
|
||||
AC_CHECK_FUNCS(pthread_kill)
|
||||
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
|
||||
AC_TRY_COMPILE([ #include <pthread.h>], [
|
||||
pthread_mutexattr_t attr;
|
||||
@@ -3252,6 +3197,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_FUNCS(remap_file_pages)
|
||||
AC_CHECK_FUNCS(posix_fadvise)
|
||||
AC_CHECK_FUNCS(posix_fallocate)
|
||||
AC_CHECK_FUNCS(posix_madvise)
|
||||
AC_CHECK_FUNCS(vsnprintf)
|
||||
AC_CHECK_FUNCS(sendfile)
|
||||
AC_CHECK_FUNCS(gethostid sethostid)
|
||||
@@ -3957,19 +3903,6 @@ if test x$host_win32 = xno; then
|
||||
|
||||
AC_CHECK_DECL(IN_EXCL_UNLINK, [AC_DEFINE(HAVE_IN_EXCL_UNLINK, 1, [IN_EXCL_UNLINK])], [], [[#include <sys/inotify.h>]])
|
||||
|
||||
if test x$host_sunos = xyes; then
|
||||
# set -Werror=strict-prototypes, to match the flags used during the compilation.
|
||||
ORIG_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Werror=strict-prototypes"
|
||||
fi
|
||||
|
||||
AC_CHECK_FUNCS(madvise)
|
||||
AC_CHECK_FUNCS(posix_madvise)
|
||||
|
||||
if test x$host_sunos = xyes; then
|
||||
CFLAGS="$ORIG_CFLAGS"
|
||||
fi
|
||||
|
||||
# *** End of Mono.Native checks ***
|
||||
else
|
||||
AM_CONDITIONAL(ENABLE_GSS, false)
|
||||
@@ -3988,8 +3921,6 @@ else
|
||||
AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?))
|
||||
AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?))
|
||||
|
||||
AC_CHECK_TYPES([struct sockaddr_in6], [AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)], , [#include <ws2tcpip.h>])
|
||||
|
||||
dnl *********************************
|
||||
dnl *** Check for struct ip_mreqn ***
|
||||
dnl *********************************
|
||||
@@ -4685,7 +4616,7 @@ case "$host" in
|
||||
ACCESS_UNALIGNED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=s390x
|
||||
CFLAGS="$CFLAGS -mbackchain"
|
||||
CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
|
||||
;;
|
||||
riscv32-*)
|
||||
TARGET=RISCV32
|
||||
@@ -4784,12 +4715,6 @@ if test "x$host" != "x$target"; then
|
||||
sizeof_register=8
|
||||
AC_DEFINE(TARGET_WATCHOS, 1, [...])
|
||||
;;
|
||||
aarch64*darwin*)
|
||||
TARGET=ARM64
|
||||
# Both ios and osx/arm64 have the same aarc64-darwin triple,
|
||||
# assume ios for now when cross compiling
|
||||
TARGET_SYS=IOS
|
||||
;;
|
||||
aarch64-*)
|
||||
TARGET=ARM64
|
||||
;;
|
||||
@@ -5002,7 +4927,7 @@ if test "x$target_mach" = "xyes"; then
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_WATCHOS"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_WATCHOS"
|
||||
BTLS_SUPPORTED=no
|
||||
elif test "x$TARGET_SYS" = "xIOS" -o "x$TARGET" = "xARM" -o "x$TARGET" = "xARM6432"; then
|
||||
elif test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64" -o "x$TARGET" = "xARM6432"; then
|
||||
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
@@ -5018,9 +4943,6 @@ if test "x$target_mach" = "xyes"; then
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_OSX"
|
||||
target_osx=yes
|
||||
if test "x$TARGET" = "xARM64"; then
|
||||
BTLS_SUPPORTED=no
|
||||
fi
|
||||
], [
|
||||
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
@@ -6211,8 +6133,8 @@ fi
|
||||
AC_SUBST(mono_runtime)
|
||||
AC_SUBST(mono_runtime_wrapper)
|
||||
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.7.0/csc.exe
|
||||
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.7.0/VBCSCompiler.exe
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.5.0/csc.exe
|
||||
VBCS_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/3.5.0/VBCSCompiler.exe
|
||||
|
||||
if test $csc_compiler = mcs; then
|
||||
CSC=$mcs_topdir/class/lib/build/mcs.exe
|
||||
@@ -6809,10 +6731,8 @@ AC_SUBST(MONO_NATIVE_PLATFORM_TYPE_UNIFIED)
|
||||
#
|
||||
if test "x$enable_llvm_runtime" = "xyes"; then
|
||||
AC_SUBST(MONO_CXXLD, [$CXX])
|
||||
AC_SUBST(MONO_LIBTOOL_TAG, '--tag=CXX')
|
||||
else
|
||||
AC_SUBST(MONO_CXXLD, [$CC])
|
||||
AC_SUBST(MONO_LIBTOOL_TAG, '')
|
||||
fi
|
||||
|
||||
### Set -Werror options
|
||||
@@ -6845,18 +6765,6 @@ if test x"$GCC" = xyes; then
|
||||
CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
|
||||
# jay has a lot of implicit declarations
|
||||
JAY_CFLAGS="-Wno-implicit-function-declaration"
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Wsometimes-uninitialized -Werror"
|
||||
AC_MSG_CHECKING(for -Wsometimes-uninitialized option to gcc)
|
||||
AC_TRY_COMPILE([],[
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
CFLAGS="$ORIG_CFLAGS -Werror=sometimes-uninitialized"
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS=$ORIG_CFLAGS
|
||||
])
|
||||
fi
|
||||
|
||||
# zlib/configure checks if this program compiles and if so
|
||||
@@ -6875,63 +6783,6 @@ AC_COMPILE_IFELSE(
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
# for icu shim
|
||||
ICU_SHIM_PATH=.
|
||||
if test x$with_core = xonly; then
|
||||
if test x$cross_compiling = xno; then
|
||||
AC_CHECK_FILE($srcdir/../libraries/Native/Unix/System.Globalization.Native/pal_icushim.h, [have_shim_globalization=yes], [have_shim_globalization=no])
|
||||
fi
|
||||
if test x$have_shim_globalization = xyes || test x$cross_compiling = xyes; then
|
||||
ICU_SHIM_PATH=../../../libraries/Native/Unix/System.Globalization.Native
|
||||
if test x$target_wasm = xyes && test x$with_static_icu = xyes; then
|
||||
ICU_CFLAGS="-DTARGET_UNIX -DU_DISABLE_RENAMING -DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS -DHAVE_SET_MAX_VARIABLE"
|
||||
have_sys_icu=yes
|
||||
elif test x$target_osx = xyes; then
|
||||
ORIG_CPPFLAGS=$CPPFLAGS
|
||||
# adding icu path to pkg_config_path
|
||||
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig
|
||||
export PKG_CONFIG_PATH
|
||||
CPPFLAGS="`pkg-config --cflags-only-I icu-uc`"
|
||||
AC_CHECK_LIB(icucore, ucol_open, LIBS=$LIBS,
|
||||
[AC_MSG_ERROR([Cannot find libicucore, skipping build for System.Globalization.Native. .NET globalization is not expected to function.])])
|
||||
AC_CHECK_HEADER(unicode/utypes.h, [have_sys_icu=yes], [have_sys_icu=no])
|
||||
if test x$have_sys_icu = xyes; then
|
||||
ICU_CFLAGS="$CPPFLAGS -DPALEXPORT="" -DOSX_ICU_LIBRARY_PATH=AS_ESCAPE(\"/usr/lib/libicucore.dylib\", '\"') -DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations"
|
||||
fi
|
||||
CPPFLAGS=$ORIG_CPPFLAGS
|
||||
elif test x$platform_android = xyes; then
|
||||
ICU_CFLAGS="-DPALEXPORT="" -DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS -DHAVE_SET_MAX_VARIABLE -DTARGET_UNIX -DTARGET_ANDROID -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option"
|
||||
have_sys_icu=yes
|
||||
elif test x$host_linux = xyes; then
|
||||
AC_CHECK_LIB(icuuc, main, LIBS=$LIBS,
|
||||
[AC_MSG_ERROR([Cannot find libicuuc, try installing libicu-dev (or the appropriate package for your platform).])])
|
||||
AC_CHECK_LIB(icui18n, main, LIBS=$LIBS,
|
||||
[AC_MSG_ERROR([Cannot find libicui18n, try installing libicu-dev (or the appropriate package for your platform).])])
|
||||
AC_CHECK_HEADER(unicode/utypes.h, [have_sys_icu=yes], [have_sys_icu=no])
|
||||
if test x$have_sys_icu = xyes; then
|
||||
ICU_CFLAGS="-DPALEXPORT="" -DTARGET_UNIX -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option"
|
||||
fi
|
||||
elif test x$host_sunos = xyes; then
|
||||
ICU_CFLAGS="-DPALEXPORT="" -DTARGET_UNIX -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option"
|
||||
have_sys_icu=yes
|
||||
elif test x$host_wasm = xyes; then
|
||||
ICU_CFLAGS="-DPALEXPORT="" -DTARGET_UNIX -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option"
|
||||
have_sys_icu=yes
|
||||
else
|
||||
GLOBALIZATION_SHIM_DEFINES="-DNO_GLOBALIZATION_SHIM"
|
||||
fi
|
||||
AC_SUBST(ICU_CFLAGS)
|
||||
else
|
||||
GLOBALIZATION_SHIM_DEFINES="-DNO_GLOBALIZATION_SHIM"
|
||||
fi
|
||||
else
|
||||
GLOBALIZATION_SHIM_DEFINES="-DNO_GLOBALIZATION_SHIM"
|
||||
fi
|
||||
|
||||
AC_SUBST(GLOBALIZATION_SHIM_DEFINES)
|
||||
AC_SUBST(ICU_SHIM_PATH)
|
||||
AM_CONDITIONAL(HAVE_SYS_ICU, test x$have_sys_icu = xyes)
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ Layout
|
||||
as well as the upcoming Monodoc tools and index creation
|
||||
tools).
|
||||
|
||||
The files can contain any amount of extra information.
|
||||
The files can contain any ammount of extra information.
|
||||
|
||||
The documentation from the source code is then merged with
|
||||
these files and the header/footer information to produce
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: e543779364...fbfa75292a.
Vendored
+1
-1
Submodule external/bockbuild updated: 93607d34ad...efde5e63c8.
Vendored
+1
-1
Submodule external/corefx updated: 7c24bb0756...bec9343705.
Vendored
+1
-1
Submodule external/ikvm updated: 26d148421c...8362227c5b.
Vendored
+1
-1
Submodule external/linker updated: 40922458d2...e1c7a72951.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 04556aa2c2...a8984d0533.
+1
-3
@@ -9,8 +9,6 @@ LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm-project/llvm" re
|
||||
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(LLVM_BRANCH)/llvm-osx64-$(LLVM_VERSION).tar.gz
|
||||
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(LLVM_VERSION).tar.gz"
|
||||
|
||||
CPU_COUNT := $(shell getconf _NPROCESSORS_ONLN || echo 8)
|
||||
|
||||
CMAKE := $(or $(CMAKE),$(shell which cmake))
|
||||
NINJA := $(shell which ninja)
|
||||
|
||||
@@ -45,7 +43,7 @@ configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile)
|
||||
|
||||
.PHONY: build-llvm
|
||||
build-llvm: configure-llvm
|
||||
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j$(CPU_COUNT)) -C $(LLVM_BUILD)
|
||||
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j) -C $(LLVM_BUILD)
|
||||
|
||||
.PHONY: install-llvm
|
||||
install-llvm: build-llvm
|
||||
|
||||
@@ -16,7 +16,6 @@ AC_DEFUN([AC_MONO_OUTPUT], [
|
||||
llvm/Makefile
|
||||
mono/Makefile
|
||||
mono/btls/Makefile
|
||||
mono/culture/Makefile
|
||||
mono/native/Makefile
|
||||
mono/utils/Makefile
|
||||
mono/metadata/Makefile
|
||||
|
||||
@@ -430,9 +430,10 @@ namespace I18N.CJK
|
||||
}
|
||||
#else
|
||||
|
||||
public override int GetByteCount(char[] chars, int start, int count, bool refresh)
|
||||
public override int GetByteCount(char[] chars, int index, int count, bool refresh)
|
||||
{
|
||||
int end = start + count;
|
||||
int start = 0;
|
||||
int end = count;
|
||||
int ret = 0;
|
||||
while (start < end)
|
||||
{
|
||||
|
||||
@@ -92,14 +92,6 @@ namespace Mono.Debugger.Soft
|
||||
vm.conn.Array_SetValues (id, index, vm.EncodeValues (values));
|
||||
}
|
||||
|
||||
public void SetByteValues (byte [] bytes)
|
||||
{
|
||||
if (bytes != null && bytes.Length != Length) {
|
||||
throw new IndexOutOfRangeException ();
|
||||
}
|
||||
vm.conn.ByteArray_SetValues (id, bytes);
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator ()
|
||||
{
|
||||
return new SimpleEnumerator (this);
|
||||
|
||||
@@ -216,7 +216,7 @@ namespace Mono.Debugger.Soft
|
||||
public bool IsEnum; // For ElementType.ValueType
|
||||
public long Id; /* For VALUE_TYPE_ID_TYPE */
|
||||
public int Index; /* For VALUE_TYPE_PARENT_VTYPE */
|
||||
public int FixedSize;
|
||||
public int FixedSize;
|
||||
}
|
||||
|
||||
class ModuleInfo {
|
||||
@@ -315,6 +315,7 @@ namespace Mono.Debugger.Soft
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class AssemblyModifier : Modifier {
|
||||
public long[] Assemblies {
|
||||
get; set;
|
||||
@@ -408,7 +409,6 @@ namespace Mono.Debugger.Soft
|
||||
public ErrorCode ErrorCode {
|
||||
get; set;
|
||||
}
|
||||
|
||||
public string ErrorMessage {
|
||||
get; set;
|
||||
}
|
||||
@@ -807,10 +807,6 @@ namespace Mono.Debugger.Soft
|
||||
get; set;
|
||||
}
|
||||
|
||||
public string ErrorMsg {
|
||||
get; internal set;
|
||||
}
|
||||
|
||||
public int Command {
|
||||
get; set;
|
||||
}
|
||||
@@ -819,6 +815,10 @@ namespace Mono.Debugger.Soft
|
||||
get; set;
|
||||
}
|
||||
|
||||
public string ErrorMsg {
|
||||
get; internal set;
|
||||
}
|
||||
|
||||
public int Offset {
|
||||
get {
|
||||
return offset;
|
||||
@@ -873,7 +873,6 @@ namespace Mono.Debugger.Soft
|
||||
|
||||
public ValueImpl ReadValue () {
|
||||
ElementType etype = (ElementType)ReadByte ();
|
||||
|
||||
switch (etype) {
|
||||
case ElementType.Void:
|
||||
return new ValueImpl { Type = etype };
|
||||
@@ -1323,7 +1322,7 @@ namespace Mono.Debugger.Soft
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected abstract int TransportReceive (byte[] buf, int buf_offset, int len);
|
||||
protected abstract int TransportSend (byte[] buf, int buf_offset, int len);
|
||||
protected abstract void TransportSetTimeouts (int send_timeout, int receive_timeout);
|
||||
@@ -2754,21 +2753,6 @@ namespace Mono.Debugger.Soft
|
||||
SendReceive (CommandSet.ARRAY_REF, (int)CmdArrayRef.SET_VALUES, new PacketWriter ().WriteId (id).WriteInt (index).WriteInt (values.Length).WriteValues (values));
|
||||
}
|
||||
|
||||
// This is a special case when setting values of an array that
|
||||
// consists of a large number of bytes. This saves much time and
|
||||
// cost than we create ValueImpl object for each byte.
|
||||
internal void ByteArray_SetValues (long id, byte [] bytes)
|
||||
{
|
||||
int index = 0;
|
||||
var typ = (byte)ElementType.U1;
|
||||
var w = new PacketWriter ().WriteId (id).WriteInt (index).WriteInt (bytes.Length);
|
||||
for (int i = 0; i < bytes.Length; i++) {
|
||||
w.WriteByte (typ);
|
||||
w.WriteInt (bytes [i]);
|
||||
}
|
||||
SendReceive (CommandSet.ARRAY_REF, (int)CmdArrayRef.SET_VALUES, w);
|
||||
}
|
||||
|
||||
/*
|
||||
* STRINGS
|
||||
*/
|
||||
|
||||
@@ -70,10 +70,9 @@ namespace Mono.Debugger.Soft
|
||||
sb.Append(Name);
|
||||
sb.Append(" ");
|
||||
sb.Append("(");
|
||||
var parameters = GetParameters ();
|
||||
for (var i = 0; i < parameters.Length; i++) {
|
||||
sb.Append(parameters[i].ParameterType.Name);
|
||||
if (i != parameters.Length - 1)
|
||||
for (var i = 0; i < param_info.Length; i++) {
|
||||
sb.Append(param_info[i].ParameterType.Name);
|
||||
if (i != param_info.Length - 1)
|
||||
sb.Append(", ");
|
||||
}
|
||||
sb.Append(")");
|
||||
|
||||
@@ -70,5 +70,5 @@ namespace Mono.Debugger.Soft
|
||||
return info.SourceLink;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -39,8 +39,6 @@ namespace Mono.Debugger.Soft
|
||||
if (vm.Version.AtLeast (2, 38)) {
|
||||
try {
|
||||
domain = vm.GetDomain (vm.conn.StackFrame_GetDomain (thread.Id, Id));
|
||||
} catch (InvalidStackFrameException) {
|
||||
domain = Thread.Domain;
|
||||
} catch (AbsentInformationException) {
|
||||
domain = Thread.Domain;
|
||||
}
|
||||
|
||||
@@ -471,14 +471,6 @@ public class Tests : TestsBase, ITest2
|
||||
|
||||
#pragma warning restore 0414
|
||||
|
||||
public string BreakInField
|
||||
{
|
||||
get {
|
||||
Debugger.Break ();
|
||||
return "Foo";
|
||||
}
|
||||
}
|
||||
|
||||
public class NestedClass {
|
||||
}
|
||||
|
||||
|
||||
@@ -1806,7 +1806,7 @@ public class DebuggerTests
|
||||
t = frame.Method.GetParameters ()[7].ParameterType;
|
||||
|
||||
var props = t.GetProperties ();
|
||||
Assert.AreEqual (4, props.Length);
|
||||
Assert.AreEqual (3, props.Length);
|
||||
foreach (PropertyInfoMirror prop in props) {
|
||||
ParameterInfoMirror[] indexes = prop.GetIndexParameters ();
|
||||
|
||||
@@ -4953,23 +4953,6 @@ public class DebuggerTests
|
||||
Assert.IsTrue ((e as StepEvent).Method.Name == "op_Equality" || (e as StepEvent).Method.Name == "if_property_stepping");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DebuggerBreakInFieldDoesNotHang () {
|
||||
vm.EnableEvents (EventType.UserBreak);
|
||||
Event e = run_until ("o1");
|
||||
|
||||
StackFrame frame = e.Thread.GetFrames () [0];
|
||||
object val = frame.GetThis ();
|
||||
Assert.IsTrue (val is ObjectMirror);
|
||||
Assert.AreEqual ("Tests", (val as ObjectMirror).Type.Name);
|
||||
ObjectMirror o = (val as ObjectMirror);
|
||||
TypeMirror t = o.Type;
|
||||
|
||||
MethodMirror m = t.GetProperty ("BreakInField").GetGetMethod();
|
||||
Value v = o.InvokeMethod (e.Thread, m, null, InvokeOptions.DisableBreakpoints);
|
||||
AssertValue ("Foo", v);
|
||||
}
|
||||
|
||||
#if !MONODROID_TOOLS
|
||||
|
||||
void HandleEvents () {
|
||||
|
||||
@@ -184,7 +184,9 @@
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'wasm'">
|
||||
<ItemGroup>
|
||||
<Compile Include="corefx\BrotliStubs.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.IO.Compression.Brotli\src\Interop\Interop.Brotli.Decoder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.IO.Compression.Brotli\src\Interop\Interop.Brotli.Encoder.cs" />
|
||||
<Compile Include="corefx\Interop.Libraries.cs" />
|
||||
</ItemGroup>
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'unreal'">
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
corefx/Interop.Libraries.cs
|
||||
../../../external/corefx/src/System.IO.Compression.Brotli/src/Interop/Interop.Brotli.Decoder.cs
|
||||
../../../external/corefx/src/System.IO.Compression.Brotli/src/Interop/Interop.Brotli.Encoder.cs
|
||||
@@ -1,5 +0,0 @@
|
||||
#include System.IO.Compression.dll.sources
|
||||
corefx/BrotliStubs.cs
|
||||
|
||||
# for clrcompression.dll (instead of BrotliStubs for Windows)
|
||||
#../../../external/corefx/src/Common/src/Interop/Windows/Interop.Libraries.cs
|
||||
+1
-1
@@ -21,7 +21,7 @@ namespace System.Runtime.Serialization
|
||||
public static void SetSerializationSurrogateProvider(this DataContractSerializer serializer, ISerializationSurrogateProvider provider)
|
||||
{
|
||||
// allocate every time, expectation is that this won't happen enough to warrant maintaining a CondtionalWeakTable.
|
||||
IDataContractSurrogate adapter = (provider != null) ? new SurrogateProviderAdapter(provider) : null;
|
||||
IDataContractSurrogate adapter = new SurrogateProviderAdapter(provider);
|
||||
|
||||
// DCS doesn't expose a setter, access the field directly as a workaround
|
||||
typeof(DataContractSerializer)
|
||||
|
||||
+1
-3
@@ -423,10 +423,8 @@ namespace System.Runtime.Serialization.Json
|
||||
XmlDictionaryString namespaceLocal = null;
|
||||
if (nameLocal != null && nameLocal is string)
|
||||
writer.WriteStartElement ((string) name, null);
|
||||
else if (name is XmlDictionaryString)
|
||||
writer.WriteStartElement ((XmlDictionaryString) name, null);
|
||||
else
|
||||
writer.WriteStartElement (name.ToString(), null);
|
||||
writer.WriteStartElement ((XmlDictionaryString) name, null);
|
||||
}
|
||||
|
||||
void WriteEndElement ()
|
||||
|
||||
@@ -23,8 +23,6 @@ namespace System.Transactions
|
||||
[ThreadStatic]
|
||||
static Transaction ambient;
|
||||
|
||||
Transaction internalTransaction;
|
||||
|
||||
IsolationLevel level;
|
||||
TransactionInformation info;
|
||||
|
||||
@@ -85,8 +83,6 @@ namespace System.Transactions
|
||||
volatiles = other.Volatiles;
|
||||
durables = other.Durables;
|
||||
pspe = other.Pspe;
|
||||
TransactionCompletedInternal = other.TransactionCompletedInternal;
|
||||
internalTransaction = other;
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
@@ -96,29 +92,7 @@ namespace System.Transactions
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
internal event TransactionCompletedEventHandler TransactionCompletedInternal;
|
||||
|
||||
// Transaction B was cloned from transaction A. Add event handlers to A
|
||||
// when they are added to B. This will not work when new handlers are added to A
|
||||
// as A has no reference to B.
|
||||
public event TransactionCompletedEventHandler TransactionCompleted
|
||||
{
|
||||
add
|
||||
{
|
||||
if (this.internalTransaction != null)
|
||||
this.internalTransaction.TransactionCompleted += value;
|
||||
|
||||
TransactionCompletedInternal += value;
|
||||
}
|
||||
|
||||
remove
|
||||
{
|
||||
if (this.internalTransaction != null)
|
||||
this.internalTransaction.TransactionCompleted -= value;
|
||||
|
||||
TransactionCompletedInternal -= value;
|
||||
}
|
||||
}
|
||||
public event TransactionCompletedEventHandler TransactionCompleted;
|
||||
|
||||
public static Transaction Current {
|
||||
get {
|
||||
@@ -404,7 +378,7 @@ namespace System.Transactions
|
||||
private void DoCommit ()
|
||||
{
|
||||
/* Scope becomes null in TransactionScope.Dispose */
|
||||
if (Scope != null && (!Scope.IsComplete || !Scope.IsDisposed)) {
|
||||
if (Scope != null) {
|
||||
/* See test ExplicitTransaction8 */
|
||||
Rollback (null, null);
|
||||
CheckAborted ();
|
||||
@@ -555,14 +529,14 @@ namespace System.Transactions
|
||||
|
||||
void CheckAborted ()
|
||||
{
|
||||
if (aborted || (Scope != null && Scope.IsAborted))
|
||||
if (aborted)
|
||||
throw new TransactionAbortedException ("Transaction has aborted", innerException);
|
||||
}
|
||||
|
||||
void FireCompleted ()
|
||||
{
|
||||
if (TransactionCompletedInternal != null)
|
||||
TransactionCompletedInternal (this, new TransactionEventArgs(this));
|
||||
if (TransactionCompleted != null)
|
||||
TransactionCompleted (this, new TransactionEventArgs(this));
|
||||
}
|
||||
|
||||
static void EnsureIncompleteCurrentScope ()
|
||||
@@ -574,3 +548,4 @@ namespace System.Transactions
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
// (C)2006 Novell Inc,
|
||||
//
|
||||
|
||||
using System.Threading;
|
||||
|
||||
using DTCOption = System.Transactions.EnterpriseServicesInteropOption;
|
||||
|
||||
@@ -20,7 +19,6 @@ namespace System.Transactions
|
||||
static TransactionOptions defaultOptions =
|
||||
new TransactionOptions (0, TransactionManager.DefaultTimeout);
|
||||
|
||||
Timer scopeTimer;
|
||||
Transaction transaction;
|
||||
Transaction oldTransaction;
|
||||
TransactionScope parentScope;
|
||||
@@ -31,7 +29,6 @@ namespace System.Transactions
|
||||
|
||||
bool disposed;
|
||||
bool completed;
|
||||
bool aborted;
|
||||
bool isRoot;
|
||||
|
||||
bool asyncFlowEnabled;
|
||||
@@ -102,7 +99,7 @@ namespace System.Transactions
|
||||
DTCOption interopOption)
|
||||
{
|
||||
Initialize (scopeOption, null, transactionOptions, interopOption,
|
||||
transactionOptions.Timeout, TransactionScopeAsyncFlowOption.Suppress);
|
||||
TransactionManager.DefaultTimeout, TransactionScopeAsyncFlowOption.Suppress);
|
||||
}
|
||||
|
||||
public TransactionScope (Transaction transactionToUse,
|
||||
@@ -146,35 +143,8 @@ namespace System.Transactions
|
||||
transaction.InitScope (this);
|
||||
if (parentScope != null)
|
||||
parentScope.nested ++;
|
||||
if (timeout != TimeSpan.Zero)
|
||||
scopeTimer = new Timer (TransactionScope.TimerCallback, this, scopeTimeout, TimeSpan.Zero);
|
||||
}
|
||||
|
||||
private static void TimerCallback (object state)
|
||||
{
|
||||
TransactionScope scope = state as TransactionScope;
|
||||
if (null == scope)
|
||||
{
|
||||
throw new TransactionException ("TransactionScopeTimerObjectInvalid", null);
|
||||
}
|
||||
|
||||
scope.TimeoutScope ();
|
||||
}
|
||||
|
||||
private void TimeoutScope()
|
||||
{
|
||||
if (!completed && transaction != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
this.transaction.Rollback ();
|
||||
this.aborted = true;
|
||||
}
|
||||
catch (ObjectDisposedException ex) { }
|
||||
catch (TransactionException txEx) { }
|
||||
}
|
||||
}
|
||||
|
||||
Transaction InitTransaction (Transaction tx, TransactionScopeOption scopeOption, TransactionOptions options)
|
||||
{
|
||||
if (tx != null)
|
||||
@@ -211,14 +181,6 @@ namespace System.Transactions
|
||||
completed = true;
|
||||
}
|
||||
|
||||
internal bool IsAborted {
|
||||
get { return aborted; }
|
||||
}
|
||||
|
||||
internal bool IsDisposed {
|
||||
get { return disposed; }
|
||||
}
|
||||
|
||||
internal bool IsComplete {
|
||||
get { return completed; }
|
||||
}
|
||||
@@ -252,9 +214,6 @@ namespace System.Transactions
|
||||
throw new InvalidOperationException ("Transaction.Current has changed inside of the TransactionScope");
|
||||
}
|
||||
|
||||
if (scopeTimer != null)
|
||||
scopeTimer.Dispose();
|
||||
|
||||
if (asyncFlowEnabled) {
|
||||
if (oldTransaction != null)
|
||||
oldTransaction.Scope = parentScope;
|
||||
@@ -270,10 +229,7 @@ namespace System.Transactions
|
||||
|
||||
transaction.Scope = null;
|
||||
|
||||
if (IsAborted) {
|
||||
throw new TransactionAbortedException("Transaction has aborted");
|
||||
}
|
||||
else if (!IsComplete) {
|
||||
if (!IsComplete) {
|
||||
transaction.Rollback ();
|
||||
variedTransaction.Rollback();
|
||||
return;
|
||||
@@ -295,11 +251,9 @@ namespace System.Transactions
|
||||
/* scope was not in a transaction, (Suppress) */
|
||||
return;
|
||||
|
||||
if (IsAborted) {
|
||||
transaction.Scope = null;
|
||||
throw new TransactionAbortedException("Transaction has aborted");
|
||||
}
|
||||
else if (!IsComplete)
|
||||
transaction.Scope = null;
|
||||
|
||||
if (!IsComplete)
|
||||
{
|
||||
transaction.Rollback();
|
||||
return;
|
||||
@@ -311,10 +265,10 @@ namespace System.Transactions
|
||||
|
||||
transaction.CommitInternal();
|
||||
|
||||
transaction.Scope = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
using System;
|
||||
using NUnit.Framework;
|
||||
using System.Transactions;
|
||||
using System.Threading;
|
||||
|
||||
namespace MonoTests.System.Transactions
|
||||
{
|
||||
@@ -1115,18 +1114,6 @@ namespace MonoTests.System.Transactions
|
||||
Assert.AreEqual(IsolationLevel.ReadCommitted, Transaction.Current.IsolationLevel);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(TransactionAbortedException))]
|
||||
public void TransactionScopeTimeout()
|
||||
{
|
||||
Assert.IsNull(Transaction.Current, "Ambient transaction exists (before)");
|
||||
using (var ts = new TransactionScope(TransactionScopeOption.Required, TimeSpan.FromMilliseconds(1)))
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
ts.Complete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -719,7 +719,7 @@ namespace System.Windows.Forms
|
||||
|
||||
if (doc.Wrap) {
|
||||
// FIXME: Technically there are multiple no-break spaces, not just the main one.
|
||||
if (wrap_pos <= pos && ((Char.IsWhiteSpace (c) && c != '\u00A0') || c == '-' || c == '\u2013' || c == '\u2014')) {
|
||||
if ((Char.IsWhiteSpace (c) && c != '\u00A0') || c == '-' || c == '\u2013' || c == '\u2014') {
|
||||
// Primarily break on dashes or whitespace other than a no-break space.
|
||||
prev_wrap_pos = wrap_pos;
|
||||
if (c == '\t') {
|
||||
@@ -738,15 +738,11 @@ namespace System.Windows.Forms
|
||||
if (Char.IsWhiteSpace (c)) {
|
||||
if (wrap_pos > pos) {
|
||||
while (wrap_pos < text.Length && Char.IsWhiteSpace (text [wrap_pos]) && text [wrap_pos] != '\t') {
|
||||
// Leave whitespace other than tabs on the end of this line.
|
||||
wrap_pos++;
|
||||
}
|
||||
pos++;
|
||||
wrapped = true;
|
||||
// don't try pulling more into this line, but keep looping to deal with the rest of the widths and tags that will be left on the line
|
||||
} else {
|
||||
// At the wrap position, so split the line. c is a tab.
|
||||
split_tag = tag;
|
||||
// don't try pulling more into this line, but keep looping to deal with the rest of the widths and tags
|
||||
}
|
||||
} else {
|
||||
if (wrap_pos > pos && pos > 0) {
|
||||
|
||||
@@ -3852,7 +3852,7 @@ namespace System.Windows.Forms
|
||||
{
|
||||
Size item_size = ItemSize;
|
||||
for (int i = 0; i < items.Count; i++) {
|
||||
Rectangle item_rect = new Rectangle(GetItemLocation(i), item_size);
|
||||
Rectangle item_rect = items [i].Bounds;
|
||||
if (item_rect.Contains (x, y))
|
||||
return items [i];
|
||||
}
|
||||
|
||||
@@ -270,11 +270,8 @@ namespace Mono.Btls
|
||||
Flush = 1
|
||||
}
|
||||
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int BioReadFunc (IntPtr bio, IntPtr data, int dataLength, out int wantMore);
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int BioWriteFunc (IntPtr bio, IntPtr data, int dataLength);
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate long BioControlFunc (IntPtr bio, ControlCommand command, long arg);
|
||||
|
||||
[DllImport (BTLS_DYLIB)]
|
||||
|
||||
@@ -32,11 +32,8 @@ using System.Runtime.CompilerServices;
|
||||
|
||||
namespace Mono.Btls
|
||||
{
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int MonoBtlsVerifyCallback (MonoBtlsX509StoreCtx ctx);
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int MonoBtlsSelectCallback (string[] acceptableIssuers);
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int MonoBtlsServerNameCallback ();
|
||||
|
||||
class MonoBtlsSsl : MonoBtlsObject
|
||||
@@ -262,7 +259,6 @@ namespace Mono.Btls
|
||||
return error;
|
||||
}
|
||||
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int PrintErrorsCallbackFunc (IntPtr str, IntPtr len, IntPtr ctx);
|
||||
|
||||
[Mono.Util.MonoPInvokeCallback (typeof (PrintErrorsCallbackFunc))]
|
||||
|
||||
@@ -93,11 +93,8 @@ namespace Mono.Btls
|
||||
[DllImport (BTLS_DYLIB)]
|
||||
extern static void mono_btls_ssl_ctx_set_server_name_callback (IntPtr handle, IntPtr func);
|
||||
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int NativeVerifyFunc (IntPtr instance, int preverify_ok, IntPtr ctx);
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int NativeSelectFunc (IntPtr instance, int count, IntPtr sizes, IntPtr data);
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int NativeServerNameFunc (IntPtr instance);
|
||||
|
||||
NativeVerifyFunc verifyFunc;
|
||||
|
||||
@@ -61,7 +61,6 @@ namespace Mono.Btls
|
||||
[DllImport (BTLS_DYLIB)]
|
||||
extern static int mono_btls_x509_lookup_mono_free (IntPtr handle);
|
||||
|
||||
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
|
||||
delegate int BySubjectFunc (IntPtr instance, IntPtr name, out IntPtr x509_ptr);
|
||||
|
||||
GCHandle gch;
|
||||
|
||||
@@ -120,15 +120,7 @@ namespace System.Net.Security
|
||||
public SslStream (Stream innerStream, bool leaveInnerStreamOpen)
|
||||
: base (innerStream, leaveInnerStreamOpen)
|
||||
{
|
||||
#if WASM
|
||||
try {
|
||||
provider = GetProvider ();
|
||||
} catch (Exception ex) {
|
||||
throw new PlatformNotSupportedException ("System.Net.Security.SslStream is not supported on the current platform.", ex);
|
||||
}
|
||||
#else
|
||||
provider = GetProvider ();
|
||||
#endif
|
||||
settings = MonoTlsSettings.CopyDefaultSettings ();
|
||||
impl = provider.CreateSslStream (this, innerStream, leaveInnerStreamOpen, settings);
|
||||
}
|
||||
@@ -141,15 +133,7 @@ namespace System.Net.Security
|
||||
public SslStream (Stream innerStream, bool leaveInnerStreamOpen, RemoteCertificateValidationCallback userCertificateValidationCallback, LocalCertificateSelectionCallback userCertificateSelectionCallback)
|
||||
: base (innerStream, leaveInnerStreamOpen)
|
||||
{
|
||||
#if WASM
|
||||
try {
|
||||
provider = GetProvider ();
|
||||
} catch (Exception ex) {
|
||||
throw new PlatformNotSupportedException ("System.Net.Security.SslStream is not supported on the current platform.", ex);
|
||||
}
|
||||
#else
|
||||
provider = GetProvider ();
|
||||
#endif
|
||||
settings = MonoTlsSettings.CopyDefaultSettings ();
|
||||
SetAndVerifyValidationCallback (userCertificateValidationCallback);
|
||||
SetAndVerifySelectionCallback (userCertificateSelectionCallback);
|
||||
|
||||
@@ -237,12 +237,8 @@ namespace System.Net {
|
||||
}
|
||||
|
||||
if (ProcessInput (ms)) {
|
||||
if (!context.HaveError) {
|
||||
if (!context.Request.FinishInitialization()) {
|
||||
Close (true);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (!context.HaveError)
|
||||
context.Request.FinishInitialization ();
|
||||
|
||||
if (context.HaveError) {
|
||||
SendError ();
|
||||
|
||||
@@ -192,12 +192,12 @@ namespace System.Net {
|
||||
return false;
|
||||
}
|
||||
|
||||
internal bool FinishInitialization ()
|
||||
internal void FinishInitialization ()
|
||||
{
|
||||
string host = UserHostName;
|
||||
if (version > HttpVersion.Version10 && (host == null || host.Length == 0)) {
|
||||
context.ErrorMessage = "Invalid host name";
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
|
||||
string path;
|
||||
@@ -223,7 +223,7 @@ namespace System.Net {
|
||||
|
||||
if (!Uri.TryCreate (base_uri + path, UriKind.Absolute, out url)){
|
||||
context.ErrorMessage = WebUtility.HtmlEncode ("Invalid url: " + base_uri + path);
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
|
||||
CreateQueryString (url.Query);
|
||||
@@ -239,7 +239,7 @@ namespace System.Net {
|
||||
// 'identity' is not valid!
|
||||
if (t_encoding != null && !is_chunked) {
|
||||
context.Connection.SendError (null, 501);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,7 +247,7 @@ namespace System.Net {
|
||||
if (String.Compare (method, "POST", StringComparison.OrdinalIgnoreCase) == 0 ||
|
||||
String.Compare (method, "PUT", StringComparison.OrdinalIgnoreCase) == 0) {
|
||||
context.Connection.SendError (null, 411);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,8 +255,6 @@ namespace System.Net {
|
||||
ResponseStream output = context.Connection.GetResponseStream ();
|
||||
output.InternalWrite (_100continue, 0, _100continue.Length);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
internal static string Unquote (String str) {
|
||||
|
||||
@@ -302,11 +302,6 @@
|
||||
<method signature="System.Void .ctor(System.String)" />
|
||||
</type>
|
||||
|
||||
<type fullname="System.PlatformNotSupportedException">
|
||||
<!-- mono_error_set_platform_not_supported -->
|
||||
<method signature="System.Void .ctor(System.String)" />
|
||||
</type>
|
||||
|
||||
<!-- mono-error.c (mono_error_set_ambiguous_implementation) -->
|
||||
<type fullname="System.Runtime.AmbiguousImplementationException">
|
||||
<!-- mono_error_set_ambiguous_implementation -->
|
||||
|
||||
@@ -6,7 +6,7 @@ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
|
||||
LIBRARY = corlib.dll
|
||||
LIBRARY_NAME = mscorlib.dll
|
||||
|
||||
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%) $(UNICODECHARINFO:%=-resource:%)
|
||||
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%)
|
||||
|
||||
USE_XTEST_REMOTE_EXECUTOR = YES
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
@@ -74,6 +74,10 @@ RESOURCE_STRINGS_FILES = --mscorlib-debug
|
||||
RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
|
||||
MODULE_DEPS = $(IL_REPLACE) LinkerDescriptor/mscorlib.xml
|
||||
|
||||
|
||||
ifdef WASM
|
||||
MANAGED_COLLATOR_RESOURCES_FILES =
|
||||
else
|
||||
MANAGED_COLLATOR_RESOURCES_FILES = \
|
||||
resources/collation.core.bin \
|
||||
resources/collation.tailoring.bin \
|
||||
@@ -82,6 +86,7 @@ MANAGED_COLLATOR_RESOURCES_FILES = \
|
||||
resources/collation.cjkJA.bin \
|
||||
resources/collation.cjkKO.bin \
|
||||
resources/collation.cjkKOlv2.bin
|
||||
endif
|
||||
|
||||
ifdef MCS_MODE
|
||||
UNICODECHARINFO = resources/charinfo.nlp
|
||||
@@ -90,6 +95,7 @@ else
|
||||
endif
|
||||
|
||||
RESOURCE_FILES = \
|
||||
$(UNICODECHARINFO) \
|
||||
$(MANAGED_COLLATOR_RESOURCES_FILES) \
|
||||
LinkerDescriptor/mscorlib.xml
|
||||
|
||||
@@ -201,7 +207,6 @@ EXTRA_DISTFILES = \
|
||||
$(RESOURCE_FILES) \
|
||||
$(TEST_RESOURCE_FILES) \
|
||||
$(TEST_RESOURCES:.resources=.resx) \
|
||||
resources/charinfo.nlp \
|
||||
LinkerDescriptor/mscorlib_test.xml
|
||||
|
||||
TEST_RESOURCE_FILES = \
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
@@ -264,43 +263,6 @@ namespace Mono {
|
||||
}
|
||||
}
|
||||
|
||||
static string get_breadcrumb_value (string file_prefix, string directory_str, bool clear)
|
||||
{
|
||||
var allfiles = Directory.GetFiles (directory_str, $"{file_prefix}_*" );
|
||||
if (allfiles.Length == 0)
|
||||
return string.Empty;
|
||||
|
||||
if (allfiles.Length > 1) {
|
||||
// it's impossible to tell which breadcrumb is the last one (let's not trust filesystem timestamps)
|
||||
// delete the multiple files so at least next crash can make sense
|
||||
try {
|
||||
Array.ForEach (allfiles, f => File.Delete (f) );
|
||||
} catch (Exception) { }
|
||||
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
if (clear)
|
||||
File.Delete (allfiles [0]);
|
||||
|
||||
var filename = Path.GetFileName (allfiles [0]);
|
||||
return filename.Substring (file_prefix.Length + 1);
|
||||
}
|
||||
|
||||
static long CheckCrashReportHash (string directory_str, bool clear)
|
||||
{
|
||||
var value = get_breadcrumb_value ("crash_hash", directory_str, clear);
|
||||
if (value == string.Empty)
|
||||
return 0;
|
||||
else
|
||||
return Convert.ToInt64 (value, 16);
|
||||
}
|
||||
|
||||
static string CheckCrashReportReason (string directory_str, bool clear)
|
||||
{
|
||||
return get_breadcrumb_value ("crash_reason", directory_str, clear);
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.InternalCall)]
|
||||
static extern void AnnotateMicrosoftTelemetry_internal (IntPtr key, IntPtr val);
|
||||
|
||||
|
||||
@@ -72,6 +72,9 @@ namespace System.Globalization
|
||||
static bool managedCollation;
|
||||
static bool managedCollationChecked;
|
||||
|
||||
#if WASM
|
||||
const bool UseManagedCollation = false;
|
||||
#else
|
||||
static bool UseManagedCollation {
|
||||
get {
|
||||
if (!managedCollationChecked) {
|
||||
@@ -82,9 +85,13 @@ namespace System.Globalization
|
||||
return managedCollation;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
ISimpleCollator GetCollator ()
|
||||
{
|
||||
#if WASM
|
||||
return null;
|
||||
#else
|
||||
if (collator != null)
|
||||
return collator;
|
||||
|
||||
@@ -100,6 +107,7 @@ namespace System.Globalization
|
||||
}
|
||||
|
||||
return collator;
|
||||
#endif
|
||||
}
|
||||
|
||||
SortKey CreateSortKeyCore (string source, CompareOptions options)
|
||||
|
||||
@@ -284,93 +284,56 @@ namespace System.Diagnostics.Tracing
|
||||
// [MonoTODO]
|
||||
public event EventHandler<EventCommandEventArgs> EventCommandExecuted
|
||||
{
|
||||
#if WASM
|
||||
add { throw new PlatformNotSupportedException (); }
|
||||
remove { throw new PlatformNotSupportedException (); }
|
||||
#else
|
||||
add { throw new NotImplementedException (); }
|
||||
remove { throw new NotImplementedException (); }
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static string GenerateManifest (Type eventSourceType, string assemblyPathToIncludeInManifest)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static string GenerateManifest (Type eventSourceType, string assemblyPathToIncludeInManifest, EventManifestOptions flags)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static Guid GetGuid (Type eventSourceType)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static string GetName (Type eventSourceType)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static IEnumerable<EventSource> GetSources ()
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static void SendCommand (EventSource eventSource, EventCommand command, IDictionary<string, string> commandArguments)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static void SetCurrentThreadActivityId (Guid activityId)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// [MonoTODO]
|
||||
public static void SetCurrentThreadActivityId (Guid activityId, out Guid oldActivityThatWillContinue)
|
||||
{
|
||||
#if WASM
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-6
@@ -66,11 +66,6 @@ namespace System.Runtime.InteropServices
|
||||
_osArchitecture = Environment.Is64BitOperatingSystem ? Architecture.X64 : Architecture.X86;
|
||||
_processArchitecture = Architecture.X64;
|
||||
break;
|
||||
case "wasm":
|
||||
#if false
|
||||
_osArchitecture = Architecture.Wasm;
|
||||
_processArchitecture = Architecture.Wasm;
|
||||
#endif
|
||||
// upstream only has these values; try to pretend we're x86 if nothing matches
|
||||
// want more? bug: https://github.com/dotnet/corefx/issues/30706
|
||||
default:
|
||||
@@ -112,7 +107,7 @@ namespace System.Runtime.InteropServices
|
||||
_osPlatform = OSPlatform.Create ("HAIKU");
|
||||
break;
|
||||
case "wasm":
|
||||
_osPlatform = OSPlatform.Create ("BROWSER");
|
||||
_osPlatform = OSPlatform.Create ("WEBASSEMBLY");
|
||||
break;
|
||||
default:
|
||||
_osPlatform = OSPlatform.Create ("UNKNOWN");
|
||||
|
||||
@@ -1499,7 +1499,6 @@ public class DirectoryTest
|
||||
}
|
||||
|
||||
[Test] // bug #346123
|
||||
[Category ("NotWasm")]
|
||||
public void GetDirectories_Backslash ()
|
||||
{
|
||||
if (!RunningOnUnix)
|
||||
@@ -1568,7 +1567,6 @@ public class DirectoryTest
|
||||
}
|
||||
|
||||
[Test] // bug #346123
|
||||
[Category ("NotWasm")]
|
||||
public void GetFiles_Backslash ()
|
||||
{
|
||||
if (!RunningOnUnix)
|
||||
|
||||
@@ -977,15 +977,9 @@ namespace MonoTests.System.IO
|
||||
Assert.IsTrue (Path.IsPathRooted ("\\"), "IsPathRooted #16");
|
||||
Assert.IsTrue (Path.IsPathRooted ("\\\\"), "IsPathRooted #17");
|
||||
} else {
|
||||
// To fix issue https://github.com/mono/mono/issues/18933 we set the AltDirectorySeparatorChar as well.
|
||||
// This causes the Assert.IsTrue (!Path.IsPathRooted ("\\"), "IsPathRooted #09"); to fail.
|
||||
// Path.IsPathFullyQualified Method handles paths that use both the DirectorySeparatorChar
|
||||
// and the AltDirectorySeparatorChar characters.
|
||||
#if !WASM
|
||||
Assert.IsTrue (!Path.IsPathRooted ("\\"), "IsPathRooted #09");
|
||||
Assert.IsTrue (!Path.IsPathRooted ("\\\\"), "IsPathRooted #10");
|
||||
Assert.IsTrue (!Path.IsPathRooted ("z:"), "IsPathRooted #11");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,28 +316,6 @@ namespace MonoTests.System.Reflection.Emit
|
||||
Assert.Fail ("Expected CreateInstance of a broken type to throw TLE");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestCreateInvalidEnumWithAnIncompleteUnderlyingEnumType ()
|
||||
{
|
||||
var mb = GenerateModule ();
|
||||
var incomplete = GenerateEnum (mb);
|
||||
GenerateField (incomplete);
|
||||
|
||||
var eb = mb.DefineEnum (
|
||||
_enumNamespace + ".IncompleteUnderlying",
|
||||
TypeAttributes.Public,
|
||||
incomplete);
|
||||
|
||||
bool caught = false;
|
||||
try {
|
||||
var t = eb.CreateType ();
|
||||
} catch (TypeLoadException exn) {
|
||||
caught = true;
|
||||
}
|
||||
if (!caught)
|
||||
Assert.Fail ("Expected CreateType of a broken type to throw TLE");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestEnumBuilderTokenUsable () {
|
||||
// Regression test for https://bugzilla.xamarin.com/show_bug.cgi?id=58361
|
||||
|
||||
@@ -14,7 +14,7 @@ namespace Internal.Runtime.Augments
|
||||
|
||||
public void ResetThreadPoolThread () {}
|
||||
|
||||
public static RuntimeThread InitializeThreadPoolThread () => new RuntimeThread (null);
|
||||
public static RuntimeThread InitializeThreadPoolThread () => default;
|
||||
|
||||
public static RuntimeThread Create (ParameterizedThreadStart start, int maxStackSize)
|
||||
=> new RuntimeThread (new Thread (start, maxStackSize));
|
||||
|
||||
@@ -1301,7 +1301,6 @@
|
||||
<Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\Normalization.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SortKey.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />
|
||||
<Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />
|
||||
@@ -1987,6 +1986,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -2266,6 +2266,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -2599,6 +2600,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -2853,6 +2855,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -3173,6 +3176,7 @@
|
||||
<Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
|
||||
<Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
|
||||
<Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -3421,6 +3425,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -3676,6 +3681,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -3931,6 +3937,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -4178,6 +4185,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -4428,6 +4436,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -4678,6 +4687,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -4963,6 +4973,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -5212,6 +5223,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -5466,6 +5478,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -5720,6 +5733,7 @@
|
||||
<Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
|
||||
<Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
|
||||
<Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
|
||||
<Compile Include="Mono.Interop\ComInteropProxy.cs" />
|
||||
<Compile Include="Mono.Interop\IDispatch.cs" />
|
||||
<Compile Include="Mono.Interop\IUnknown.cs" />
|
||||
@@ -6409,27 +6423,6 @@
|
||||
<EmbeddedResource Include="LinkerDescriptor/mscorlib.xml">
|
||||
<LogicalName>mscorlib.xml</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.cjkCHS.bin">
|
||||
<LogicalName>collation.cjkCHS.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.cjkCHT.bin">
|
||||
<LogicalName>collation.cjkCHT.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.cjkJA.bin">
|
||||
<LogicalName>collation.cjkJA.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.cjkKO.bin">
|
||||
<LogicalName>collation.cjkKO.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.cjkKOlv2.bin">
|
||||
<LogicalName>collation.cjkKOlv2.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.core.bin">
|
||||
<LogicalName>collation.core.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="resources/collation.tailoring.bin">
|
||||
<LogicalName>collation.tailoring.bin</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
#include unix_build_corlib.dll.exclude.sources
|
||||
#include testing_aot_common_corlib.dll.exclude.sources
|
||||
|
||||
Mono.Globalization.Unicode/SimpleCollator.cs
|
||||
+1
-1
@@ -92,7 +92,7 @@ t }
|
||||
. int [] tokens = yyExpectingTokens (state);
|
||||
. string [] result = new string[tokens.Length];
|
||||
. for (int n = 0; n < tokens.Length; n++)
|
||||
. result[n] = yyNames[tokens [n]];
|
||||
. result[n++] = yyNames[tokens [n]];
|
||||
. return result;
|
||||
. }
|
||||
.
|
||||
|
||||
+1
-1
@@ -1661,7 +1661,7 @@ namespace Mono.CSharp {
|
||||
" -reference:A1[,An] Imports metadata from the specified assembly (short: -r)\n" +
|
||||
" -reference:ALIAS=A Imports metadata using specified extern alias (short: -r)\n" +
|
||||
" -sdk:VERSION Specifies SDK version of referenced assemblies\n" +
|
||||
" VERSION can be one of: 2, 4, 4.5, 4.x (default) or a custom value\n" +
|
||||
" VERSION can be one of: 2, 4, 4.5 (default) or a custom value\n" +
|
||||
" -target:KIND Specifies the format of the output assembly (short: -t)\n" +
|
||||
" KIND can be one of: exe, winexe, library, module\n" +
|
||||
" -unsafe[+|-] Allows to compile code which uses unsafe keyword\n" +
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.DataSetExtensions.dll,System.Data.Services.Client.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.dll,System.Json.dll,System.Net.Http.WinHttpHandler.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reflection.Context.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.Transactions.dll,System.Web.Services.dll,System.Windows.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
|
||||
System.Core/test-plinq-01.exe,1563648,12800,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-01.exe,1888768,14336,385536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-02.exe,1888768,14336,385536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Net.Http/test-handler-01.exe,1890816,101376,27136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,1884672,71168,27136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-plinq-01.exe,1564160,12800,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-01.exe,1889280,14336,385536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-02.exe,1889280,14336,385536,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Net.Http/test-handler-01.exe,1891328,101376,27136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10752,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,1885184,71168,27136,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-typeconverter.exe,1589760,81408,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-crypto-01.exe,1747968,13824,24576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-locale-01.exe,1559040,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,1566720,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,1567232,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,1558016,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-04.exe,1566720,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection.exe,1852416,13824,24576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-remoting.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,1556992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection.exe,1852928,13824,24576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-remoting.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-03.exe,1557504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-task-01.exe,1561088,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
|
@@ -1,19 +1,19 @@
|
||||
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.DataSetExtensions.dll,System.Data.Services.Client.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.dll,System.Json.dll,System.Net.Http.WinHttpHandler.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reflection.Context.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.Transactions.dll,System.Web.Services.dll,System.Windows.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
|
||||
Newtonsoft.Json.Test/bin/iPhoneSimulator/Release/Newtonsoft.Json.Test.exe,1824256,720384,369152,420864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0,0,0,0,0,0,0,0,0,0,30720,0
|
||||
Newtonsoft.Json.Test/bin/iPhoneSimulator/Release/Newtonsoft.Json.Test.exe,1824768,720384,369152,421376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0,0,0,0,0,0,0,0,0,0,30720,0
|
||||
System.Core/test-plinq-01.exe,942080,13824,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Net.Http/test-handler-01.exe,1391616,86016,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10240,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,1384448,64000,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Net.Http/test-handler-01.exe,1392128,86016,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10240,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,1384960,64000,8192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-typeconverter.exe,1033728,80384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-crypto-01.exe,875008,0,4608,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-locale-01.exe,878080,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-locale-01.exe,878592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,886272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,996864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,886784,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,997376,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-04.exe,886272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,874496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,875008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
|
||||
|
@@ -1,23 +1,23 @@
|
||||
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.Build.Engine.dll,Microsoft.Build.Framework.dll,Microsoft.Build.Tasks.v4.0.dll,Microsoft.Build.Utilities.v4.0.dll,Microsoft.Build.dll,Microsoft.CSharp.dll,Microsoft.VisualC.dll,Microsoft.Web.Infrastructure.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Configuration.Install.dll,System.Configuration.dll,System.Data.DataSetExtensions.dll,System.Data.Entity.dll,System.Data.Linq.dll,System.Data.OracleClient.dll,System.Data.Services.Client.dll,System.Data.Services.dll,System.Data.dll,System.Deployment.dll,System.Design.dll,System.DirectoryServices.Protocols.dll,System.DirectoryServices.dll,System.Drawing.Design.dll,System.Drawing.dll,System.Dynamic.dll,System.EnterpriseServices.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.IdentityModel.Selectors.dll,System.IdentityModel.dll,System.Json.Microsoft.dll,System.Json.dll,System.Management.dll,System.Messaging.dll,System.Net.Http.Formatting.dll,System.Net.Http.WebRequest.dll,System.Net.Http.dll,System.Net.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Reactive.Core.dll,System.Reactive.Debugger.dll,System.Reactive.Experimental.dll,System.Reactive.Interfaces.dll,System.Reactive.Linq.dll,System.Reactive.Observable.Aliases.dll,System.Reactive.PlatformServices.dll,System.Reactive.Providers.dll,System.Reactive.Runtime.Remoting.dll,System.Reactive.Windows.Forms.dll,System.Reactive.Windows.Threading.dll,System.Reflection.Context.dll,System.Runtime.Caching.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.DurableInstancing.dll,System.Runtime.Remoting.dll,System.Runtime.Serialization.Formatters.Soap.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Activation.dll,System.ServiceModel.Discovery.dll,System.ServiceModel.Internals.dll,System.ServiceModel.Routing.dll,System.ServiceModel.Web.dll,System.ServiceModel.dll,System.ServiceProcess.dll,System.Threading.Tasks.Dataflow.dll,System.Transactions.dll,System.Web.Abstractions.dll,System.Web.ApplicationServices.dll,System.Web.DynamicData.dll,System.Web.Extensions.Design.dll,System.Web.Extensions.dll,System.Web.Http.SelfHost.dll,System.Web.Http.WebHost.dll,System.Web.Http.dll,System.Web.Mobile.dll,System.Web.Mvc.dll,System.Web.Razor.dll,System.Web.RegularExpressions.dll,System.Web.Routing.dll,System.Web.Services.dll,System.Web.WebPages.Deployment.dll,System.Web.WebPages.Razor.dll,System.Web.WebPages.dll,System.Web.dll,System.Windows.Forms.DataVisualization.dll,System.Windows.Forms.dll,System.Windows.dll,System.Workflow.Activities.dll,System.Workflow.ComponentModel.dll,System.Workflow.Runtime.dll,System.Xaml.dll,System.Xml.Linq.dll,System.Xml.Serialization.dll
|
||||
Newtonsoft.Json.Test/bin/Release/Newtonsoft.Json.Test.exe,2366464,1024512,346112,1319424,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56832,0,0,0,0,0,0,622080,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6144,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0
|
||||
System.Core/test-plinq-01.exe,1562624,67072,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-01.exe,1979904,62464,365056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-02.exe,1979904,62464,365568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,2152448,841728,7168,694272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51712,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-typeconverter.exe,1578496,136704,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
Newtonsoft.Json.Test/bin/Release/Newtonsoft.Json.Test.exe,2366976,1025024,346112,1319424,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56832,0,0,0,0,0,0,622080,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6144,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35840,0
|
||||
System.Core/test-plinq-01.exe,1563136,67072,63488,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-01.exe,1980416,62464,365056,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Core/test-queryable-02.exe,1980416,62464,365568,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,2152960,842240,7168,694272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51712,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System/test-typeconverter.exe,1579008,136704,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-locale-01.exe,1558528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,1565696,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,1657856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,1566208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,1658368,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-04.exe,1565696,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection.exe,1943040,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-remoting.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,1555968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-03.exe,1560576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-task-01.exe,1560064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection.exe,1943552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-remoting.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,1556480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-03.exe,1561088,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-task-01.exe,1560576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
|
@@ -1,24 +1,24 @@
|
||||
App,mscorlib.dll,System.dll,System.Core.dll,System.Xml.dll,I18N.CJK.dll,I18N.MidEast.dll,I18N.Other.dll,I18N.Rare.dll,I18N.West.dll,I18N.dll,Microsoft.CSharp.dll,System.ComponentModel.Composition.dll,System.ComponentModel.DataAnnotations.dll,System.Data.DataSetExtensions.dll,System.Data.dll,System.IO.Compression.FileSystem.dll,System.IO.Compression.dll,System.Net.Http.dll,System.Numerics.Vectors.dll,System.Numerics.dll,System.Runtime.CompilerServices.Unsafe.dll,System.Runtime.Serialization.dll,System.Security.dll,System.ServiceModel.Internals.dll,System.Transactions.dll,System.Xml.Linq.dll
|
||||
BlazingPizza.Client/bin/Release/netstandard2.0/BlazingPizza.Client.dll,1491968,67072,286208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,3072,0,0,0,0,0
|
||||
HelloWorld/bin/Release/netstandard2.0/dist/_framework/_bin/HelloWorld.dll,1479680,67072,284672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,0,0,0,0,0,0
|
||||
Microsoft.AspNetCore.Blazor.E2EPerformance/bin/Release/netstandard2.0/Microsoft.AspNetCore.Blazor.E2EPerformance.dll,1529856,68608,286208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,0,0,0,0,0,0
|
||||
Newtonsoft/bin/Release/netstandard2.0/dist/_framework/_bin/Newtonsoft.dll,1479680,67072,284672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,0,0,0,0,0,0
|
||||
System.Core/test-plinq-01.exe,975360,12288,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Net.Http/test-handler-01.exe,1085440,38400,7168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6656,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,1414144,60416,26624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0
|
||||
System/test-typeconverter.exe,1135104,78848,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-crypto-01.exe,1210880,11776,24576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-locale-01.exe,971264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,980480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,990208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-04.exe,979968,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,969216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-03.exe,977920,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-task-01.exe,972800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
BlazingPizza.Client/bin/Release/netstandard2.0/BlazingPizza.Client.dll,1122304,67072,286208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,3072,0,0,0,0,0
|
||||
HelloWorld/bin/Release/netstandard2.0/dist/_framework/_bin/HelloWorld.dll,1110016,67072,284672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,0,0,0,0,0,0
|
||||
Microsoft.AspNetCore.Blazor.E2EPerformance/bin/Release/netstandard2.0/Microsoft.AspNetCore.Blazor.E2EPerformance.dll,1155584,68608,286208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,0,0,0,0,0,0
|
||||
Newtonsoft/bin/Release/netstandard2.0/dist/_framework/_bin/Newtonsoft.dll,1110016,67072,284672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8704,0,0,0,0,0,0,0,0
|
||||
System.Core/test-plinq-01.exe,535040,12288,60928,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
System.Net.Http/test-handler-01.exe,713216,38400,7168,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6656,0,0,0,0,0,0,0,0
|
||||
System/test-security.exe,1039360,60416,26624,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25600,0,0,0,0,0,0
|
||||
System/test-typeconverter.exe,648704,78848,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-array.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-01.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-calendar-02.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-crypto-01.exe,833024,11776,24576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-exception-01.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-locale-01.exe,458752,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-methodimpl-01.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-01.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-02.exe,462336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-03.exe,599040,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-reflection-04.exe,461824,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-01.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-02.exe,450560,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-string-03.exe,466944,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
mscorlib/test-task-01.exe,532992,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
|
@@ -72,9 +72,7 @@ Options:
|
||||
return new ResourceReader (stream);
|
||||
case ".resx":
|
||||
var reader = new ResXResourceReader (stream);
|
||||
if (useSourcePath) {
|
||||
reader.BasePath = Path.GetDirectoryName (name);
|
||||
}
|
||||
reader.BasePath = Path.GetDirectoryName (name);
|
||||
return reader;
|
||||
default:
|
||||
throw new Exception ("Unknown format in file " + name);
|
||||
|
||||
@@ -1,346 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Collections.Generic;
|
||||
using Mono.Cecil;
|
||||
|
||||
//
|
||||
// This class generates the icall_trampoline_dispatch () function used by the interpreter to call native code on WASM.
|
||||
// It should be kept in sync with mono_wasm_interp_to_native_trampoline () in the runtime.
|
||||
//
|
||||
|
||||
class InterpToNativeGenerator {
|
||||
// Default set of signatures
|
||||
static string[] cookies = new string[] {
|
||||
"V",
|
||||
"VI",
|
||||
"VII",
|
||||
"VIII",
|
||||
"VIIII",
|
||||
"VIIIII",
|
||||
"VIIIIII",
|
||||
"VIIIIIII",
|
||||
"VIIIIIIII",
|
||||
"VIIIIIIIII",
|
||||
"VIIIIIIIIII",
|
||||
"VIIIIIIIIIII",
|
||||
"VIIIIIIIIIIII",
|
||||
"VIIIIIIIIIIIII",
|
||||
"VIIIIIIIIIIIIII",
|
||||
"VIIIIIIIIIIIIIII",
|
||||
"I",
|
||||
"II",
|
||||
"III",
|
||||
"IIII",
|
||||
"IIIII",
|
||||
"IIIIII",
|
||||
"IIIIIII",
|
||||
"IIIIIIII",
|
||||
"IIIIIIIII",
|
||||
"IIIIIIIIII",
|
||||
"IIIIIIIIIII",
|
||||
"IIIIIIIIIIII",
|
||||
"IIIIIIIIIIIII",
|
||||
"IIIIIIIIIIIIII",
|
||||
"IILIIII",
|
||||
"IIIL",
|
||||
"IF",
|
||||
"ID",
|
||||
"IIF",
|
||||
"IIFI",
|
||||
"IIFF",
|
||||
"IFFII",
|
||||
"IIFII",
|
||||
"IIFFI",
|
||||
"IIFFF",
|
||||
"IIFFFI",
|
||||
"IIFFII",
|
||||
"IIFIII",
|
||||
"IIFFFFI",
|
||||
"IIFFFFII",
|
||||
"IIIF",
|
||||
"IIIFI",
|
||||
"IIIFII",
|
||||
"IIIFIII",
|
||||
"IIIIF",
|
||||
"IIIIFI",
|
||||
"IIIIFII",
|
||||
"IIIIFIII",
|
||||
"IIIFFFF",
|
||||
"IIIFFFFF",
|
||||
"IIFFFFFF",
|
||||
"IIIFFFFFF",
|
||||
"IIIIIIIF",
|
||||
"IIIIIIIFF",
|
||||
"IIFFFFFFFF",
|
||||
"IIIFFFFFFFF",
|
||||
"IIIIIIFII",
|
||||
"IIIFFFFFFFFIII",
|
||||
"IIIIIFFFFIIII",
|
||||
"IFFFFFFI",
|
||||
"IIFFIII",
|
||||
"ILI",
|
||||
"IILLI",
|
||||
"L",
|
||||
"LL",
|
||||
"LI",
|
||||
"LIL",
|
||||
"LILI",
|
||||
"LILII",
|
||||
"DD",
|
||||
"DDI",
|
||||
"DDD",
|
||||
"DDDD",
|
||||
"VF",
|
||||
"VFF",
|
||||
"VFFF",
|
||||
"VFFFF",
|
||||
"VFFFFF",
|
||||
"VFFFFFF",
|
||||
"VFFFFFFF",
|
||||
"VFFFFFFFF",
|
||||
"VFI",
|
||||
"VIF",
|
||||
"VIFF",
|
||||
"VIFFFF",
|
||||
"VIFFFFF",
|
||||
"VIFFFFFF",
|
||||
"VIFFFFFI",
|
||||
"VIIFFI",
|
||||
"VIIF",
|
||||
"VIIFFF",
|
||||
"VIIFI",
|
||||
"FF",
|
||||
"FFI",
|
||||
"FFF",
|
||||
"FFFF",
|
||||
"DI",
|
||||
"FI",
|
||||
"IIL",
|
||||
"IILI",
|
||||
"IILIIIL",
|
||||
"IILLLI",
|
||||
"IDIII",
|
||||
"LII",
|
||||
"VID",
|
||||
"VILLI",
|
||||
"DID",
|
||||
"DIDD",
|
||||
"FIF",
|
||||
"FIFF",
|
||||
"LILL",
|
||||
"VL",
|
||||
"VIL",
|
||||
"VIIL",
|
||||
"FIFFF",
|
||||
"FII",
|
||||
"FIII",
|
||||
"FIIIIII",
|
||||
"IFFFFIIII",
|
||||
"IFFI",
|
||||
"IFFIF",
|
||||
"IFFIFI",
|
||||
"IFI",
|
||||
"IFIII",
|
||||
"IIFIFIIIII",
|
||||
"IIFIFIIIIII",
|
||||
"IIFIIIII",
|
||||
"IIFIIIIII",
|
||||
"IIIFFFII",
|
||||
"IIIFFIFFFII",
|
||||
"IIIFFIFFII",
|
||||
"IIIFFII",
|
||||
"IIIFFIIIII",
|
||||
"IIIIIF",
|
||||
"IIIIIFII",
|
||||
"IIIIIIFFI",
|
||||
"IIIIIIIFFI",
|
||||
"VIFFF",
|
||||
"VIFFFFI",
|
||||
"VIFFFI",
|
||||
"VIFFFIIFF",
|
||||
"VIFFI",
|
||||
"VIFI",
|
||||
"VIIFF",
|
||||
"VIIFFFF",
|
||||
"VIIFFII",
|
||||
"VIIIF",
|
||||
"VIIIFFII",
|
||||
"VIIIFFIII",
|
||||
"VIIIFII",
|
||||
"VIIIFIII",
|
||||
"VIIIIF",
|
||||
"IFFFFIII",
|
||||
"IFFIII",
|
||||
"VIIIIFFII",
|
||||
"IIILIIII",
|
||||
"IIILLI",
|
||||
"IL",
|
||||
"IFF",
|
||||
"IFFF",
|
||||
"IFFFF",
|
||||
"VLII",
|
||||
};
|
||||
|
||||
static string TypeToSigType (char c) {
|
||||
switch (c) {
|
||||
case 'V': return "void";
|
||||
case 'I': return "int";
|
||||
case 'L': return "gint64";
|
||||
case 'F': return "float";
|
||||
case 'D': return "double";
|
||||
default:
|
||||
throw new Exception ("Can't handle " + c);
|
||||
}
|
||||
}
|
||||
|
||||
List<string> extra_signatures;
|
||||
|
||||
public InterpToNativeGenerator () {
|
||||
extra_signatures = new List<string> ();
|
||||
}
|
||||
|
||||
static char typeToChar (TypeReference type) {
|
||||
switch (type.MetadataType) {
|
||||
case MetadataType.Void:
|
||||
return 'V';
|
||||
case MetadataType.Boolean:
|
||||
case MetadataType.Char:
|
||||
case MetadataType.SByte:
|
||||
case MetadataType.Byte:
|
||||
case MetadataType.Int16:
|
||||
case MetadataType.UInt16:
|
||||
case MetadataType.Int32:
|
||||
case MetadataType.UInt32:
|
||||
case MetadataType.IntPtr:
|
||||
case MetadataType.UIntPtr:
|
||||
return 'I';
|
||||
case MetadataType.Int64:
|
||||
case MetadataType.UInt64:
|
||||
return 'L';
|
||||
case MetadataType.Single:
|
||||
return 'F';
|
||||
case MetadataType.Double:
|
||||
return 'D';
|
||||
case MetadataType.String:
|
||||
case MetadataType.Pointer:
|
||||
case MetadataType.ByReference:
|
||||
case MetadataType.Object:
|
||||
case MetadataType.Class:
|
||||
case MetadataType.Array:
|
||||
return 'I';
|
||||
case MetadataType.ValueType:
|
||||
return 'I';
|
||||
default:
|
||||
throw new Exception ("Can't handle type '" + type.FullName + "' (" + type.MetadataType + ").");
|
||||
}
|
||||
}
|
||||
|
||||
// Add an extra signature for a pinvoke method
|
||||
public void AddSignature (MethodReference Method) {
|
||||
var sb = new StringBuilder ();
|
||||
sb.Append (typeToChar (Method.ReturnType));
|
||||
foreach (var par in Method.Parameters)
|
||||
sb.Append (typeToChar (par.ParameterType));
|
||||
extra_signatures.Add (sb.ToString ());
|
||||
}
|
||||
|
||||
public void Emit (StreamWriter w) {
|
||||
w.WriteLine ("/*");
|
||||
w.WriteLine ("* GENERATED FILE, DON'T EDIT");
|
||||
w.WriteLine ("* Generated by wasm-tuner.exe --gen-interp-to-native");
|
||||
w.WriteLine ("*/");
|
||||
|
||||
var added = new HashSet<string> ();
|
||||
|
||||
var l = new List<string> ();
|
||||
foreach (var c in cookies) {
|
||||
l.Add (c);
|
||||
added.Add (c);
|
||||
}
|
||||
foreach (var c in extra_signatures) {
|
||||
if (!added.Contains (c)) {
|
||||
l.Add (c);
|
||||
added.Add (c);
|
||||
}
|
||||
}
|
||||
var signatures = l.ToArray ();
|
||||
|
||||
foreach (var c in signatures) {
|
||||
w.WriteLine ("static void");
|
||||
w.WriteLine ($"wasm_invoke_{c.ToLower ()} (void *target_func, InterpMethodArguments *margs)");
|
||||
w.WriteLine ("{");
|
||||
|
||||
w.Write ($"\ttypedef {TypeToSigType (c [0])} (*T)(");
|
||||
for (int i = 1; i < c.Length; ++i) {
|
||||
char p = c [i];
|
||||
if (i > 1)
|
||||
w.Write (", ");
|
||||
w.Write ($"{TypeToSigType (p)} arg_{i - 1}");
|
||||
}
|
||||
if (c.Length == 1)
|
||||
w.Write ("void");
|
||||
|
||||
w.WriteLine (");\n\tT func = (T)target_func;");
|
||||
|
||||
var ctx = new EmitCtx ();
|
||||
|
||||
w.Write ("\t");
|
||||
if (c [0] != 'V')
|
||||
w.Write ($"{TypeToSigType (c [0])} res = ");
|
||||
|
||||
w.Write ("func (");
|
||||
for (int i = 1; i < c.Length; ++i) {
|
||||
char p = c [i];
|
||||
if (i > 1)
|
||||
w.Write (", ");
|
||||
w.Write (ctx.Emit (p));
|
||||
}
|
||||
w.WriteLine (");");
|
||||
|
||||
if (c [0] != 'V')
|
||||
w.WriteLine ($"\t*({TypeToSigType (c [0])}*)margs->retval = res;");
|
||||
|
||||
w.WriteLine ("\n}\n");
|
||||
}
|
||||
|
||||
Array.Sort (signatures);
|
||||
|
||||
w.WriteLine ("static const char* interp_to_native_signatures [] = {");
|
||||
foreach (var sig in signatures)
|
||||
w.WriteLine ($"\"{sig}\",");
|
||||
w.WriteLine ("};");
|
||||
|
||||
w.WriteLine ("static void* interp_to_native_invokes [] = {");
|
||||
foreach (var sig in signatures) {
|
||||
var lsig = sig.ToLower ();
|
||||
w.WriteLine ($"wasm_invoke_{lsig},");
|
||||
}
|
||||
w.WriteLine ("};");
|
||||
}
|
||||
|
||||
class EmitCtx
|
||||
{
|
||||
int iarg, farg;
|
||||
|
||||
public string Emit (char c) {
|
||||
switch (c) {
|
||||
case 'I':
|
||||
iarg += 1;
|
||||
return $"(int)(gssize)margs->iargs [{iarg - 1}]";
|
||||
case 'F':
|
||||
farg += 1;
|
||||
return $"*(float*)&margs->fargs [FIDX ({farg - 1})]";
|
||||
case 'L':
|
||||
iarg += 2;
|
||||
return $"get_long_arg (margs, {iarg - 2})";
|
||||
case 'D':
|
||||
farg += 1;
|
||||
return $"margs->fargs [FIDX ({farg - 1})]";
|
||||
default:
|
||||
throw new Exception ("IDK how to handle " + c);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,303 +0,0 @@
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Json;
|
||||
using System.Collections.Generic;
|
||||
using Mono.Cecil;
|
||||
|
||||
public class PInvokeTableGenerator
|
||||
{
|
||||
public PInvokeTableGenerator () {
|
||||
}
|
||||
|
||||
List<AssemblyDefinition> assemblies;
|
||||
Dictionary<string, string> modules;
|
||||
List<Pinvoke> pinvokes;
|
||||
List<PinvokeCallback> callbacks;
|
||||
|
||||
public void Run (List<AssemblyDefinition> assemblies, Dictionary<string, string> modules) {
|
||||
this.assemblies = assemblies;
|
||||
this.modules = modules;
|
||||
|
||||
CollectPInvokes (assemblies, out pinvokes, out callbacks);
|
||||
|
||||
Console.WriteLine ("// GENERATED FILE, DO NOT MODIFY");
|
||||
Console.WriteLine ();
|
||||
|
||||
GenPInvokeTable ();
|
||||
GenNativeToInterp ();
|
||||
}
|
||||
|
||||
void GenPInvokeTable () {
|
||||
var decls = new Dictionary<string, Pinvoke> ();
|
||||
foreach (var pinvoke in pinvokes) {
|
||||
if (modules.ContainsKey (pinvoke.Module)) {
|
||||
pinvoke.CDecl = GenPinvokeDecl (pinvoke);
|
||||
if (decls.TryGetValue (pinvoke.EntryPoint, out Pinvoke prev_pinvoke)) {
|
||||
if (pinvoke.CDecl != prev_pinvoke.CDecl) {
|
||||
Console.Error.WriteLine ($"Warning: PInvoke method '{pinvoke.EntryPoint}' has incompatible declarations.");
|
||||
pinvoke.TableEntryPoint = "mono_wasm_pinvoke_vararg_stub";
|
||||
prev_pinvoke.TableEntryPoint = "mono_wasm_pinvoke_vararg_stub";
|
||||
continue;
|
||||
}
|
||||
}
|
||||
decls [pinvoke.EntryPoint] = pinvoke;
|
||||
Console.WriteLine (pinvoke.CDecl);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var module in modules.Keys) {
|
||||
string symbol = module.Replace (".", "_") + "_imports";
|
||||
Console.WriteLine ("static PinvokeImport " + symbol + " [] = {");
|
||||
foreach (var pinvoke in pinvokes) {
|
||||
if (pinvoke.Module == module)
|
||||
Console.WriteLine ("{\"" + pinvoke.EntryPoint + "\", " + pinvoke.TableEntryPoint + "},");
|
||||
}
|
||||
Console.WriteLine ("{NULL, NULL}");
|
||||
Console.WriteLine ("};");
|
||||
}
|
||||
Console.Write ("static void *pinvoke_tables[] = { ");
|
||||
foreach (var module in modules.Keys) {
|
||||
string symbol = module.Replace (".", "_") + "_imports";
|
||||
Console.Write (symbol + ",");
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
Console.Write ("static char *pinvoke_names[] = { ");
|
||||
foreach (var module in modules.Keys) {
|
||||
Console.Write ("\"" + module + "\"" + ",");
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
}
|
||||
|
||||
void GenNativeToInterp () {
|
||||
// Generate native->interp entry functions
|
||||
// These are called by native code, so they need to obtain
|
||||
// the interp entry function/arg from a global array
|
||||
// They also need to have a signature matching what the
|
||||
// native code expects, which is the native signature
|
||||
// of the delegate invoke in the [MonoPInvokeCallback]
|
||||
// attribute.
|
||||
// Only blittable parameter/return types are supposed.
|
||||
int cb_index = 0;
|
||||
|
||||
// Arguments to interp entry functions in the runtime
|
||||
Console.WriteLine ("InterpFtnDesc wasm_native_to_interp_ftndescs[" + callbacks.Count + "];");
|
||||
|
||||
foreach (var cb in callbacks) {
|
||||
var method = cb.Method;
|
||||
|
||||
if (!IsBlittable (method.ReturnType))
|
||||
Error ("The return type of pinvoke callback method '" + method.FullName + "' needs to be blittable.");
|
||||
foreach (var p in method.Parameters) {
|
||||
if (!IsBlittable (p.ParameterType))
|
||||
Error ("Parameter types of pinvoke callback method '" + method.FullName + "' needs to be blittable.");
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var cb in callbacks) {
|
||||
var sb = new StringBuilder ();
|
||||
var method = cb.Method;
|
||||
|
||||
// The signature of the interp entry function
|
||||
// This is a gsharedvt_in signature
|
||||
sb.Append ("typedef void ");
|
||||
sb.Append (" (*WasmInterpEntrySig_" + cb_index + ") (");
|
||||
int pindex = 0;
|
||||
if (method.ReturnType.Name != "Void") {
|
||||
sb.Append ("int");
|
||||
pindex ++;
|
||||
}
|
||||
foreach (var p in method.Parameters) {
|
||||
if (pindex > 0)
|
||||
sb.Append (",");
|
||||
sb.Append ("int");
|
||||
pindex ++;
|
||||
}
|
||||
if (pindex > 0)
|
||||
sb.Append (",");
|
||||
// Extra arg
|
||||
sb.Append ("int");
|
||||
sb.Append (");\n");
|
||||
|
||||
bool is_void = method.ReturnType.Name == "Void";
|
||||
|
||||
string module_symbol = method.DeclaringType.Module.Assembly.Name.Name.Replace (".", "_");
|
||||
var token = method.MetadataToken.ToUInt32 ();
|
||||
string entry_name = $"wasm_native_to_interp_{module_symbol}_{token}";
|
||||
cb.EntryName = entry_name;
|
||||
sb.Append (WasmTuner.MapType (method.ReturnType));
|
||||
sb.Append ($" {entry_name} (");
|
||||
pindex = 0;
|
||||
foreach (var p in method.Parameters) {
|
||||
if (pindex > 0)
|
||||
sb.Append (",");
|
||||
sb.Append (WasmTuner.MapType (method.Parameters [pindex].ParameterType));
|
||||
sb.Append (" arg" + pindex);
|
||||
pindex ++;
|
||||
}
|
||||
sb.Append (") { \n");
|
||||
if (!is_void)
|
||||
sb.Append (WasmTuner.MapType (method.ReturnType) + " res;\n");
|
||||
sb.Append ("((WasmInterpEntrySig_" + cb_index + ")wasm_native_to_interp_ftndescs [" + cb_index + "].func) (");
|
||||
pindex = 0;
|
||||
if (!is_void) {
|
||||
sb.Append ("&res");
|
||||
pindex ++;
|
||||
}
|
||||
int aindex = 0;
|
||||
foreach (var p in method.Parameters) {
|
||||
if (pindex > 0)
|
||||
sb.Append (", ");
|
||||
sb.Append ("&arg" + aindex);
|
||||
pindex ++;
|
||||
aindex ++;
|
||||
}
|
||||
if (pindex > 0)
|
||||
sb.Append (", ");
|
||||
sb.Append ($"wasm_native_to_interp_ftndescs [{cb_index}].arg");
|
||||
sb.Append (");\n");
|
||||
if (!is_void)
|
||||
sb.Append ("return res;\n");
|
||||
sb.Append ("}");
|
||||
Console.WriteLine (sb);
|
||||
cb_index ++;
|
||||
}
|
||||
|
||||
// Array of function pointers
|
||||
Console.Write ("static void *wasm_native_to_interp_funcs[] = { ");
|
||||
foreach (var cb in callbacks) {
|
||||
Console.Write (cb.EntryName + ",");
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
|
||||
// Lookup table from method->interp entry
|
||||
// The key is a string of the form <assembly name>_<method token>
|
||||
// FIXME: Use a better encoding
|
||||
Console.Write ("static const char *wasm_native_to_interp_map[] = { ");
|
||||
foreach (var cb in callbacks) {
|
||||
var method = cb.Method;
|
||||
string module_symbol = method.DeclaringType.Module.Assembly.Name.Name.Replace (".", "_");
|
||||
var token = method.MetadataToken.ToUInt32 ();
|
||||
Console.WriteLine ($"\"{module_symbol}_{token}\",");
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
}
|
||||
|
||||
static bool IsBlittable (TypeReference type) {
|
||||
switch (type.MetadataType) {
|
||||
case MetadataType.Void:
|
||||
case MetadataType.Char:
|
||||
case MetadataType.Boolean:
|
||||
case MetadataType.Byte:
|
||||
case MetadataType.SByte:
|
||||
case MetadataType.Int16:
|
||||
case MetadataType.UInt16:
|
||||
case MetadataType.Int32:
|
||||
case MetadataType.UInt32:
|
||||
case MetadataType.Int64:
|
||||
case MetadataType.UInt64:
|
||||
case MetadataType.IntPtr:
|
||||
case MetadataType.UIntPtr:
|
||||
case MetadataType.Single:
|
||||
case MetadataType.Double:
|
||||
case MetadataType.Pointer:
|
||||
case MetadataType.ByReference:
|
||||
return true;
|
||||
case MetadataType.ValueType: {
|
||||
var tdef = type.Resolve ();
|
||||
return tdef != null && tdef.IsEnum;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
static void Error (string msg) {
|
||||
Console.Error.WriteLine (msg);
|
||||
Environment.Exit (1);
|
||||
}
|
||||
|
||||
public static void CollectPInvokes (List<AssemblyDefinition> assemblies, out List<Pinvoke> pinvokes, out List<PinvokeCallback> callbacks) {
|
||||
pinvokes = new List<Pinvoke> ();
|
||||
callbacks = new List<PinvokeCallback> ();
|
||||
foreach (var assembly in assemblies) {
|
||||
foreach (var type in assembly.MainModule.Types) {
|
||||
ProcessTypeForPinvoke (pinvokes, callbacks, type);
|
||||
foreach (var nested in type.NestedTypes)
|
||||
ProcessTypeForPinvoke (pinvokes, callbacks, nested);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void ProcessTypeForPinvoke (List<Pinvoke> pinvokes, List<PinvokeCallback> callbacks, TypeDefinition type) {
|
||||
foreach (var method in type.Methods) {
|
||||
var info = method.PInvokeInfo;
|
||||
if (info != null) {
|
||||
pinvokes.Add (new Pinvoke (info.EntryPoint, info.Module.Name, method));
|
||||
}
|
||||
|
||||
foreach (var attr in method.CustomAttributes) {
|
||||
// The type has no defined namespace
|
||||
if (attr.Constructor.DeclaringType.Name == "MonoPInvokeCallbackAttribute") {
|
||||
if (!method.IsStatic)
|
||||
Error ($"Method '{method.FullName}' decored with [MonoPInvokeCallback] needs to be static.");
|
||||
var callback_type = attr.ConstructorArguments [0];
|
||||
if (callback_type.Type.Name != "Type" || callback_type.Value == null)
|
||||
Error ("[MonoPInvokeCallback] attribute has invalid format.");
|
||||
var tref = (TypeReference)callback_type.Value;
|
||||
callbacks.Add (new PinvokeCallback (method, tref));
|
||||
} else if (attr.Constructor.DeclaringType.Name == "UnmanagedCallersOnlyAttribute") {
|
||||
callbacks.Add (new PinvokeCallback (method, null));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static string GenPinvokeDecl (Pinvoke pinvoke) {
|
||||
var sb = new StringBuilder ();
|
||||
var method = pinvoke.Method;
|
||||
sb.Append (WasmTuner.MapType (method.ReturnType));
|
||||
sb.Append ($" {pinvoke.EntryPoint} (");
|
||||
int pindex = 0;
|
||||
foreach (var p in method.Parameters) {
|
||||
if (pindex > 0)
|
||||
sb.Append (",");
|
||||
sb.Append (WasmTuner.MapType (method.Parameters [pindex].ParameterType));
|
||||
pindex ++;
|
||||
}
|
||||
sb.Append (");");
|
||||
return sb.ToString ();
|
||||
}
|
||||
}
|
||||
|
||||
public class Pinvoke
|
||||
{
|
||||
public Pinvoke (string entry_point, string module, MethodReference method) {
|
||||
EntryPoint = entry_point;
|
||||
TableEntryPoint = entry_point;
|
||||
Module = module;
|
||||
Method = method;
|
||||
}
|
||||
|
||||
public string EntryPoint;
|
||||
public string TableEntryPoint;
|
||||
public string Module;
|
||||
public MethodReference Method;
|
||||
public string CDecl;
|
||||
}
|
||||
|
||||
public class PinvokeCallback
|
||||
{
|
||||
public PinvokeCallback (MethodReference method, TypeReference callback_type) {
|
||||
Method = method;
|
||||
CallbackType = callback_type;
|
||||
}
|
||||
|
||||
public MethodReference Method;
|
||||
public TypeReference CallbackType;
|
||||
public string EntryName;
|
||||
}
|
||||
@@ -40,6 +40,19 @@ class IcallClass {
|
||||
public Dictionary<string, Icall> Icalls;
|
||||
}
|
||||
|
||||
class Pinvoke
|
||||
{
|
||||
public Pinvoke (string entry_point, string module, MethodReference method) {
|
||||
EntryPoint = entry_point;
|
||||
Module = module;
|
||||
Method = method;
|
||||
}
|
||||
|
||||
public string EntryPoint;
|
||||
public string Module;
|
||||
public MethodReference Method;
|
||||
}
|
||||
|
||||
public class WasmTuner
|
||||
{
|
||||
public static int Main (String[] args) {
|
||||
@@ -50,6 +63,8 @@ public class WasmTuner
|
||||
|
||||
Dictionary<string, IcallClass> runtime_icalls;
|
||||
|
||||
List<Pinvoke> pinvokes;
|
||||
|
||||
// Read the icall table generated by mono --print-icall-table
|
||||
void ReadTable (string filename) {
|
||||
JsonValue json;
|
||||
@@ -82,7 +97,6 @@ public class WasmTuner
|
||||
Console.WriteLine ("Arguments:");
|
||||
Console.WriteLine ("--gen-icall-table icall-table.json <assemblies>.");
|
||||
Console.WriteLine ("--gen-pinvoke-table <list of native library names separated by commas> <assemblies>.");
|
||||
Console.WriteLine ("--gen-interp-to-native <output file name> <assemblies>.");
|
||||
Console.WriteLine ("--gen-empty-assemblies <filenames>.");
|
||||
}
|
||||
|
||||
@@ -102,15 +116,13 @@ public class WasmTuner
|
||||
return GenPinvokeTable (args);
|
||||
} else if (cmd == "--gen-empty-assemblies") {
|
||||
return GenEmptyAssemblies (args);
|
||||
} else if (cmd == "--gen-interp-to-native") {
|
||||
return GenInterpToNative (args);
|
||||
} else {
|
||||
Usage ();
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
public static string MapType (TypeReference t) {
|
||||
static string MapType (TypeReference t) {
|
||||
if (t.Name == "Void")
|
||||
return "void";
|
||||
else if (t.Name == "Double")
|
||||
@@ -125,25 +137,83 @@ public class WasmTuner
|
||||
return "int";
|
||||
}
|
||||
|
||||
static string GenPinvokeDecl (Pinvoke pinvoke) {
|
||||
var sb = new StringBuilder ();
|
||||
var method = pinvoke.Method;
|
||||
sb.Append (MapType (method.ReturnType));
|
||||
sb.Append ($" {pinvoke.EntryPoint} (");
|
||||
int pindex = 0;
|
||||
foreach (var p in method.Parameters) {
|
||||
if (pindex > 0)
|
||||
sb.Append (",");
|
||||
sb.Append (MapType (method.Parameters [pindex].ParameterType));
|
||||
pindex ++;
|
||||
}
|
||||
sb.Append (");");
|
||||
return sb.ToString ();
|
||||
}
|
||||
|
||||
int GenPinvokeTable (String[] args) {
|
||||
var modules = new Dictionary<string, string> ();
|
||||
foreach (var module in args [1].Split (','))
|
||||
modules [module] = module;
|
||||
|
||||
args = args.Skip (2).ToArray ();
|
||||
var assemblies = new List<AssemblyDefinition> ();
|
||||
foreach (var fname in args)
|
||||
assemblies.Add (AssemblyDefinition.ReadAssembly (fname));
|
||||
pinvokes = new List<Pinvoke> ();
|
||||
foreach (var fname in args) {
|
||||
var a = AssemblyDefinition.ReadAssembly (fname);
|
||||
|
||||
var generator = new PInvokeTableGenerator ();
|
||||
generator.Run (assemblies, modules);
|
||||
foreach (var type in a.MainModule.Types) {
|
||||
ProcessTypeForPinvoke (type);
|
||||
foreach (var nested in type.NestedTypes)
|
||||
ProcessTypeForPinvoke (nested);
|
||||
}
|
||||
}
|
||||
|
||||
Console.WriteLine ("// GENERATED FILE, DO NOT MODIFY");
|
||||
Console.WriteLine ("typedef struct {");
|
||||
Console.WriteLine ("const char *name;");
|
||||
Console.WriteLine ("void *func;");
|
||||
Console.WriteLine ("} PinvokeImport;");
|
||||
Console.WriteLine ();
|
||||
|
||||
foreach (var pinvoke in pinvokes) {
|
||||
if (modules.ContainsKey (pinvoke.Module))
|
||||
Console.WriteLine (GenPinvokeDecl (pinvoke));
|
||||
}
|
||||
|
||||
foreach (var module in modules.Keys) {
|
||||
string symbol = module.Replace (".", "_") + "_imports";
|
||||
Console.WriteLine ("static PinvokeImport " + symbol + " [] = {");
|
||||
foreach (var pinvoke in pinvokes) {
|
||||
if (pinvoke.Module == module)
|
||||
Console.WriteLine ("{\"" + pinvoke.EntryPoint + "\", " + pinvoke.EntryPoint + "},");
|
||||
}
|
||||
Console.WriteLine ("{NULL, NULL}");
|
||||
Console.WriteLine ("};");
|
||||
}
|
||||
Console.Write ("static void *pinvoke_tables[] = { ");
|
||||
foreach (var module in modules.Keys) {
|
||||
string symbol = module.Replace (".", "_") + "_imports";
|
||||
Console.Write (symbol + ",");
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
Console.Write ("static char *pinvoke_names[] = { ");
|
||||
foreach (var module in modules.Keys) {
|
||||
Console.Write ("\"" + module + "\"" + ",");
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Error (string msg) {
|
||||
Console.Error.WriteLine (msg);
|
||||
Environment.Exit (1);
|
||||
void ProcessTypeForPinvoke (TypeDefinition type) {
|
||||
foreach (var method in type.Methods) {
|
||||
var info = method.PInvokeInfo;
|
||||
if (info == null)
|
||||
continue;
|
||||
pinvokes.Add (new Pinvoke (info.EntryPoint, info.Module.Name, method));
|
||||
}
|
||||
}
|
||||
|
||||
static string GenIcallDecl (Icall icall) {
|
||||
@@ -204,26 +274,21 @@ public class WasmTuner
|
||||
var sorted = icalls.Where (i => i.Assembly == assembly).ToArray ();
|
||||
Array.Sort (sorted);
|
||||
|
||||
string aname;
|
||||
if (assembly == "mscorlib" || assembly == "System.Private.CoreLib")
|
||||
aname = "corlib";
|
||||
else
|
||||
aname = assembly.Replace (".", "_");
|
||||
Console.WriteLine ($"#define ICALL_TABLE_{aname} 1\n");
|
||||
Console.WriteLine ($"#define ICALL_TABLE_{assembly} 1\n");
|
||||
|
||||
Console.WriteLine ($"static int {aname}_icall_indexes [] = {{");
|
||||
Console.WriteLine ($"static int {assembly}_icall_indexes [] = {{");
|
||||
foreach (var icall in sorted)
|
||||
Console.WriteLine (String.Format ("{0},", icall.TokenIndex));
|
||||
Console.WriteLine ("};");
|
||||
foreach (var icall in sorted)
|
||||
Console.WriteLine (GenIcallDecl (icall));
|
||||
Console.WriteLine ($"static void *{aname}_icall_funcs [] = {{");
|
||||
Console.WriteLine ($"static void *{assembly}_icall_funcs [] = {{");
|
||||
foreach (var icall in sorted) {
|
||||
Console.WriteLine (String.Format ("// token {0},", icall.TokenIndex));
|
||||
Console.WriteLine (String.Format ("{0},", icall.Func));
|
||||
}
|
||||
Console.WriteLine ("};");
|
||||
Console.WriteLine ($"static uint8_t {aname}_icall_handles [] = {{");
|
||||
Console.WriteLine ($"static uint8_t {assembly}_icall_handles [] = {{");
|
||||
foreach (var icall in sorted)
|
||||
Console.WriteLine (String.Format ("{0},", icall.Handles ? "1" : "0"));
|
||||
Console.WriteLine ("};");
|
||||
@@ -361,30 +426,4 @@ public class WasmTuner
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int GenInterpToNative (String[] args) {
|
||||
if (args.Length < 2) {
|
||||
Usage ();
|
||||
return 1;
|
||||
}
|
||||
string outfileName = args [1];
|
||||
args = args.Skip (2).ToArray ();
|
||||
|
||||
var assemblies = new List<AssemblyDefinition> ();
|
||||
foreach (var fname in args)
|
||||
assemblies.Add (AssemblyDefinition.ReadAssembly (fname));
|
||||
|
||||
List<Pinvoke> pinvokes;
|
||||
List<PinvokeCallback> callbacks;
|
||||
|
||||
PInvokeTableGenerator.CollectPInvokes (assemblies, out pinvokes, out callbacks);
|
||||
|
||||
var gen = new InterpToNativeGenerator ();
|
||||
foreach (var pinvoke in pinvokes)
|
||||
gen.AddSignature (pinvoke.Method);
|
||||
using (var w = File.CreateText (outfileName)) {
|
||||
gen.Emit (w);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -53,8 +53,6 @@
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\SR.cs" />
|
||||
<Compile Include="..\..\class\System.Json\corefx\SR.cs" />
|
||||
<Compile Include="InterpToNativeGenerator.cs" />
|
||||
<Compile Include="PInvokeTableGenerator.cs" />
|
||||
<Compile Include="tuner.cs" />
|
||||
<ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
|
||||
<Name>genconsts</Name>
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
tuner.cs
|
||||
InterpToNativeGenerator.cs
|
||||
PInvokeTableGenerator.cs
|
||||
../../build/common/Consts.cs
|
||||
../../build/common/SR.cs
|
||||
../../class/System.Json/corefx/SR.cs
|
||||
|
||||
+6
-6
@@ -1,8 +1,8 @@
|
||||
project(mono)
|
||||
project (mono)
|
||||
|
||||
#set(subdirs eglib arch utils cil sgen metadata mini dis profiler)
|
||||
set(subdirs mini profiler)
|
||||
#set (subdirs eglib arch utils cil sgen metadata mini dis profiler)
|
||||
set (subdirs mini)
|
||||
|
||||
foreach(dir ${subdirs})
|
||||
add_subdirectory(${dir})
|
||||
endforeach()
|
||||
foreach (dir ${subdirs})
|
||||
add_subdirectory (${dir})
|
||||
endforeach ()
|
||||
+6
-19
@@ -13,35 +13,22 @@ native_dirs = native
|
||||
endif
|
||||
|
||||
if ENABLE_NETCORE
|
||||
btls_dirs =
|
||||
managed_unit_test_dirs =
|
||||
native_unit_test_dirs =
|
||||
culture_dirs =
|
||||
else
|
||||
managed_unit_test_dirs = tests
|
||||
native_unit_test_dirs = unit-tests
|
||||
culture_dirs = culture
|
||||
endif
|
||||
|
||||
if ENABLE_PERFTRACING
|
||||
eventpipe_dirs = eventpipe
|
||||
btls_dirs =
|
||||
endif
|
||||
|
||||
if ENABLE_NETCORE
|
||||
SUBDIRS = eglib arch utils sgen zlib $(eventpipe_dirs) metadata mini profiler $(native_unit_test_dirs)
|
||||
SUBDIRS = eglib arch utils sgen zlib metadata mini profiler
|
||||
else
|
||||
|
||||
if CROSS_COMPILING
|
||||
SUBDIRS = $(btls_dirs) $(culture_dirs) eglib arch utils cil zlib $(sgen_dirs) metadata mini dis profiler $(native_dirs)
|
||||
SUBDIRS = $(btls_dirs) eglib arch utils cil zlib $(sgen_dirs) metadata mini dis profiler $(native_dirs)
|
||||
else
|
||||
if INSTALL_MONOTOUCH
|
||||
SUBDIRS = $(btls_dirs) $(culture_dirs) eglib arch utils zlib $(sgen_dirs) metadata mini profiler $(native_dirs)
|
||||
SUBDIRS = $(btls_dirs) eglib arch utils zlib $(sgen_dirs) metadata mini profiler $(native_dirs)
|
||||
else
|
||||
SUBDIRS = $(btls_dirs) $(culture_dirs) eglib arch utils cil zlib $(sgen_dirs) metadata mini dis $(managed_unit_test_dirs) $(native_unit_test_dirs) benchmark profiler $(native_dirs)
|
||||
SUBDIRS = $(btls_dirs) eglib arch utils cil zlib $(sgen_dirs) metadata mini dis tests unit-tests benchmark profiler $(native_dirs)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
DIST_SUBDIRS = btls $(culture_dirs) native eglib eventpipe arch utils cil zlib $(sgen_dirs) metadata mini dis $(managed_unit_test_dirs) $(native_unit_test_dirs) benchmark profiler
|
||||
|
||||
EXTRA_DIST = eventpipe/Makefile
|
||||
DIST_SUBDIRS = btls native eglib arch utils cil zlib $(sgen_dirs) metadata mini dis tests unit-tests benchmark profiler
|
||||
@@ -1,9 +1,3 @@
|
||||
MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
|
||||
|
||||
EXTRA_DIST = arm64-codegen.h codegen-test.c
|
||||
|
||||
test-codegen:
|
||||
$(CC) $(CFLAGS) -I../../.. -I../../eglib/ ../../eglib/.libs/libeglib.a -o codegen-test codegen-test.c
|
||||
./codegen-test > tmp.s
|
||||
$(CC) $(CFLAGS) -c -o tmp.o tmp.s
|
||||
objdump -d --triple=arm64e tmp.o
|
||||
@@ -867,40 +867,4 @@ arm_encode_arith_imm (int imm, guint32 *shift)
|
||||
#define arm_cmpp arm_cmpx
|
||||
#endif
|
||||
|
||||
/* ARM v8.3 */
|
||||
|
||||
/* PACIA */
|
||||
|
||||
#define arm_format_pacia(p, crm, op2) arm_emit ((p), (0b11010101000000110010000000011111 << 0) | ((crm) << 8) | ((op2) << 5))
|
||||
#define arm_paciasp(p) arm_format_pacia ((p), 0b0011, 0b001)
|
||||
|
||||
/* PACIB */
|
||||
|
||||
#define arm_format_pacib(p, crm, op2) arm_emit ((p), (0b11010101000000110010000000011111 << 0) | ((crm) << 8) | ((op2) << 5))
|
||||
#define arm_pacibsp(p) arm_format_pacib ((p), 0b0011, 0b011)
|
||||
|
||||
/* RETA */
|
||||
#define arm_format_reta(p,key) arm_emit ((p), 0b11010110010111110000101111111111 + ((key) << 10))
|
||||
|
||||
#define arm_retaa(p) arm_format_reta ((p),0)
|
||||
#define arm_retab(p) arm_format_reta ((p),1)
|
||||
|
||||
/* BRA */
|
||||
|
||||
#define arm_format_bra(p, z, m, rn, rm) arm_emit ((p), (0b1101011000011111000010 << 10) + ((z) << 24) + ((m) << 10) + ((rn) << 5) + ((rm) << 0))
|
||||
|
||||
#define arm_braaz(p, rn) arm_format_bra ((p), 0, 0, (rn), 0b11111)
|
||||
#define arm_brabz(p, rn) arm_format_bra ((p), 0, 1, (rn), 0b11111)
|
||||
#define arm_braa(p, rn, rm) arm_format_bra ((p), 1, 0, (rn), (rm))
|
||||
#define arm_brab(p, rn, rm) arm_format_bra ((p), 1, 1, (rn), (rm))
|
||||
|
||||
/* BLRA */
|
||||
|
||||
#define arm_format_blra(p, z, m, rn, rm) arm_emit ((p), (0b1101011000111111000010 << 10) + ((z) << 24) + ((m) << 10) + ((rn) << 5) + ((rm) << 0))
|
||||
|
||||
#define arm_blraaz(p, rn) arm_format_blra ((p), 0, 0, (rn), 0b11111)
|
||||
#define arm_blraa(p, rn, rm) arm_format_blra ((p), 1, 0, (rn), (rm))
|
||||
#define arm_blrabz(p, rn) arm_format_blra ((p), 0, 1, (rn), 0b11111)
|
||||
#define arm_blrab(p, rn, rm) arm_format_blra ((p), 1, 1, (rn), (rm))
|
||||
|
||||
#endif /* __arm_CODEGEN_H__ */
|
||||
@@ -416,19 +416,6 @@ main (int argc, char *argv [])
|
||||
arm_stlxrx (code, ARMREG_R0, ARMREG_R1, ARMREG_R2);
|
||||
arm_stlxrw (code, ARMREG_R0, ARMREG_R1, ARMREG_R2);
|
||||
|
||||
arm_paciasp (code);
|
||||
arm_pacibsp (code);
|
||||
arm_retaa (code);
|
||||
arm_retab (code);
|
||||
arm_braaz (code, ARMREG_R1);
|
||||
arm_brabz (code, ARMREG_R1);
|
||||
arm_braa (code, ARMREG_R1, ARMREG_R2);
|
||||
arm_brab (code, ARMREG_R1, ARMREG_R2);
|
||||
arm_blraaz (code, ARMREG_R1);
|
||||
arm_blraa (code, ARMREG_R1, ARMREG_R2);
|
||||
arm_blrabz (code, ARMREG_R1);
|
||||
arm_blrab (code, ARMREG_R1, ARMREG_R2);
|
||||
|
||||
for (i = 0; i < code - buf; ++i)
|
||||
printf (".byte %d\n", buf [i]);
|
||||
printf ("\n");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Licensed to the .NET Foundation under one or more agreements.
|
||||
* The .NET Foundation licenses this file to you under the MIT license.
|
||||
* See the LICENSE file in the project root for more information.
|
||||
*/
|
||||
|
||||
#define MONO_RISCV_CODEGEN_TEST
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Licensed to the .NET Foundation under one or more agreements.
|
||||
* The .NET Foundation licenses this file to you under the MIT license.
|
||||
* See the LICENSE file in the project root for more information.
|
||||
*/
|
||||
|
||||
#ifndef __MONO_RISCV_CODEGEN_H__
|
||||
|
||||
@@ -191,7 +191,6 @@ typedef enum {
|
||||
#define S390_FP s390_r11
|
||||
#define S390_MINIMAL_STACK_SIZE 160
|
||||
#define S390_REG_SAVE_OFFSET 48
|
||||
#define S390_NONPARM_SAVE_OFFSET 56
|
||||
#define S390_PARM_SAVE_OFFSET 16
|
||||
#define S390_RET_ADDR_OFFSET 112
|
||||
#define S390_FLOAT_SAVE_OFFSET 128
|
||||
@@ -1340,6 +1339,7 @@ typedef struct {
|
||||
#define s390_ldeb(c, r, x, b, d) S390_RXE(c, 0xed04, r, x, b, d)
|
||||
#define s390_ldebr(c, r1, r2) S390_RRE(c, 0xb304, r1, r2)
|
||||
#define s390_ldgr(c, r1, r2) S390_RRE(c, 0xb3c1, r1, r2)
|
||||
#define s390_ldgr(c, r1, r2) S390_RRE(c, 0xb3c1, r1, r2)
|
||||
#define s390_ldxbr(c, r1, r2) S390_RRE(c, 0xb345, r1, r2)
|
||||
#define s390_ldr(c, r1, r2) S390_RR(c, 0x28, r1, r2)
|
||||
#define s390_le(c, f, x, b, d) S390_RX(c, 0x78, f, x, b, d)
|
||||
@@ -1384,7 +1384,6 @@ typedef struct {
|
||||
#define s390_lm(c, r1, r2, b, d) S390_RS_1(c, 0x98, r1, r2, b, d)
|
||||
#define s390_lmg(c, r1, r2, b, d) S390_RSY_1(c, 0xeb04, r1, r2, b, d)
|
||||
#define s390_lndbr(c, r1, r2) S390_RRE(c, 0xb311, r1, r2)
|
||||
#define s390_lnebr(c, r1, r2) S390_RRE(c, 0xb301, r1, r2)
|
||||
#define s390_lngr(c, r1, r2) S390_RRE(c, 0xb901, r1, r2)
|
||||
#define s390_lnr(c, r1, r2) S390_RR(c, 0x11, r1, r2)
|
||||
#define s390_lpdbr(c, r1, r2) S390_RRE(c, 0xb310, r1, r2)
|
||||
@@ -1490,7 +1489,6 @@ typedef struct {
|
||||
#define s390_srlg(c, r1, r2, b, d) S390_RSY_1(c, 0xeb0c, r1, r2, b, d)
|
||||
#define s390_st(c, r, x, b, d) S390_RX(c, 0x50, r, x, b, d)
|
||||
#define s390_stam(c, r1, r2, b, d) S390_RS_1(c, 0x9b, r1, r2, b, d)
|
||||
#define s390_stamy(c, r1, r2, b, d) S390_RSY_1(c, 0xeb9b, r1, r2, b, d)
|
||||
#define s390_stc(c, r, x, b, d) S390_RX(c, 0x42, r, x, b, d)
|
||||
#define s390_stcm(c, r, m, b, d) S390_RX(c, 0xbe, r, m, b, d)
|
||||
#define s390_stcmy(c, r, x, b, d) S390_RXY(c, 0xeb2d, r, x, b, d)
|
||||
|
||||
@@ -325,6 +325,4 @@
|
||||
<opcode name="mono_ld_delegate_method_ptr" input="Pop1" output="PushI" args="InlineNone" o1="0xF0" o2="0x1E" flow="next" />
|
||||
<opcode name="mono_rethrow" input="PopRef" output="Push0" args="InlineNone" o1="0xF0" o2="0x1F" flow="throw" type="Objmodel" />
|
||||
<opcode name="mono_get_sp" input="Pop0" output="PushI" args="InlineNone" o1="0xF0" o2="0x20" flow="next" />
|
||||
<opcode name="mono_methodconst" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x21" flow="next" />
|
||||
<opcode name="mono_pinvoke_addr_cache" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x22" flow="next" />
|
||||
</opdesc>
|
||||
@@ -325,8 +325,6 @@ OPDEF(CEE_MONO_LDPTR_PROFILER_ALLOCATION_COUNT, "mono_ldptr_profiler_allocation_
|
||||
OPDEF(CEE_MONO_LD_DELEGATE_METHOD_PTR, "mono_ld_delegate_method_ptr", Pop1, PushI, InlineNone, 0, 2, 0xF0, 0x1E, NEXT)
|
||||
OPDEF(CEE_MONO_RETHROW, "mono_rethrow", PopRef, Push0, InlineNone, 0, 2, 0xF0, 0x1F, ERROR)
|
||||
OPDEF(CEE_MONO_GET_SP, "mono_get_sp", Pop0, PushI, InlineNone, 0, 2, 0xF0, 0x20, NEXT)
|
||||
OPDEF(CEE_MONO_METHODCONST, "mono_methodconst", Pop0, PushI, InlineI, 0, 2, 0xF0, 0x21, NEXT)
|
||||
OPDEF(CEE_MONO_PINVOKE_ADDR_CACHE, "mono_pinvoke_addr_cache", Pop0, PushI, InlineI, 0, 2, 0xF0, 0x22, NEXT)
|
||||
#ifndef OPALIAS
|
||||
#define _MONO_CIL_OPALIAS_DEFINED_
|
||||
#define OPALIAS(a,s,r)
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
/Makefile
|
||||
/Makefile.in
|
||||
/.libs
|
||||
/.deps
|
||||
/*.lo
|
||||
/*.la
|
||||
/*.o
|
||||
/*.a
|
||||
/semantic.cache
|
||||
/.project
|
||||
/.cproject
|
||||
/TAGS
|
||||
@@ -1,24 +0,0 @@
|
||||
MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(GLIB_CFLAGS) $(SHARED_CFLAGS)
|
||||
|
||||
CFLAGS := $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@)
|
||||
|
||||
if !ENABLE_MSVC_ONLY
|
||||
|
||||
noinst_LTLIBRARIES = libmono-culture.la
|
||||
|
||||
if !HOST_WIN32
|
||||
unix_sources = w32process-unix-language.c
|
||||
|
||||
platform_sources = $(unix_sources)
|
||||
endif
|
||||
|
||||
libmono_culture_la_SOURCES = \
|
||||
$(platform_sources) \
|
||||
culture-info.h \
|
||||
culture-info-tables.h \
|
||||
locales.c
|
||||
libmono_culture_la_CPPFLAGS = $(AM_CPPFLAGS) @CXX_ADD_CFLAGS@
|
||||
|
||||
endif # ENABLE_MSVC_ONLY
|
||||
@@ -1,796 +0,0 @@
|
||||
/**
|
||||
* \file
|
||||
* System.Diagnostics.Process support, mono_w32process_ver_language_name
|
||||
*/
|
||||
#include <config.h>
|
||||
#include <glib.h>
|
||||
#include <mono/utils/mono-compiler.h>
|
||||
#include <mono/utils/mono-publib.h>
|
||||
#include <mono/metadata/w32process-internals.h>
|
||||
|
||||
#if !defined(ENABLE_NETCORE) && !defined(DISABLE_PROCESSES)
|
||||
|
||||
static guint32
|
||||
copy_lang (gunichar2 *lang_out, guint32 lang_len, const gchar *text)
|
||||
{
|
||||
gunichar2 *unitext;
|
||||
int chars = strlen (text);
|
||||
int ret;
|
||||
|
||||
unitext = g_utf8_to_utf16 (text, -1, NULL, NULL, NULL);
|
||||
g_assert (unitext != NULL);
|
||||
|
||||
if (chars < (lang_len - 1)) {
|
||||
memcpy (lang_out, (gpointer)unitext, chars * 2);
|
||||
lang_out[chars] = '\0';
|
||||
ret = chars;
|
||||
} else {
|
||||
memcpy (lang_out, (gpointer)unitext, (lang_len - 1) * 2);
|
||||
lang_out[lang_len] = '\0';
|
||||
ret = lang_len;
|
||||
}
|
||||
|
||||
g_free (unitext);
|
||||
|
||||
return(ret);
|
||||
}
|
||||
|
||||
guint32
|
||||
mono_w32process_ver_language_name (guint32 lang, gunichar2 *lang_out, guint32 lang_len)
|
||||
{
|
||||
int primary, secondary;
|
||||
const char *name = NULL;
|
||||
|
||||
primary = lang & 0x3FF;
|
||||
secondary = (lang >> 10) & 0x3F;
|
||||
|
||||
switch(primary) {
|
||||
case 0x00:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Process Default Language"; break;
|
||||
}
|
||||
break;
|
||||
case 0x01:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Arabic (Saudi Arabia)"; break;
|
||||
case 0x02: name = "Arabic (Iraq)"; break;
|
||||
case 0x03: name = "Arabic (Egypt)"; break;
|
||||
case 0x04: name = "Arabic (Libya)"; break;
|
||||
case 0x05: name = "Arabic (Algeria)"; break;
|
||||
case 0x06: name = "Arabic (Morocco)"; break;
|
||||
case 0x07: name = "Arabic (Tunisia)"; break;
|
||||
case 0x08: name = "Arabic (Oman)"; break;
|
||||
case 0x09: name = "Arabic (Yemen)"; break;
|
||||
case 0x0a: name = "Arabic (Syria)"; break;
|
||||
case 0x0b: name = "Arabic (Jordan)"; break;
|
||||
case 0x0c: name = "Arabic (Lebanon)"; break;
|
||||
case 0x0d: name = "Arabic (Kuwait)"; break;
|
||||
case 0x0e: name = "Arabic (U.A.E.)"; break;
|
||||
case 0x0f: name = "Arabic (Bahrain)"; break;
|
||||
case 0x10: name = "Arabic (Qatar)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x02:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Bulgarian (Bulgaria)"; break;
|
||||
case 0x01: name = "Bulgarian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x03:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Catalan (Spain)"; break;
|
||||
case 0x01: name = "Catalan"; break;
|
||||
}
|
||||
break;
|
||||
case 0x04:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Chinese (Taiwan)"; break;
|
||||
case 0x02: name = "Chinese (PRC)"; break;
|
||||
case 0x03: name = "Chinese (Hong Kong S.A.R.)"; break;
|
||||
case 0x04: name = "Chinese (Singapore)"; break;
|
||||
case 0x05: name = "Chinese (Macau S.A.R.)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x05:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Czech (Czech Republic)"; break;
|
||||
case 0x01: name = "Czech"; break;
|
||||
}
|
||||
break;
|
||||
case 0x06:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Danish (Denmark)"; break;
|
||||
case 0x01: name = "Danish"; break;
|
||||
}
|
||||
break;
|
||||
case 0x07:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "German (Germany)"; break;
|
||||
case 0x02: name = "German (Switzerland)"; break;
|
||||
case 0x03: name = "German (Austria)"; break;
|
||||
case 0x04: name = "German (Luxembourg)"; break;
|
||||
case 0x05: name = "German (Liechtenstein)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x08:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Greek (Greece)"; break;
|
||||
case 0x01: name = "Greek"; break;
|
||||
}
|
||||
break;
|
||||
case 0x09:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "English (United States)"; break;
|
||||
case 0x02: name = "English (United Kingdom)"; break;
|
||||
case 0x03: name = "English (Australia)"; break;
|
||||
case 0x04: name = "English (Canada)"; break;
|
||||
case 0x05: name = "English (New Zealand)"; break;
|
||||
case 0x06: name = "English (Ireland)"; break;
|
||||
case 0x07: name = "English (South Africa)"; break;
|
||||
case 0x08: name = "English (Jamaica)"; break;
|
||||
case 0x09: name = "English (Caribbean)"; break;
|
||||
case 0x0a: name = "English (Belize)"; break;
|
||||
case 0x0b: name = "English (Trinidad and Tobago)"; break;
|
||||
case 0x0c: name = "English (Zimbabwe)"; break;
|
||||
case 0x0d: name = "English (Philippines)"; break;
|
||||
case 0x10: name = "English (India)"; break;
|
||||
case 0x11: name = "English (Malaysia)"; break;
|
||||
case 0x12: name = "English (Singapore)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x0a:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Spanish (Spain)"; break;
|
||||
case 0x01: name = "Spanish (Traditional Sort)"; break;
|
||||
case 0x02: name = "Spanish (Mexico)"; break;
|
||||
case 0x03: name = "Spanish (International Sort)"; break;
|
||||
case 0x04: name = "Spanish (Guatemala)"; break;
|
||||
case 0x05: name = "Spanish (Costa Rica)"; break;
|
||||
case 0x06: name = "Spanish (Panama)"; break;
|
||||
case 0x07: name = "Spanish (Dominican Republic)"; break;
|
||||
case 0x08: name = "Spanish (Venezuela)"; break;
|
||||
case 0x09: name = "Spanish (Colombia)"; break;
|
||||
case 0x0a: name = "Spanish (Peru)"; break;
|
||||
case 0x0b: name = "Spanish (Argentina)"; break;
|
||||
case 0x0c: name = "Spanish (Ecuador)"; break;
|
||||
case 0x0d: name = "Spanish (Chile)"; break;
|
||||
case 0x0e: name = "Spanish (Uruguay)"; break;
|
||||
case 0x0f: name = "Spanish (Paraguay)"; break;
|
||||
case 0x10: name = "Spanish (Bolivia)"; break;
|
||||
case 0x11: name = "Spanish (El Salvador)"; break;
|
||||
case 0x12: name = "Spanish (Honduras)"; break;
|
||||
case 0x13: name = "Spanish (Nicaragua)"; break;
|
||||
case 0x14: name = "Spanish (Puerto Rico)"; break;
|
||||
case 0x15: name = "Spanish (United States)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x0b:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Finnish (Finland)"; break;
|
||||
case 0x01: name = "Finnish"; break;
|
||||
}
|
||||
break;
|
||||
case 0x0c:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "French (France)"; break;
|
||||
case 0x02: name = "French (Belgium)"; break;
|
||||
case 0x03: name = "French (Canada)"; break;
|
||||
case 0x04: name = "French (Switzerland)"; break;
|
||||
case 0x05: name = "French (Luxembourg)"; break;
|
||||
case 0x06: name = "French (Monaco)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x0d:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Hebrew (Israel)"; break;
|
||||
case 0x01: name = "Hebrew"; break;
|
||||
}
|
||||
break;
|
||||
case 0x0e:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Hungarian (Hungary)"; break;
|
||||
case 0x01: name = "Hungarian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x0f:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Icelandic (Iceland)"; break;
|
||||
case 0x01: name = "Icelandic"; break;
|
||||
}
|
||||
break;
|
||||
case 0x10:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Italian (Italy)"; break;
|
||||
case 0x02: name = "Italian (Switzerland)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x11:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Japanese (Japan)"; break;
|
||||
case 0x01: name = "Japanese"; break;
|
||||
}
|
||||
break;
|
||||
case 0x12:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Korean (Korea)"; break;
|
||||
case 0x01: name = "Korean"; break;
|
||||
}
|
||||
break;
|
||||
case 0x13:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Dutch (Netherlands)"; break;
|
||||
case 0x02: name = "Dutch (Belgium)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x14:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Norwegian (Bokmal)"; break;
|
||||
case 0x02: name = "Norwegian (Nynorsk)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x15:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Polish (Poland)"; break;
|
||||
case 0x01: name = "Polish"; break;
|
||||
}
|
||||
break;
|
||||
case 0x16:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Portuguese (Brazil)"; break;
|
||||
case 0x02: name = "Portuguese (Portugal)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x17:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Romansh (Switzerland)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x18:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Romanian (Romania)"; break;
|
||||
case 0x01: name = "Romanian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x19:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Russian (Russia)"; break;
|
||||
case 0x01: name = "Russian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x1a:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Croatian (Croatia)"; break;
|
||||
case 0x01: name = "Croatian"; break;
|
||||
case 0x02: name = "Serbian (Latin)"; break;
|
||||
case 0x03: name = "Serbian (Cyrillic)"; break;
|
||||
case 0x04: name = "Croatian (Bosnia and Herzegovina)"; break;
|
||||
case 0x05: name = "Bosnian (Latin, Bosnia and Herzegovina)"; break;
|
||||
case 0x06: name = "Serbian (Latin, Bosnia and Herzegovina)"; break;
|
||||
case 0x07: name = "Serbian (Cyrillic, Bosnia and Herzegovina)"; break;
|
||||
case 0x08: name = "Bosnian (Cyrillic, Bosnia and Herzegovina)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x1b:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Slovak (Slovakia)"; break;
|
||||
case 0x01: name = "Slovak"; break;
|
||||
}
|
||||
break;
|
||||
case 0x1c:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Albanian (Albania)"; break;
|
||||
case 0x01: name = "Albanian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x1d:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Swedish (Sweden)"; break;
|
||||
case 0x01: name = "Swedish"; break;
|
||||
case 0x02: name = "Swedish (Finland)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x1e:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Thai (Thailand)"; break;
|
||||
case 0x01: name = "Thai"; break;
|
||||
}
|
||||
break;
|
||||
case 0x1f:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Turkish (Turkey)"; break;
|
||||
case 0x01: name = "Turkish"; break;
|
||||
}
|
||||
break;
|
||||
case 0x20:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Urdu (Islamic Republic of Pakistan)"; break;
|
||||
case 0x01: name = "Urdu"; break;
|
||||
}
|
||||
break;
|
||||
case 0x21:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Indonesian (Indonesia)"; break;
|
||||
case 0x01: name = "Indonesian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x22:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Ukrainian (Ukraine)"; break;
|
||||
case 0x01: name = "Ukrainian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x23:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Belarusian (Belarus)"; break;
|
||||
case 0x01: name = "Belarusian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x24:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Slovenian (Slovenia)"; break;
|
||||
case 0x01: name = "Slovenian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x25:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Estonian (Estonia)"; break;
|
||||
case 0x01: name = "Estonian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x26:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Latvian (Latvia)"; break;
|
||||
case 0x01: name = "Latvian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x27:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Lithuanian (Lithuania)"; break;
|
||||
case 0x01: name = "Lithuanian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x28:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Tajik (Tajikistan)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x29:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Farsi (Iran)"; break;
|
||||
case 0x01: name = "Farsi"; break;
|
||||
}
|
||||
break;
|
||||
case 0x2a:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Vietnamese (Viet Nam)"; break;
|
||||
case 0x01: name = "Vietnamese"; break;
|
||||
}
|
||||
break;
|
||||
case 0x2b:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Armenian (Armenia)"; break;
|
||||
case 0x01: name = "Armenian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x2c:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Azeri (Latin) (Azerbaijan)"; break;
|
||||
case 0x01: name = "Azeri (Latin)"; break;
|
||||
case 0x02: name = "Azeri (Cyrillic)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x2d:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Basque (Spain)"; break;
|
||||
case 0x01: name = "Basque"; break;
|
||||
}
|
||||
break;
|
||||
case 0x2e:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Upper Sorbian (Germany)"; break;
|
||||
case 0x02: name = "Lower Sorbian (Germany)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x2f:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "FYRO Macedonian (Former Yugoslav Republic of Macedonia)"; break;
|
||||
case 0x01: name = "FYRO Macedonian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x32:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Tswana (South Africa)"; break;
|
||||
case 0x01: name = "Tswana"; break;
|
||||
}
|
||||
break;
|
||||
case 0x34:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Xhosa (South Africa)"; break;
|
||||
case 0x01: name = "Xhosa"; break;
|
||||
}
|
||||
break;
|
||||
case 0x35:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Zulu (South Africa)"; break;
|
||||
case 0x01: name = "Zulu"; break;
|
||||
}
|
||||
break;
|
||||
case 0x36:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Afrikaans (South Africa)"; break;
|
||||
case 0x01: name = "Afrikaans"; break;
|
||||
}
|
||||
break;
|
||||
case 0x37:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Georgian (Georgia)"; break;
|
||||
case 0x01: name = "Georgian"; break;
|
||||
}
|
||||
break;
|
||||
case 0x38:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Faroese (Faroe Islands)"; break;
|
||||
case 0x01: name = "Faroese"; break;
|
||||
}
|
||||
break;
|
||||
case 0x39:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Hindi (India)"; break;
|
||||
case 0x01: name = "Hindi"; break;
|
||||
}
|
||||
break;
|
||||
case 0x3a:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Maltese (Malta)"; break;
|
||||
case 0x01: name = "Maltese"; break;
|
||||
}
|
||||
break;
|
||||
case 0x3b:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Sami (Northern) (Norway)"; break;
|
||||
case 0x01: name = "Sami, Northern (Norway)"; break;
|
||||
case 0x02: name = "Sami, Northern (Sweden)"; break;
|
||||
case 0x03: name = "Sami, Northern (Finland)"; break;
|
||||
case 0x04: name = "Sami, Lule (Norway)"; break;
|
||||
case 0x05: name = "Sami, Lule (Sweden)"; break;
|
||||
case 0x06: name = "Sami, Southern (Norway)"; break;
|
||||
case 0x07: name = "Sami, Southern (Sweden)"; break;
|
||||
case 0x08: name = "Sami, Skolt (Finland)"; break;
|
||||
case 0x09: name = "Sami, Inari (Finland)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x3c:
|
||||
switch (secondary) {
|
||||
case 0x02: name = "Irish (Ireland)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x3e:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Malay (Malaysia)"; break;
|
||||
case 0x02: name = "Malay (Brunei Darussalam)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x3f:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Kazakh (Kazakhstan)"; break;
|
||||
case 0x01: name = "Kazakh"; break;
|
||||
}
|
||||
break;
|
||||
case 0x40:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Kyrgyz (Kyrgyzstan)"; break;
|
||||
case 0x01: name = "Kyrgyz (Cyrillic)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x41:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Swahili (Kenya)"; break;
|
||||
case 0x01: name = "Swahili"; break;
|
||||
}
|
||||
break;
|
||||
case 0x42:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Turkmen (Turkmenistan)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x43:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Uzbek (Latin) (Uzbekistan)"; break;
|
||||
case 0x01: name = "Uzbek (Latin)"; break;
|
||||
case 0x02: name = "Uzbek (Cyrillic)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x44:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Tatar (Russia)"; break;
|
||||
case 0x01: name = "Tatar"; break;
|
||||
}
|
||||
break;
|
||||
case 0x45:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Bengali (India)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x46:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Punjabi (India)"; break;
|
||||
case 0x01: name = "Punjabi"; break;
|
||||
}
|
||||
break;
|
||||
case 0x47:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Gujarati (India)"; break;
|
||||
case 0x01: name = "Gujarati"; break;
|
||||
}
|
||||
break;
|
||||
case 0x49:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Tamil (India)"; break;
|
||||
case 0x01: name = "Tamil"; break;
|
||||
}
|
||||
break;
|
||||
case 0x4a:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Telugu (India)"; break;
|
||||
case 0x01: name = "Telugu"; break;
|
||||
}
|
||||
break;
|
||||
case 0x4b:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Kannada (India)"; break;
|
||||
case 0x01: name = "Kannada"; break;
|
||||
}
|
||||
break;
|
||||
case 0x4c:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Malayalam (India)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x4d:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Assamese (India)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x4e:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Marathi (India)"; break;
|
||||
case 0x01: name = "Marathi"; break;
|
||||
}
|
||||
break;
|
||||
case 0x4f:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Sanskrit (India)"; break;
|
||||
case 0x01: name = "Sanskrit"; break;
|
||||
}
|
||||
break;
|
||||
case 0x50:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Mongolian (Mongolia)"; break;
|
||||
case 0x01: name = "Mongolian (Cyrillic)"; break;
|
||||
case 0x02: name = "Mongolian (PRC)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x51:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Tibetan (PRC)"; break;
|
||||
case 0x02: name = "Tibetan (Bhutan)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x52:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Welsh (United Kingdom)"; break;
|
||||
case 0x01: name = "Welsh"; break;
|
||||
}
|
||||
break;
|
||||
case 0x53:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Khmer (Cambodia)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x54:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Lao (Lao PDR)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x56:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Galician (Spain)"; break;
|
||||
case 0x01: name = "Galician"; break;
|
||||
}
|
||||
break;
|
||||
case 0x57:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Konkani (India)"; break;
|
||||
case 0x01: name = "Konkani"; break;
|
||||
}
|
||||
break;
|
||||
case 0x5a:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Syriac (Syria)"; break;
|
||||
case 0x01: name = "Syriac"; break;
|
||||
}
|
||||
break;
|
||||
case 0x5b:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Sinhala (Sri Lanka)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x5d:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Inuktitut (Syllabics, Canada)"; break;
|
||||
case 0x02: name = "Inuktitut (Latin, Canada)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x5e:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Amharic (Ethiopia)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x5f:
|
||||
switch (secondary) {
|
||||
case 0x02: name = "Tamazight (Algeria, Latin)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x61:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Nepali (Nepal)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x62:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Frisian (Netherlands)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x63:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Pashto (Afghanistan)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x64:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Filipino (Philippines)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x65:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Divehi (Maldives)"; break;
|
||||
case 0x01: name = "Divehi"; break;
|
||||
}
|
||||
break;
|
||||
case 0x68:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Hausa (Nigeria, Latin)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x6a:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Yoruba (Nigeria)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x6b:
|
||||
switch (secondary) {
|
||||
case 0x00:
|
||||
case 0x01: name = "Quechua (Bolivia)"; break;
|
||||
case 0x02: name = "Quechua (Ecuador)"; break;
|
||||
case 0x03: name = "Quechua (Peru)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x6c:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Northern Sotho (South Africa)"; break;
|
||||
case 0x01: name = "Northern Sotho"; break;
|
||||
}
|
||||
break;
|
||||
case 0x6d:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Bashkir (Russia)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x6e:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Luxembourgish (Luxembourg)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x6f:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Greenlandic (Greenland)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x78:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Yi (PRC)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x7a:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Mapudungun (Chile)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x7c:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Mohawk (Mohawk)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x7e:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Breton (France)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x7f:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Invariant Language (Invariant Country)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x80:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Uighur (PRC)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x81:
|
||||
switch (secondary) {
|
||||
case 0x00: name = "Maori (New Zealand)"; break;
|
||||
case 0x01: name = "Maori"; break;
|
||||
}
|
||||
break;
|
||||
case 0x83:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Corsican (France)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x84:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Alsatian (France)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x85:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Yakut (Russia)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x86:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "K'iche (Guatemala)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x87:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Kinyarwanda (Rwanda)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x88:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Wolof (Senegal)"; break;
|
||||
}
|
||||
break;
|
||||
case 0x8c:
|
||||
switch (secondary) {
|
||||
case 0x01: name = "Dari (Afghanistan)"; break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
name = "Language Neutral";
|
||||
|
||||
}
|
||||
|
||||
if (!name)
|
||||
name = "Language Neutral";
|
||||
|
||||
return copy_lang (lang_out, lang_len, name);
|
||||
}
|
||||
|
||||
#endif /* ENABLE_NETCORE && DISABLE_PROCESSES */
|
||||
|
||||
MONO_EMPTY_SOURCE_FILE (culture_w32_process_unix_language);
|
||||
@@ -159,7 +159,6 @@
|
||||
#define g_ptr_array_sized_new monoeg_g_ptr_array_sized_new
|
||||
#define g_ptr_array_sort monoeg_g_ptr_array_sort
|
||||
#define g_ptr_array_sort_with_data monoeg_g_ptr_array_sort_with_data
|
||||
#define g_ptr_array_find monoeg_g_ptr_array_find
|
||||
#define g_qsort_with_data monoeg_g_qsort_with_data
|
||||
#define g_queue_free monoeg_g_queue_free
|
||||
#define g_queue_is_empty monoeg_g_queue_is_empty
|
||||
@@ -312,6 +311,3 @@
|
||||
#define g_set_printerr_handler monoeg_set_printerr_handler
|
||||
|
||||
#define g_size_to_int monoeg_size_to_int
|
||||
#define g_ascii_charcmp monoeg_ascii_charcmp
|
||||
#define g_ascii_charcasecmp monoeg_ascii_charcasecmp
|
||||
#define g_warning_d monoeg_warning_d
|
||||
@@ -179,7 +179,7 @@ g_get_current_dir (void)
|
||||
} while (fail);
|
||||
|
||||
/* On amd64 sometimes the bottom 32-bits of r == the bottom 32-bits of buffer
|
||||
* but the top 32-bits of r have overflown to 0xffffffff (seriously, getcwd
|
||||
* but the top 32-bits of r have overflown to 0xffffffff (seriously wtf getcwd
|
||||
* so we return the buffer here since it has a pointer to the valid string
|
||||
*/
|
||||
return buffer;
|
||||
|
||||
@@ -726,7 +726,6 @@ void g_ptr_array_set_size (GPtrArray *array, gint length);
|
||||
gpointer *g_ptr_array_free (GPtrArray *array, gboolean free_seg);
|
||||
void g_ptr_array_foreach (GPtrArray *array, GFunc func, gpointer user_data);
|
||||
guint g_ptr_array_capacity (GPtrArray *array);
|
||||
gboolean g_ptr_array_find (GPtrArray *array, gconstpointer needle, guint *index);
|
||||
#define g_ptr_array_index(array,index) (array)->pdata[(index)]
|
||||
//FIXME previous missing parens
|
||||
|
||||
@@ -780,7 +779,6 @@ GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags f
|
||||
void g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, ...);
|
||||
void g_log_disabled (const gchar *log_domain, GLogLevelFlags log_level, const char *file, int line);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_assertion_message (const gchar *format, ...) G_GNUC_NORETURN;
|
||||
void mono_assertion_message_disabled (const char *file, int line) G_GNUC_NORETURN;
|
||||
@@ -788,7 +786,6 @@ void mono_assertion_message (const char *file, int line, const char *
|
||||
void mono_assertion_message_unreachable (const char *file, int line) G_GNUC_NORETURN;
|
||||
const char * g_get_assertion_message (void);
|
||||
|
||||
#ifndef DISABLE_ASSERT_MESSAGES
|
||||
#ifdef HAVE_C99_SUPPORT
|
||||
/* The for (;;) tells gc thats g_error () doesn't return, avoiding warnings */
|
||||
#define g_error(format, ...) do { g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, __VA_ARGS__); for (;;); } while (0)
|
||||
@@ -803,13 +800,6 @@ const char * g_get_assertion_message (void);
|
||||
#define g_message(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, __VA_ARGS__)
|
||||
#define g_debug(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, __VA_ARGS__)
|
||||
#endif /* ndef HAVE_C99_SUPPORT */
|
||||
#else
|
||||
#define g_error(...) do { g_log_disabled (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, __FILE__, __LINE__); for (;;); } while (0)
|
||||
#define g_critical(...) g_log_disabled (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, __FILE__, __LINE__)
|
||||
#define g_warning(...) g_log_disabled (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, __FILE__, __LINE__)
|
||||
#define g_message(...) g_log_disabled (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, __FILE__, __LINE__)
|
||||
#define g_debug(...) g_log_disabled (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, __FILE__, __LINE__)
|
||||
#endif
|
||||
|
||||
typedef void (*GLogFunc) (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
|
||||
typedef void (*GPrintFunc) (const gchar *string);
|
||||
|
||||
@@ -183,12 +183,6 @@ g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, .
|
||||
va_end (args);
|
||||
}
|
||||
|
||||
void
|
||||
g_log_disabled (const gchar *log_domain, GLogLevelFlags log_level, const char *file, int line)
|
||||
{
|
||||
g_log (log_domain, log_level, "%s:%d <disabled>", file, line);
|
||||
}
|
||||
|
||||
static char *failure_assertion = NULL;
|
||||
|
||||
const char *
|
||||
|
||||
@@ -229,18 +229,3 @@ g_ptr_array_capacity (GPtrArray *array)
|
||||
{
|
||||
return ((GPtrArrayPriv *)array)->size;
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_ptr_array_find (GPtrArray *array, gconstpointer needle, guint *index)
|
||||
{
|
||||
g_assert (array);
|
||||
for (int i = 0; i < array->len; i++) {
|
||||
if (array->pdata [i] == needle) {
|
||||
if (index)
|
||||
*index = i;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
# empty placeholder for build
|
||||
dist:
|
||||
|
||||
distdir:
|
||||
|
||||
distclean:
|
||||
+12
-55
@@ -91,10 +91,6 @@ if !ENABLE_ILGEN
|
||||
ilgen_libraries = libmono-ilgen.la
|
||||
endif
|
||||
|
||||
if ENABLE_PERFTRACING
|
||||
eventpipe_libs = $(top_builddir)/mono/eventpipe/libeventpipe.la
|
||||
endif
|
||||
|
||||
BUNDLE_ZLIB_PATH=$(top_builddir)/mono/zlib/libz.la
|
||||
|
||||
if HAVE_STATIC_ZLIB
|
||||
@@ -107,7 +103,7 @@ Z_LIBS=$(BUNDLE_ZLIB_PATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = libmonoruntime-config.la $(support_libraries) $(boehm_libraries) $(sgen_libraries) $(shim_libraries)
|
||||
noinst_LTLIBRARIES = libmonoruntime-config.la $(support_libraries) $(boehm_libraries) $(sgen_libraries)
|
||||
|
||||
lib_LTLIBRARIES = $(icall_table_libraries) $(ilgen_libraries)
|
||||
|
||||
@@ -140,42 +136,6 @@ libmonoruntime_support_la_SOURCES = support.c
|
||||
libmonoruntime_support_la_LDFLAGS = $(Z_LIBS)
|
||||
libmonoruntime_support_la_CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@) @ZLIB_CFLAGS@
|
||||
|
||||
if ENABLE_NETCORE
|
||||
if HAVE_SYS_ICU
|
||||
|
||||
# symlink ICU sources to a local dir so automake puts intermediates into the target-specific folder
|
||||
icushim/%.c: @ICU_SHIM_PATH@/%.c
|
||||
$(LN_S) $^ $@
|
||||
|
||||
shim_libraries = libmonoruntime-shimglobalization.la
|
||||
|
||||
nodist_libmonoruntime_shimglobalization_la_SOURCES = \
|
||||
icushim/pal_calendarData.c \
|
||||
icushim/pal_casing.c \
|
||||
icushim/pal_collation.c \
|
||||
icushim/pal_idna.c \
|
||||
icushim/pal_locale.c \
|
||||
icushim/pal_localeNumberData.c \
|
||||
icushim/pal_localeStringData.c \
|
||||
icushim/pal_normalization.c \
|
||||
icushim/pal_timeZoneInfo.c \
|
||||
icushim/entrypoints.c
|
||||
|
||||
libmonoruntime_shimglobalization_la_CFLAGS = @ICU_CFLAGS@ -I$(top_srcdir)/../libraries/Native/Unix/System.Globalization.Native/ -I$(top_srcdir)/../libraries/Native/Unix/Common/
|
||||
|
||||
if STATIC_ICU
|
||||
nodist_libmonoruntime_shimglobalization_la_SOURCES += icushim/pal_icushim_static.c
|
||||
else
|
||||
nodist_libmonoruntime_shimglobalization_la_SOURCES += icushim/pal_icushim.c
|
||||
endif # STATIC_ICU
|
||||
|
||||
endif # HAVE_SYS_ICU
|
||||
endif # ENABLE_NETCORE
|
||||
|
||||
if !ENABLE_NETCORE
|
||||
culture_libraries = ../culture/libmono-culture.la
|
||||
endif
|
||||
|
||||
#
|
||||
# This library contains the icall tables if the runtime was configured with --disable-icall-tables
|
||||
#
|
||||
@@ -189,7 +149,7 @@ if BITCODE
|
||||
if WASM
|
||||
libmono_icall_table_la_LIBADD = # empty to avoid duplicate symbols when enabling dynamic linking
|
||||
else
|
||||
libmono_icall_table_la_LIBADD = $(glib_libs) ../utils/libmonoutils.la ../sgen/libmonosgen.la $(eventpipe_libs) libmonoruntimesgen.la
|
||||
libmono_icall_table_la_LIBADD = $(glib_libs) ../utils/libmonoutils.la ../sgen/libmonosgen.la libmonoruntimesgen.la
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -213,7 +173,7 @@ if BITCODE
|
||||
if WASM
|
||||
libmono_ilgen_la_LIBADD = # empty to avoid duplicate symbols when enabling dynamic linking
|
||||
else
|
||||
libmono_ilgen_la_LIBADD = $(glib_libs) ../utils/libmonoutils.la ../sgen/libmonosgen.la $(eventpipe_libs) libmonoruntimesgen.la
|
||||
libmono_ilgen_la_LIBADD = $(glib_libs) ../utils/libmonoutils.la ../sgen/libmonosgen.la libmonoruntimesgen.la
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -260,11 +220,9 @@ common_sources = \
|
||||
class-getters.h \
|
||||
class-init.h \
|
||||
class-init.c \
|
||||
class-init-internals.h \
|
||||
class-internals.h \
|
||||
class-inlines.h \
|
||||
class-private-definition.h \
|
||||
class-setup-vtable.c \
|
||||
class-accessors.c \
|
||||
cominterop.c \
|
||||
cominterop.h \
|
||||
@@ -272,6 +230,8 @@ common_sources = \
|
||||
coree.c \
|
||||
coree.h \
|
||||
coree-internals.h \
|
||||
culture-info.h \
|
||||
culture-info-tables.h \
|
||||
debug-helpers.c \
|
||||
debug-mono-symfile.h \
|
||||
debug-mono-symfile.c \
|
||||
@@ -280,7 +240,6 @@ common_sources = \
|
||||
domain-internals.h \
|
||||
environment.c \
|
||||
environment.h \
|
||||
icall-eventpipe.c \
|
||||
exception.c \
|
||||
exception.h \
|
||||
exception-internals.h \
|
||||
@@ -308,6 +267,7 @@ common_sources = \
|
||||
loaded-images.c \
|
||||
loaded-images-global.c \
|
||||
loaded-images-netcore.c \
|
||||
locales.c \
|
||||
locales.h \
|
||||
lock-tracer.c \
|
||||
lock-tracer.h \
|
||||
@@ -427,10 +387,7 @@ common_sources = \
|
||||
callspec.h \
|
||||
callspec.c \
|
||||
abi.c \
|
||||
native-library.c \
|
||||
native-library.h \
|
||||
native-library-qcall.c \
|
||||
qcall-def.h
|
||||
native-library.c
|
||||
|
||||
# These source files have compile time dependencies on GC code
|
||||
gc_dependent_sources = \
|
||||
@@ -466,13 +423,13 @@ if !ENABLE_MSVC_ONLY
|
||||
|
||||
libmonoruntime_la_SOURCES = $(common_sources) $(icall_tables_sources) $(ilgen_sources) $(gc_dependent_sources) $(null_gc_sources) $(boehm_sources)
|
||||
# Add CXX_ADD_CFLAGS per-library until/unless https://github.com/dotnet/corefx/pull/31342.
|
||||
libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES) $(GLOBALIZATION_SHIM_DEFINES) @CXX_ADD_CFLAGS@
|
||||
libmonoruntime_la_LIBADD = libmonoruntime-config.la $(culture_libraries) $(support_libraries) $(shim_libraries)
|
||||
libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES) @CXX_ADD_CFLAGS@
|
||||
libmonoruntime_la_LIBADD = libmonoruntime-config.la $(support_libraries)
|
||||
|
||||
libmonoruntimesgen_la_SOURCES = $(common_sources) $(icall_tables_sources) $(ilgen_sources) $(gc_dependent_sources) $(sgen_sources)
|
||||
# Add CXX_ADD_CFLAGS per-library until/unless https://github.com/dotnet/corefx/pull/31342.
|
||||
libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES) $(GLOBALIZATION_SHIM_DEFINES) @CXX_ADD_CFLAGS@
|
||||
libmonoruntimesgen_la_LIBADD = libmonoruntime-config.la $(culture_libraries) $(support_libraries) $(shim_libraries)
|
||||
libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES) @CXX_ADD_CFLAGS@
|
||||
libmonoruntimesgen_la_LIBADD = libmonoruntime-config.la $(support_libraries)
|
||||
|
||||
endif # !ENABLE_MSVC_ONLY
|
||||
|
||||
@@ -509,7 +466,7 @@ libmonoruntimeinclude_HEADERS = \
|
||||
sgen-bridge.h \
|
||||
threads.h \
|
||||
tokentype.h \
|
||||
verify.h
|
||||
verify.h
|
||||
|
||||
if !ENABLE_MSVC_ONLY
|
||||
|
||||
|
||||
@@ -1609,8 +1609,7 @@ mono_domain_fire_assembly_load_event (MonoDomain *domain, MonoAssembly *assembly
|
||||
MONO_STATIC_POINTER_INIT_END (MonoMethod, method)
|
||||
goto_if_nok (error, exit);
|
||||
|
||||
MonoReflectionAssemblyHandle assembly_handle;
|
||||
assembly_handle = mono_assembly_get_object_handle (domain, assembly, error);
|
||||
MonoReflectionAssemblyHandle assembly_handle = mono_assembly_get_object_handle (domain, assembly, error);
|
||||
goto_if_nok (error, exit);
|
||||
|
||||
gpointer args [1];
|
||||
@@ -1678,8 +1677,7 @@ mono_domain_fire_assembly_load (MonoAssemblyLoadContext *alc, MonoAssembly *asse
|
||||
#endif
|
||||
mono_domain_assemblies_unlock (domain);
|
||||
|
||||
if (assembly->context.kind != MONO_ASMCTX_INTERNAL)
|
||||
mono_domain_fire_assembly_load_event (domain, assembly, error_out);
|
||||
mono_domain_fire_assembly_load_event (domain, assembly, error_out);
|
||||
|
||||
leave:
|
||||
mono_error_cleanup (error);
|
||||
@@ -2147,7 +2145,7 @@ mono_is_shadow_copy_enabled (MonoDomain *domain, const gchar *dir_name)
|
||||
if (!is_ok (error))
|
||||
goto exit;
|
||||
|
||||
found = strstr (dir_name, base_dir) != 0;
|
||||
found = !!strstr (dir_name, base_dir);
|
||||
if (found)
|
||||
goto exit;
|
||||
|
||||
@@ -2480,7 +2478,7 @@ mono_domain_assembly_preload (MonoAssemblyLoadContext *alc,
|
||||
|
||||
char *base_dir = get_app_context_base_directory (error);
|
||||
search_path [0] = base_dir;
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Domain (%p) ApplicationBase is %s", domain, base_dir);
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Domain %s (%p) ApplicationBase is %s", domain->friendly_name, domain, base_dir);
|
||||
|
||||
result = real_load (search_path, aname->culture, aname->name, &req);
|
||||
|
||||
@@ -2605,10 +2603,8 @@ ves_icall_System_Reflection_Assembly_InternalLoad (MonoStringHandle name_handle,
|
||||
if (!parsed)
|
||||
goto fail;
|
||||
|
||||
MonoAssemblyCandidatePredicate predicate;
|
||||
void* predicate_ud;
|
||||
predicate = NULL;
|
||||
predicate_ud = NULL;
|
||||
MonoAssemblyCandidatePredicate predicate = NULL;
|
||||
void* predicate_ud = NULL;
|
||||
if (mono_loader_get_strict_assembly_name_check ()) {
|
||||
predicate = &mono_assembly_candidate_predicate_sn_same_name;
|
||||
predicate_ud = &aname;
|
||||
@@ -2821,7 +2817,7 @@ mono_alc_load_raw_bytes (MonoAssemblyLoadContext *alc, guint8 *assembly_data, gu
|
||||
{
|
||||
MonoAssembly *ass = NULL;
|
||||
MonoImageOpenStatus status;
|
||||
MonoImage *image = mono_image_open_from_data_internal (alc, (char*)assembly_data, raw_assembly_len, FALSE, NULL, refonly, FALSE, NULL, NULL);
|
||||
MonoImage *image = mono_image_open_from_data_internal (alc, (char*)assembly_data, raw_assembly_len, FALSE, NULL, refonly, FALSE, NULL);
|
||||
|
||||
if (!image) {
|
||||
mono_error_set_bad_image_by_name (error, "In memory assembly", "0x%p", assembly_data);
|
||||
|
||||
@@ -106,9 +106,6 @@ mono_domain_foreach (MonoDomainFunc func, void* user_data);
|
||||
MONO_API MONO_RT_EXTERNAL_ONLY MonoAssembly *
|
||||
mono_domain_assembly_open (MonoDomain *domain, const char *name);
|
||||
|
||||
MONO_API void
|
||||
mono_domain_ensure_entry_assembly (MonoDomain *domain, MonoAssembly *assembly);
|
||||
|
||||
MONO_API mono_bool
|
||||
mono_domain_finalize (MonoDomain *domain, uint32_t timeout);
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
#else
|
||||
#define MONO_ASSEMBLY_CORLIB_NAME "System.Private.CoreLib"
|
||||
#endif
|
||||
#define MONO_ASSEMBLY_CORLIB_RESOURCE_NAME (MONO_ASSEMBLY_CORLIB_NAME ".resources")
|
||||
|
||||
/* Flag bits for mono_assembly_names_equal_flags (). */
|
||||
typedef enum {
|
||||
|
||||
@@ -9,13 +9,12 @@
|
||||
#include "mono/metadata/icall-decl.h"
|
||||
#include "mono/metadata/loader-internals.h"
|
||||
#include "mono/metadata/loaded-images-internals.h"
|
||||
#include "mono/metadata/mono-private-unstable.h"
|
||||
#include "mono/utils/mono-error-internals.h"
|
||||
#include "mono/utils/mono-logger-internals.h"
|
||||
|
||||
GENERATE_GET_CLASS_WITH_CACHE (assembly_load_context, "System.Runtime.Loader", "AssemblyLoadContext");
|
||||
|
||||
static void
|
||||
void
|
||||
mono_alc_init (MonoAssemblyLoadContext *alc, MonoDomain *domain, gboolean collectible)
|
||||
{
|
||||
MonoLoadedImages *li = g_new0 (MonoLoadedImages, 1);
|
||||
@@ -30,63 +29,36 @@ mono_alc_init (MonoAssemblyLoadContext *alc, MonoDomain *domain, gboolean collec
|
||||
mono_coop_mutex_init (&alc->pinvoke_lock);
|
||||
}
|
||||
|
||||
static MonoAssemblyLoadContext *
|
||||
mono_alc_create (MonoDomain *domain, gboolean is_default, gboolean collectible)
|
||||
{
|
||||
MonoAssemblyLoadContext *alc = NULL;
|
||||
|
||||
mono_domain_alcs_lock (domain);
|
||||
if (is_default && domain->default_alc)
|
||||
goto leave;
|
||||
|
||||
alc = g_new0 (MonoAssemblyLoadContext, 1);
|
||||
mono_alc_init (alc, domain, collectible);
|
||||
|
||||
domain->alcs = g_slist_prepend (domain->alcs, alc);
|
||||
if (is_default)
|
||||
domain->default_alc = alc;
|
||||
|
||||
leave:
|
||||
mono_domain_alcs_unlock (domain);
|
||||
return alc;
|
||||
}
|
||||
|
||||
void
|
||||
mono_alc_create_default (MonoDomain *domain)
|
||||
mono_alc_cleanup (MonoAssemblyLoadContext *alc)
|
||||
{
|
||||
if (domain->default_alc)
|
||||
return;
|
||||
mono_alc_create (domain, TRUE, FALSE);
|
||||
}
|
||||
|
||||
MonoAssemblyLoadContext *
|
||||
mono_alc_create_individual (MonoDomain *domain, MonoGCHandle this_gchandle, gboolean collectible, MonoError *error)
|
||||
{
|
||||
MonoAssemblyLoadContext *alc = mono_alc_create (domain, FALSE, collectible);
|
||||
|
||||
alc->gchandle = this_gchandle;
|
||||
|
||||
return alc;
|
||||
}
|
||||
|
||||
static void
|
||||
mono_alc_cleanup_assemblies (MonoAssemblyLoadContext *alc)
|
||||
{
|
||||
// The minimum refcount on assemblies is 2: one for the domain and one for the ALC.
|
||||
// The domain refcount might be less than optimal on netcore, but its removal is too likely to cause issues for now.
|
||||
/*
|
||||
* This is still very much WIP. It needs to be split up into various other functions and adjusted to work with the
|
||||
* managed LoaderAllocator design. For now, I've put it all in this function, but don't look at it too closely.
|
||||
*
|
||||
* Of particular note: the minimum refcount on assemblies is 2: one for the domain and one for the ALC.
|
||||
* The domain refcount might be less than optimal on netcore, but its removal is too likely to cause issues for now.
|
||||
*/
|
||||
GSList *tmp;
|
||||
MonoDomain *domain = alc->domain;
|
||||
|
||||
g_assert (alc != mono_domain_default_alc (domain));
|
||||
g_assert (alc->collectible == TRUE);
|
||||
|
||||
// FIXME: alc unloading profiler event
|
||||
|
||||
// Remove the assemblies from domain_assemblies
|
||||
mono_domain_assemblies_lock (domain);
|
||||
for (tmp = alc->loaded_assemblies; tmp; tmp = tmp->next) {
|
||||
MonoAssembly *assembly = (MonoAssembly *)tmp->data;
|
||||
domain->domain_assemblies = g_slist_remove (domain->domain_assemblies, assembly);
|
||||
mono_assembly_decref (assembly);
|
||||
g_slist_remove (domain->domain_assemblies, assembly);
|
||||
mono_atomic_dec_i32 (&assembly->ref_count);
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Unloading ALC [%p], removing assembly %s[%p] from domain_assemblies, ref_count=%d\n", alc, assembly->aname.name, assembly, assembly->ref_count);
|
||||
}
|
||||
mono_domain_assemblies_unlock (domain);
|
||||
|
||||
// Some equivalent to mono_gc_clear_domain? I guess in our case we just have to assert that we have no lingering references?
|
||||
|
||||
// Release the GC roots
|
||||
for (tmp = alc->loaded_assemblies; tmp; tmp = tmp->next) {
|
||||
MonoAssembly *assembly = (MonoAssembly *)tmp->data;
|
||||
@@ -126,46 +98,15 @@ mono_alc_cleanup_assemblies (MonoAssemblyLoadContext *alc)
|
||||
g_slist_free (alc->loaded_assemblies);
|
||||
alc->loaded_assemblies = NULL;
|
||||
|
||||
mono_coop_mutex_destroy (&alc->assemblies_lock);
|
||||
|
||||
mono_loaded_images_free (alc->loaded_images);
|
||||
alc->loaded_images = NULL;
|
||||
|
||||
// TODO: free mempool stuff/jit info tables, see domain freeing for an example
|
||||
}
|
||||
|
||||
static void
|
||||
mono_alc_cleanup (MonoAssemblyLoadContext *alc)
|
||||
{
|
||||
MonoDomain *domain = alc->domain;
|
||||
|
||||
g_assert (alc != mono_domain_default_alc (domain));
|
||||
g_assert (alc->collectible == TRUE);
|
||||
|
||||
// TODO: alc unloading profiler event
|
||||
|
||||
// Remove from domain list
|
||||
mono_domain_alcs_lock (domain);
|
||||
domain->alcs = g_slist_remove (domain->alcs, alc);
|
||||
mono_domain_alcs_unlock (domain);
|
||||
|
||||
mono_alc_cleanup_assemblies (alc);
|
||||
|
||||
mono_gchandle_free_internal (alc->gchandle);
|
||||
alc->gchandle = NULL;
|
||||
// FIXME: alc unloaded profiler event
|
||||
|
||||
g_hash_table_destroy (alc->pinvoke_scopes);
|
||||
alc->pinvoke_scopes = NULL;
|
||||
mono_coop_mutex_destroy (&alc->assemblies_lock);
|
||||
mono_coop_mutex_destroy (&alc->pinvoke_lock);
|
||||
|
||||
// TODO: alc unloaded profiler event
|
||||
}
|
||||
mono_loaded_images_free (alc->loaded_images);
|
||||
|
||||
static void
|
||||
mono_alc_free (MonoAssemblyLoadContext *alc)
|
||||
{
|
||||
mono_alc_cleanup (alc);
|
||||
g_free (alc);
|
||||
// TODO: free mempool stuff/jit info tables, see domain freeing for an example
|
||||
}
|
||||
|
||||
void
|
||||
@@ -194,9 +135,10 @@ ves_icall_System_Runtime_Loader_AssemblyLoadContext_InternalInitializeNativeALC
|
||||
g_assert (alc);
|
||||
if (!alc->gchandle)
|
||||
alc->gchandle = this_gchandle;
|
||||
} else
|
||||
alc = mono_alc_create_individual (domain, this_gchandle, collectible, error);
|
||||
|
||||
} else {
|
||||
/* create it */
|
||||
alc = mono_domain_create_individual_alc (domain, this_gchandle, collectible, error);
|
||||
}
|
||||
return alc;
|
||||
}
|
||||
|
||||
@@ -206,13 +148,10 @@ ves_icall_System_Runtime_Loader_AssemblyLoadContext_PrepareForAssemblyLoadContex
|
||||
MonoGCHandle strong_gchandle = (MonoGCHandle)strong_gchandle_ptr;
|
||||
MonoAssemblyLoadContext *alc = (MonoAssemblyLoadContext *)alc_pointer;
|
||||
|
||||
g_assert (alc->collectible);
|
||||
g_assert (!alc->unloading);
|
||||
g_assert (alc->gchandle);
|
||||
|
||||
g_assert (alc->collectible == TRUE);
|
||||
g_assert (alc->unloading == FALSE);
|
||||
alc->unloading = TRUE;
|
||||
|
||||
// Replace the weak gchandle with the new strong one to keep the managed ALC alive
|
||||
MonoGCHandle weak_gchandle = alc->gchandle;
|
||||
alc->gchandle = strong_gchandle;
|
||||
mono_gchandle_free_internal (weak_gchandle);
|
||||
@@ -233,22 +172,6 @@ mono_alc_is_default (MonoAssemblyLoadContext *alc)
|
||||
return alc == mono_alc_domain (alc)->default_alc;
|
||||
}
|
||||
|
||||
MonoAssemblyLoadContext *
|
||||
mono_alc_from_gchandle (MonoGCHandle alc_gchandle)
|
||||
{
|
||||
HANDLE_FUNCTION_ENTER ();
|
||||
MonoManagedAssemblyLoadContextHandle managed_alc = MONO_HANDLE_CAST (MonoManagedAssemblyLoadContext, mono_gchandle_get_target_handle (alc_gchandle));
|
||||
MonoAssemblyLoadContext *alc = MONO_HANDLE_GETVAL (managed_alc, native_assembly_load_context);
|
||||
HANDLE_FUNCTION_RETURN_VAL (alc);
|
||||
}
|
||||
|
||||
MonoGCHandle
|
||||
mono_alc_get_default_gchandle (void)
|
||||
{
|
||||
// Because the default domain is never unloadable, this should be a strong handle and never change
|
||||
return mono_domain_default_alc (mono_domain_get ())->gchandle;
|
||||
}
|
||||
|
||||
static MonoAssembly*
|
||||
invoke_resolve_method (MonoMethod *resolve_method, MonoAssemblyLoadContext *alc, MonoAssemblyName *aname, MonoError *error)
|
||||
{
|
||||
|
||||
+39
-148
@@ -45,7 +45,6 @@
|
||||
#include <mono/utils/mono-io-portability.h>
|
||||
#include <mono/utils/atomic.h>
|
||||
#include <mono/utils/mono-os-mutex.h>
|
||||
#include <mono/metadata/mono-private-unstable.h>
|
||||
|
||||
#ifndef HOST_WIN32
|
||||
#include <sys/types.h>
|
||||
@@ -1308,16 +1307,10 @@ assemblyref_public_tok_checked (MonoImage *image, guint32 key_index, guint32 fla
|
||||
* The reference count is reduced every time the method mono_assembly_close() is
|
||||
* invoked.
|
||||
*/
|
||||
gint32
|
||||
void
|
||||
mono_assembly_addref (MonoAssembly *assembly)
|
||||
{
|
||||
return mono_atomic_inc_i32 (&assembly->ref_count);
|
||||
}
|
||||
|
||||
gint32
|
||||
mono_assembly_decref (MonoAssembly *assembly)
|
||||
{
|
||||
return mono_atomic_dec_i32 (&assembly->ref_count);
|
||||
mono_atomic_inc_i32 (&assembly->ref_count);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1648,27 +1641,6 @@ load_reference_by_aname_individual_asmctx (MonoAssemblyName *aname, MonoAssembly
|
||||
return reference;
|
||||
}
|
||||
#else
|
||||
static MonoAssembly *
|
||||
search_bundle_for_assembly (MonoAssemblyLoadContext *alc, MonoAssemblyName *aname)
|
||||
{
|
||||
if (bundles == NULL)
|
||||
return NULL;
|
||||
|
||||
MonoImageOpenStatus status;
|
||||
MonoImage *image;
|
||||
MonoAssemblyLoadRequest req;
|
||||
image = mono_assembly_open_from_bundle (alc, aname->name, &status, FALSE);
|
||||
if (!image) {
|
||||
char *name = g_strdup_printf ("%s.dll", aname->name);
|
||||
image = mono_assembly_open_from_bundle (alc, name, &status, FALSE);
|
||||
}
|
||||
if (image) {
|
||||
mono_assembly_request_prepare_load (&req, MONO_ASMCTX_DEFAULT, alc);
|
||||
return mono_assembly_request_load_from (image, aname->name, &req, &status);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static MonoAssembly*
|
||||
netcore_load_reference (MonoAssemblyName *aname, MonoAssemblyLoadContext *alc, MonoAssembly *requesting, gboolean postload)
|
||||
{
|
||||
@@ -1690,85 +1662,60 @@ netcore_load_reference (MonoAssemblyName *aname, MonoAssemblyLoadContext *alc, M
|
||||
* Try these until one of them succeeds (by returning a non-NULL reference):
|
||||
* 1. Check if it's already loaded by the ALC.
|
||||
*
|
||||
* 2. If we have a bundle registered, search the images for a matching name.
|
||||
* 2. If it's a non-default ALC, call the Load() method.
|
||||
*
|
||||
* 3. If it's a non-default ALC, call the Load() method.
|
||||
*
|
||||
* 4. If the ALC is not the default and this is not a satellite request,
|
||||
* 3. If the ALC is not the default and this is not a satellite request,
|
||||
* check if it's already loaded by the default ALC.
|
||||
*
|
||||
* 5. If the ALC is the default or this is not a satellite request,
|
||||
* 4. If the ALC is the default or this is not a satellite request,
|
||||
* check the TPA list, APP_PATHS, and ApplicationBase.
|
||||
*
|
||||
* 6. If this is a satellite request, call the ALC ResolveSatelliteAssembly method.
|
||||
* 5. If this is a satellite request, call the ALC ResolveSatelliteAssembly method.
|
||||
*
|
||||
* 7. Call the ALC Resolving event.
|
||||
* 6. Call the ALC Resolving event.
|
||||
*
|
||||
* 8. Call the ALC AssemblyResolve event (except for corlib satellite assemblies).
|
||||
* 7. Call the ALC AssemblyResolve event (except for corlib satellite assemblies).
|
||||
*
|
||||
* 9. Return NULL.
|
||||
* 8. Return NULL.
|
||||
*/
|
||||
|
||||
reference = mono_assembly_loaded_internal (alc, aname, FALSE);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly already loaded in the active ALC: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
|
||||
if (bundles != NULL) {
|
||||
reference = search_bundle_for_assembly (alc, aname);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly found in the bundle: '%s'.", aname->name);
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_default) {
|
||||
reference = mono_alc_invoke_resolve_using_load_nofail (alc, aname);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly found using Load method: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_default && !is_satellite) {
|
||||
reference = mono_assembly_loaded_internal (mono_domain_default_alc (mono_alc_domain (alc)), aname, FALSE);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly already loaded in the default ALC: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
if (is_default || !is_satellite) {
|
||||
reference = invoke_assembly_preload_hook (mono_domain_default_alc (mono_alc_domain (alc)), aname, assemblies_path);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly found with the filesystem probing logic: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
if (is_satellite) {
|
||||
reference = mono_alc_invoke_resolve_using_resolve_satellite_nofail (alc, aname);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly found with ResolveSatelliteAssembly method: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
reference = mono_alc_invoke_resolve_using_resolving_event_nofail (alc, aname);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly found with the Resolving event: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
|
||||
// Looking up corlib resources here can cause an infinite loop
|
||||
// See: https://github.com/dotnet/coreclr/blob/0a762eb2f3a299489c459da1ddeb69e042008f07/src/vm/appdomain.cpp#L5178-L5239
|
||||
if (!(strcmp (aname->name, MONO_ASSEMBLY_CORLIB_RESOURCE_NAME) == 0 && is_satellite) && postload) {
|
||||
if (!(strcmp (aname->name, MONO_ASSEMBLY_CORLIB_NAME) == 0 && is_satellite) && postload) {
|
||||
reference = mono_assembly_invoke_search_hook_internal (alc, requesting, aname, FALSE, TRUE);
|
||||
if (reference) {
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly found with AssemblyResolve event: '%s'.", aname->name);
|
||||
if (reference)
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
|
||||
leave:
|
||||
@@ -1791,21 +1738,14 @@ leave:
|
||||
gboolean
|
||||
mono_assembly_get_assemblyref_checked (MonoImage *image, int index, MonoAssemblyName *aname, MonoError *error)
|
||||
{
|
||||
MonoTableInfo *t;
|
||||
guint32 cols [MONO_ASSEMBLYREF_SIZE];
|
||||
const char *hash;
|
||||
|
||||
if (image_is_dynamic (image)) {
|
||||
MonoDynamicTable *t = &(((MonoDynamicImage*) image)->tables [MONO_TABLE_ASSEMBLYREF]);
|
||||
if (!mono_metadata_decode_row_dynamic_checked ((MonoDynamicImage*)image, t, index, cols, MONO_ASSEMBLYREF_SIZE, error))
|
||||
return FALSE;
|
||||
}
|
||||
else {
|
||||
MonoTableInfo *t = &image->tables [MONO_TABLE_ASSEMBLYREF];
|
||||
if (!mono_metadata_decode_row_checked (image, t, index, cols, MONO_ASSEMBLYREF_SIZE, error))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
t = &image->tables [MONO_TABLE_ASSEMBLYREF];
|
||||
|
||||
if (!mono_metadata_decode_row_checked (image, t, index, cols, MONO_ASSEMBLYREF_SIZE, error))
|
||||
return FALSE;
|
||||
|
||||
// ECMA-335: II.22.5 - AssemblyRef
|
||||
// HashValue can be null or non-null. If non-null it's an index into the blob heap
|
||||
@@ -2221,9 +2161,8 @@ typedef struct AssemblyPreLoadHook AssemblyPreLoadHook;
|
||||
struct AssemblyPreLoadHook {
|
||||
AssemblyPreLoadHook *next;
|
||||
union {
|
||||
MonoAssemblyPreLoadFunc v1; // legacy internal use
|
||||
MonoAssemblyPreLoadFuncV2 v2; // current internal use
|
||||
MonoAssemblyPreLoadFuncV3 v3; // netcore external use
|
||||
MonoAssemblyPreLoadFunc v1;
|
||||
MonoAssemblyPreLoadFuncV2 v2;
|
||||
} func;
|
||||
gpointer user_data;
|
||||
gint32 version;
|
||||
@@ -2243,18 +2182,8 @@ invoke_assembly_preload_hook (MonoAssemblyLoadContext *alc, MonoAssemblyName *an
|
||||
assembly = hook->func.v1 (aname, apath, hook->user_data);
|
||||
else {
|
||||
ERROR_DECL (error);
|
||||
g_assert (hook->version == 2 || hook->version == 3);
|
||||
if (hook->version == 2)
|
||||
assembly = hook->func.v2 (alc, aname, apath, FALSE, hook->user_data, error);
|
||||
else { // v3
|
||||
#ifdef ENABLE_NETCORE
|
||||
MonoGCHandle strong_gchandle = mono_gchandle_from_handle (mono_gchandle_get_target_handle (alc->gchandle), TRUE);
|
||||
assembly = hook->func.v3 (strong_gchandle, aname, apath, hook->user_data, error);
|
||||
mono_gchandle_free_internal (strong_gchandle);
|
||||
#else
|
||||
assembly = hook->func.v3 (NULL, aname, apath, hook->user_data, error);
|
||||
#endif
|
||||
}
|
||||
g_assert (hook->version == 2);
|
||||
assembly = hook->func.v2 (alc, aname, apath, FALSE, hook->user_data, error);
|
||||
/* TODO: propagage error out to callers */
|
||||
mono_error_assert_ok (error);
|
||||
}
|
||||
@@ -2349,29 +2278,6 @@ mono_install_assembly_preload_hook_v2 (MonoAssemblyPreLoadFuncV2 func, gpointer
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
mono_install_assembly_preload_hook_v3 (MonoAssemblyPreLoadFuncV3 func, gpointer user_data, gboolean append)
|
||||
{
|
||||
AssemblyPreLoadHook *hook;
|
||||
|
||||
g_return_if_fail (func != NULL);
|
||||
|
||||
hook = g_new0 (AssemblyPreLoadHook, 1);
|
||||
hook->version = 3;
|
||||
hook->func.v3 = func;
|
||||
hook->user_data = user_data;
|
||||
|
||||
if (append && assembly_preload_hook != NULL) {
|
||||
AssemblyPreLoadHook *old = assembly_preload_hook;
|
||||
while (old->next != NULL)
|
||||
old = old->next;
|
||||
old->next = hook;
|
||||
} else {
|
||||
hook->next = assembly_preload_hook;
|
||||
assembly_preload_hook = hook;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
free_assembly_preload_hooks (void)
|
||||
{
|
||||
@@ -2551,12 +2457,7 @@ mono_assembly_open_from_bundle (MonoAssemblyLoadContext *alc, const char *filena
|
||||
name = g_path_get_basename (filename);
|
||||
for (i = 0; !image && bundles [i]; ++i) {
|
||||
if (strcmp (bundles [i]->name, is_satellite ? filename : name) == 0) {
|
||||
#ifdef ENABLE_NETCORE
|
||||
// Since bundled images don't exist on disk, don't give them a legit filename
|
||||
image = mono_image_open_from_data_internal (alc, (char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly, FALSE, name, NULL);
|
||||
#else
|
||||
image = mono_image_open_from_data_internal (alc, (char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly, FALSE, name, name);
|
||||
#endif
|
||||
image = mono_image_open_from_data_internal (alc, (char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly, FALSE, name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -2779,10 +2680,8 @@ mono_assembly_request_open (const char *filename, const MonoAssemblyOpenRequest
|
||||
if (!loaded_from_bundle)
|
||||
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY,
|
||||
"Assembly Loader loaded assembly from location: '%s'.", filename);
|
||||
#ifndef ENABLE_NETCORE // no XML file loading on netcore
|
||||
if (!refonly)
|
||||
mono_config_for_assembly_internal (ass->image);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Clear the reference added by mono_image_open */
|
||||
@@ -4908,29 +4807,22 @@ mono_assembly_request_byname (MonoAssemblyName *aname, const MonoAssemblyByNameR
|
||||
}
|
||||
#else
|
||||
result = netcore_load_reference (aname, req->request.alc, req->requesting_assembly, !req->no_postload_search);
|
||||
|
||||
if (!result && bundles != NULL) {
|
||||
MonoImageOpenStatus status;
|
||||
MonoImage *image;
|
||||
image = mono_assembly_open_from_bundle (req->request.alc, aname->name, &status, FALSE);
|
||||
if (!image) {
|
||||
char *name = g_strdup_printf ("%s.dll", aname->name);
|
||||
image = mono_assembly_open_from_bundle (req->request.alc, name, &status, FALSE);
|
||||
}
|
||||
if (image)
|
||||
result = mono_assembly_request_load_from (image, aname->name, &req->request, &status);
|
||||
}
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
MonoAssembly *
|
||||
mono_assembly_load_full_alc (MonoGCHandle alc_gchandle, MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status)
|
||||
{
|
||||
MonoAssembly *res;
|
||||
MONO_ENTER_GC_UNSAFE;
|
||||
MonoAssemblyByNameRequest req;
|
||||
#ifdef ENABLE_NETCORE
|
||||
MonoAssemblyLoadContext *alc = mono_alc_from_gchandle (alc_gchandle);
|
||||
#else
|
||||
MonoAssemblyLoadContext *alc = mono_domain_default_alc (mono_domain_get ());
|
||||
#endif
|
||||
mono_assembly_request_prepare_byname (&req, MONO_ASMCTX_DEFAULT, alc);
|
||||
req.requesting_assembly = NULL;
|
||||
req.basedir = basedir;
|
||||
res = mono_assembly_request_byname (aname, &req, status);
|
||||
MONO_EXIT_GC_UNSAFE;
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_assembly_load_full:
|
||||
* \param aname A MonoAssemblyName with the assembly name to load.
|
||||
@@ -5063,7 +4955,7 @@ mono_assembly_close_except_image_pools (MonoAssembly *assembly)
|
||||
return FALSE;
|
||||
|
||||
/* Might be 0 already */
|
||||
if (mono_assembly_decref (assembly) > 0)
|
||||
if (mono_atomic_dec_i32 (&assembly->ref_count) > 0)
|
||||
return FALSE;
|
||||
|
||||
MONO_PROFILER_RAISE (assembly_unloading, (assembly));
|
||||
@@ -5454,7 +5346,6 @@ mono_asmctx_get_name (const MonoAssemblyContext *asmctx)
|
||||
"REFONLY",
|
||||
"LOADFROM",
|
||||
"INDIVIDIUAL",
|
||||
"INTERNAL"
|
||||
};
|
||||
g_assert (asmctx->kind >= 0 && asmctx->kind <= MONO_ASMCTX_LAST);
|
||||
return names [asmctx->kind];
|
||||
|
||||
@@ -76,8 +76,6 @@ mono_class_get_flags (MonoClass *klass)
|
||||
/* all arrays are marked serializable and sealed, bug #42779 */
|
||||
return TYPE_ATTRIBUTE_CLASS | TYPE_ATTRIBUTE_SERIALIZABLE | TYPE_ATTRIBUTE_SEALED | TYPE_ATTRIBUTE_PUBLIC;
|
||||
case MONO_CLASS_POINTER:
|
||||
if (m_class_get_byval_arg (klass)->type == MONO_TYPE_FNPTR)
|
||||
return TYPE_ATTRIBUTE_SEALED | TYPE_ATTRIBUTE_PUBLIC;
|
||||
return TYPE_ATTRIBUTE_CLASS | (mono_class_get_flags (m_class_get_element_class (klass)) & TYPE_ATTRIBUTE_VISIBILITY_MASK);
|
||||
}
|
||||
g_assert_not_reached ();
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
/*
|
||||
* \file Implementation details for class initialization
|
||||
*/
|
||||
|
||||
#ifndef __MONO_METADATA_CLASS_INIT_INTERNALS_H__
|
||||
#define __MONO_METADATA_CLASS_INIT_INTERNALS_H__
|
||||
|
||||
#include <mono/metadata/class.h>
|
||||
|
||||
void
|
||||
mono_class_setup_interface_id_nolock (MonoClass *klass);
|
||||
|
||||
int
|
||||
mono_class_setup_interface_offsets_internal (MonoClass *klass, int cur_slot, gboolean overwrite);
|
||||
|
||||
int
|
||||
mono_class_setup_count_virtual_methods (MonoClass *klass);
|
||||
|
||||
gboolean
|
||||
mono_class_setup_need_stelemref_method (MonoClass *klass);
|
||||
|
||||
gboolean
|
||||
mono_class_setup_method_has_preserve_base_overrides_attribute (MonoMethod *method);
|
||||
|
||||
|
||||
#endif /* __MONO_METADATA_CLASS_INIT_INTERNALS_H__ */
|
||||
+1872
-203
File diff suppressed because it is too large.
Load diff
@@ -53,21 +53,6 @@ typedef enum {
|
||||
} MonoRemotingTarget;
|
||||
|
||||
#define MONO_METHOD_PROP_GENERIC_CONTAINER 0
|
||||
/* verification success bit, protected by the image lock */
|
||||
#define MONO_METHOD_PROP_VERIFICATION_SUCCESS 1
|
||||
/* infrequent vtable layout bits protected by the loader lock */
|
||||
#define MONO_METHOD_PROP_INFREQUENT_BITS 2
|
||||
|
||||
/* Infrequently accessed bits of method definitions stored in the image properties.
|
||||
* The method must not be inflated.
|
||||
*
|
||||
* LOCKING: Reading the bits acquires the image lock. Writing the bits assumes
|
||||
* the loader lock is held.
|
||||
*/
|
||||
typedef struct _MonoMethodDefInfrequentBits {
|
||||
unsigned int is_reabstracted:1; /* whenever this is a reabstraction of another interface */
|
||||
unsigned int is_covariant_override_impl:1; /* whether this is an override with a signature different from its declared method */
|
||||
} MonoMethodDefInfrequentBits;
|
||||
|
||||
struct _MonoMethod {
|
||||
guint16 flags; /* method flags */
|
||||
@@ -88,7 +73,8 @@ struct _MonoMethod {
|
||||
unsigned int is_generic:1; /* whenever this is a generic method definition */
|
||||
unsigned int is_inflated:1; /* whether we're a MonoMethodInflated */
|
||||
unsigned int skip_visibility:1; /* whenever to skip JIT visibility checks */
|
||||
unsigned int _unused : 2; /* unused */
|
||||
unsigned int verification_success:1; /* whether this method has been verified successfully.*/
|
||||
unsigned int is_reabstracted:1; /* whenever this is a reabstraction of another interface */
|
||||
signed int slot : 16;
|
||||
|
||||
/*
|
||||
@@ -842,6 +828,9 @@ mono_lookup_dynamic_token (MonoImage *image, guint32 token, MonoGenericContext *
|
||||
gpointer
|
||||
mono_lookup_dynamic_token_class (MonoImage *image, guint32 token, gboolean check_token, MonoClass **handle_class, MonoGenericContext *context, MonoError *error);
|
||||
|
||||
gpointer
|
||||
mono_runtime_create_jump_trampoline (MonoDomain *domain, MonoMethod *method, gboolean add_sync_wrapper, MonoError *error);
|
||||
|
||||
gpointer
|
||||
mono_runtime_create_delegate_trampoline (MonoClass *klass);
|
||||
|
||||
@@ -900,30 +889,6 @@ mono_generic_class_get_context (MonoGenericClass *gclass);
|
||||
void
|
||||
mono_method_set_generic_container (MonoMethod *method, MonoGenericContainer* container);
|
||||
|
||||
void
|
||||
mono_method_set_verification_success (MonoMethod *method);
|
||||
|
||||
gboolean
|
||||
mono_method_get_verification_success (MonoMethod *method);
|
||||
|
||||
const MonoMethodDefInfrequentBits *
|
||||
mono_method_lookup_infrequent_bits (MonoMethod *methoddef);
|
||||
|
||||
MonoMethodDefInfrequentBits *
|
||||
mono_method_get_infrequent_bits (MonoMethod *methoddef);
|
||||
|
||||
gboolean
|
||||
mono_method_get_is_reabstracted (MonoMethod *method);
|
||||
|
||||
void
|
||||
mono_method_set_is_reabstracted (MonoMethod *methoddef);
|
||||
|
||||
gboolean
|
||||
mono_method_get_is_covariant_override_impl (MonoMethod *method);
|
||||
|
||||
void
|
||||
mono_method_set_is_covariant_override_impl (MonoMethod *methoddef);
|
||||
|
||||
MonoMethod*
|
||||
mono_class_inflate_generic_method_full_checked (MonoMethod *method, MonoClass *klass_hint, MonoGenericContext *context, MonoError *error);
|
||||
|
||||
@@ -1011,10 +976,6 @@ typedef struct {
|
||||
MonoClass *critical_finalizer_object; /* MAYBE NULL */
|
||||
MonoClass *generic_ireadonlylist_class;
|
||||
MonoClass *generic_ienumerator_class;
|
||||
#ifdef ENABLE_NETCORE
|
||||
MonoClass *alc_class;
|
||||
MonoClass *appcontext_class;
|
||||
#endif
|
||||
#ifndef ENABLE_NETCORE
|
||||
MonoMethod *threadpool_perform_wait_callback_method;
|
||||
#endif
|
||||
@@ -1286,9 +1247,6 @@ mono_class_vtable_checked (MonoDomain *domain, MonoClass *klass, MonoError *erro
|
||||
void
|
||||
mono_class_is_assignable_from_checked (MonoClass *klass, MonoClass *oklass, gboolean *result, MonoError *error);
|
||||
|
||||
void
|
||||
mono_class_signature_is_assignable_from (MonoClass *klass, MonoClass *oklass, gboolean *result, MonoError *error);
|
||||
|
||||
gboolean
|
||||
mono_class_is_assignable_from_slow (MonoClass *target, MonoClass *candidate);
|
||||
|
||||
@@ -1304,9 +1262,6 @@ mono_class_is_subclass_of_internal (MonoClass *klass, MonoClass *klassc, gboolea
|
||||
mono_bool
|
||||
mono_class_is_assignable_from_internal (MonoClass *klass, MonoClass *oklass);
|
||||
|
||||
gboolean
|
||||
mono_byref_type_is_assignable_from (MonoType *type, MonoType *ctype, gboolean signature_assignment);
|
||||
|
||||
gboolean mono_is_corlib_image (MonoImage *image);
|
||||
|
||||
MonoType*
|
||||
@@ -1553,9 +1508,6 @@ mono_method_is_constructor (MonoMethod *method);
|
||||
gboolean
|
||||
mono_class_has_default_constructor (MonoClass *klass, gboolean public_only);
|
||||
|
||||
gboolean
|
||||
mono_method_has_unmanaged_callers_only_attribute (MonoMethod *method);
|
||||
|
||||
// There are many ways to do on-demand initialization.
|
||||
// Some allow multiple concurrent initializations. Some do not.
|
||||
// Some allow multiple concurrent writes to the global. Some do not.
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
+5
-273
@@ -372,12 +372,8 @@ mono_type_get_name_recurse (MonoType *type, GString *str, gboolean is_recursed,
|
||||
g_string_append_c (str, '[');
|
||||
if (rank == 1)
|
||||
g_string_append_c (str, '*');
|
||||
else if (rank > 64)
|
||||
// Only taken in an error path, runtime will not load arrays of more than 32 dimensions
|
||||
g_string_append_printf (str, "%d", rank);
|
||||
else
|
||||
for (i = 1; i < rank; i++)
|
||||
g_string_append_c (str, ',');
|
||||
for (i = 1; i < rank; i++)
|
||||
g_string_append_c (str, ',');
|
||||
g_string_append_c (str, ']');
|
||||
|
||||
mono_type_name_check_byref (type, str);
|
||||
@@ -1383,133 +1379,6 @@ mono_method_set_generic_container (MonoMethod *method, MonoGenericContainer* con
|
||||
mono_image_property_insert (mono_method_get_image (method), method, MONO_METHOD_PROP_GENERIC_CONTAINER, container);
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_method_set_verification_success:
|
||||
*
|
||||
* Sets a bit indicating that the method has been verified.
|
||||
*
|
||||
* LOCKING: acquires the image lock.
|
||||
*/
|
||||
void
|
||||
mono_method_set_verification_success (MonoMethod *method)
|
||||
{
|
||||
g_assert (!method->is_inflated);
|
||||
|
||||
mono_image_property_insert (mono_method_get_image (method), method, MONO_METHOD_PROP_VERIFICATION_SUCCESS, GUINT_TO_POINTER(1));
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_method_get_verification_sucess:
|
||||
*
|
||||
* Returns \c TRUE if the method has been verified successfully.
|
||||
*
|
||||
* LOCKING: acquires the image lock.
|
||||
*/
|
||||
gboolean
|
||||
mono_method_get_verification_success (MonoMethod *method)
|
||||
{
|
||||
if (method->is_inflated)
|
||||
method = ((MonoMethodInflated *)method)->declaring;
|
||||
|
||||
gpointer value = mono_image_property_lookup (mono_method_get_image (method), method, MONO_METHOD_PROP_VERIFICATION_SUCCESS);
|
||||
|
||||
return value != NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_method_lookup_infrequent_bits:
|
||||
*
|
||||
* Looks for existing \c MonoMethodDefInfrequentBits struct associated with
|
||||
* this method definition. Unlike \c mono_method_get_infrequent bits, this
|
||||
* does not allocate a new struct if one doesn't exist.
|
||||
*
|
||||
* LOCKING: Acquires the image lock
|
||||
*/
|
||||
const MonoMethodDefInfrequentBits*
|
||||
mono_method_lookup_infrequent_bits (MonoMethod *method)
|
||||
{
|
||||
g_assert (!method->is_inflated);
|
||||
|
||||
return (const MonoMethodDefInfrequentBits*)mono_image_property_lookup (mono_method_get_image (method), method, MONO_METHOD_PROP_INFREQUENT_BITS);
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_method_get_infrequent_bits:
|
||||
*
|
||||
* Looks for an existing, or allocates a new \c MonoMethodDefInfrequentBits struct for this method definition.
|
||||
* Method must not be inflated.
|
||||
*
|
||||
* Unlike \c mono_method_lookup_infrequent_bits, this will allocate a new
|
||||
* struct if the method didn't have one.
|
||||
*
|
||||
* LOCKING: Acquires the image lock
|
||||
*/
|
||||
MonoMethodDefInfrequentBits *
|
||||
mono_method_get_infrequent_bits (MonoMethod *method)
|
||||
{
|
||||
g_assert (!method->is_inflated);
|
||||
MonoImage *image = mono_method_get_image (method);
|
||||
MonoMethodDefInfrequentBits *infrequent_bits = NULL;
|
||||
mono_image_lock (image);
|
||||
infrequent_bits = (MonoMethodDefInfrequentBits *)mono_image_property_lookup (image, method, MONO_METHOD_PROP_INFREQUENT_BITS);
|
||||
if (!infrequent_bits) {
|
||||
infrequent_bits = (MonoMethodDefInfrequentBits *)mono_image_alloc0 (image, sizeof (MonoMethodDefInfrequentBits));
|
||||
mono_image_property_insert (image, method, MONO_METHOD_PROP_INFREQUENT_BITS, infrequent_bits);
|
||||
}
|
||||
mono_image_unlock (image);
|
||||
return infrequent_bits;
|
||||
}
|
||||
|
||||
gboolean
|
||||
mono_method_get_is_reabstracted (MonoMethod *method)
|
||||
{
|
||||
if (method->is_inflated)
|
||||
method = ((MonoMethodInflated*)method)->declaring;
|
||||
const MonoMethodDefInfrequentBits *infrequent_bits = mono_method_lookup_infrequent_bits (method);
|
||||
return infrequent_bits != NULL && infrequent_bits->is_reabstracted;
|
||||
}
|
||||
|
||||
gboolean
|
||||
mono_method_get_is_covariant_override_impl (MonoMethod *method)
|
||||
{
|
||||
if (method->is_inflated)
|
||||
method = ((MonoMethodInflated*)method)->declaring;
|
||||
const MonoMethodDefInfrequentBits *infrequent_bits = mono_method_lookup_infrequent_bits (method);
|
||||
return infrequent_bits != NULL && infrequent_bits->is_covariant_override_impl;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_method_set_is_reabstracted:
|
||||
*
|
||||
* Sets the \c MonoMethodDefInfrequentBits:is_reabstracted bit for this method
|
||||
* definition. The bit means that the method is a default interface method
|
||||
* that used to have a default implementation in an ancestor interface, but is
|
||||
* now abstract once again.
|
||||
*
|
||||
* LOCKING: Assumes the loader lock is held
|
||||
*/
|
||||
void
|
||||
mono_method_set_is_reabstracted (MonoMethod *method)
|
||||
{
|
||||
mono_method_get_infrequent_bits (method)->is_reabstracted = 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_method_set_is_covariant_override_impl:
|
||||
*
|
||||
* Sets the \c MonoMethodDefInfrequentBits:is_covariant_override_impl bit for
|
||||
* this method definition. The bit means that the method is an override with a
|
||||
* signature that is not equal to the signature of the method that it is
|
||||
* overriding.
|
||||
*
|
||||
* LOCKING: Assumes the loader lock is held
|
||||
*/
|
||||
void
|
||||
mono_method_set_is_covariant_override_impl (MonoMethod *method)
|
||||
{
|
||||
mono_method_get_infrequent_bits (method)->is_covariant_override_impl = 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_class_find_enum_basetype:
|
||||
* \param class The enum class
|
||||
@@ -3448,7 +3317,7 @@ mono_class_from_name (MonoImage *image, const char* name_space, const char *name
|
||||
*
|
||||
* This function works exactly like mono_class_from_name but it will abort if the class is not found.
|
||||
* This function should be used by the runtime for critical types to which there's no way to recover but crash
|
||||
* if they are missing. For example, System.Object or System.String.
|
||||
* If they are missing. Thing of System.Object or System.String.
|
||||
*/
|
||||
MonoClass *
|
||||
mono_class_load_from_name (MonoImage *image, const char* name_space, const char *name)
|
||||
@@ -3745,64 +3614,6 @@ mono_gparam_is_assignable_from (MonoClass *target, MonoClass *candidate)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static MonoType*
|
||||
mono_type_get_underlying_type_ignore_byref (MonoType *type)
|
||||
{
|
||||
if (type->type == MONO_TYPE_VALUETYPE && m_class_is_enumtype (type->data.klass))
|
||||
return mono_class_enum_basetype_internal (type->data.klass);
|
||||
if (type->type == MONO_TYPE_GENERICINST && m_class_is_enumtype (type->data.generic_class->container_class))
|
||||
return mono_class_enum_basetype_internal (type->data.generic_class->container_class);
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_byref_type_is_assignable_from:
|
||||
* \param type The type assignee
|
||||
* \param ctype The type being assigned
|
||||
* \param signature_assignment whether this is a signature assginment check according to ECMA rules, or reflection
|
||||
*
|
||||
* Given two byref types, returns \c TRUE if values of the second type are assignable to locations of the first type.
|
||||
*
|
||||
* The \p signature_assignment parameter affects comparing T& and U& where T and U are both reference types. Reflection
|
||||
* does an IsAssignableFrom check for T and U here, but ECMA I.8.7.2 says that the verification types of T and U must be
|
||||
* identical. If \p signature_assignment is \c TRUE we do an ECMA check, otherwise, reflection.
|
||||
*/
|
||||
gboolean
|
||||
mono_byref_type_is_assignable_from (MonoType *type, MonoType *ctype, gboolean signature_assignment)
|
||||
{
|
||||
g_assert (type->byref);
|
||||
g_assert (ctype->byref);
|
||||
MonoType *t = mono_type_get_underlying_type_ignore_byref (type);
|
||||
MonoType *ot = mono_type_get_underlying_type_ignore_byref (ctype);
|
||||
|
||||
MonoClass *klass = mono_class_from_mono_type_internal (t);
|
||||
MonoClass *klassc = mono_class_from_mono_type_internal (ot);
|
||||
|
||||
if (mono_type_is_primitive (t)) {
|
||||
return mono_type_is_primitive (ot) && m_class_get_instance_size (klass) == m_class_get_instance_size (klassc);
|
||||
} else if (t->type == MONO_TYPE_VAR || t->type == MONO_TYPE_MVAR) {
|
||||
return t->type == ot->type && t->data.generic_param->num == ot->data.generic_param->num;
|
||||
} else if (t->type == MONO_TYPE_PTR || t->type == MONO_TYPE_FNPTR) {
|
||||
return t->type == ot->type;
|
||||
} else {
|
||||
if (ot->type == MONO_TYPE_VAR || ot->type == MONO_TYPE_MVAR)
|
||||
return FALSE;
|
||||
|
||||
if (m_class_is_valuetype (klass))
|
||||
return klass == klassc;
|
||||
if (m_class_is_valuetype (klassc))
|
||||
return FALSE;
|
||||
/*
|
||||
* assignment compatability for location types, ECMA I.8.7.2 - two managed pointer types T& and U& are
|
||||
* assignment compatible if the verification types of T and U are identical.
|
||||
*/
|
||||
if (signature_assignment)
|
||||
return klass == klassc;
|
||||
/* the reflection IsAssignableFrom does a subtype comparison here for reference types only */
|
||||
return mono_class_is_assignable_from_internal (klass, klassc);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_class_is_assignable_from_internal:
|
||||
* \param klass the class to be assigned to
|
||||
@@ -3839,31 +3650,6 @@ mono_class_is_assignable_from (MonoClass *klass, MonoClass *oklass)
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
* ECMA I.8.7.3 general assignment compatability is defined in terms of an "intermediate type"
|
||||
* whereas ECMA I.8.7.1 assignment compatability for signature types is defined in terms of a "reduced type".
|
||||
*
|
||||
* This matters when we're comparing arrays of IntPtr. IntPtr[] is generally
|
||||
* assignable to int[] or long[], depending on architecture. But for signature
|
||||
* compatability, IntPtr[] is distinct from both of them.
|
||||
*
|
||||
* Similarly for ulong* and IntPtr*, etc.
|
||||
*/
|
||||
static MonoClass*
|
||||
composite_type_to_reduced_element_type (MonoClass *array_klass)
|
||||
{
|
||||
switch (m_class_get_byval_arg (m_class_get_element_class (array_klass))->type) {
|
||||
case MONO_TYPE_I:
|
||||
case MONO_TYPE_U:
|
||||
return mono_defaults.int_class;
|
||||
default:
|
||||
return m_class_get_cast_class (array_klass);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
mono_class_is_assignable_from_general (MonoClass *klass, MonoClass *oklass, gboolean signature_assignment, gboolean *result, MonoError *error);
|
||||
|
||||
/**
|
||||
* mono_class_is_assignable_from_checked:
|
||||
* \param klass the class to be assigned to
|
||||
@@ -3877,20 +3663,6 @@ mono_class_is_assignable_from_general (MonoClass *klass, MonoClass *oklass, gboo
|
||||
*/
|
||||
void
|
||||
mono_class_is_assignable_from_checked (MonoClass *klass, MonoClass *oklass, gboolean *result, MonoError *error)
|
||||
{
|
||||
const gboolean for_sig = FALSE;
|
||||
mono_class_is_assignable_from_general (klass, oklass, for_sig, result, error);
|
||||
}
|
||||
|
||||
void
|
||||
mono_class_signature_is_assignable_from (MonoClass *klass, MonoClass *oklass, gboolean *result, MonoError *error)
|
||||
{
|
||||
const gboolean for_sig = TRUE;
|
||||
mono_class_is_assignable_from_general (klass, oklass, for_sig, result, error);
|
||||
}
|
||||
|
||||
void
|
||||
mono_class_is_assignable_from_general (MonoClass *klass, MonoClass *oklass, gboolean signature_assignment, gboolean *result, MonoError *error)
|
||||
{
|
||||
g_assert (result);
|
||||
if (klass == oklass) {
|
||||
@@ -4058,14 +3830,8 @@ mono_class_is_assignable_from_general (MonoClass *klass, MonoClass *oklass, gboo
|
||||
return;
|
||||
}
|
||||
|
||||
if (signature_assignment) {
|
||||
eclass = composite_type_to_reduced_element_type (klass);
|
||||
eoclass = composite_type_to_reduced_element_type (oklass);
|
||||
} else {
|
||||
eclass = m_class_get_cast_class (klass);
|
||||
eoclass = m_class_get_cast_class (oklass);
|
||||
}
|
||||
|
||||
eclass = m_class_get_cast_class (klass);
|
||||
eoclass = m_class_get_cast_class (oklass);
|
||||
|
||||
/*
|
||||
* a is b does not imply a[] is b[] when a is a valuetype, and
|
||||
@@ -4131,40 +3897,6 @@ mono_class_is_assignable_from_general (MonoClass *klass, MonoClass *oklass, gboo
|
||||
else
|
||||
mono_class_is_assignable_from_checked (m_class_get_cast_class (klass), oklass, result, error);
|
||||
return;
|
||||
} else if (m_class_get_class_kind (klass) == MONO_CLASS_POINTER) {
|
||||
if (m_class_get_class_kind (oklass) != MONO_CLASS_POINTER) {
|
||||
*result = FALSE;
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_class_get_byval_arg (klass)->type == MONO_TYPE_FNPTR) {
|
||||
/*
|
||||
* if both klass and oklass are fnptr, and they're equal, we would have returned at the
|
||||
* beginning.
|
||||
*/
|
||||
/* Is this right? or do we need to look at signature compatability? */
|
||||
*result = FALSE;
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_class_get_byval_arg (oklass)->type != MONO_TYPE_PTR) {
|
||||
*result = FALSE;
|
||||
}
|
||||
g_assert (m_class_get_byval_arg (klass)->type == MONO_TYPE_PTR);
|
||||
|
||||
MonoClass *eclass;
|
||||
MonoClass *eoclass;
|
||||
if (signature_assignment) {
|
||||
eclass = composite_type_to_reduced_element_type (klass);
|
||||
eoclass = composite_type_to_reduced_element_type (oklass);
|
||||
} else {
|
||||
eclass = m_class_get_cast_class (klass);
|
||||
eoclass = m_class_get_cast_class (oklass);
|
||||
}
|
||||
|
||||
*result = (eclass == eoclass);
|
||||
return;
|
||||
|
||||
} else if (klass == mono_defaults.object_class) {
|
||||
if (m_class_get_class_kind (oklass) == MONO_CLASS_POINTER)
|
||||
*result = FALSE;
|
||||
|
||||
+72
-296
@@ -150,7 +150,6 @@ static GENERATE_GET_CLASS_WITH_CACHE (interface_type_attribute, "System.Runtime.
|
||||
static GENERATE_GET_CLASS_WITH_CACHE (guid_attribute, "System.Runtime.InteropServices", "GuidAttribute")
|
||||
static GENERATE_GET_CLASS_WITH_CACHE (com_visible_attribute, "System.Runtime.InteropServices", "ComVisibleAttribute")
|
||||
static GENERATE_GET_CLASS_WITH_CACHE (com_default_interface_attribute, "System.Runtime.InteropServices", "ComDefaultInterfaceAttribute")
|
||||
static GENERATE_GET_CLASS_WITH_CACHE (class_interface_attribute, "System.Runtime.InteropServices", "ClassInterfaceAttribute")
|
||||
|
||||
/* Upon creation of a CCW, only allocate a weak handle and set the
|
||||
* reference count to 0. If the unmanaged client code decides to addref and
|
||||
@@ -549,27 +548,6 @@ cominterop_com_visible (MonoClass* klass)
|
||||
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cominterop_method_com_visible (MonoMethod *method)
|
||||
{
|
||||
ERROR_DECL (error);
|
||||
MonoCustomAttrInfo *cinfo;
|
||||
MonoBoolean visible = 1;
|
||||
|
||||
cinfo = mono_custom_attrs_from_method_checked (method, error);
|
||||
mono_error_assert_ok (error);
|
||||
if (cinfo) {
|
||||
MonoReflectionComVisibleAttribute *attr = (MonoReflectionComVisibleAttribute*)mono_custom_attrs_get_attr_checked (cinfo, mono_class_get_com_visible_attribute_class (), error);
|
||||
mono_error_assert_ok (error); /*FIXME proper error handling*/
|
||||
|
||||
if (attr)
|
||||
visible = attr->visible;
|
||||
if (!cinfo->cached)
|
||||
mono_custom_attrs_free (cinfo);
|
||||
}
|
||||
return visible;
|
||||
}
|
||||
|
||||
static void
|
||||
cominterop_set_hr_error (MonoError *oerror, int hr)
|
||||
{
|
||||
@@ -2100,140 +2078,6 @@ cominterop_get_ccw_default_mspec (const MonoType *param_type)
|
||||
return result;
|
||||
}
|
||||
|
||||
static MonoClass*
|
||||
cominterop_get_default_iface (MonoClass *klass)
|
||||
{
|
||||
if (mono_class_is_interface (klass))
|
||||
return klass;
|
||||
|
||||
ERROR_DECL (error);
|
||||
MonoCustomAttrInfo *cinfo = mono_custom_attrs_from_class_checked (klass, error);
|
||||
mono_error_assert_ok (error);
|
||||
|
||||
if (!cinfo)
|
||||
return mono_class_get_idispatch_class ();
|
||||
|
||||
MonoClassInterfaceAttribute *class_attr = (MonoClassInterfaceAttribute *)mono_custom_attrs_get_attr_checked (cinfo, mono_class_get_class_interface_attribute_class (), error);
|
||||
MonoClass *ret;
|
||||
|
||||
if (class_attr)
|
||||
{
|
||||
if (class_attr->intType == 0) {
|
||||
ret = mono_defaults.object_class;
|
||||
for (guint16 i = 0; i < m_class_get_interface_count (klass); i++) {
|
||||
MonoClass *iface = m_class_get_interfaces (klass) [i];
|
||||
if (cominterop_com_visible (iface)) {
|
||||
ret = iface;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (class_attr->intType == 1)
|
||||
ret = mono_class_get_idispatch_class ();
|
||||
else
|
||||
ret = klass;
|
||||
} else
|
||||
ret = mono_class_get_idispatch_class ();
|
||||
|
||||
if (!cinfo->cached)
|
||||
mono_custom_attrs_free (cinfo);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
cominterop_class_method_is_visible (MonoMethod *method)
|
||||
{
|
||||
guint16 flags = method->flags;
|
||||
|
||||
if ((flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) != METHOD_ATTRIBUTE_PUBLIC)
|
||||
return FALSE;
|
||||
|
||||
if (flags & METHOD_ATTRIBUTE_STATIC)
|
||||
return FALSE;
|
||||
|
||||
if (flags & METHOD_ATTRIBUTE_RT_SPECIAL_NAME)
|
||||
return FALSE;
|
||||
|
||||
if (!cominterop_method_com_visible (method))
|
||||
return FALSE;
|
||||
|
||||
/* if the method is an override, ignore it and use the original definition */
|
||||
if ((flags & METHOD_ATTRIBUTE_VIRTUAL) && !(flags & METHOD_ATTRIBUTE_NEW_SLOT))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gpointer
|
||||
cominterop_get_ccw_method (MonoClass *iface, MonoMethod *method, MonoError *error)
|
||||
{
|
||||
int param_index = 0;
|
||||
MonoMethodBuilder *mb;
|
||||
MonoMarshalSpec ** mspecs;
|
||||
MonoMethod *wrapper_method, *adjust_method;
|
||||
MonoMethodSignature* sig_adjusted;
|
||||
MonoMethodSignature* sig = mono_method_signature_internal (method);
|
||||
gboolean const preserve_sig = (method->iflags & METHOD_IMPL_ATTRIBUTE_PRESERVE_SIG) != 0;
|
||||
EmitMarshalContext m;
|
||||
|
||||
mb = mono_mb_new (iface, method->name, MONO_WRAPPER_NATIVE_TO_MANAGED);
|
||||
adjust_method = cominterop_get_managed_wrapper_adjusted (method);
|
||||
sig_adjusted = mono_method_signature_internal (adjust_method);
|
||||
|
||||
mspecs = g_new (MonoMarshalSpec*, sig_adjusted->param_count + 1);
|
||||
mono_method_get_marshal_info (method, mspecs);
|
||||
|
||||
/* move managed args up one */
|
||||
for (param_index = sig->param_count; param_index >= 1; param_index--) {
|
||||
int mspec_index = param_index+1;
|
||||
mspecs [mspec_index] = mspecs [param_index];
|
||||
|
||||
if (mspecs[mspec_index] == NULL) {
|
||||
mspecs[mspec_index] = cominterop_get_ccw_default_mspec (sig_adjusted->params[param_index]);
|
||||
} else {
|
||||
/* increase SizeParamIndex since we've added a param */
|
||||
if (sig_adjusted->params[param_index]->type == MONO_TYPE_ARRAY ||
|
||||
sig_adjusted->params[param_index]->type == MONO_TYPE_SZARRAY)
|
||||
if (mspecs[mspec_index]->data.array_data.param_num != -1)
|
||||
mspecs[mspec_index]->data.array_data.param_num++;
|
||||
}
|
||||
}
|
||||
|
||||
/* first arg is IntPtr for interface */
|
||||
mspecs [1] = NULL;
|
||||
|
||||
/* move return spec to last param */
|
||||
if (!preserve_sig && !MONO_TYPE_IS_VOID (sig->ret)) {
|
||||
if (mspecs [0] == NULL)
|
||||
mspecs[0] = cominterop_get_ccw_default_mspec (sig_adjusted->params[sig_adjusted->param_count-1]);
|
||||
|
||||
mspecs [sig_adjusted->param_count] = mspecs [0];
|
||||
mspecs [0] = NULL;
|
||||
}
|
||||
|
||||
#ifndef DISABLE_JIT
|
||||
/* skip visiblity since we call internal methods */
|
||||
mb->skip_visibility = TRUE;
|
||||
#endif
|
||||
|
||||
cominterop_setup_marshal_context (&m, adjust_method);
|
||||
m.mb = mb;
|
||||
mono_marshal_emit_managed_wrapper (mb, sig_adjusted, mspecs, &m, adjust_method, 0);
|
||||
mono_cominterop_lock ();
|
||||
wrapper_method = mono_mb_create_method (mb, m.csig, m.csig->param_count + 16);
|
||||
mono_cominterop_unlock ();
|
||||
|
||||
gpointer ret = mono_compile_method_checked (wrapper_method, error);
|
||||
|
||||
mono_mb_free (mb);
|
||||
for (param_index = sig_adjusted->param_count; param_index >= 0; param_index--)
|
||||
if (mspecs [param_index])
|
||||
mono_metadata_free_marshal_spec (mspecs [param_index]);
|
||||
g_free (mspecs);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* cominterop_get_ccw_checked:
|
||||
* @object: a pointer to the object
|
||||
@@ -2247,11 +2091,12 @@ cominterop_get_ccw_method (MonoClass *iface, MonoMethod *method, MonoError *erro
|
||||
static gpointer
|
||||
cominterop_get_ccw_checked (MonoObjectHandle object, MonoClass* itf, MonoError *error)
|
||||
{
|
||||
int i, j;
|
||||
int i;
|
||||
MonoCCW *ccw = NULL;
|
||||
MonoCCWInterface* ccw_entry = NULL;
|
||||
gpointer *vtable = NULL;
|
||||
MonoClass* iface = NULL;
|
||||
EmitMarshalContext m;
|
||||
int start_slot = 3;
|
||||
int method_count = 0;
|
||||
GList *ccw_list, *ccw_list_item;
|
||||
@@ -2321,35 +2166,17 @@ cominterop_get_ccw_checked (MonoObjectHandle object, MonoClass* itf, MonoError *
|
||||
mono_custom_attrs_free (cinfo);
|
||||
}
|
||||
|
||||
iface = cominterop_get_default_iface(itf);
|
||||
iface = itf;
|
||||
if (iface == mono_class_get_iunknown_class ()) {
|
||||
start_slot = 3;
|
||||
}
|
||||
else if (iface == mono_class_get_idispatch_class ()) {
|
||||
start_slot = 7;
|
||||
}
|
||||
else if (mono_class_is_interface (iface)) {
|
||||
else {
|
||||
method_count += mono_class_get_method_count (iface);
|
||||
start_slot = cominterop_get_com_slot_begin (iface);
|
||||
}
|
||||
else {
|
||||
/* auto-dual object */
|
||||
start_slot = 7;
|
||||
|
||||
MonoClass *klass_iter;
|
||||
for (klass_iter = iface; klass_iter; klass_iter = m_class_get_parent (klass_iter)) {
|
||||
int mcount = mono_class_get_method_count (klass_iter);
|
||||
if (mcount && !m_class_get_methods (klass_iter))
|
||||
mono_class_setup_methods (klass_iter);
|
||||
|
||||
for (i = 0; i < mcount; ++i) {
|
||||
MonoMethod *method = m_class_get_methods (klass_iter) [i];
|
||||
if (cominterop_class_method_is_visible (method))
|
||||
++method_count;
|
||||
}
|
||||
|
||||
/* FIXME: accessors for public fields */
|
||||
}
|
||||
iface = NULL;
|
||||
}
|
||||
|
||||
ccw_entry = (MonoCCWInterface *)g_hash_table_lookup (ccw->vtable_hash, itf);
|
||||
@@ -2367,78 +2194,77 @@ cominterop_get_ccw_checked (MonoObjectHandle object, MonoClass* itf, MonoError *
|
||||
vtable [6] = (gpointer)cominterop_ccw_invoke;
|
||||
}
|
||||
|
||||
if (mono_class_is_interface (iface)) {
|
||||
if (method_count && !m_class_get_methods (iface))
|
||||
mono_class_setup_methods (iface);
|
||||
iface = itf;
|
||||
method_count = mono_class_get_method_count (iface);
|
||||
if (method_count && !m_class_get_methods (iface))
|
||||
mono_class_setup_methods (iface);
|
||||
|
||||
for (i = method_count - 1; i >= 0; i--) {
|
||||
vtable [vtable_index--] = cominterop_get_ccw_method (iface, m_class_get_methods (iface) [i], error);
|
||||
return_val_if_nok (error, NULL);
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Auto-dual object. The methods on an auto-dual interface are
|
||||
* exposed starting from the innermost parent (i.e. Object) and
|
||||
* proceeding outwards. The methods within each interfaces are
|
||||
* exposed in the following order:
|
||||
*
|
||||
* 1. Virtual methods
|
||||
* 2. Interface methods
|
||||
* 3. Nonvirtual methods
|
||||
* 4. Fields (get, then put)
|
||||
*
|
||||
* Interface methods are exposed in the order that the interface
|
||||
* was declared. Child interface methods are exposed before parents.
|
||||
*
|
||||
* Because we need to expose superclass methods starting from the
|
||||
* innermost parent, we expose methods in reverse order, so that
|
||||
* we can just iterate using m_class_get_parent (). */
|
||||
for (i = method_count - 1; i >= 0; i--) {
|
||||
int param_index = 0;
|
||||
MonoMethodBuilder *mb;
|
||||
MonoMarshalSpec ** mspecs;
|
||||
MonoMethod *wrapper_method, *adjust_method;
|
||||
MonoMethod *method = m_class_get_methods (iface) [i];
|
||||
MonoMethodSignature* sig_adjusted;
|
||||
MonoMethodSignature* sig = mono_method_signature_internal (method);
|
||||
gboolean const preserve_sig = (method->iflags & METHOD_IMPL_ATTRIBUTE_PRESERVE_SIG) != 0;
|
||||
|
||||
mono_class_setup_vtable (iface);
|
||||
mb = mono_mb_new (iface, method->name, MONO_WRAPPER_NATIVE_TO_MANAGED);
|
||||
adjust_method = cominterop_get_managed_wrapper_adjusted (method);
|
||||
sig_adjusted = mono_method_signature_internal (adjust_method);
|
||||
|
||||
mspecs = g_new (MonoMarshalSpec*, sig_adjusted->param_count + 1);
|
||||
mono_method_get_marshal_info (method, mspecs);
|
||||
|
||||
MonoClass *klass_iter;
|
||||
for (klass_iter = iface; klass_iter; klass_iter = m_class_get_parent (klass_iter)) {
|
||||
mono_class_setup_vtable (klass_iter);
|
||||
|
||||
/* move managed args up one */
|
||||
for (param_index = sig->param_count; param_index >= 1; param_index--) {
|
||||
int mspec_index = param_index+1;
|
||||
mspecs [mspec_index] = mspecs [param_index];
|
||||
|
||||
/* 3. Nonvirtual methods */
|
||||
for (i = mono_class_get_method_count (klass_iter) - 1; i >= 0; i--) {
|
||||
MonoMethod *method = m_class_get_methods (klass_iter) [i];
|
||||
if (cominterop_class_method_is_visible (method) && !(method->flags & METHOD_ATTRIBUTE_VIRTUAL)) {
|
||||
vtable [vtable_index--] = cominterop_get_ccw_method (iface, method, error);
|
||||
return_val_if_nok (error, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
/* 2. Interface methods */
|
||||
GPtrArray *ifaces = mono_class_get_implemented_interfaces (klass_iter, error);
|
||||
mono_error_assert_ok (error);
|
||||
if (ifaces) {
|
||||
for (i = ifaces->len - 1; i >= 0; i--) {
|
||||
MonoClass *ic = (MonoClass *)g_ptr_array_index (ifaces, i);
|
||||
int offset = mono_class_interface_offset (iface, ic);
|
||||
g_assert (offset >= 0);
|
||||
for (j = mono_class_get_method_count (ic) - 1; j >= 0; j--) {
|
||||
MonoMethod *method = m_class_get_methods (ic) [j];
|
||||
vtable [vtable_index--] = cominterop_get_ccw_method (iface, m_class_get_vtable (iface) [offset + method->slot], error);
|
||||
if (!is_ok (error)) {
|
||||
g_ptr_array_free (ifaces, TRUE);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
g_ptr_array_free (ifaces, TRUE);
|
||||
}
|
||||
|
||||
/* 1. Virtual methods */
|
||||
for (i = mono_class_get_method_count (klass_iter) - 1; i >= 0; i--) {
|
||||
MonoMethod *method = m_class_get_methods (klass_iter) [i];
|
||||
if (cominterop_class_method_is_visible (method) && (method->flags & METHOD_ATTRIBUTE_VIRTUAL)
|
||||
&& !cominterop_get_method_interface (method)) {
|
||||
vtable [vtable_index--] = cominterop_get_ccw_method (iface, m_class_get_vtable (iface) [method->slot], error);
|
||||
return_val_if_nok (error, NULL);
|
||||
}
|
||||
if (mspecs[mspec_index] == NULL) {
|
||||
mspecs[mspec_index] = cominterop_get_ccw_default_mspec (sig_adjusted->params[param_index]);
|
||||
} else {
|
||||
/* increase SizeParamIndex since we've added a param */
|
||||
if (sig_adjusted->params[param_index]->type == MONO_TYPE_ARRAY ||
|
||||
sig_adjusted->params[param_index]->type == MONO_TYPE_SZARRAY)
|
||||
if (mspecs[mspec_index]->data.array_data.param_num != -1)
|
||||
mspecs[mspec_index]->data.array_data.param_num++;
|
||||
}
|
||||
}
|
||||
|
||||
/* first arg is IntPtr for interface */
|
||||
mspecs [1] = NULL;
|
||||
|
||||
/* move return spec to last param */
|
||||
if (!preserve_sig && !MONO_TYPE_IS_VOID (sig->ret)) {
|
||||
if (mspecs [0] == NULL)
|
||||
mspecs[0] = cominterop_get_ccw_default_mspec (sig_adjusted->params[sig_adjusted->param_count-1]);
|
||||
|
||||
mspecs [sig_adjusted->param_count] = mspecs [0];
|
||||
mspecs [0] = NULL;
|
||||
}
|
||||
|
||||
#ifndef DISABLE_JIT
|
||||
/* skip visiblity since we call internal methods */
|
||||
mb->skip_visibility = TRUE;
|
||||
#endif
|
||||
|
||||
cominterop_setup_marshal_context (&m, adjust_method);
|
||||
m.mb = mb;
|
||||
mono_marshal_emit_managed_wrapper (mb, sig_adjusted, mspecs, &m, adjust_method, 0);
|
||||
mono_cominterop_lock ();
|
||||
wrapper_method = mono_mb_create_method (mb, m.csig, m.csig->param_count + 16);
|
||||
mono_cominterop_unlock ();
|
||||
|
||||
vtable [vtable_index--] = mono_compile_method_checked (wrapper_method, error);
|
||||
|
||||
// cleanup, then error out if compile_method failed
|
||||
for (param_index = sig_adjusted->param_count; param_index >= 0; param_index--)
|
||||
if (mspecs [param_index])
|
||||
mono_metadata_free_marshal_spec (mspecs [param_index]);
|
||||
g_free (mspecs);
|
||||
return_val_if_nok (error, NULL);
|
||||
}
|
||||
|
||||
ccw_entry = g_new0 (MonoCCWInterface, 1);
|
||||
@@ -3162,26 +2988,6 @@ init_com_provider_ms (void)
|
||||
#endif // WIN32
|
||||
#endif // DISABLE_COM
|
||||
|
||||
// This function is used regardless of the BSTR type, so cast the return value
|
||||
// Inputted string length, in bytes, should include the null terminator
|
||||
// Returns the start of the string itself
|
||||
static gpointer
|
||||
mono_bstr_alloc (size_t str_byte_len)
|
||||
{
|
||||
// Allocate string length plus pointer-size integer to store the length, aligned to 16 bytes
|
||||
size_t alloc_size = str_byte_len + SIZEOF_VOID_P;
|
||||
alloc_size += (16 - 1);
|
||||
alloc_size &= ~(16 - 1);
|
||||
gpointer ret = g_malloc0 (alloc_size);
|
||||
return ret ? (char *)ret + SIZEOF_VOID_P : NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
mono_bstr_set_length (gunichar2 *bstr, int slen)
|
||||
{
|
||||
*((guint32 *)bstr - 1) = slen * sizeof (gunichar2);
|
||||
}
|
||||
|
||||
/* PTR can be NULL */
|
||||
mono_bstr
|
||||
mono_ptr_to_bstr (const gunichar2* ptr, int slen)
|
||||
@@ -3192,24 +2998,12 @@ mono_ptr_to_bstr (const gunichar2* ptr, int slen)
|
||||
#ifndef DISABLE_COM
|
||||
if (com_provider == MONO_COM_DEFAULT) {
|
||||
#endif
|
||||
// In Mono, historically BSTR was allocated with a guaranteed size prefix of 4 bytes regardless of platform.
|
||||
// Presumably this is due to the BStr documentation page, which indicates that behavior and then directs you to call
|
||||
// SysAllocString on Windows to handle the allocation for you. Unfortunately, this is not actually how it works:
|
||||
// The allocation pre-string is pointer-sized, and then only 4 bytes are used for the length regardless. Additionally,
|
||||
// the total length is also aligned to a 16-byte boundary. This preserves the old behavior on legacy and fixes it for
|
||||
// netcore moving forward.
|
||||
#ifdef ENABLE_NETCORE
|
||||
mono_bstr const s = (mono_bstr)mono_bstr_alloc ((slen + 1) * sizeof (gunichar2));
|
||||
if (s == NULL)
|
||||
return NULL;
|
||||
#else
|
||||
/* allocate len + 1 utf16 characters plus 4 byte integer for length*/
|
||||
guint32 * const ret = (guint32 *)g_malloc ((slen + 1) * sizeof (gunichar2) + sizeof (guint32));
|
||||
if (ret == NULL)
|
||||
return NULL;
|
||||
mono_bstr const s = (mono_bstr)(ret + 1);
|
||||
#endif
|
||||
mono_bstr_set_length (s, slen);
|
||||
*ret = slen * sizeof (gunichar2);
|
||||
if (ptr)
|
||||
memcpy (s, ptr, slen * sizeof (gunichar2));
|
||||
s [slen] = 0;
|
||||
@@ -3230,21 +3024,7 @@ mono_ptr_to_bstr (const gunichar2* ptr, int slen)
|
||||
#endif
|
||||
}
|
||||
|
||||
char *
|
||||
mono_ptr_to_ansibstr (const char *ptr, size_t slen)
|
||||
{
|
||||
// FIXME: should this behave differently without DISABLE_COM?
|
||||
char *s = (char *)mono_bstr_alloc ((slen + 1) * sizeof(char));
|
||||
if (s == NULL)
|
||||
return NULL;
|
||||
*((guint32 *)s - 1) = slen * sizeof (char);
|
||||
if (ptr)
|
||||
memcpy (s, ptr, slen * sizeof (char));
|
||||
s [slen] = 0;
|
||||
return s;
|
||||
}
|
||||
|
||||
MonoStringHandle
|
||||
static MonoStringHandle
|
||||
mono_string_from_bstr_checked (mono_bstr_const bstr, MonoError *error)
|
||||
{
|
||||
if (!bstr)
|
||||
@@ -3299,11 +3079,7 @@ mono_free_bstr (/*mono_bstr_const*/gpointer bstr)
|
||||
#ifndef DISABLE_COM
|
||||
if (com_provider == MONO_COM_DEFAULT) {
|
||||
#endif
|
||||
#ifdef ENABLE_NETCORE
|
||||
g_free (((char *)bstr) - SIZEOF_VOID_P);
|
||||
#else // In Mono, historically BSTR was allocated with a guaranteed size prefix of 4 bytes regardless of platform
|
||||
g_free (((char *)bstr) - 4);
|
||||
#endif
|
||||
#ifndef DISABLE_COM
|
||||
} else if (com_provider == MONO_COM_MS && init_com_provider_ms ()) {
|
||||
sys_free_string_ms ((mono_bstr_const)bstr);
|
||||
|
||||
@@ -58,9 +58,6 @@ mono_cominterop_emit_marshal_safearray (EmitMarshalContext *m, int argnum,
|
||||
MONO_API MONO_RT_EXTERNAL_ONLY MonoString *
|
||||
mono_string_from_bstr (/*mono_bstr*/gpointer bstr);
|
||||
|
||||
MonoStringHandle
|
||||
mono_string_from_bstr_checked (mono_bstr_const bstr, MonoError *error);
|
||||
|
||||
MONO_API void
|
||||
mono_free_bstr (/*mono_bstr_const*/gpointer bstr);
|
||||
|
||||
|
||||
File renamed without changes.
File renamed without changes.
Loaded 100 of 465 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user