mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-15 17:10:51 -10:00
Compare commits
80
Commits
xcode8
...
hotfix-19334
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
074b47c890 | ||
|
|
ba6b10b69c | ||
|
|
41e151d8b5 | ||
|
|
de2f33f7b2 | ||
|
|
7569e1a18d | ||
|
|
933e19bca3 | ||
|
|
501f5a9ed6 | ||
|
|
1538a59191 | ||
|
|
5892cd77a0 | ||
|
|
c82a2e5074 | ||
|
|
d778fb3631 | ||
|
|
a813491664 | ||
|
|
f0c92250f1 | ||
|
|
dc0ce1d96e | ||
|
|
76cd0085cc | ||
|
|
ef27535985 | ||
|
|
18666b6e21 | ||
|
|
3016bd7f31 | ||
|
|
9331fc979b | ||
|
|
4e94779847 | ||
|
|
12fd95f950 | ||
|
|
e1edabc081 | ||
|
|
3a4aeaa649 | ||
|
|
a067aa1cc7 | ||
|
|
2d61e91f57 | ||
|
|
cba1d4ffa1 | ||
|
|
eef579fa97 | ||
|
|
be40f3f97e | ||
|
|
40a3eb5354 | ||
|
|
1b35c8b74a | ||
|
|
b92d2bd239 | ||
|
|
00d88a51af | ||
|
|
aaa6f3c3fc | ||
|
|
b75fa2b333 | ||
|
|
84068e57b7 | ||
|
|
92be1aebdb | ||
|
|
7138ab117f | ||
|
|
09d18d4f47 | ||
|
|
75b30d0fd9 | ||
|
|
b813e56737 | ||
|
|
117302400a | ||
|
|
399facb8ca | ||
|
|
2311da7b9a | ||
|
|
5b3813b1d2 | ||
|
|
2e5167402b | ||
|
|
bf54221823 | ||
|
|
f9afcf06b9 | ||
|
|
d955217874 | ||
|
|
d457bae593 | ||
|
|
6e152a16a1 | ||
|
|
a824dad5f6 | ||
|
|
55fcfb81be | ||
|
|
f8691c441b | ||
|
|
2f569721a7 | ||
|
|
f07e7d0850 | ||
|
|
a9a6e86072 | ||
|
|
219bd64946 | ||
|
|
255a8971e5 | ||
|
|
91a4a3d504 | ||
|
|
6d5c45d559 | ||
|
|
5e1afc4533 | ||
|
|
e7da99bb17 | ||
|
|
e9e611d501 | ||
|
|
cefe30a5cc | ||
|
|
928436efc6 | ||
|
|
838ec2fb6f | ||
|
|
45d8971caa | ||
|
|
cf53f2aab3 | ||
|
|
f2c520372f | ||
|
|
3bc58c925b | ||
|
|
3790413f38 | ||
|
|
ef4965a6dd | ||
|
|
7cb75c8355 | ||
|
|
90a83b65df | ||
|
|
96a5c1247e | ||
|
|
b5a5402beb | ||
|
|
9d2eec1131 | ||
|
|
a825298e9d | ||
|
|
e11a0b175d | ||
|
|
2f5ddd0210 |
No files matched your search
@@ -69,6 +69,7 @@ config.status
|
||||
config.sub
|
||||
configure
|
||||
configure.scan
|
||||
cygconfig.h
|
||||
depcomp
|
||||
install-sh
|
||||
libtool
|
||||
|
||||
+13
-2
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [3.10.1],
|
||||
AC_INIT(mono, [3.12.0],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -2806,7 +2806,18 @@ if test "x$host" != "x$target"; then
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
;;
|
||||
;;
|
||||
aarch64*-linux-*)
|
||||
TARGET=ARM64;
|
||||
arch_target=arm64;
|
||||
AC_DEFINE(TARGET_ARM64, 1, [...])
|
||||
AC_DEFINE(TARGET_ANDROID, 1, [...])
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
;;
|
||||
aarch64-*)
|
||||
TARGET=ARM64
|
||||
;;
|
||||
|
||||
+2
-1
@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
|
||||
#
|
||||
# Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding
|
||||
@@ -179,7 +180,7 @@ if test "x$have_iso_varargs" = "xyes"; then
|
||||
fi
|
||||
AC_SUBST(G_HAVE_ISO_VARARGS)
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
|
||||
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h)
|
||||
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
|
||||
AC_SUBST(HAVE_ALLOCA_H)
|
||||
|
||||
|
||||
@@ -176,7 +176,6 @@ typedef struct _GMemChunk GMemChunk;
|
||||
/*
|
||||
* Misc.
|
||||
*/
|
||||
#define g_atexit(func) ((void) atexit (func))
|
||||
|
||||
const gchar * g_getenv(const gchar *variable);
|
||||
gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);
|
||||
|
||||
+23
-2
@@ -53,6 +53,10 @@
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
# include <sys/resource.h>
|
||||
#endif
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h>
|
||||
#include <winsock2.h>
|
||||
@@ -213,6 +217,23 @@ write_all (int fd, const void *vbuf, size_t n)
|
||||
return nwritten;
|
||||
}
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static int
|
||||
g_getdtablesize (void)
|
||||
{
|
||||
#ifdef HAVE_GETRLIMIT
|
||||
struct rlimit limit;
|
||||
int res;
|
||||
|
||||
res = getrlimit (RLIMIT_NOFILE, &limit);
|
||||
g_assert (res == 0);
|
||||
return limit.rlim_cur;
|
||||
#else
|
||||
return getdtablesize ();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
gboolean
|
||||
g_spawn_command_line_sync (const gchar *command_line,
|
||||
gchar **standard_output,
|
||||
@@ -256,7 +277,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
close (stderr_pipe [0]);
|
||||
dup2 (stderr_pipe [1], STDERR_FILENO);
|
||||
}
|
||||
for (i = getdtablesize () - 1; i >= 3; i--)
|
||||
for (i = g_getdtablesize () - 1; i >= 3; i--)
|
||||
close (i);
|
||||
|
||||
/* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */
|
||||
@@ -417,7 +438,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
}
|
||||
|
||||
if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) {
|
||||
for (i = getdtablesize () - 1; i >= 3; i--)
|
||||
for (i = g_getdtablesize () - 1; i >= 3; i--)
|
||||
close (i);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
/* config.h. Generated by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include "cygconfig.h"
|
||||
#else
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
@@ -74,3 +78,4 @@
|
||||
#define VERSION "0.1"
|
||||
|
||||
#define HAVE_STRTOK_R 1
|
||||
#endif
|
||||
@@ -489,6 +489,19 @@ namespace Mono.Data.Tds.Protocol
|
||||
|
||||
Comm.Append ((byte) 0x00); // no param meta data name
|
||||
Comm.Append ((byte) 0x00); // no status flags
|
||||
|
||||
// Convert BigNVarChar values larger than 4000 chars to nvarchar(max)
|
||||
// Need to do this here so WritePreparedParameterInfo emit the
|
||||
// correct data type
|
||||
foreach (TdsMetaParameter param2 in parameters) {
|
||||
var colType = param2.GetMetaType ();
|
||||
|
||||
if (colType == TdsColumnType.BigNVarChar) {
|
||||
int size = param2.GetActualSize ();
|
||||
if ((size >> 1) > 4000)
|
||||
param2.Size = -1;
|
||||
}
|
||||
}
|
||||
|
||||
// Write sql as a parameter value - UCS2
|
||||
TdsMetaParameter param = new TdsMetaParameter ("sql",
|
||||
|
||||
@@ -417,7 +417,7 @@ namespace Mono.Debugger.Soft
|
||||
* with newer runtimes, and vice versa.
|
||||
*/
|
||||
internal const int MAJOR_VERSION = 2;
|
||||
internal const int MINOR_VERSION = 37;
|
||||
internal const int MINOR_VERSION = 38;
|
||||
|
||||
enum WPSuspendPolicy {
|
||||
NONE = 0,
|
||||
@@ -585,7 +585,8 @@ namespace Mono.Debugger.Soft
|
||||
enum CmdStackFrame {
|
||||
GET_VALUES = 1,
|
||||
GET_THIS = 2,
|
||||
SET_VALUES = 3
|
||||
SET_VALUES = 3,
|
||||
GET_DOMAIN = 4,
|
||||
}
|
||||
|
||||
enum CmdArrayRef {
|
||||
@@ -2378,6 +2379,10 @@ namespace Mono.Debugger.Soft
|
||||
SendReceive (CommandSet.STACK_FRAME, (int)CmdStackFrame.SET_VALUES, new PacketWriter ().WriteId (thread_id).WriteId (id).WriteInt (len).WriteInts (pos).WriteValues (values));
|
||||
}
|
||||
|
||||
internal long StackFrame_GetDomain (long thread_id, long id) {
|
||||
return SendReceive (CommandSet.STACK_FRAME, (int)CmdStackFrame.GET_DOMAIN, new PacketWriter ().WriteId (thread_id).WriteId (id)).ReadId ();
|
||||
}
|
||||
|
||||
/*
|
||||
* ARRAYS
|
||||
*/
|
||||
|
||||
@@ -7,6 +7,7 @@ namespace Mono.Debugger.Soft
|
||||
public class StackFrame : Mirror
|
||||
{
|
||||
ThreadMirror thread;
|
||||
AppDomainMirror domain;
|
||||
MethodMirror method;
|
||||
int il_offset;
|
||||
Location location;
|
||||
@@ -32,6 +33,16 @@ namespace Mono.Debugger.Soft
|
||||
}
|
||||
}
|
||||
|
||||
public AppDomainMirror Domain {
|
||||
get {
|
||||
vm.CheckProtocolVersion (2, 38);
|
||||
if (domain == null)
|
||||
domain = vm.GetDomain (vm.conn.StackFrame_GetDomain (thread.Id, Id));
|
||||
|
||||
return domain;
|
||||
}
|
||||
}
|
||||
|
||||
public MethodMirror Method {
|
||||
get {
|
||||
return method;
|
||||
|
||||
@@ -2869,8 +2869,10 @@ public class DebuggerTests
|
||||
|
||||
var frames = e.Thread.GetFrames ();
|
||||
Assert.AreEqual ("invoke_in_domain", frames [0].Method.Name);
|
||||
Assert.AreEqual (domain, frames [0].Domain);
|
||||
Assert.AreEqual ("invoke", frames [1].Method.Name);
|
||||
Assert.AreEqual ("domains", frames [2].Method.Name);
|
||||
Assert.AreEqual (vm.RootDomain, frames [2].Domain);
|
||||
|
||||
// Test breakpoints on already JITted methods in other domains
|
||||
m = entry_point.DeclaringType.GetMethod ("invoke_in_domain_2");
|
||||
|
||||
@@ -669,14 +669,24 @@ namespace Mono.Security.Protocol.Tls
|
||||
|
||||
#region Send Alert Methods
|
||||
|
||||
internal void SendAlert(ref Exception ex)
|
||||
{
|
||||
var tlsEx = ex as TlsException;
|
||||
var alert = tlsEx != null ? tlsEx.Alert : new Alert(AlertDescription.InternalError);
|
||||
|
||||
try {
|
||||
SendAlert(alert);
|
||||
} catch (Exception alertEx) {
|
||||
ex = new IOException (string.Format ("Error while sending TLS Alert ({0}:{1}): {2}", alert.Level, alert.Description, ex), ex);
|
||||
}
|
||||
}
|
||||
|
||||
public void SendAlert(AlertDescription description)
|
||||
{
|
||||
this.SendAlert(new Alert(description));
|
||||
}
|
||||
|
||||
public void SendAlert(
|
||||
AlertLevel level,
|
||||
AlertDescription description)
|
||||
public void SendAlert(AlertLevel level, AlertDescription description)
|
||||
{
|
||||
this.SendAlert(new Alert(level, description));
|
||||
}
|
||||
@@ -699,8 +709,13 @@ namespace Mono.Security.Protocol.Tls
|
||||
close = alert.IsCloseNotify;
|
||||
}
|
||||
|
||||
try {
|
||||
// Write record
|
||||
this.SendRecord (ContentType.Alert, new byte[2] { (byte) level, (byte) description });
|
||||
this.SendRecord (ContentType.Alert, new byte[2] { (byte) level, (byte) description });
|
||||
} catch (Exception ex) {
|
||||
throw new IOException (string.Format (
|
||||
"Exception while sending TLS Alert ({0}:{1})", level, description), ex);
|
||||
}
|
||||
|
||||
if (close) {
|
||||
this.context.SentConnectionEnd = true;
|
||||
|
||||
@@ -588,14 +588,34 @@ namespace Mono.Security.Protocol.Tls
|
||||
}
|
||||
catch (TlsException ex)
|
||||
{
|
||||
// FIXME: should the send alert also be done asynchronously here and below?
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
negotiate.SetComplete (new IOException("The authentication or decryption has failed.", ex));
|
||||
#if NET_4_0
|
||||
AggregateException aggregate;
|
||||
try {
|
||||
// FIXME: should the send alert also be done asynchronously here and below?
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
aggregate = new AggregateException ("The authentication or decryption has failed.", ex);
|
||||
} catch (Exception alertEx) {
|
||||
aggregate = new AggregateException ("The authentication or decryption has failed (error while sending Alert).", ex, alertEx);
|
||||
}
|
||||
#else
|
||||
var aggregate = new Exception ();
|
||||
#endif
|
||||
negotiate.SetComplete (aggregate);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
this.protocol.SendAlert(AlertDescription.InternalError);
|
||||
negotiate.SetComplete (new IOException("The authentication or decryption has failed.", ex));
|
||||
#if NET_4_0
|
||||
AggregateException aggregate;
|
||||
try {
|
||||
this.protocol.SendAlert(AlertDescription.InternalError);
|
||||
aggregate = new AggregateException ("The authentication or decryption has failed.", ex);
|
||||
} catch (Exception alertEx) {
|
||||
aggregate = new AggregateException ("The authentication or decryption has failed (error while sending Alert).", ex, alertEx);
|
||||
}
|
||||
#else
|
||||
var aggregate = new Exception ();
|
||||
#endif
|
||||
negotiate.SetComplete (aggregate);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -98,16 +98,9 @@ namespace Mono.Security.Protocol.Tls
|
||||
{
|
||||
this.EndNegotiateHandshake(asyncResult);
|
||||
}
|
||||
catch (TlsException ex)
|
||||
{
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
this.protocol.SendAlert(AlertDescription.InternalError);
|
||||
|
||||
this.protocol.SendAlert(ref ex);
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
|
||||
@@ -502,17 +495,10 @@ namespace Mono.Security.Protocol.Tls
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (TlsException ex)
|
||||
{
|
||||
this.negotiationComplete.Set();
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
this.negotiationComplete.Set();
|
||||
this.protocol.SendAlert(AlertDescription.InternalError);
|
||||
this.protocol.SendAlert(ref ex);
|
||||
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
@@ -628,15 +614,10 @@ namespace Mono.Security.Protocol.Tls
|
||||
asyncResult.SetComplete(0);
|
||||
}
|
||||
}
|
||||
catch (TlsException ex)
|
||||
{
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new IOException("IO exception during read.", ex);
|
||||
this.protocol.SendAlert(ref ex);
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -781,17 +762,13 @@ namespace Mono.Security.Protocol.Tls
|
||||
record, 0, record.Length, new AsyncCallback(InternalWriteCallback), asyncResult);
|
||||
}
|
||||
}
|
||||
catch (TlsException ex)
|
||||
catch (Exception ex)
|
||||
{
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
this.protocol.SendAlert (ref ex);
|
||||
this.Close();
|
||||
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new IOException("IO exception during Write.", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private void InternalWriteCallback(IAsyncResult ar)
|
||||
@@ -1121,15 +1098,11 @@ namespace Mono.Security.Protocol.Tls
|
||||
byte[] record = this.protocol.EncodeRecord (ContentType.ApplicationData, buffer, offset, count);
|
||||
this.innerStream.Write (record, 0, record.Length);
|
||||
}
|
||||
catch (TlsException ex)
|
||||
{
|
||||
this.protocol.SendAlert(ex.Alert);
|
||||
this.Close();
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new IOException("IO exception during Write.", ex);
|
||||
this.protocol.SendAlert(ref ex);
|
||||
this.Close();
|
||||
throw new IOException("The authentication or decryption has failed.", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -538,7 +538,8 @@ namespace System {
|
||||
lock (_lock) {
|
||||
if (defaultZone != null)
|
||||
return defaultZone;
|
||||
return defaultZone = GetTimeZone ("Local", GetDefaultTimeZoneName ());
|
||||
var id = GetDefaultTimeZoneName ();
|
||||
return defaultZone = GetTimeZone (id, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -426,12 +426,6 @@ namespace System
|
||||
return FromRegistryKey(id, key);
|
||||
}
|
||||
#endif
|
||||
#if MONODROID
|
||||
var timeZoneInfo = AndroidTimeZones.GetTimeZone (id, id);
|
||||
if (timeZoneInfo == null)
|
||||
throw new TimeZoneNotFoundException ();
|
||||
return timeZoneInfo;
|
||||
#else
|
||||
// Local requires special logic that already exists in the Local property (bug #326)
|
||||
if (id == "Local")
|
||||
return Local;
|
||||
@@ -439,12 +433,16 @@ namespace System
|
||||
using (Stream stream = GetMonoTouchData (id)) {
|
||||
return BuildFromStream (id, stream);
|
||||
}
|
||||
#elif MONODROID
|
||||
var timeZoneInfo = AndroidTimeZones.GetTimeZone (id, id);
|
||||
if (timeZoneInfo == null)
|
||||
throw new TimeZoneNotFoundException ();
|
||||
return timeZoneInfo;
|
||||
#elif LIBC
|
||||
string filepath = Path.Combine (TimeZoneDirectory, id);
|
||||
return FindSystemTimeZoneByFileName (id, filepath);
|
||||
#else
|
||||
throw new NotImplementedException ();
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -401,9 +401,14 @@ namespace MonoTests.System.Threading
|
||||
{
|
||||
var v = new ReaderWriterLockSlim ();
|
||||
int local = 10;
|
||||
int ready_count = 0;
|
||||
int entered_count = 0;
|
||||
const int thread_count = 10;
|
||||
|
||||
var r = from i in Enumerable.Range (1, 10) select new Thread (() => {
|
||||
var r = from i in Enumerable.Range (1, thread_count) select new Thread (() => {
|
||||
Interlocked.Increment (ref ready_count);
|
||||
v.EnterReadLock ();
|
||||
Interlocked.Increment (ref entered_count);
|
||||
|
||||
Assert.AreEqual (11, local);
|
||||
});
|
||||
@@ -415,12 +420,16 @@ namespace MonoTests.System.Threading
|
||||
t.Start ();
|
||||
}
|
||||
|
||||
Thread.Sleep (200);
|
||||
while (ready_count != thread_count)
|
||||
Thread.Sleep (10);
|
||||
|
||||
/* Extra up to 2s of sleep to ensure all threads got the chance to enter the lock */
|
||||
for (int i = 0; i < 200 && v.WaitingReadCount != thread_count; ++i)
|
||||
Thread.Sleep (10);
|
||||
local = 11;
|
||||
|
||||
// FIXME: Don't rely on Thread.Sleep (200)
|
||||
Assert.AreEqual (0, v.WaitingWriteCount, "in waiting write");
|
||||
Assert.AreEqual (10, v.WaitingReadCount, "in waiting read");
|
||||
Assert.AreEqual (thread_count, v.WaitingReadCount, "in waiting read");
|
||||
Assert.AreEqual (0, v.WaitingUpgradeCount, "in waiting upgrade");
|
||||
v.ExitWriteLock ();
|
||||
|
||||
|
||||
@@ -43,7 +43,6 @@ namespace System.Data.Common {
|
||||
readonly IDataReader reader;
|
||||
readonly bool closeReader;
|
||||
readonly SchemaInfo [] schema;
|
||||
readonly object [] values;
|
||||
|
||||
#endregion // Fields
|
||||
|
||||
@@ -58,7 +57,6 @@ namespace System.Data.Common {
|
||||
{
|
||||
this.reader = reader;
|
||||
this.closeReader = closeReader;
|
||||
this.values = new object [reader.FieldCount];
|
||||
this.schema = LoadSchema (reader);
|
||||
}
|
||||
|
||||
@@ -67,8 +65,13 @@ namespace System.Data.Common {
|
||||
#region Properties
|
||||
|
||||
public object Current {
|
||||
get {
|
||||
get {
|
||||
// DbDataRecordImpl does not do copy of the array
|
||||
// and MoveNext would overwrite any previously filled data
|
||||
var values = new object [reader.FieldCount];
|
||||
reader.GetValues (values);
|
||||
|
||||
// TODO: Should not allocate on every property call
|
||||
return new DbDataRecordImpl (schema, values);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -257,6 +257,11 @@ namespace System.Net.Http.Headers
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!Lexer.IsValidCharacter (ch) || ch == '*' || ch == '?' || ch == '%') {
|
||||
sb.Append (Uri.HexEscape (ch));
|
||||
continue;
|
||||
}
|
||||
|
||||
sb.Append (ch);
|
||||
}
|
||||
|
||||
|
||||
@@ -193,13 +193,18 @@ namespace System.Net.Http.Headers
|
||||
//
|
||||
for (; i < input.Length; ++i) {
|
||||
char s = input[i];
|
||||
if (s > last_token_char || !token_chars[s])
|
||||
if (!IsValidCharacter (s))
|
||||
return false;
|
||||
}
|
||||
|
||||
return i > 0;
|
||||
}
|
||||
|
||||
public static bool IsValidCharacter (char input)
|
||||
{
|
||||
return input <= last_token_char && token_chars[input];
|
||||
}
|
||||
|
||||
public void EatChar ()
|
||||
{
|
||||
++pos;
|
||||
|
||||
+4
-1
@@ -237,8 +237,11 @@ namespace MonoTests.System.Net.Http.Headers
|
||||
value.FileNameStar = "č";
|
||||
Assert.AreEqual ("č", value.FileNameStar, "#11");
|
||||
Assert.AreEqual (new NameValueHeaderValue ("filename*", "utf-8''%C4%8D"), value.Parameters.First (), "#12");
|
||||
}
|
||||
|
||||
value.FileNameStar = "@x*\\%?.txt";
|
||||
Assert.AreEqual ("@x*\\%?.txt", value.FileNameStar, "#21");
|
||||
Assert.AreEqual (new NameValueHeaderValue ("filename*", "utf-8''%40x%2A%5C%25%3F.txt"), value.Parameters.First (), "#22");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Properties_Name ()
|
||||
|
||||
@@ -24,7 +24,7 @@ TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -r:Sy
|
||||
|
||||
LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%)
|
||||
TEST_MCS_FLAGS += -r:System.Configuration
|
||||
PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammaci mobile mobile_static, $(PROFILE))
|
||||
PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
|
||||
|
||||
ifeq (2.1, $(FRAMEWORK_VERSION))
|
||||
LIB_MCS_FLAGS += -d:INSIDE_SYSTEM
|
||||
|
||||
@@ -101,6 +101,7 @@ namespace MonoTests.System.Net.WebSockets
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Ignore ("See bug #24340")]
|
||||
public void EchoTest ()
|
||||
{
|
||||
const string Payload = "This is a websocket test";
|
||||
@@ -125,6 +126,7 @@ namespace MonoTests.System.Net.WebSockets
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Ignore ("See bug #24340")]
|
||||
public void CloseOutputAsyncTest ()
|
||||
{
|
||||
Assert.IsTrue (socket.ConnectAsync (new Uri (EchoServerUrl), CancellationToken.None).Wait (5000));
|
||||
|
||||
@@ -807,15 +807,20 @@ namespace MonoTests.System.Threading.Tasks
|
||||
finished ++;
|
||||
Monitor.Pulse (monitor);
|
||||
}
|
||||
return r;
|
||||
return r ? 1 : 10; //1 -> ok, 10 -> evt wait failed
|
||||
});
|
||||
var cntd = new CountdownEvent (2);
|
||||
var cntd2 = new CountdownEvent (2);
|
||||
|
||||
bool r1 = false, r2 = false;
|
||||
int r1 = 0, r2 = 0;
|
||||
ThreadPool.QueueUserWorkItem (delegate {
|
||||
cntd.Signal ();
|
||||
r1 = t.Wait (1000) && t.Result;
|
||||
if (!t.Wait (1000))
|
||||
r1 = 20; // 20 -> task wait failed
|
||||
else if (t.Result != 1)
|
||||
r1 = 30 + t.Result; // 30 -> task result is bad
|
||||
else
|
||||
r1 = 2; //2 -> ok
|
||||
cntd2.Signal ();
|
||||
lock (monitor) {
|
||||
finished ++;
|
||||
@@ -824,7 +829,13 @@ namespace MonoTests.System.Threading.Tasks
|
||||
});
|
||||
ThreadPool.QueueUserWorkItem (delegate {
|
||||
cntd.Signal ();
|
||||
r2 = t.Wait (1000) && t.Result;
|
||||
if (!t.Wait (1000))
|
||||
r2 = 40; // 40 -> task wait failed
|
||||
else if (t.Result != 1)
|
||||
r2 = 50 + t.Result; // 50 -> task result is bad
|
||||
else
|
||||
r2 = 3; //3 -> ok
|
||||
|
||||
cntd2.Signal ();
|
||||
lock (monitor) {
|
||||
finished ++;
|
||||
@@ -834,8 +845,8 @@ namespace MonoTests.System.Threading.Tasks
|
||||
Assert.IsTrue (cntd.Wait (2000), "#1");
|
||||
evt.Set ();
|
||||
Assert.IsTrue (cntd2.Wait (2000), "#2");
|
||||
Assert.IsTrue (r1, "r1");
|
||||
Assert.IsTrue (r2, "r2");
|
||||
Assert.AreEqual (2, r1, "r1");
|
||||
Assert.AreEqual (3, r2, "r2");
|
||||
|
||||
// Wait for everything to finish to avoid overloading the tpool
|
||||
lock (monitor) {
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
// CS7048: First argument of a security attribute `CustomSecurityAttribute' must be a valid SecurityAction
|
||||
// Line: 20
|
||||
|
||||
using System.Security;
|
||||
using System.Security.Permissions;
|
||||
|
||||
public class CustomSecurityAttribute : CodeAccessSecurityAttribute
|
||||
{
|
||||
public CustomSecurityAttribute ()
|
||||
: base (SecurityAction.Demand)
|
||||
{
|
||||
}
|
||||
|
||||
public override IPermission CreatePermission()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
[CustomSecurity]
|
||||
class X
|
||||
{
|
||||
public static void Main ()
|
||||
{
|
||||
}
|
||||
}
|
||||
+34
-7
@@ -832,9 +832,9 @@ namespace Mono.CSharp {
|
||||
/// </summary>
|
||||
bool IsSecurityActionValid ()
|
||||
{
|
||||
SecurityAction action = GetSecurityActionValue ();
|
||||
Constant c = null;
|
||||
var action = GetSecurityActionValue (ref c);
|
||||
bool for_assembly = Target == AttributeTargets.Assembly || Target == AttributeTargets.Module;
|
||||
var c = (Constant)pos_args [0].Expr;
|
||||
|
||||
switch (action) {
|
||||
#pragma warning disable 618
|
||||
@@ -855,6 +855,10 @@ namespace Mono.CSharp {
|
||||
return true;
|
||||
break;
|
||||
#pragma warning restore 618
|
||||
case null:
|
||||
Report.Error (7048, loc, "First argument of a security attribute `{0}' must be a valid SecurityAction",
|
||||
Type.GetSignatureForError ());
|
||||
return false;
|
||||
|
||||
default:
|
||||
Report.Error (7049, c.Location, "Security attribute `{0}' has an invalid SecurityAction value `{1}'",
|
||||
@@ -876,9 +880,25 @@ namespace Mono.CSharp {
|
||||
return false;
|
||||
}
|
||||
|
||||
System.Security.Permissions.SecurityAction GetSecurityActionValue ()
|
||||
SecurityAction? GetSecurityActionValue (ref Constant value)
|
||||
{
|
||||
return (SecurityAction) ((Constant) pos_args[0].Expr).GetValue ();
|
||||
if (pos_args == null) {
|
||||
var predefined = context.Module.PredefinedAttributes;
|
||||
|
||||
//
|
||||
// BCL defines System.Security.Permissions.HostProtectionAttribute with parameterless
|
||||
// contructor which should not be valid but it's already part of the framework
|
||||
//
|
||||
if (Type == predefined.HostProtection.TypeSpec) {
|
||||
value = new IntConstant (context.Module.Compiler.BuiltinTypes, (int)SecurityAction.LinkDemand, loc);
|
||||
return SecurityAction.LinkDemand;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
value = (Constant) pos_args [0].Expr;
|
||||
return (SecurityAction) value.GetValue ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -888,9 +908,14 @@ namespace Mono.CSharp {
|
||||
public void ExtractSecurityPermissionSet (MethodSpec ctor, ref SecurityType permissions)
|
||||
{
|
||||
#if STATIC
|
||||
object[] values = new object[pos_args.Count];
|
||||
for (int i = 0; i < values.Length; ++i)
|
||||
values[i] = ((Constant) pos_args[i].Expr).GetValue ();
|
||||
object[] values;
|
||||
if (pos_args != null) {
|
||||
values = new object[pos_args.Count];
|
||||
for (int i = 0; i < values.Length; ++i)
|
||||
values[i] = ((Constant) pos_args[i].Expr).GetValue ();
|
||||
} else {
|
||||
values = null;
|
||||
}
|
||||
|
||||
PropertyInfo[] prop;
|
||||
object[] prop_values;
|
||||
@@ -1679,6 +1704,7 @@ namespace Mono.CSharp {
|
||||
public readonly PredefinedDebuggerBrowsableAttribute DebuggerBrowsable;
|
||||
public readonly PredefinedAttribute DebuggerStepThrough;
|
||||
public readonly PredefinedDebuggableAttribute Debuggable;
|
||||
public readonly PredefinedAttribute HostProtection;
|
||||
|
||||
// New in .NET 3.5
|
||||
public readonly PredefinedAttribute Extension;
|
||||
@@ -1734,6 +1760,7 @@ namespace Mono.CSharp {
|
||||
DefaultParameterValue = new PredefinedAttribute (module, "System.Runtime.InteropServices", "DefaultParameterValueAttribute");
|
||||
OptionalParameter = new PredefinedAttribute (module, "System.Runtime.InteropServices", "OptionalAttribute");
|
||||
UnverifiableCode = new PredefinedAttribute (module, "System.Security", "UnverifiableCodeAttribute");
|
||||
HostProtection = new PredefinedAttribute (module, "System.Security.Permissions", "HostProtectionAttribute");
|
||||
|
||||
DefaultCharset = new PredefinedAttribute (module, "System.Runtime.InteropServices", "DefaultCharSetAttribute");
|
||||
TypeForwarder = new PredefinedAttribute (module, "System.Runtime.CompilerServices", "TypeForwardedToAttribute");
|
||||
|
||||
+13
-1
@@ -1298,7 +1298,7 @@ namespace Mono.CSharp
|
||||
CreateMetadataName (sb);
|
||||
TypeBuilder = Module.CreateBuilder (sb.ToString (), TypeAttr, type_size);
|
||||
} else {
|
||||
TypeBuilder = parent_def.TypeBuilder.DefineNestedType (MemberName.Basename, TypeAttr, null, type_size);
|
||||
TypeBuilder = parent_def.TypeBuilder.DefineNestedType (FilterNestedName (MemberName.Basename), TypeAttr, null, type_size);
|
||||
}
|
||||
|
||||
if (DeclaringAssembly.Importer != null)
|
||||
@@ -1328,6 +1328,18 @@ namespace Mono.CSharp
|
||||
return true;
|
||||
}
|
||||
|
||||
public static string FilterNestedName (string name)
|
||||
{
|
||||
//
|
||||
// SRE API does not handle namespaces and types separately but
|
||||
// determine that from '.' in name. That's problematic because
|
||||
// dot is valid character for type name. By replacing any '.'
|
||||
// in name we avoid any ambiguities and never emit metadata
|
||||
// namespace for nested types
|
||||
//
|
||||
return name.Replace ('.', '_');
|
||||
}
|
||||
|
||||
string[] CreateTypeParameters (TypeParameters parentAllTypeParameters)
|
||||
{
|
||||
string[] names;
|
||||
|
||||
@@ -887,7 +887,7 @@ named_argument
|
||||
|
||||
named_argument_expr
|
||||
: expression_or_error
|
||||
| declaration_expression
|
||||
// | declaration_expression
|
||||
;
|
||||
|
||||
opt_named_modifier
|
||||
|
||||
+1
-1
@@ -425,7 +425,7 @@ namespace Mono.CSharp
|
||||
}
|
||||
|
||||
// Create nested fixed buffer container
|
||||
string name = String.Format ("<{0}>__FixedBuffer{1}", Name, GlobalCounter++);
|
||||
string name = String.Format ("<{0}>__FixedBuffer{1}", TypeDefinition.FilterNestedName (Name), GlobalCounter++);
|
||||
fixed_buffer_type = Parent.TypeBuilder.DefineNestedType (name,
|
||||
TypeAttributes.NestedPublic | TypeAttributes.Sealed | TypeAttributes.BeforeFieldInit,
|
||||
Compiler.BuiltinTypes.ValueType.GetMetaInfo ());
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
// parser test
|
||||
|
||||
class X
|
||||
{
|
||||
public static int T1 (int seconds)
|
||||
{
|
||||
return T1_Foo (value: seconds * 1000);
|
||||
}
|
||||
|
||||
public static int T1_Foo (int value = 0)
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
public static void Main ()
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
using System.Security;
|
||||
using System.Security.Permissions;
|
||||
|
||||
[HostProtection]
|
||||
class X
|
||||
{
|
||||
public static void Main ()
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
// Compiler options: -r:../class/lib/net_4_5/Mono.Cecil.dll
|
||||
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Mono.Cecil;
|
||||
|
||||
namespace N
|
||||
{
|
||||
class C
|
||||
{
|
||||
}
|
||||
|
||||
interface I<T>
|
||||
{
|
||||
void Foo (T t);
|
||||
}
|
||||
|
||||
class X : I<C>
|
||||
{
|
||||
async void I<C>.Foo (C c)
|
||||
{
|
||||
await Task.Delay (1);
|
||||
}
|
||||
|
||||
public static void Main ()
|
||||
{
|
||||
var assembly = AssemblyDefinition.ReadAssembly (typeof (X).Assembly.Location);
|
||||
foreach (var t in assembly.MainModule.Types) {
|
||||
PrintType (t, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void PrintType (TypeDefinition td, int indent)
|
||||
{
|
||||
if (td.IsNested && !string.IsNullOrEmpty (td.Namespace))
|
||||
throw new ApplicationException ("BROKEN NESTED TYPE:");
|
||||
Console.WriteLine ("{2} Namespace: {0} Name: {1}", td.Namespace, td.Name, new string (' ', indent * 4));
|
||||
foreach (var tn in td.NestedTypes)
|
||||
PrintType (tn, indent + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,9 +29,9 @@ class DeclarationExpression
|
||||
if (r2 != 8)
|
||||
return 6;
|
||||
|
||||
Out2 (str: "b", v: out var o5);
|
||||
if (o5 != 9)
|
||||
return 7;
|
||||
// Out2 (str: "b", v: out var o5);
|
||||
// if (o5 != 9)
|
||||
// return 7;
|
||||
|
||||
Out3 (out var o6 = 9m);
|
||||
if (o6.GetType () != typeof (decimal))
|
||||
|
||||
@@ -10959,16 +10959,24 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Qux`2+GetEnumerator>c__Iterator0[X,V]">
|
||||
<type name="Qux`2[X,V]">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Qux`2+<System_Collections_IEnumerable_GetEnumerator>c__Iterator0[X,V]">
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="System.Object System.Collections.Generic.IEnumerator<object>.get_Current()" attrs="2529">
|
||||
<size>14</size>
|
||||
</method>
|
||||
<method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
|
||||
<size>14</size>
|
||||
</method>
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="Void Dispose()" attrs="486">
|
||||
<size>1</size>
|
||||
</method>
|
||||
@@ -10979,14 +10987,6 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Qux`2[X,V]">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-272.cs">
|
||||
<type name="Handler`1[T]">
|
||||
@@ -11736,16 +11736,24 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Test+GetEnumerator>c__Iterator0">
|
||||
<type name="Test">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable<int>.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Test+<System_Collections_Generic_IEnumerable<int>_GetEnumerator>c__Iterator0">
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="Int32 System.Collections.Generic.IEnumerator<int>.get_Current()" attrs="2529">
|
||||
<size>14</size>
|
||||
</method>
|
||||
<method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
|
||||
<size>19</size>
|
||||
</method>
|
||||
<method name="Boolean MoveNext()" attrs="486">
|
||||
<size>26</size>
|
||||
</method>
|
||||
<method name="Void Dispose()" attrs="486">
|
||||
<size>1</size>
|
||||
</method>
|
||||
@@ -11756,14 +11764,6 @@
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="Test">
|
||||
<method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable<int>.GetEnumerator()" attrs="481">
|
||||
<size>15</size>
|
||||
</method>
|
||||
<method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-303.cs">
|
||||
<type name="test.BaseClass">
|
||||
@@ -29260,6 +29260,22 @@
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-named-06.cs">
|
||||
<type name="X">
|
||||
<method name="Int32 T1(Int32)" attrs="150">
|
||||
<size>21</size>
|
||||
</method>
|
||||
<method name="Int32 T1_Foo(Int32)" attrs="150">
|
||||
<size>10</size>
|
||||
</method>
|
||||
<method name="Void Main()" attrs="150">
|
||||
<size>2</size>
|
||||
</method>
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="gtest-optional-01.cs">
|
||||
<type name="C">
|
||||
<method name="Void TestA(Int32)" attrs="150">
|
||||
@@ -50891,6 +50907,16 @@
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-910.cs">
|
||||
<type name="X">
|
||||
<method name="Void Main()" attrs="150">
|
||||
<size>2</size>
|
||||
</method>
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-92.cs">
|
||||
<type name="Outer">
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
@@ -62064,11 +62090,6 @@
|
||||
<size>285</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="A+async>c__async0">
|
||||
<method name="Void MoveNext()" attrs="486">
|
||||
<size>61</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="D">
|
||||
<method name="System.Threading.Tasks.Task M()" attrs="129">
|
||||
<size>33</size>
|
||||
@@ -62116,11 +62137,6 @@
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="A+async>c__async0">
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="D+<M>c__async0">
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
@@ -62153,6 +62169,14 @@
|
||||
<size>2</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="A+<Iasync_async>c__async0">
|
||||
<method name="Void MoveNext()" attrs="486">
|
||||
<size>61</size>
|
||||
</method>
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-async-23.cs">
|
||||
<type name="MyContext">
|
||||
@@ -64187,6 +64211,35 @@
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-async-76.cs">
|
||||
<type name="N.C">
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="N.X">
|
||||
<method name="Void N.I<N.C>.Foo(N.C)" attrs="481">
|
||||
<size>27</size>
|
||||
</method>
|
||||
<method name="Void Main()" attrs="150">
|
||||
<size>99</size>
|
||||
</method>
|
||||
<method name="Void PrintType(Mono.Cecil.TypeDefinition, Int32)" attrs="145">
|
||||
<size>138</size>
|
||||
</method>
|
||||
<method name="Void .ctor()" attrs="6278">
|
||||
<size>7</size>
|
||||
</method>
|
||||
</type>
|
||||
<type name="N.X+<N_I<N_C>_Foo>c__async0">
|
||||
<method name="Void MoveNext()" attrs="486">
|
||||
<size>157</size>
|
||||
</method>
|
||||
<method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
|
||||
<size>13</size>
|
||||
</method>
|
||||
</type>
|
||||
</test>
|
||||
<test name="test-cls-00.cs">
|
||||
<type name="CLSCLass_6">
|
||||
<method name="Void add_Disposed(Delegate)" attrs="2182">
|
||||
@@ -65646,7 +65699,7 @@
|
||||
<test name="test-decl-expr-01.cs">
|
||||
<type name="DeclarationExpression">
|
||||
<method name="Int32 Main()" attrs="150">
|
||||
<size>252</size>
|
||||
<size>223</size>
|
||||
</method>
|
||||
<method name="Boolean Out(Int32 ByRef)" attrs="145">
|
||||
<size>13</size>
|
||||
|
||||
@@ -74,6 +74,10 @@ namespace Xamarin.ApiDiff {
|
||||
get { return ignoreRemoved; }
|
||||
}
|
||||
|
||||
public static bool IgnoreParameterNameChanges { get; set; }
|
||||
public static bool IgnoreVirtualChanges { get; set; }
|
||||
public static bool IgnoreAddedPropertySetters { get; set; }
|
||||
|
||||
public static bool Lax;
|
||||
}
|
||||
|
||||
@@ -105,6 +109,15 @@ namespace Xamarin.ApiDiff {
|
||||
{ "n|ignore-new=", "Ignore new namespaces and types whose description matches a given C# regular expression (see below).",
|
||||
v => State.IgnoreNew.Add (new Regex (v))
|
||||
},
|
||||
{ "ignore-changes-parameter-names", "Ignore changes to parameter names for identically prototyped methods.",
|
||||
v => State.IgnoreParameterNameChanges = v != null
|
||||
},
|
||||
{ "ignore-changes-property-setters", "Ignore adding setters to properties.",
|
||||
v => State.IgnoreAddedPropertySetters = v != null
|
||||
},
|
||||
{ "ignore-changes-virtual", "Ignore changing non-`virtual` to `virtual` or adding `override`.",
|
||||
v => State.IgnoreVirtualChanges = v != null
|
||||
},
|
||||
{ "x|lax", "Ignore duplicate XML entries", v => State.Lax = true }
|
||||
};
|
||||
|
||||
|
||||
@@ -99,7 +99,10 @@ namespace Xamarin.ApiDiff {
|
||||
if (parameters != null) {
|
||||
var list = new List<string> ();
|
||||
foreach (var p in parameters.Elements ("parameter")) {
|
||||
list.Add (p.GetTypeName ("type") + " " + p.GetAttribute ("name"));
|
||||
var pTypeName = p.GetTypeName ("type");
|
||||
list.Add (State.IgnoreParameterNameChanges
|
||||
? pTypeName
|
||||
: pTypeName + " " + p.GetAttribute ("name"));
|
||||
}
|
||||
sb.Append (String.Join (", ", list));
|
||||
}
|
||||
|
||||
@@ -177,7 +177,25 @@ namespace Xamarin.ApiDiff {
|
||||
if (base.Equals (source, target))
|
||||
return true;
|
||||
|
||||
return GetDescription (source) == GetDescription (target);
|
||||
string sourceDescription = GetDescription (source);
|
||||
string targetDescription = GetDescription (target);
|
||||
|
||||
return CheckVirtualChanges (sourceDescription, targetDescription) ||
|
||||
(State.IgnoreAddedPropertySetters &&
|
||||
CheckVirtualChanges (sourceDescription, targetDescription.Replace (" set; ", " ")));
|
||||
}
|
||||
|
||||
static bool CheckVirtualChanges (string sourceDescription, string targetDescription)
|
||||
{
|
||||
return (sourceDescription == targetDescription) ||
|
||||
// *adding* virtual or override to target is acceptable; *removing* them is NOT
|
||||
(State.IgnoreVirtualChanges &&
|
||||
// non-virtual to virtual is fine
|
||||
(sourceDescription == targetDescription.Replace ("virtual ", "")) ||
|
||||
// non-virtual to override is fine
|
||||
(sourceDescription == targetDescription.Replace ("override ", "")) ||
|
||||
// virtual to override is fine
|
||||
(sourceDescription.Replace (" virtual ", " override ") == targetDescription));
|
||||
}
|
||||
|
||||
bool IsNowObsoleted (XElement source, XElement target)
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace Xamarin.ApiDiff {
|
||||
var sb = new StringBuilder ();
|
||||
|
||||
sb.Append (family ? "protected " : "public ");
|
||||
if (virt)
|
||||
if (virt && !State.IgnoreVirtualChanges)
|
||||
sb.Append (over ? "override " : "virtual ");
|
||||
else if (stat)
|
||||
sb.Append ("static ");
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <mono/io-layer/process-private.h>
|
||||
|
||||
#include <mono/utils/mono-mutex.h>
|
||||
#include <mono/utils/mono-proclib.h>
|
||||
#undef DEBUG_REFS
|
||||
|
||||
#if 0
|
||||
@@ -286,12 +287,12 @@ wapi_init (void)
|
||||
|
||||
wapi_processes_init ();
|
||||
|
||||
/* Using g_atexit here instead of an explicit function call in
|
||||
/* Using atexit here instead of an explicit function call in
|
||||
* a cleanup routine lets us cope when a third-party library
|
||||
* calls exit (eg if an X client loses the connection to its
|
||||
* server.)
|
||||
*/
|
||||
g_atexit (handle_cleanup);
|
||||
mono_atexit (handle_cleanup);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -753,7 +753,7 @@ create_allocator (int atype, int tls_key)
|
||||
bytes_var = mono_mb_add_local (mb, &mono_defaults.int32_class->byval_arg);
|
||||
if (atype == ATYPE_STRING) {
|
||||
/* a string alloator method takes the args: (vtable, len) */
|
||||
/* bytes = (offsetof (MonoString, chars) + ((len + 1) * 2)); */
|
||||
/* bytes = (sizeof (MonoString) + ((len + 1) * 2)); */
|
||||
mono_mb_emit_ldarg (mb, 1);
|
||||
mono_mb_emit_icon (mb, 1);
|
||||
mono_mb_emit_byte (mb, MONO_CEE_ADD);
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <mono/metadata/metadata.h>
|
||||
#include <mono/metadata/threadpool.h>
|
||||
#include <mono/utils/mono-signal-handler.h>
|
||||
#include <mono/utils/mono-proclib.h>
|
||||
|
||||
/* On solaris, curses.h must come before both termios.h and term.h */
|
||||
#ifdef HAVE_CURSES_H
|
||||
@@ -502,7 +503,7 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardow
|
||||
if (teardown != NULL)
|
||||
teardown_str = mono_string_to_utf8 (teardown);
|
||||
|
||||
atexit (tty_teardown);
|
||||
mono_atexit (tty_teardown);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
+36
-3
@@ -2278,16 +2278,49 @@ mono_stack_walk_no_il (MonoStackWalk func, gpointer user_data)
|
||||
mono_get_eh_callbacks ()->mono_walk_stack_with_ctx (stack_walk_adapter, NULL, MONO_UNWIND_DEFAULT, &ud);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
MonoStackWalkAsyncSafe func;
|
||||
gpointer user_data;
|
||||
} AsyncStackWalkUserData;
|
||||
|
||||
|
||||
static gboolean
|
||||
async_stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
|
||||
{
|
||||
AsyncStackWalkUserData *d = data;
|
||||
|
||||
switch (frame->type) {
|
||||
case FRAME_TYPE_DEBUGGER_INVOKE:
|
||||
case FRAME_TYPE_MANAGED_TO_NATIVE:
|
||||
return FALSE;
|
||||
case FRAME_TYPE_MANAGED:
|
||||
if (!frame->ji)
|
||||
return FALSE;
|
||||
if (frame->ji->async)
|
||||
return d->func (NULL, frame->domain, frame->ji->code_start, frame->native_offset, d->user_data);
|
||||
else
|
||||
return d->func (mono_jit_info_get_method (frame->ji), frame->domain, frame->ji->code_start, frame->native_offset, d->user_data);
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* mono_stack_walk_async_safe:
|
||||
*
|
||||
* Async safe version callable from signal handlers.
|
||||
*/
|
||||
void
|
||||
mono_stack_walk_async_safe (MonoStackWalk func, gpointer user_data)
|
||||
mono_stack_walk_async_safe (MonoStackWalkAsyncSafe func, void *initial_sig_context, void *user_data)
|
||||
{
|
||||
StackWalkUserData ud = { func, user_data };
|
||||
mono_get_eh_callbacks ()->mono_walk_stack_with_ctx (stack_walk_adapter, NULL, MONO_UNWIND_NONE, &ud);
|
||||
MonoContext ctx;
|
||||
AsyncStackWalkUserData ud = { func, user_data };
|
||||
|
||||
mono_sigctx_to_monoctx (initial_sig_context, &ctx);
|
||||
mono_get_eh_callbacks ()->mono_walk_stack_with_ctx (async_stack_walk_adapter, NULL, MONO_UNWIND_SIGNAL_SAFE, &ud);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
||||
@@ -90,8 +90,9 @@ mono_stack_walk (MonoStackWalk func, void* user_data);
|
||||
MONO_API void
|
||||
mono_stack_walk_no_il (MonoStackWalk func, void* user_data);
|
||||
|
||||
typedef mono_bool (*MonoStackWalkAsyncSafe) (MonoMethod *method, MonoDomain *domain, void *base_address, int offset, void* data);
|
||||
MONO_API void
|
||||
mono_stack_walk_async_safe (MonoStackWalk func, void* user_data);
|
||||
mono_stack_walk_async_safe (MonoStackWalkAsyncSafe func, void *initial_sig_context, void* user_data);
|
||||
|
||||
MONO_END_DECLS
|
||||
|
||||
|
||||
@@ -5041,10 +5041,10 @@ mono_string_new_size (MonoDomain *domain, gint32 len)
|
||||
size_t size;
|
||||
|
||||
/* check for overflow */
|
||||
if (len < 0 || len > ((SIZE_MAX - offsetof (MonoString, chars) - 2) / 2))
|
||||
if (len < 0 || len > ((SIZE_MAX - sizeof (MonoString) - 2) / 2))
|
||||
mono_gc_out_of_memory (-1);
|
||||
|
||||
size = (offsetof (MonoString, chars) + ((len + 1) * 2));
|
||||
size = (sizeof (MonoString) + ((len + 1) * 2));
|
||||
g_assert (size > 0);
|
||||
|
||||
vtable = mono_class_vtable (domain, mono_defaults.string_class);
|
||||
|
||||
@@ -77,5 +77,8 @@ void mono_profiler_code_buffer_new (gpointer buffer, int size, MonoProfilerCodeB
|
||||
|
||||
void mono_profiler_runtime_initialized (void) MONO_INTERNAL;
|
||||
|
||||
int64_t mono_profiler_get_sampling_rate (void) MONO_INTERNAL;
|
||||
MonoProfileSamplingMode mono_profiler_get_sampling_mode (void) MONO_INTERNAL;
|
||||
|
||||
#endif /* __MONO_PROFILER_PRIVATE_H__ */
|
||||
|
||||
@@ -273,6 +273,28 @@ mono_profiler_install_monitor (MonoProfileMonitorFunc callback)
|
||||
prof_list->monitor_event_cb = callback;
|
||||
}
|
||||
|
||||
static MonoProfileSamplingMode sampling_mode = MONO_PROFILER_STAT_MODE_PROCESS;
|
||||
static int64_t sampling_frequency = 1000; //1ms
|
||||
|
||||
/**
|
||||
* mono_profiler_set_statistical_mode:
|
||||
* @mode the sampling mode used.
|
||||
* @sample_frequency_is_us the sampling frequency in microseconds.
|
||||
*
|
||||
* Set the sampling parameters for the profiler. Sampling mode affects the effective sampling rate as in samples/s you'll witness.
|
||||
* The default sampling mode is process mode, which only reports samples when there's activity in the process.
|
||||
*
|
||||
* Sampling frequency should be interpreted as a suggestion that can't always be honored due to how most kernels expose alarms.
|
||||
*
|
||||
* Said that, when using statistical sampling, always assume variable rate sampling as all sort of external factors can interfere.
|
||||
*/
|
||||
void
|
||||
mono_profiler_set_statistical_mode (MonoProfileSamplingMode mode, int64_t sampling_frequency_is_us)
|
||||
{
|
||||
sampling_mode = mode;
|
||||
sampling_frequency = sampling_frequency_is_us;
|
||||
}
|
||||
|
||||
void
|
||||
mono_profiler_install_statistical (MonoProfileStatFunc callback)
|
||||
{
|
||||
@@ -281,6 +303,18 @@ mono_profiler_install_statistical (MonoProfileStatFunc callback)
|
||||
prof_list->statistical_cb = callback;
|
||||
}
|
||||
|
||||
int64_t
|
||||
mono_profiler_get_sampling_rate (void)
|
||||
{
|
||||
return sampling_frequency;
|
||||
}
|
||||
|
||||
MonoProfileSamplingMode
|
||||
mono_profiler_get_sampling_mode (void)
|
||||
{
|
||||
return sampling_mode;
|
||||
}
|
||||
|
||||
void
|
||||
mono_profiler_install_statistical_call_chain (MonoProfileStatCallChainFunc callback, int call_chain_depth, MonoProfilerCallChainStrategy call_chain_strategy) {
|
||||
if (!prof_list)
|
||||
|
||||
@@ -193,6 +193,15 @@ MONO_API void mono_profiler_install_iomap (MonoProfileIomapFunc callback);
|
||||
|
||||
MONO_API void mono_profiler_load (const char *desc);
|
||||
|
||||
typedef enum {
|
||||
/* Elapsed time is tracked by user+kernel time of the process - this is the default*/
|
||||
MONO_PROFILER_STAT_MODE_PROCESS = 0,
|
||||
/* Elapsed time is tracked by wallclock time */
|
||||
MONO_PROFILER_STAT_MODE_REAL = 1,
|
||||
} MonoProfileSamplingMode;
|
||||
|
||||
MONO_API void mono_profiler_set_statistical_mode (MonoProfileSamplingMode mode, int64_t sampling_frequency_is_us);
|
||||
|
||||
MONO_END_DECLS
|
||||
|
||||
#endif /* __MONO_PROFILER_H__ */
|
||||
|
||||
@@ -896,7 +896,7 @@ create_allocator (int atype)
|
||||
/*
|
||||
* a string allocator method takes the args: (vtable, len)
|
||||
*
|
||||
* bytes = offsetof (MonoString, chars) + ((len + 1) * 2)
|
||||
* bytes = sizeof (MonoString) + ((len + 1) * 2)
|
||||
*
|
||||
* condition:
|
||||
*
|
||||
@@ -904,11 +904,11 @@ create_allocator (int atype)
|
||||
*
|
||||
* therefore:
|
||||
*
|
||||
* offsetof (MonoString, chars) + ((len + 1) * 2) <= INT32_MAX - (SGEN_ALLOC_ALIGN - 1)
|
||||
* len <= (INT32_MAX - (SGEN_ALLOC_ALIGN - 1) - offsetof (MonoString, chars)) / 2 - 1
|
||||
* sizeof (MonoString) + ((len + 1) * 2) <= INT32_MAX - (SGEN_ALLOC_ALIGN - 1)
|
||||
* len <= (INT32_MAX - (SGEN_ALLOC_ALIGN - 1) - sizeof (MonoString)) / 2 - 1
|
||||
*/
|
||||
mono_mb_emit_ldarg (mb, 1);
|
||||
mono_mb_emit_icon (mb, (INT32_MAX - (SGEN_ALLOC_ALIGN - 1) - MONO_STRUCT_OFFSET (MonoString, chars)) / 2 - 1);
|
||||
mono_mb_emit_icon (mb, (INT32_MAX - (SGEN_ALLOC_ALIGN - 1) - sizeof (MonoString)) / 2 - 1);
|
||||
pos = mono_mb_emit_short_branch (mb, MONO_CEE_BLE_UN_S);
|
||||
|
||||
mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
|
||||
@@ -920,7 +920,7 @@ create_allocator (int atype)
|
||||
mono_mb_emit_icon (mb, 1);
|
||||
mono_mb_emit_byte (mb, MONO_CEE_SHL);
|
||||
//WE manually fold the above + 2 here
|
||||
mono_mb_emit_icon (mb, MONO_STRUCT_OFFSET (MonoString, chars) + 2);
|
||||
mono_mb_emit_icon (mb, sizeof (MonoString) + 2);
|
||||
mono_mb_emit_byte (mb, CEE_ADD);
|
||||
mono_mb_emit_stloc (mb, size_var);
|
||||
} else {
|
||||
|
||||
@@ -731,7 +731,7 @@ slow_object_get_size (MonoVTable *vtable, MonoObject* o)
|
||||
* mono_array_length_fast not using the object's vtable.
|
||||
*/
|
||||
if (klass == mono_defaults.string_class) {
|
||||
return offsetof (MonoString, chars) + 2 * mono_string_length_fast ((MonoString*) o) + 2;
|
||||
return sizeof (MonoString) + 2 * mono_string_length_fast ((MonoString*) o) + 2;
|
||||
} else if (klass->rank) {
|
||||
MonoArray *array = (MonoArray*)o;
|
||||
size_t size = sizeof (MonoArray) + klass->sizes.element_size * mono_array_length_fast (array);
|
||||
@@ -782,7 +782,7 @@ sgen_par_object_get_size (MonoVTable *vtable, MonoObject* o)
|
||||
if (type == DESC_TYPE_RUN_LENGTH || type == DESC_TYPE_SMALL_BITMAP) {
|
||||
mword size = descr & 0xfff8;
|
||||
if (size == 0) /* This is used to encode a string */
|
||||
return offsetof (MonoString, chars) + 2 * mono_string_length_fast ((MonoString*) o) + 2;
|
||||
return sizeof (MonoString) + 2 * mono_string_length_fast ((MonoString*) o) + 2;
|
||||
return size;
|
||||
} else if (type == DESC_TYPE_VECTOR) {
|
||||
int element_size = ((descr) >> VECTOR_ELSIZE_SHIFT) & MAX_ELEMENT_SIZE;
|
||||
|
||||
@@ -146,7 +146,7 @@ sgen_gray_object_dequeue (SgenGrayQueue *queue)
|
||||
entry = *queue->cursor--;
|
||||
|
||||
#ifdef SGEN_HEAVY_BINARY_PROTOCOL
|
||||
binary_protocol_gray_dequeue (queue, queue->cursor + 1, obj);
|
||||
binary_protocol_gray_dequeue (queue, queue->cursor + 1, entry.obj);
|
||||
#endif
|
||||
|
||||
if (G_UNLIKELY (queue->cursor < GRAY_FIRST_CURSOR_POSITION (queue->first))) {
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
#ifndef __MONO_SGEN_GRAY_H__
|
||||
#define __MONO_SGEN_GRAY_H__
|
||||
|
||||
#include "sgen-protocol.h"
|
||||
|
||||
/*
|
||||
* This gray queue has to be as optimized as possible, because it is in the core of
|
||||
* the mark/copy phase of the garbage collector. The memory access has then to be as
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "metadata/sgen-cardtable.h"
|
||||
#include "metadata/sgen-memory-governor.h"
|
||||
#include "utils/mono-mmap.h"
|
||||
#include "utils/mono-compiler.h"
|
||||
|
||||
#define LOS_SECTION_SIZE (1024 * 1024)
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include "utils/mono-compiler.h"
|
||||
#include "metadata/sgen-gc.h"
|
||||
#include "metadata/sgen-pointer-queue.h"
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ ves_icall_System_String_GetLOSLimit (void)
|
||||
{
|
||||
int limit = mono_gc_get_los_limit ();
|
||||
|
||||
return (limit - 2 - offsetof (MonoString, chars)) / 2;
|
||||
return (limit - 2 - sizeof (MonoString)) / 2;
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -44,11 +44,17 @@
|
||||
|
||||
#include <mono/metadata/gc-internal.h>
|
||||
|
||||
#if defined(PLATFORM_ANDROID) && !defined(TARGET_ARM64)
|
||||
#define USE_TKILL_ON_ANDROID 1
|
||||
#endif
|
||||
|
||||
#ifdef PLATFORM_ANDROID
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef USE_TKILL_ON_ANDROID
|
||||
extern int tkill (pid_t tid, int signal);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*#define THREAD_DEBUG(a) do { a; } while (0)*/
|
||||
#define THREAD_DEBUG(a)
|
||||
@@ -4476,7 +4482,7 @@ mono_thread_kill (MonoInternalThread *thread, int signal)
|
||||
# ifdef PTHREAD_POINTER_ID
|
||||
return pthread_kill ((gpointer)(gsize)(thread->tid), mono_thread_get_abort_signal ());
|
||||
# else
|
||||
# ifdef PLATFORM_ANDROID
|
||||
# ifdef USE_TKILL_ON_ANDROID
|
||||
if (thread->android_tid != 0) {
|
||||
int ret;
|
||||
int old_errno = errno;
|
||||
|
||||
@@ -191,8 +191,6 @@ buildver-boehm.h: libmini-static.la $(monodir)/mono/metadata/libmonoruntime-stat
|
||||
endif
|
||||
@echo "const char *build_date = \"`date`\";" > buildver-boehm.h
|
||||
mono_boehm-main.$(OBJEXT): buildver-boehm.h
|
||||
main.c: buildver-boehm.h
|
||||
|
||||
endif
|
||||
|
||||
if DISABLE_EXECUTABLES
|
||||
@@ -202,8 +200,7 @@ buildver-sgen.h: libmini-static.la $(monodir)/mono/metadata/libmonoruntimesgen-s
|
||||
endif
|
||||
@echo "const char *build_date = \"`date`\";" > buildver-sgen.h
|
||||
mono_sgen-main-sgen.$(OBJEXT): buildver-sgen.h
|
||||
main-sgen.c: buildver-sgen.h
|
||||
|
||||
main-sgen.$(OBJEXT): buildver-sgen.h
|
||||
|
||||
if DTRACE_G_REQUIRED
|
||||
LIBMONO_DTRACE_OBJECT = .libs/mono-dtrace.$(OBJEXT)
|
||||
|
||||
@@ -5392,6 +5392,15 @@ emit_exception_debug_info (MonoAotCompile *acfg, MonoCompile *cfg)
|
||||
encode_value (table->num_holes, p, &p);
|
||||
}
|
||||
|
||||
if (jinfo->has_arch_eh_info) {
|
||||
/*
|
||||
* In AOT mode, the code length is calculated from the address of the previous method,
|
||||
* which could include alignment padding, so calculating the start of the epilog as
|
||||
* code_len - epilog_size is correct any more. Save the real code len as a workaround.
|
||||
*/
|
||||
encode_value (jinfo->code_size, p, &p);
|
||||
}
|
||||
|
||||
/* Exception table */
|
||||
if (cfg->compile_llvm) {
|
||||
/*
|
||||
|
||||
+27
-15
@@ -2585,17 +2585,21 @@ decode_exception_debug_info (MonoAotModule *amodule, MonoDomain *domain,
|
||||
} else {
|
||||
num_holes = try_holes_info_size = 0;
|
||||
}
|
||||
|
||||
if (has_arch_eh_jit_info) {
|
||||
flags |= JIT_INFO_HAS_ARCH_EH_INFO;
|
||||
arch_eh_jit_info_size = sizeof (MonoArchEHJitInfo);
|
||||
/* Overwrite the original code_len which includes alignment padding */
|
||||
code_len = decode_value (p, &p);
|
||||
} else {
|
||||
arch_eh_jit_info_size = 0;
|
||||
}
|
||||
|
||||
/* Exception table */
|
||||
if (has_clauses)
|
||||
num_clauses = decode_value (p, &p);
|
||||
else
|
||||
num_clauses = 0;
|
||||
if (has_arch_eh_jit_info) {
|
||||
flags |= JIT_INFO_HAS_ARCH_EH_INFO;
|
||||
arch_eh_jit_info_size = sizeof (MonoArchEHJitInfo);
|
||||
} else {
|
||||
arch_eh_jit_info_size = 0;
|
||||
}
|
||||
|
||||
if (from_llvm) {
|
||||
MonoJitExceptionInfo *clauses;
|
||||
@@ -3399,14 +3403,14 @@ load_patch_info (MonoAotModule *aot_module, MonoMemPool *mp, int n_patches,
|
||||
|
||||
got_offset = decode_value (p, &p);
|
||||
|
||||
if (aot_module->got [got_offset]) {
|
||||
shared_p = aot_module->blob + mono_aot_get_offset (aot_module->got_info_offsets, got_offset);
|
||||
|
||||
ji->type = decode_value (shared_p, &shared_p);
|
||||
|
||||
/* See load_method () for SFLDA */
|
||||
if (aot_module->got [got_offset] && ji->type != MONO_PATCH_INFO_SFLDA) {
|
||||
/* Already loaded */
|
||||
//printf ("HIT!\n");
|
||||
} else {
|
||||
shared_p = aot_module->blob + mono_aot_get_offset (aot_module->got_info_offsets, got_offset);
|
||||
|
||||
ji->type = decode_value (shared_p, &shared_p);
|
||||
|
||||
res = decode_patch (aot_module, mp, ji, shared_p, &shared_p);
|
||||
if (!res)
|
||||
goto cleanup;
|
||||
@@ -3574,11 +3578,19 @@ load_method (MonoDomain *domain, MonoAotModule *amodule, MonoImage *image, MonoM
|
||||
|
||||
for (pindex = 0; pindex < n_patches; ++pindex) {
|
||||
MonoJumpInfo *ji = &patches [pindex];
|
||||
gpointer addr;
|
||||
|
||||
if (!amodule->got [got_slots [pindex]]) {
|
||||
amodule->got [got_slots [pindex]] = mono_resolve_patch_target (method, domain, code, ji, TRUE);
|
||||
/*
|
||||
* For SFLDA, we need to call resolve_patch_target () since the GOT slot could have
|
||||
* been initialized by load_method () for a static cctor before the cctor has
|
||||
* finished executing (#23242).
|
||||
*/
|
||||
if (!amodule->got [got_slots [pindex]] || ji->type == MONO_PATCH_INFO_SFLDA) {
|
||||
addr = mono_resolve_patch_target (method, domain, code, ji, TRUE);
|
||||
if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
|
||||
amodule->got [got_slots [pindex]] = mono_create_ftnptr (domain, amodule->got [got_slots [pindex]]);
|
||||
addr = mono_create_ftnptr (domain, addr);
|
||||
mono_memory_barrier ();
|
||||
amodule->got [got_slots [pindex]] = addr;
|
||||
if (ji->type == MONO_PATCH_INFO_METHOD_JUMP)
|
||||
register_jump_target_got_slot (domain, ji->data.method, &(amodule->got [got_slots [pindex]]));
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ long_conv_to_ovf_i4_2: dest:i src1:i src2:i len:36
|
||||
vcall2: len:40 clob:c
|
||||
vcall2_reg: src1:i len:40 clob:c
|
||||
vcall2_membase: src1:b len:40 clob:c
|
||||
dyn_call: src1:i src2:i len:120 clob:c
|
||||
dyn_call: src1:i src2:i len:192 clob:c
|
||||
|
||||
# This is different from the original JIT opcodes
|
||||
float_beq: len:32
|
||||
|
||||
@@ -289,7 +289,7 @@ typedef struct {
|
||||
#define HEADER_LENGTH 11
|
||||
|
||||
#define MAJOR_VERSION 2
|
||||
#define MINOR_VERSION 37
|
||||
#define MINOR_VERSION 38
|
||||
|
||||
typedef enum {
|
||||
CMD_SET_VM = 1,
|
||||
@@ -514,7 +514,8 @@ typedef enum {
|
||||
typedef enum {
|
||||
CMD_STACK_FRAME_GET_VALUES = 1,
|
||||
CMD_STACK_FRAME_GET_THIS = 2,
|
||||
CMD_STACK_FRAME_SET_VALUES = 3
|
||||
CMD_STACK_FRAME_SET_VALUES = 3,
|
||||
CMD_STACK_FRAME_GET_DOMAIN = 4,
|
||||
} CmdStackFrame;
|
||||
|
||||
typedef enum {
|
||||
@@ -815,6 +816,12 @@ static void
|
||||
register_socket_transport (void);
|
||||
#endif
|
||||
|
||||
static inline gboolean
|
||||
is_debugger_thread (void)
|
||||
{
|
||||
return GetCurrentThreadId () == debugger_thread_id;
|
||||
}
|
||||
|
||||
static int
|
||||
parse_address (char *address, char **host, int *port)
|
||||
{
|
||||
@@ -4070,6 +4077,10 @@ appdomain_start_unload (MonoProfiler *prof, MonoDomain *domain)
|
||||
{
|
||||
DebuggerTlsData *tls;
|
||||
|
||||
/* This might be called during shutdown on the debugger thread from the CMD_VM_EXIT code */
|
||||
if (is_debugger_thread ())
|
||||
return;
|
||||
|
||||
/*
|
||||
* Remember the currently unloading appdomain as it is needed to generate
|
||||
* proper ids for unloading assemblies.
|
||||
@@ -4084,6 +4095,9 @@ appdomain_unload (MonoProfiler *prof, MonoDomain *domain)
|
||||
{
|
||||
DebuggerTlsData *tls;
|
||||
|
||||
if (is_debugger_thread ())
|
||||
return;
|
||||
|
||||
tls = mono_native_tls_get_value (debugger_tls_id);
|
||||
g_assert (tls);
|
||||
tls->domain_unloading = NULL;
|
||||
@@ -4122,6 +4136,9 @@ assembly_load (MonoProfiler *prof, MonoAssembly *assembly, int result)
|
||||
static void
|
||||
assembly_unload (MonoProfiler *prof, MonoAssembly *assembly)
|
||||
{
|
||||
if (is_debugger_thread ())
|
||||
return;
|
||||
|
||||
process_profiler_event (EVENT_KIND_ASSEMBLY_UNLOAD, assembly);
|
||||
|
||||
clear_event_requests_for_assembly (assembly);
|
||||
@@ -6490,6 +6507,10 @@ clear_types_for_assembly (MonoAssembly *assembly)
|
||||
MonoDomain *domain = mono_domain_get ();
|
||||
AgentDomainInfo *info = NULL;
|
||||
|
||||
if (!domain || !domain_jit_info (domain))
|
||||
/* Can happen during shutdown */
|
||||
return;
|
||||
|
||||
mono_loader_lock ();
|
||||
info = get_agent_domain_info (domain);
|
||||
g_hash_table_foreach_remove (info->loaded_classes, type_comes_from_assembly, assembly);
|
||||
@@ -9037,6 +9058,11 @@ frame_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
|
||||
mono_metadata_free_mh (header);
|
||||
break;
|
||||
}
|
||||
case CMD_STACK_FRAME_GET_DOMAIN: {
|
||||
if (CHECK_PROTOCOL_VERSION (2, 38))
|
||||
buffer_add_domainid (buf, frame->domain);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return ERR_NOT_IMPLEMENTED;
|
||||
}
|
||||
@@ -9405,7 +9431,8 @@ static const char* type_cmds_str[] = {
|
||||
static const char* stack_frame_cmds_str[] = {
|
||||
"GET_VALUES",
|
||||
"GET_THIS",
|
||||
"SET_VALUES"
|
||||
"SET_VALUES",
|
||||
"GET_DOMAIN",
|
||||
};
|
||||
|
||||
static const char* array_cmds_str[] = {
|
||||
|
||||
@@ -828,14 +828,12 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
if ((ji = mini_jit_info_table_find (domain, (gpointer)(*lmf)->eip, NULL))) {
|
||||
frame->ji = ji;
|
||||
} else {
|
||||
if (!((guint32)((*lmf)->previous_lmf) & 1))
|
||||
/* Top LMF entry */
|
||||
if (!(*lmf)->method)
|
||||
return FALSE;
|
||||
g_assert_not_reached ();
|
||||
/* Trampoline lmf frame */
|
||||
frame->method = (*lmf)->method;
|
||||
}
|
||||
|
||||
@@ -848,7 +846,6 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls,
|
||||
/* Adjust IP */
|
||||
new_ctx->eip --;
|
||||
|
||||
frame->ji = ji;
|
||||
frame->type = FRAME_TYPE_MANAGED_TO_NATIVE;
|
||||
|
||||
/* Check if we are in a trampoline LMF frame */
|
||||
|
||||
@@ -3579,11 +3579,11 @@ static void
|
||||
save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean null_check, MonoBasicBlock **out_bblock)
|
||||
{
|
||||
if (mini_get_debug_options ()->better_cast_details) {
|
||||
int to_klass_reg = alloc_preg (cfg);
|
||||
int vtable_reg = alloc_preg (cfg);
|
||||
int klass_reg = alloc_preg (cfg);
|
||||
MonoBasicBlock *is_null_bb = NULL;
|
||||
MonoInst *tls_get;
|
||||
int to_klass_reg, context_used;
|
||||
|
||||
if (null_check) {
|
||||
NEW_BBLOCK (cfg, is_null_bb);
|
||||
@@ -3603,7 +3603,17 @@ save_cast_details (MonoCompile *cfg, MonoClass *klass, int obj_reg, gboolean nul
|
||||
MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass));
|
||||
|
||||
MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORE_MEMBASE_REG, tls_get->dreg, MONO_STRUCT_OFFSET (MonoJitTlsData, class_cast_from), klass_reg);
|
||||
MONO_EMIT_NEW_PCONST (cfg, to_klass_reg, klass);
|
||||
|
||||
context_used = mini_class_check_context_used (cfg, klass);
|
||||
if (context_used) {
|
||||
MonoInst *class_ins;
|
||||
|
||||
class_ins = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS);
|
||||
to_klass_reg = class_ins->dreg;
|
||||
} else {
|
||||
to_klass_reg = alloc_preg (cfg);
|
||||
MONO_EMIT_NEW_CLASSCONST (cfg, to_klass_reg, klass);
|
||||
}
|
||||
MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORE_MEMBASE_REG, tls_get->dreg, MONO_STRUCT_OFFSET (MonoJitTlsData, class_cast_to), to_klass_reg);
|
||||
|
||||
if (null_check) {
|
||||
@@ -4095,6 +4105,7 @@ emit_castclass_with_cache (MonoCompile *cfg, MonoClass *klass, MonoInst **args,
|
||||
save_cast_details (cfg, klass, args [0]->dreg, TRUE, out_bblock);
|
||||
res = mono_emit_method_call (cfg, mono_castclass, args, NULL);
|
||||
reset_cast_details (cfg);
|
||||
*out_bblock = cfg->cbb;
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -4130,13 +4141,15 @@ emit_castclass_with_cache_nonshared (MonoCompile *cfg, MonoInst *obj, MonoClass
|
||||
* Returns NULL and set the cfg exception on error.
|
||||
*/
|
||||
static MonoInst*
|
||||
handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_used)
|
||||
handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_used, MonoBasicBlock **out_bb)
|
||||
{
|
||||
MonoBasicBlock *is_null_bb;
|
||||
int obj_reg = src->dreg;
|
||||
int vtable_reg = alloc_preg (cfg);
|
||||
MonoInst *klass_inst = NULL;
|
||||
|
||||
*out_bb = cfg->cbb;
|
||||
|
||||
if (context_used) {
|
||||
MonoInst *args [3];
|
||||
|
||||
@@ -4154,7 +4167,7 @@ handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context
|
||||
/* cache */
|
||||
args [2] = cache_ins;
|
||||
|
||||
return emit_castclass_with_cache (cfg, klass, args, NULL);
|
||||
return emit_castclass_with_cache (cfg, klass, args, out_bb);
|
||||
}
|
||||
|
||||
klass_inst = emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS);
|
||||
@@ -4200,6 +4213,8 @@ handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context
|
||||
|
||||
reset_cast_details (cfg);
|
||||
|
||||
*out_bb = cfg->cbb;
|
||||
|
||||
return src;
|
||||
}
|
||||
|
||||
@@ -9863,7 +9878,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
|
||||
inline_costs += costs;
|
||||
}
|
||||
else {
|
||||
ins = handle_castclass (cfg, klass, *sp, context_used);
|
||||
ins = handle_castclass (cfg, klass, *sp, context_used, &bblock);
|
||||
CHECK_CFG_EXCEPTION;
|
||||
bblock = cfg->cbb;
|
||||
*sp ++ = ins;
|
||||
@@ -9977,7 +9992,7 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
|
||||
*sp++ = iargs [0];
|
||||
inline_costs += costs;
|
||||
} else {
|
||||
ins = handle_castclass (cfg, klass, *sp, context_used);
|
||||
ins = handle_castclass (cfg, klass, *sp, context_used, &bblock);
|
||||
CHECK_CFG_EXCEPTION;
|
||||
bblock = cfg->cbb;
|
||||
*sp ++ = ins;
|
||||
|
||||
@@ -5022,8 +5022,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
|
||||
break;
|
||||
case OP_STORER4_MEMBASE_REG:
|
||||
/* This requires a double->single conversion */
|
||||
amd64_sse_cvtsd2ss_reg_reg (code, AMD64_XMM15, ins->sreg1);
|
||||
amd64_sse_movss_membase_reg (code, ins->inst_destbasereg, ins->inst_offset, AMD64_XMM15);
|
||||
amd64_sse_cvtsd2ss_reg_reg (code, MONO_ARCH_FP_SCRATCH_REG, ins->sreg1);
|
||||
amd64_sse_movss_membase_reg (code, ins->inst_destbasereg, ins->inst_offset, MONO_ARCH_FP_SCRATCH_REG);
|
||||
break;
|
||||
case OP_LOADR4_MEMBASE:
|
||||
amd64_sse_movss_reg_membase (code, ins->dreg, ins->inst_basereg, ins->inst_offset);
|
||||
@@ -6070,8 +6070,8 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
|
||||
break;
|
||||
case OP_EXTRACT_I8:
|
||||
if (ins->inst_c0) {
|
||||
amd64_movhlps_reg_reg (code, AMD64_XMM15, ins->sreg1);
|
||||
amd64_movd_reg_xreg_size (code, ins->dreg, AMD64_XMM15, 8);
|
||||
amd64_movhlps_reg_reg (code, MONO_ARCH_FP_SCRATCH_REG, ins->sreg1);
|
||||
amd64_movd_reg_xreg_size (code, ins->dreg, MONO_ARCH_FP_SCRATCH_REG, 8);
|
||||
} else {
|
||||
amd64_movd_reg_xreg_size (code, ins->dreg, ins->sreg1, 8);
|
||||
}
|
||||
@@ -6123,11 +6123,11 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
|
||||
amd64_sse_pinsrw_reg_reg_imm (code, ins->dreg, ins->sreg2, ins->inst_c0 * 2 + 1);
|
||||
break;
|
||||
case OP_INSERTX_I8_SLOW:
|
||||
amd64_movd_xreg_reg_size(code, AMD64_XMM15, ins->sreg2, 8);
|
||||
amd64_movd_xreg_reg_size(code, MONO_ARCH_FP_SCRATCH_REG, ins->sreg2, 8);
|
||||
if (ins->inst_c0)
|
||||
amd64_movlhps_reg_reg (code, ins->dreg, AMD64_XMM15);
|
||||
amd64_movlhps_reg_reg (code, ins->dreg, MONO_ARCH_FP_SCRATCH_REG);
|
||||
else
|
||||
amd64_sse_movsd_reg_reg (code, ins->dreg, AMD64_XMM15);
|
||||
amd64_sse_movsd_reg_reg (code, ins->dreg, MONO_ARCH_FP_SCRATCH_REG);
|
||||
break;
|
||||
|
||||
case OP_INSERTX_R4_SLOW:
|
||||
|
||||
+12
-3
@@ -122,14 +122,23 @@ struct sigcontext {
|
||||
|
||||
#define MONO_ARCH_FP_RETURN_REG AMD64_XMM0
|
||||
|
||||
/* xmm15 is reserved for use by some opcodes */
|
||||
#ifdef TARGET_WIN32
|
||||
/* xmm5 is used as a scratch register */
|
||||
#define MONO_ARCH_CALLEE_FREGS 0x1f
|
||||
/* xmm6:xmm15 */
|
||||
#define MONO_ARCH_CALLEE_SAVED_FREGS (0xffff - 0x3f)
|
||||
#define MONO_ARCH_FP_SCRATCH_REG AMD64_XMM5
|
||||
#else
|
||||
/* xmm15 is used as a scratch register */
|
||||
#define MONO_ARCH_CALLEE_FREGS 0x7fff
|
||||
#define MONO_ARCH_CALLEE_SAVED_FREGS 0
|
||||
#define MONO_ARCH_FP_SCRATCH_REG AMD64_XMM15
|
||||
#endif
|
||||
|
||||
#define MONO_MAX_XREGS MONO_MAX_FREGS
|
||||
|
||||
#define MONO_ARCH_CALLEE_XREGS 0x7fff
|
||||
#define MONO_ARCH_CALLEE_SAVED_XREGS 0
|
||||
#define MONO_ARCH_CALLEE_XREGS MONO_ARCH_CALLEE_FREGS
|
||||
#define MONO_ARCH_CALLEE_SAVED_XREGS MONO_ARCH_CALLEE_SAVED_FREGS
|
||||
|
||||
|
||||
#define MONO_ARCH_CALLEE_REGS AMD64_CALLEE_REGS
|
||||
|
||||
+29
-10
@@ -247,9 +247,32 @@ emit_big_add (guint8 *code, int dreg, int sreg, int imm)
|
||||
ARM_ADD_REG_IMM (code, dreg, sreg, imm8, rot_amount);
|
||||
return code;
|
||||
}
|
||||
g_assert (dreg != sreg);
|
||||
code = mono_arm_emit_load_imm (code, dreg, imm);
|
||||
ARM_ADD_REG_REG (code, dreg, dreg, sreg);
|
||||
if (dreg == sreg) {
|
||||
code = mono_arm_emit_load_imm (code, ARMREG_IP, imm);
|
||||
ARM_ADD_REG_REG (code, dreg, sreg, ARMREG_IP);
|
||||
} else {
|
||||
code = mono_arm_emit_load_imm (code, dreg, imm);
|
||||
ARM_ADD_REG_REG (code, dreg, dreg, sreg);
|
||||
}
|
||||
return code;
|
||||
}
|
||||
|
||||
/* If dreg == sreg, this clobbers IP */
|
||||
static guint8*
|
||||
emit_sub_imm (guint8 *code, int dreg, int sreg, int imm)
|
||||
{
|
||||
int imm8, rot_amount;
|
||||
if ((imm8 = mono_arm_is_rotated_imm8 (imm, &rot_amount)) >= 0) {
|
||||
ARM_SUB_REG_IMM (code, dreg, sreg, imm8, rot_amount);
|
||||
return code;
|
||||
}
|
||||
if (dreg == sreg) {
|
||||
code = mono_arm_emit_load_imm (code, ARMREG_IP, imm);
|
||||
ARM_SUB_REG_REG (code, dreg, sreg, ARMREG_IP);
|
||||
} else {
|
||||
code = mono_arm_emit_load_imm (code, dreg, imm);
|
||||
ARM_SUB_REG_REG (code, dreg, dreg, sreg);
|
||||
}
|
||||
return code;
|
||||
}
|
||||
|
||||
@@ -4945,15 +4968,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
|
||||
break;
|
||||
}
|
||||
case OP_LOCALLOC: {
|
||||
/* keep alignment */
|
||||
int alloca_waste = cfg->param_area;
|
||||
alloca_waste += 7;
|
||||
alloca_waste &= ~7;
|
||||
/* round the size to 8 bytes */
|
||||
ARM_ADD_REG_IMM8 (code, ins->dreg, ins->sreg1, 7);
|
||||
ARM_BIC_REG_IMM8 (code, ins->dreg, ins->dreg, 7);
|
||||
if (alloca_waste)
|
||||
ARM_ADD_REG_IMM8 (code, ins->dreg, ins->dreg, alloca_waste);
|
||||
ARM_SUB_REG_REG (code, ARMREG_SP, ARMREG_SP, ins->dreg);
|
||||
/* memzero the area: dreg holds the size, sp is the pointer */
|
||||
if (ins->flags & MONO_INST_INIT) {
|
||||
@@ -4969,7 +4986,9 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
|
||||
ARM_B_COND (code, ARMCOND_GE, 0);
|
||||
arm_patch (code - 4, start_loop);
|
||||
}
|
||||
ARM_ADD_REG_IMM8 (code, ins->dreg, ARMREG_SP, alloca_waste);
|
||||
ARM_MOV_REG_REG (code, ins->dreg, ARMREG_SP);
|
||||
if (cfg->param_area)
|
||||
code = emit_sub_imm (code, ARMREG_SP, ARMREG_SP, ALIGN_TO (cfg->param_area, MONO_ARCH_FRAME_ALIGNMENT));
|
||||
break;
|
||||
}
|
||||
case OP_DYN_CALL: {
|
||||
|
||||
+77
-8
@@ -25,6 +25,8 @@
|
||||
#ifdef HAVE_SYS_SYSCALL_H
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
|
||||
#include <mono/metadata/assembly.h>
|
||||
#include <mono/metadata/loader.h>
|
||||
@@ -55,6 +57,7 @@
|
||||
#include <mono/utils/mono-mmap.h>
|
||||
#include <mono/utils/dtrace.h>
|
||||
#include <mono/utils/mono-signal-handler.h>
|
||||
#include <mono/utils/mono-threads.h>
|
||||
|
||||
#include "mini.h"
|
||||
#include <string.h>
|
||||
@@ -306,12 +309,14 @@ MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
|
||||
|
||||
#else
|
||||
|
||||
MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
|
||||
static int profiling_signal_in_use;
|
||||
|
||||
static void
|
||||
per_thread_profiler_hit (void *ctx)
|
||||
{
|
||||
int call_chain_depth = mono_profiler_stat_get_call_chain_depth ();
|
||||
MonoProfilerCallChainStrategy call_chain_strategy = mono_profiler_stat_get_call_chain_strategy ();
|
||||
MONO_SIG_HANDLER_GET_CONTEXT;
|
||||
|
||||
|
||||
if (call_chain_depth == 0) {
|
||||
mono_profiler_stat_hit (mono_arch_ip_from_context (ctx), ctx);
|
||||
} else {
|
||||
@@ -378,6 +383,40 @@ MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
|
||||
|
||||
mono_profiler_stat_call_chain (current_frame_index, & ips [0], ctx);
|
||||
}
|
||||
}
|
||||
|
||||
MONO_SIG_HANDLER_FUNC (static, sigprof_signal_handler)
|
||||
{
|
||||
MonoThreadInfo *info;
|
||||
int old_errno = errno;
|
||||
int hp_save_index;
|
||||
MONO_SIG_HANDLER_GET_CONTEXT;
|
||||
|
||||
if (mono_thread_info_get_small_id () == -1)
|
||||
return; //an non-attached thread got the signal
|
||||
|
||||
if (!mono_domain_get () || !mono_native_tls_get_value (mono_jit_tls_id))
|
||||
return; //thread in the process of dettaching
|
||||
|
||||
hp_save_index = mono_hazard_pointer_save_for_signal_handler ();
|
||||
|
||||
/* If we can't consume a profiling request it means we're the initiator. */
|
||||
if (!(mono_threads_consume_async_jobs () & MONO_SERVICE_REQUEST_SAMPLE)) {
|
||||
FOREACH_THREAD_SAFE (info) {
|
||||
if (mono_thread_info_get_tid (info) == mono_native_thread_id_get ())
|
||||
continue;
|
||||
|
||||
mono_threads_add_async_job (info, MONO_SERVICE_REQUEST_SAMPLE);
|
||||
mono_threads_pthread_kill (info, profiling_signal_in_use);
|
||||
} END_FOREACH_THREAD_SAFE;
|
||||
}
|
||||
|
||||
mono_thread_info_set_is_async_context (TRUE);
|
||||
per_thread_profiler_hit (ctx);
|
||||
mono_thread_info_set_is_async_context (FALSE);
|
||||
|
||||
mono_hazard_pointer_restore_for_signal_handler (hp_save_index);
|
||||
errno = old_errno;
|
||||
|
||||
mono_chain_signal (MONO_SIG_HANDLER_PARAMS);
|
||||
}
|
||||
@@ -600,6 +639,30 @@ mono_runtime_shutdown_stat_profiler (void)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef ITIMER_PROF
|
||||
static int
|
||||
get_itimer_mode (void)
|
||||
{
|
||||
switch (mono_profiler_get_sampling_mode ()) {
|
||||
case MONO_PROFILER_STAT_MODE_PROCESS: return ITIMER_PROF;
|
||||
case MONO_PROFILER_STAT_MODE_REAL: return ITIMER_REAL;
|
||||
}
|
||||
g_assert_not_reached ();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
get_itimer_signal (void)
|
||||
{
|
||||
switch (mono_profiler_get_sampling_mode ()) {
|
||||
case MONO_PROFILER_STAT_MODE_PROCESS: return SIGPROF;
|
||||
case MONO_PROFILER_STAT_MODE_REAL: return SIGALRM;
|
||||
}
|
||||
g_assert_not_reached ();
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
mono_runtime_setup_stat_profiler (void)
|
||||
{
|
||||
@@ -620,7 +683,8 @@ mono_runtime_setup_stat_profiler (void)
|
||||
perror ("open /dev/rtc");
|
||||
return;
|
||||
}
|
||||
add_signal_handler (SIGPROF, sigprof_signal_handler);
|
||||
profiling_signal_in_use = SIGPROF;
|
||||
add_signal_handler (profiling_signal_in_use, sigprof_signal_handler);
|
||||
if (ioctl (rtc_fd, RTC_IRQP_SET, freq) == -1) {
|
||||
perror ("set rtc freq");
|
||||
return;
|
||||
@@ -644,14 +708,15 @@ mono_runtime_setup_stat_profiler (void)
|
||||
return;
|
||||
#endif
|
||||
|
||||
itval.it_interval.tv_usec = 999;
|
||||
itval.it_interval.tv_usec = (1000000 / mono_profiler_get_sampling_rate ()) - 1;
|
||||
itval.it_interval.tv_sec = 0;
|
||||
itval.it_value = itval.it_interval;
|
||||
setitimer (ITIMER_PROF, &itval, NULL);
|
||||
if (inited)
|
||||
return;
|
||||
inited = 1;
|
||||
add_signal_handler (SIGPROF, sigprof_signal_handler);
|
||||
profiling_signal_in_use = get_itimer_signal ();
|
||||
add_signal_handler (profiling_signal_in_use, sigprof_signal_handler);
|
||||
setitimer (get_itimer_mode (), &itval, NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -659,7 +724,11 @@ mono_runtime_setup_stat_profiler (void)
|
||||
pid_t
|
||||
mono_runtime_syscall_fork ()
|
||||
{
|
||||
#if defined(SYS_fork)
|
||||
#if defined(PLATFORM_ANDROID)
|
||||
/* SYS_fork is defined to be __NR_fork which is not defined in some ndk versions */
|
||||
g_assert_not_reached ();
|
||||
return 0;
|
||||
#elif defined(SYS_fork)
|
||||
return (pid_t) syscall (SYS_fork);
|
||||
#else
|
||||
g_assert_not_reached ();
|
||||
|
||||
+4
-3
@@ -4137,6 +4137,7 @@ mono_codegen (MonoCompile *cfg)
|
||||
if (bb == cfg->bb_exit) {
|
||||
cfg->epilog_begin = cfg->code_len;
|
||||
mono_arch_emit_epilog (cfg);
|
||||
cfg->epilog_end = cfg->code_len;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4645,7 +4646,7 @@ create_jit_info (MonoCompile *cfg, MonoMethod *method_to_compile)
|
||||
|
||||
info = mono_jit_info_get_arch_eh_info (jinfo);
|
||||
g_assert (info);
|
||||
info->epilog_size = cfg->code_size - cfg->epilog_begin;
|
||||
info->epilog_size = cfg->code_len - cfg->epilog_begin;
|
||||
}
|
||||
jinfo->unwind_info = unwind_desc;
|
||||
g_free (unwind_info);
|
||||
@@ -6691,8 +6692,8 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
|
||||
gpointer *args;
|
||||
static RuntimeInvokeDynamicFunction dyn_runtime_invoke;
|
||||
int i, pindex;
|
||||
guint8 buf [128];
|
||||
guint8 retval [128];
|
||||
guint8 buf [256];
|
||||
guint8 retval [256];
|
||||
|
||||
if (!dyn_runtime_invoke) {
|
||||
invoke = mono_marshal_get_runtime_invoke_dynamic ();
|
||||
|
||||
+2
-1
@@ -111,7 +111,7 @@
|
||||
#endif
|
||||
|
||||
/* Version number of the AOT file format */
|
||||
#define MONO_AOT_FILE_VERSION 103
|
||||
#define MONO_AOT_FILE_VERSION 104
|
||||
|
||||
//TODO: This is x86/amd64 specific.
|
||||
#define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6))
|
||||
@@ -1454,6 +1454,7 @@ typedef struct {
|
||||
guint code_len;
|
||||
guint prolog_end;
|
||||
guint epilog_begin;
|
||||
guint epilog_end;
|
||||
regmask_t used_int_regs;
|
||||
guint32 opt;
|
||||
guint32 prof_options;
|
||||
|
||||
+87
-22
@@ -90,6 +90,7 @@ static int do_mono_sample = 0;
|
||||
static int in_shutdown = 0;
|
||||
static int do_debug = 0;
|
||||
static int do_counters = 0;
|
||||
static MonoProfileSamplingMode sampling_mode = MONO_PROFILER_STAT_MODE_PROCESS;
|
||||
|
||||
/* For linux compile with:
|
||||
* gcc -fPIC -shared -o libmono-profiler-log.so proflog.c utils.c -Wall -g -lz `pkg-config --cflags --libs mono-2`
|
||||
@@ -831,13 +832,10 @@ walk_stack (MonoMethod *method, int32_t native_offset, int32_t il_offset, mono_b
|
||||
* event, hence the collect_bt/emit_bt split.
|
||||
*/
|
||||
static void
|
||||
collect_bt (FrameData *data, gboolean async_safe)
|
||||
collect_bt (FrameData *data)
|
||||
{
|
||||
data->count = 0;
|
||||
if (async_safe)
|
||||
mono_stack_walk_async_safe (walk_stack, data);
|
||||
else
|
||||
mono_stack_walk_no_il (walk_stack, data);
|
||||
mono_stack_walk_no_il (walk_stack, data);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -870,7 +868,7 @@ gc_alloc (MonoProfiler *prof, MonoObject *obj, MonoClass *klass)
|
||||
len += 7;
|
||||
len &= ~7;
|
||||
if (do_bt)
|
||||
collect_bt (&data, FALSE);
|
||||
collect_bt (&data);
|
||||
logbuffer = ensure_logbuf (32 + MAX_FRAMES * 8);
|
||||
now = current_time ();
|
||||
ENTER_LOG (logbuffer, "gcalloc");
|
||||
@@ -1135,7 +1133,7 @@ throw_exc (MonoProfiler *prof, MonoObject *object)
|
||||
FrameData data;
|
||||
LogBuffer *logbuffer;
|
||||
if (do_bt)
|
||||
collect_bt (&data, FALSE);
|
||||
collect_bt (&data);
|
||||
logbuffer = ensure_logbuf (16 + MAX_FRAMES * 8);
|
||||
now = current_time ();
|
||||
ENTER_LOG (logbuffer, "throw");
|
||||
@@ -1171,7 +1169,7 @@ monitor_event (MonoProfiler *profiler, MonoObject *object, MonoProfilerMonitorEv
|
||||
FrameData data;
|
||||
LogBuffer *logbuffer;
|
||||
if (do_bt)
|
||||
collect_bt (&data, FALSE);
|
||||
collect_bt (&data);
|
||||
logbuffer = ensure_logbuf (16 + MAX_FRAMES * 8);
|
||||
now = current_time ();
|
||||
ENTER_LOG (logbuffer, "monitor");
|
||||
@@ -1220,11 +1218,44 @@ thread_name (MonoProfiler *prof, uintptr_t tid, const char *name)
|
||||
EXIT_LOG (logbuffer);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
MonoMethod *method;
|
||||
MonoDomain *domain;
|
||||
void *base_address;
|
||||
int offset;
|
||||
} AsyncFrameInfo;
|
||||
|
||||
typedef struct {
|
||||
int count;
|
||||
AsyncFrameInfo *data;
|
||||
} AsyncFrameData;
|
||||
|
||||
static mono_bool
|
||||
async_walk_stack (MonoMethod *method, MonoDomain *domain, void *base_address, int offset, void *data)
|
||||
{
|
||||
AsyncFrameData *frame = data;
|
||||
if (frame->count < num_frames) {
|
||||
frame->data [frame->count].method = method;
|
||||
frame->data [frame->count].domain = domain;
|
||||
frame->data [frame->count].base_address = base_address;
|
||||
frame->data [frame->count].offset = offset;
|
||||
// printf ("In %d at %p (dom %p) (native: %p)\n", frame->count, method, domain, base_address);
|
||||
frame->count++;
|
||||
}
|
||||
return frame->count == num_frames;
|
||||
}
|
||||
|
||||
/*
|
||||
(type | frame count), tid, time, ip, [method, domain, base address, offset] * frames
|
||||
*/
|
||||
#define SAMPLE_EVENT_SIZE_IN_SLOTS(FRAMES) (4 + (FRAMES) * 4)
|
||||
|
||||
static void
|
||||
mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
|
||||
{
|
||||
StatBuffer *sbuf;
|
||||
FrameData bt_data;
|
||||
AsyncFrameInfo frames [num_frames];
|
||||
AsyncFrameData bt_data = { 0, &frames [0]};
|
||||
uint64_t now;
|
||||
uintptr_t *data, *new_data, *old_data;
|
||||
uintptr_t elapsed;
|
||||
@@ -1233,7 +1264,9 @@ mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
|
||||
if (in_shutdown)
|
||||
return;
|
||||
now = current_time ();
|
||||
collect_bt (&bt_data, TRUE);
|
||||
|
||||
mono_stack_walk_async_safe (&async_walk_stack, context, &bt_data);
|
||||
|
||||
elapsed = (now - profiler->startup_time) / 10000;
|
||||
if (do_debug) {
|
||||
int len;
|
||||
@@ -1272,7 +1305,7 @@ mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
|
||||
}
|
||||
do {
|
||||
old_data = sbuf->data;
|
||||
new_data = old_data + 4 + bt_data.count * 3;
|
||||
new_data = old_data + SAMPLE_EVENT_SIZE_IN_SLOTS (bt_data.count);
|
||||
data = InterlockedCompareExchangePointer ((void * volatile*)&sbuf->data, new_data, old_data);
|
||||
} while (data != old_data);
|
||||
if (old_data >= sbuf->data_end)
|
||||
@@ -1282,9 +1315,10 @@ mono_sample_hit (MonoProfiler *profiler, unsigned char *ip, void *context)
|
||||
old_data [2] = elapsed;
|
||||
old_data [3] = (uintptr_t)ip;
|
||||
for (i = 0; i < bt_data.count; ++i) {
|
||||
old_data [4+3*i] = (uintptr_t)bt_data.methods [i];
|
||||
old_data [4+3*i+1] = (uintptr_t)bt_data.il_offsets [i];
|
||||
old_data [4+3*i+2] = (uintptr_t)bt_data.native_offsets [i];
|
||||
old_data [4 + 4 * i + 0] = (uintptr_t)frames [i].method;
|
||||
old_data [4 + 4 * i + 1] = (uintptr_t)frames [i].domain;
|
||||
old_data [4 + 4 * i + 2] = (uintptr_t)frames [i].base_address;
|
||||
old_data [4 + 4 * i + 3] = (uintptr_t)frames [i].offset;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1624,8 +1658,22 @@ dump_sample_hits (MonoProfiler *prof, StatBuffer *sbuf, int recurse)
|
||||
int count = sample [0] & 0xff;
|
||||
int mbt_count = (sample [0] & 0xff00) >> 8;
|
||||
int type = sample [0] >> 16;
|
||||
if (sample + count + 3 + mbt_count * 3 > sbuf->data)
|
||||
uintptr_t *managed_sample_base = sample + count + 3;
|
||||
|
||||
if (sample + SAMPLE_EVENT_SIZE_IN_SLOTS (mbt_count) > sbuf->data)
|
||||
break;
|
||||
|
||||
for (i = 0; i < mbt_count; ++i) {
|
||||
MonoMethod *method = (MonoMethod*)managed_sample_base [i * 4 + 0];
|
||||
MonoDomain *domain = (MonoDomain*)managed_sample_base [i * 4 + 1];
|
||||
void *address = (void*)managed_sample_base [i * 4 + 2];
|
||||
|
||||
if (!method) {
|
||||
MonoJitInfo *ji = mono_jit_info_table_find (domain, address);
|
||||
if (ji)
|
||||
managed_sample_base [i * 4 + 0] = (uintptr_t)mono_jit_info_get_method (ji);
|
||||
}
|
||||
}
|
||||
logbuffer = ensure_logbuf (20 + count * 8);
|
||||
emit_byte (logbuffer, TYPE_SAMPLE | TYPE_SAMPLE_HIT);
|
||||
emit_value (logbuffer, type);
|
||||
@@ -1635,15 +1683,16 @@ dump_sample_hits (MonoProfiler *prof, StatBuffer *sbuf, int recurse)
|
||||
emit_ptr (logbuffer, (void*)sample [i + 3]);
|
||||
add_code_pointer (sample [i + 3]);
|
||||
}
|
||||
|
||||
sample += count + 3;
|
||||
/* new in data version 6 */
|
||||
emit_uvalue (logbuffer, mbt_count);
|
||||
for (i = 0; i < mbt_count; ++i) {
|
||||
emit_method (logbuffer, (void*)sample [i * 3]); /* method */
|
||||
emit_svalue (logbuffer, sample [i * 3 + 1]); /* il offset */
|
||||
emit_svalue (logbuffer, sample [i * 3 + 2]); /* native offset */
|
||||
emit_method (logbuffer, (void*)sample [i * 4]); /* method */
|
||||
emit_svalue (logbuffer, 0); /* il offset will always be 0 from now on */
|
||||
emit_svalue (logbuffer, sample [i * 4 + 3]); /* native offset */
|
||||
}
|
||||
sample += 3 * mbt_count;
|
||||
sample += 4 * mbt_count;
|
||||
}
|
||||
dump_unmanaged_coderefs (prof);
|
||||
}
|
||||
@@ -2188,6 +2237,10 @@ new_filename (const char* filename)
|
||||
}
|
||||
|
||||
#ifndef DISABLE_HELPER_THREAD
|
||||
|
||||
//this is exposed by the JIT, but it's not meant to be a supported API for now.
|
||||
extern void mono_threads_attach_tools_thread (void);
|
||||
|
||||
static void*
|
||||
helper_thread (void* arg)
|
||||
{
|
||||
@@ -2198,6 +2251,7 @@ helper_thread (void* arg)
|
||||
MonoThread *thread = NULL;
|
||||
uint64_t start, now;
|
||||
|
||||
mono_threads_attach_tools_thread ();
|
||||
//fprintf (stderr, "Server listening\n");
|
||||
start = current_time ();
|
||||
command_socket = -1;
|
||||
@@ -2255,9 +2309,11 @@ helper_thread (void* arg)
|
||||
sbufbase->next->next = NULL;
|
||||
if (do_debug)
|
||||
fprintf (stderr, "stat buffer dump\n");
|
||||
dump_sample_hits (prof, sbuf, 1);
|
||||
free_buffer (sbuf, sbuf->size);
|
||||
safe_dump (prof, ensure_logbuf (0));
|
||||
if (sbuf) {
|
||||
dump_sample_hits (prof, sbuf, 1);
|
||||
free_buffer (sbuf, sbuf->size);
|
||||
safe_dump (prof, ensure_logbuf (0));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
/* time to shut down */
|
||||
@@ -2692,6 +2748,14 @@ mono_profiler_startup (const char *desc)
|
||||
do_debug = 1;
|
||||
continue;
|
||||
}
|
||||
if ((opt = match_option (p, "sampling-real", NULL)) != p) {
|
||||
sampling_mode = MONO_PROFILER_STAT_MODE_REAL;
|
||||
continue;
|
||||
}
|
||||
if ((opt = match_option (p, "sampling-process", NULL)) != p) {
|
||||
sampling_mode = MONO_PROFILER_STAT_MODE_PROCESS;
|
||||
continue;
|
||||
}
|
||||
if ((opt = match_option (p, "heapshot", &val)) != p) {
|
||||
events &= ~MONO_PROFILE_ALLOCATIONS;
|
||||
events &= ~MONO_PROFILE_ENTER_LEAVE;
|
||||
@@ -2781,6 +2845,7 @@ mono_profiler_startup (const char *desc)
|
||||
|
||||
if (do_mono_sample && sample_type == SAMPLE_CYCLES) {
|
||||
events |= MONO_PROFILE_STATISTICAL;
|
||||
mono_profiler_set_statistical_mode (sampling_mode, 1000000 / sample_freq);
|
||||
mono_profiler_install_statistical (mono_sample_hit);
|
||||
}
|
||||
|
||||
|
||||
@@ -214,6 +214,7 @@ BASE_TEST_CS_SRC= \
|
||||
array3.cs \
|
||||
classinit.cs \
|
||||
classinit2.cs \
|
||||
classinit3.cs \
|
||||
synchronized.cs \
|
||||
async_read.cs \
|
||||
threadpool.cs \
|
||||
@@ -1299,12 +1300,8 @@ patch-libtool:
|
||||
if NACL_CODEGEN
|
||||
test-process-exit:
|
||||
else
|
||||
EXTRA_DIST += bug-438454.cs bug-438454.exe.stdout.expected threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
|
||||
EXTRA_DIST += threadpool-in-processexit.cs threadpool-in-processexit.exe.stdout.expected
|
||||
test-process-exit:
|
||||
@$(MCS) $(srcdir)/bug-438454.cs -out:bug-438454.exe
|
||||
@echo "Testing bug-438454.exe..."
|
||||
@$(RUNTIME) bug-438454.exe > bug-438454.exe.stdout
|
||||
@diff -w bug-438454.exe.stdout $(srcdir)/bug-438454.exe.stdout.expected
|
||||
@$(MCS) $(srcdir)/threadpool-in-processexit.cs -out:threadpool-in-processexit.exe
|
||||
@echo "Testing threadpool-in-processexit.exe..."
|
||||
@$(RUNTIME) threadpool-in-processexit.exe > threadpool-in-processexit.exe.stdout
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
|
||||
class Program
|
||||
{
|
||||
static void Main ()
|
||||
{
|
||||
var d = AppDomain.CreateDomain("Foo");
|
||||
d.ProcessExit += AppDomain_ProcessExit;
|
||||
|
||||
AppDomain.CurrentDomain.ProcessExit += new EventHandler (AppDomain_ProcessExit);
|
||||
ThreadPool.QueueUserWorkItem (new WaitCallback (Proc));
|
||||
Thread.Sleep (100);
|
||||
}
|
||||
|
||||
static void Proc (object unused)
|
||||
{
|
||||
Thread.CurrentThread.IsBackground = false;
|
||||
Thread.Sleep (500);
|
||||
Console.WriteLine ("done");
|
||||
}
|
||||
|
||||
static void AppDomain_ProcessExit (object sender, EventArgs e)
|
||||
{
|
||||
Console.WriteLine ("exit");
|
||||
|
||||
// No messages should be printed, as when this event is fired the
|
||||
// ThreadPool has been shutdown, thus `a.BeginInvoke()` has no effect.
|
||||
Action a = () => {
|
||||
int i = 0;
|
||||
while (i < 1024)
|
||||
Console.WriteLine ("Ha! {0}", i++);
|
||||
};
|
||||
a.BeginInvoke (null, null);
|
||||
}
|
||||
}
|
||||
@@ -1,3 +0,0 @@
|
||||
done
|
||||
exit
|
||||
exit
|
||||
@@ -0,0 +1,35 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
namespace integer_test
|
||||
{
|
||||
class MainClass
|
||||
{
|
||||
// #23242
|
||||
public static void Main (string[] args)
|
||||
{
|
||||
var _trigger = new ManualResetEvent (false);
|
||||
|
||||
var testThreads = new Thread[100];
|
||||
for (Int16 i = 0; i < testThreads.Length; ++i)
|
||||
{
|
||||
testThreads [i] = new Thread ( () =>
|
||||
{
|
||||
_trigger.WaitOne();
|
||||
for (Int16 index = 0; index < 1000; ++index)
|
||||
{
|
||||
var val = index.ToString();
|
||||
GC.KeepAlive(val);
|
||||
}
|
||||
});
|
||||
testThreads [i].Start ();
|
||||
}
|
||||
Console.WriteLine ("setting event");
|
||||
_trigger.Set ();
|
||||
foreach (var thread in testThreads)
|
||||
{
|
||||
thread.Join ();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -219,6 +219,20 @@
|
||||
#include <BaseTsd.h>
|
||||
typedef SSIZE_T ssize_t;
|
||||
|
||||
/*
|
||||
* SSIZE_MAX is not defined in MSVC, so define it here.
|
||||
*
|
||||
* These values come from MinGW64, and are public domain.
|
||||
*
|
||||
*/
|
||||
#ifndef SSIZE_MAX
|
||||
#ifdef _WIN64
|
||||
#define SSIZE_MAX _I64_MAX
|
||||
#else
|
||||
#define SSIZE_MAX INT_MAX
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#if !defined(_MSC_VER) && !defined(PLATFORM_SOLARIS) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(MONOTOUCH) && HAVE_VISIBILITY_HIDDEN
|
||||
|
||||
@@ -66,7 +66,15 @@ Requires the world to be stoped
|
||||
MonoLinkedListSetNode *__cur; \
|
||||
for (__cur = (list)->head; __cur; __cur = mono_lls_pointer_unmask (__cur->next)) \
|
||||
if (!mono_lls_pointer_get_mark (__cur->next)) { \
|
||||
(element) = (type)__cur; \
|
||||
(element) = (type)__cur;
|
||||
|
||||
|
||||
#define MONO_LLS_FOREACH_FILTERED(list, element, filter_func, type) {\
|
||||
MonoLinkedListSetNode *__cur; \
|
||||
for (__cur = (list)->head; __cur; __cur = mono_lls_pointer_unmask (__cur->next)) \
|
||||
if (!mono_lls_pointer_get_mark (__cur->next)) { \
|
||||
(element) = (type)__cur; \
|
||||
if (!filter_func (element)) continue;
|
||||
|
||||
#define MONO_LLS_END_FOREACH }}
|
||||
|
||||
@@ -91,6 +99,18 @@ Provides snapshot iteration
|
||||
if (!mono_lls_pointer_get_mark (__next)) { \
|
||||
(element) = (type)__cur;
|
||||
|
||||
#define MONO_LLS_FOREACH_FILTERED_SAFE(list, element, filter_func, type) {\
|
||||
MonoThreadHazardPointers *__hp = mono_hazard_pointer_get (); \
|
||||
MonoLinkedListSetNode *__cur, *__next; \
|
||||
for (__cur = mono_lls_pointer_unmask (get_hazardous_pointer ((gpointer volatile*)&(list)->head, __hp, 1)); \
|
||||
__cur; \
|
||||
__cur = mono_lls_info_step (__next, __hp)) { \
|
||||
__next = get_hazardous_pointer_with_mask ((gpointer volatile*)&__cur->next, __hp, 0); \
|
||||
if (!mono_lls_pointer_get_mark (__next)) { \
|
||||
(element) = (type)__cur; \
|
||||
if (!filter_func (element)) continue;
|
||||
|
||||
|
||||
#define MONO_LLS_END_FOREACH_SAFE \
|
||||
} \
|
||||
} \
|
||||
|
||||
@@ -645,7 +645,7 @@ mono_shared_area (void)
|
||||
header->stats_start = sizeof (SAreaHeader);
|
||||
header->stats_end = sizeof (SAreaHeader);
|
||||
|
||||
atexit (mono_shared_area_remove);
|
||||
mono_atexit (mono_shared_area_remove);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
@@ -664,3 +664,13 @@ mono_cpu_get_data (int cpu_id, MonoCpuData data, MonoProcessError *error)
|
||||
return value;
|
||||
}
|
||||
|
||||
int
|
||||
mono_atexit (void (*func)(void))
|
||||
{
|
||||
#ifdef PLATFORM_ANDROID
|
||||
/* Some versions of android libc doesn't define atexit () */
|
||||
return 0;
|
||||
#else
|
||||
return atexit (func);
|
||||
#endif
|
||||
}
|
||||
@@ -52,5 +52,7 @@ int mono_process_current_pid (void) MONO_INTERNAL;
|
||||
int mono_cpu_count (void) MONO_INTERNAL;
|
||||
gint64 mono_cpu_get_data (int cpu_id, MonoCpuData data, MonoProcessError *error) MONO_INTERNAL;
|
||||
|
||||
int mono_atexit (void (*func)(void)) MONO_INTERNAL;
|
||||
|
||||
#endif /* __MONO_PROC_LIB_H__ */
|
||||
|
||||
@@ -19,9 +19,6 @@
|
||||
|
||||
#if defined(TARGET_X86)
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__DragonFly__)
|
||||
#include <ucontext.h>
|
||||
#endif
|
||||
#if defined(__APPLE__)
|
||||
#include <AvailabilityMacros.h>
|
||||
#endif
|
||||
@@ -90,7 +87,7 @@
|
||||
#define UCONTEXT_REG_EIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.gregs [EIP])
|
||||
#else
|
||||
|
||||
#if defined(PLATFORM_ANDROID)
|
||||
#if defined(PLATFORM_ANDROID) && !defined(HAVE_UCONTEXT_H)
|
||||
/* No ucontext.h as of NDK v6b */
|
||||
typedef int greg_t;
|
||||
#define NGREG 19
|
||||
|
||||
@@ -19,7 +19,11 @@
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#if defined(PLATFORM_ANDROID)
|
||||
#if defined(PLATFORM_ANDROID) && !defined(TARGET_ARM64)
|
||||
#define USE_TKILL_ON_ANDROID 1
|
||||
#endif
|
||||
|
||||
#ifdef USE_TKILL_ON_ANDROID
|
||||
extern int tkill (pid_t tid, int signal);
|
||||
#endif
|
||||
|
||||
@@ -260,6 +264,26 @@ mono_threads_core_clear_interruption (void)
|
||||
wapi_clear_interruption ();
|
||||
}
|
||||
|
||||
int
|
||||
mono_threads_pthread_kill (MonoThreadInfo *info, int signum)
|
||||
{
|
||||
#ifdef USE_TKILL_ON_ANDROID
|
||||
int result, old_errno = errno;
|
||||
result = tkill (info->native_handle, signum);
|
||||
if (result < 0) {
|
||||
result = errno;
|
||||
errno = old_errno;
|
||||
}
|
||||
return result;
|
||||
#elif defined(__native_client__)
|
||||
/* Workaround pthread_kill abort() in NaCl glibc. */
|
||||
return 0;
|
||||
#else
|
||||
return pthread_kill (mono_thread_info_get_tid (info), signum);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
#if !defined (__MACH__)
|
||||
|
||||
#if !defined(__native_client__)
|
||||
@@ -341,26 +365,6 @@ mono_threads_core_interrupt (MonoThreadInfo *info)
|
||||
{
|
||||
}
|
||||
|
||||
int
|
||||
mono_threads_pthread_kill (MonoThreadInfo *info, int signum)
|
||||
{
|
||||
#if defined (PLATFORM_ANDROID)
|
||||
int result, old_errno = errno;
|
||||
result = tkill (info->native_handle, signum);
|
||||
if (result < 0) {
|
||||
result = errno;
|
||||
errno = old_errno;
|
||||
}
|
||||
return result;
|
||||
#elif defined(__native_client__)
|
||||
/* Workaround pthread_kill abort() in NaCl glibc. */
|
||||
return 0;
|
||||
#else
|
||||
return pthread_kill (mono_thread_info_get_tid (info), signum);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
mono_threads_core_abort_syscall (MonoThreadInfo *info)
|
||||
{
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <mono/utils/hazard-pointer.h>
|
||||
#include <mono/utils/mono-memory-model.h>
|
||||
#include <mono/utils/mono-mmap.h>
|
||||
#include <mono/utils/atomic.h>
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
@@ -286,6 +287,31 @@ mono_thread_info_list_head (void)
|
||||
return &thread_list;
|
||||
}
|
||||
|
||||
/**
|
||||
* mono_threads_attach_tools_thread
|
||||
*
|
||||
* Attach the current thread as a tool thread. DON'T USE THIS FUNCTION WITHOUT READING ALL DISCLAIMERS.
|
||||
*
|
||||
* A tools thread is a very special kind of thread that needs access to core runtime facilities but should
|
||||
* not be counted as a regular thread for high order facilities such as executing managed code or accessing
|
||||
* the managed heap.
|
||||
*
|
||||
* This is intended only to tools such as a profiler than needs to be able to use our lock-free support when
|
||||
* doing things like resolving backtraces in their background processing thread.
|
||||
*/
|
||||
void
|
||||
mono_threads_attach_tools_thread (void)
|
||||
{
|
||||
int dummy = 0;
|
||||
MonoThreadInfo *info;
|
||||
|
||||
/* Must only be called once */
|
||||
g_assert (!mono_native_tls_get_value (thread_info_key));
|
||||
|
||||
info = mono_thread_info_attach (&dummy);
|
||||
info->tools_thread = TRUE;
|
||||
}
|
||||
|
||||
MonoThreadInfo*
|
||||
mono_thread_info_attach (void *baseptr)
|
||||
{
|
||||
@@ -909,3 +935,27 @@ mono_thread_info_clear_interruption (void)
|
||||
{
|
||||
mono_threads_core_clear_interruption ();
|
||||
}
|
||||
|
||||
/* info must be self or be held in a hazard pointer. */
|
||||
gboolean
|
||||
mono_threads_add_async_job (MonoThreadInfo *info, MonoAsyncJob job)
|
||||
{
|
||||
MonoAsyncJob old_job;
|
||||
do {
|
||||
old_job = info->service_requests;
|
||||
if (old_job & job)
|
||||
return FALSE;
|
||||
} while (InterlockedCompareExchange (&info->service_requests, old_job | job, old_job) != old_job);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
MonoAsyncJob
|
||||
mono_threads_consume_async_jobs (void)
|
||||
{
|
||||
MonoThreadInfo *info = (MonoThreadInfo*)mono_native_tls_get_value (thread_info_key);
|
||||
|
||||
if (!info)
|
||||
return 0;
|
||||
|
||||
return InterlockedExchange (&info->service_requests, 0);
|
||||
}
|
||||
@@ -94,6 +94,13 @@ enum {
|
||||
SUSPEND_STATE_MASK = 0xF0,
|
||||
};
|
||||
|
||||
/*
|
||||
* This enum tells which async thread service corresponds to which bit.
|
||||
*/
|
||||
typedef enum {
|
||||
MONO_SERVICE_REQUEST_SAMPLE = 1,
|
||||
} MonoAsyncJob;
|
||||
|
||||
#define mono_thread_info_run_state(info) (((MonoThreadInfo*)info)->thread_state & RUN_STATE_MASK)
|
||||
#define mono_thread_info_suspend_state(info) (((MonoThreadInfo*)info)->thread_state & SUSPEND_STATE_MASK)
|
||||
|
||||
@@ -106,6 +113,9 @@ typedef struct {
|
||||
/*Tells if this thread was created by the runtime or not.*/
|
||||
gboolean runtime_thread;
|
||||
|
||||
/* Tells if this thread should be ignored or not by runtime services such as GC and profiling */
|
||||
gboolean tools_thread;
|
||||
|
||||
/* suspend machinery, fields protected by suspend_semaphore */
|
||||
MonoSemType suspend_semaphore;
|
||||
int suspend_count;
|
||||
@@ -155,6 +165,12 @@ typedef struct {
|
||||
/* IO layer handle for this thread */
|
||||
/* Set when the thread is started, or in _wapi_thread_duplicate () */
|
||||
HANDLE handle;
|
||||
|
||||
/* Asynchronous service request. This flag is meant to be consumed by the multiplexing signal handlers to discover what sort of work they need to do.
|
||||
* Use the mono_threads_add_async_job and mono_threads_consume_async_jobs APIs to modify this flag.
|
||||
* In the future the signaling should be part of the API, but for now, it's only for massaging the bits.
|
||||
*/
|
||||
volatile gint32 service_requests;
|
||||
} MonoThreadInfo;
|
||||
|
||||
typedef struct {
|
||||
@@ -187,16 +203,22 @@ typedef struct {
|
||||
gboolean (*thread_state_init_from_handle) (MonoThreadUnwindState *tctx, MonoThreadInfo *info);
|
||||
} MonoThreadInfoRuntimeCallbacks;
|
||||
|
||||
static inline gboolean
|
||||
mono_threads_filter_tools_threads (THREAD_INFO_TYPE *info)
|
||||
{
|
||||
return !((MonoThreadInfo*)info)->tools_thread;
|
||||
}
|
||||
|
||||
/*
|
||||
Requires the world to be stoped
|
||||
*/
|
||||
#define FOREACH_THREAD(thread) MONO_LLS_FOREACH (mono_thread_info_list_head (), thread, THREAD_INFO_TYPE*)
|
||||
#define FOREACH_THREAD(thread) MONO_LLS_FOREACH_FILTERED (mono_thread_info_list_head (), thread, mono_threads_filter_tools_threads, THREAD_INFO_TYPE*)
|
||||
#define END_FOREACH_THREAD MONO_LLS_END_FOREACH
|
||||
|
||||
/*
|
||||
Snapshot iteration.
|
||||
*/
|
||||
#define FOREACH_THREAD_SAFE(thread) MONO_LLS_FOREACH_SAFE (mono_thread_info_list_head (), thread, THREAD_INFO_TYPE*)
|
||||
#define FOREACH_THREAD_SAFE(thread) MONO_LLS_FOREACH_FILTERED_SAFE (mono_thread_info_list_head (), thread, mono_threads_filter_tools_threads, THREAD_INFO_TYPE*)
|
||||
#define END_FOREACH_THREAD_SAFE MONO_LLS_END_FOREACH_SAFE
|
||||
|
||||
#define mono_thread_info_get_tid(info) ((MonoNativeThreadId)((MonoThreadInfo*)info)->node.key)
|
||||
@@ -326,13 +348,26 @@ mono_threads_get_max_stack_size (void) MONO_INTERNAL;
|
||||
HANDLE
|
||||
mono_threads_open_thread_handle (HANDLE handle, MonoNativeThreadId tid) MONO_INTERNAL;
|
||||
|
||||
/*
|
||||
This is the async job submission/consumption API.
|
||||
XXX: This is a PROVISIONAL API only meant to be used by the statistical profiler.
|
||||
If you want to use/extend it anywhere else, understand that you'll have to do some API design work to better fit this puppy.
|
||||
*/
|
||||
gboolean
|
||||
mono_threads_add_async_job (THREAD_INFO_TYPE *info, MonoAsyncJob job) MONO_INTERNAL;
|
||||
|
||||
MonoAsyncJob
|
||||
mono_threads_consume_async_jobs (void) MONO_INTERNAL;
|
||||
|
||||
void
|
||||
mono_threads_attach_tools_thread (void);
|
||||
|
||||
|
||||
#if !defined(HOST_WIN32)
|
||||
|
||||
#if !defined(__MACH__)
|
||||
/*Use this instead of pthread_kill */
|
||||
int
|
||||
mono_threads_pthread_kill (THREAD_INFO_TYPE *info, int signum) MONO_INTERNAL;
|
||||
#endif
|
||||
|
||||
#endif /* !defined(HOST_WIN32) */
|
||||
|
||||
|
||||
+127
-5
@@ -1,6 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug_SGen|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug_SGen|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -9,6 +17,14 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -29,51 +45,107 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
@@ -89,7 +161,21 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
@@ -103,7 +189,26 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
@@ -122,7 +227,24 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>copy ..\eglib\winconfig.h ..\eglib\config.h</Command>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>winsetup.bat</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
@@ -182,4 +304,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
+307
-2
@@ -1,6 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug_SGen|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug_SGen|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -9,6 +17,14 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -30,50 +46,94 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\bin\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEvent>
|
||||
@@ -118,6 +178,49 @@
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TypeLibraryName>.\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
@@ -132,7 +235,51 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
<TypeLibraryName>.\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
@@ -204,6 +351,48 @@
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TypeLibraryName>.\Release/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
@@ -219,7 +408,51 @@
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>false</LinkLibraryDependencies>
|
||||
</ProjectReference>
|
||||
<Link>
|
||||
<AdditionalDependencies>eglib.lib;libmonoutils.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>$(Platform)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>runmdesc.bat "$(TargetPath)" $(Platform)</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
<PreBuildEvent>
|
||||
<Command>
|
||||
</Command>
|
||||
</PreBuildEvent>
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
<TypeLibraryName>.\Release/genmdesc.tlb</TypeLibraryName>
|
||||
<HeaderFileName>
|
||||
</HeaderFileName>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;..\;..\mono\;..\eglib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;TARGET_AMD64;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;_CONSOLE;HAVE_CONFIG_H;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
@@ -255,19 +488,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\mono\mini\helpers.c">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -275,19 +526,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\mono\utils\monobitset.c">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -295,19 +564,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\mono\metadata\opcodes.c">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
@@ -315,19 +602,37 @@
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">true</BrowseInformation>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</PrecompiledHeader>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
+140
-4
@@ -1,6 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug_SGen|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug_SGen|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -9,6 +17,14 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release_SGen|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
@@ -29,53 +45,113 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
@@ -95,7 +171,24 @@
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__i386__;TARGET_X86;i386;i386;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
@@ -115,7 +208,30 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<DisableSpecificWarnings>4311;4312;4996;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
@@ -138,7 +254,27 @@
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<ProgramDataBaseFileName>$(OutDir)vc80.pdb</ProgramDataBaseFileName>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
</ClCompile>
|
||||
<Lib>
|
||||
<OutputFile>$(OutDir)libgc.lib</OutputFile>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<AdditionalIncludeDirectories>..\libgc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;__x86_64__;WIN64;_WIN64;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;__STDC__;PACKAGE_NAME="libgc-mono";PACKAGE_TARNAME="libgc-mono";PACKAGE_VERSION="6.6";PACKAGE_STRING="libgc-mono 6.6";PACKAGE_BUGREPORT="Hans_Boehm%40hp.com";GC_WIN32_THREADS=1;NO_GETENV=1;GC_INSIDE_DLL=1;GC_NOT_DLL=1;STDC_HEADERS=1;HAVE_SYS_TYPES_H=1;HAVE_SYS_STAT_H=1;HAVE_STDLIB_H=1;HAVE_STRING_H=1;HAVE_MEMORY_H=1;HAVE_STRINGS_H=1;HAVE_INTTYPES_H=1;HAVE_STDINT_H=1;HAVE_UNISTD_H=1;SILENT=1;NO_SIGNALS=1;NO_EXECUTE_PERMISSION=1;JAVA_FINALIZATION=1;GC_GCJ_SUPPORT=1;ATOMIC_UNCOLLECTABLE=1;_IN_LIBGC=1;WINVER=0x0502;_WIN32_WINNT=0x0502;_WIN32_IE=0x0501;WIN32_THREADS;FD_SETSIZE=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<PrecompiledHeader>
|
||||
|
||||
@@ -109,7 +109,9 @@
|
||||
<ClCompile Include="..\mono\metadata\sgen-os-win32.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-pinning-stats.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-pinning.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-pointer-queue.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-protocol.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-qsort.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-simple-nursery.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-split-nursery.c" />
|
||||
<ClCompile Include="..\mono\metadata\sgen-tarjan-bridge.c" />
|
||||
|
||||
@@ -84,6 +84,7 @@ mono_class_from_mono_type
|
||||
mono_class_from_name
|
||||
mono_class_from_name_case
|
||||
mono_class_from_typeref
|
||||
mono_class_from_typeref_checked
|
||||
mono_class_get
|
||||
mono_class_get_byref_type
|
||||
mono_class_get_com_object_class
|
||||
@@ -161,10 +162,19 @@ mono_context_get
|
||||
mono_context_get_desc
|
||||
mono_context_init
|
||||
mono_context_set
|
||||
mono_counter_get_name
|
||||
mono_counter_get_section
|
||||
mono_counter_get_size
|
||||
mono_counter_get_type
|
||||
mono_counter_get_unit
|
||||
mono_counter_get_variance
|
||||
mono_counters_cleanup
|
||||
mono_counters_dump
|
||||
mono_counters_enable
|
||||
mono_counters_foreach
|
||||
mono_counters_register
|
||||
mono_counters_register_with_size
|
||||
mono_counters_sample
|
||||
mono_custom_attrs_construct
|
||||
mono_custom_attrs_free
|
||||
mono_custom_attrs_from_assembly
|
||||
@@ -209,6 +219,7 @@ mono_debug_symfile_is_loaded
|
||||
mono_debug_symfile_lookup_locals
|
||||
mono_debug_symfile_lookup_location
|
||||
mono_debug_symfile_lookup_method
|
||||
mono_debugger_agent_register_transport
|
||||
mono_debugger_insert_breakpoint
|
||||
mono_debugger_method_has_breakpoint
|
||||
mono_debugger_run_finally
|
||||
@@ -250,6 +261,7 @@ mono_domain_try_unload
|
||||
mono_domain_unload
|
||||
mono_dwarf_escape_path
|
||||
mono_emit_native_call
|
||||
mono_enable_debug_domain_unload
|
||||
mono_environment_exitcode_get
|
||||
mono_environment_exitcode_set
|
||||
mono_error_cleanup
|
||||
@@ -325,6 +337,9 @@ mono_gc_out_of_memory
|
||||
mono_gc_reference_queue_add
|
||||
mono_gc_reference_queue_free
|
||||
mono_gc_reference_queue_new
|
||||
mono_gc_register_finalizer_callbacks
|
||||
mono_gc_toggleref_add
|
||||
mono_gc_toggleref_register_callback
|
||||
mono_gc_walk_heap
|
||||
mono_gc_wbarrier_arrayref_copy
|
||||
mono_gc_wbarrier_generic_nostore
|
||||
@@ -537,6 +552,7 @@ mono_metadata_guid_heap
|
||||
mono_metadata_implmap_from_method
|
||||
mono_metadata_init
|
||||
mono_metadata_interfaces_from_typedef
|
||||
mono_metadata_load_generic_param_constraints_checked
|
||||
mono_metadata_load_generic_params
|
||||
mono_metadata_locate
|
||||
mono_metadata_locate_token
|
||||
@@ -688,6 +704,7 @@ mono_profiler_install_thread_name
|
||||
mono_profiler_install_transition
|
||||
mono_profiler_load
|
||||
mono_profiler_set_events
|
||||
mono_profiler_set_statistical_mode
|
||||
mono_property_get_flags
|
||||
mono_property_get_get_method
|
||||
mono_property_get_name
|
||||
@@ -704,6 +721,7 @@ mono_property_set_value
|
||||
mono_ptr_class_get
|
||||
mono_raise_exception
|
||||
mono_realloc_native_code
|
||||
mono_reflection_assembly_get_assembly
|
||||
mono_reflection_free_type_info
|
||||
mono_reflection_get_custom_attrs
|
||||
mono_reflection_get_custom_attrs_blob
|
||||
@@ -736,6 +754,7 @@ mono_runtime_resource_check_limit
|
||||
mono_runtime_resource_limit
|
||||
mono_runtime_resource_set_callback
|
||||
mono_runtime_run_main
|
||||
mono_runtime_set_main_args
|
||||
mono_runtime_set_shutting_down
|
||||
mono_security_core_clr_get_options
|
||||
mono_security_core_clr_require_elevated_permissions
|
||||
@@ -748,6 +767,7 @@ mono_sem_wait
|
||||
mono_set_assemblies_path
|
||||
mono_set_break_policy
|
||||
mono_set_config_dir
|
||||
mono_set_crash_chaining
|
||||
mono_set_defaults
|
||||
mono_set_dirs
|
||||
mono_set_is_debugger_attached
|
||||
@@ -776,6 +796,7 @@ mono_signature_vararg_start
|
||||
mono_signbit_double
|
||||
mono_signbit_float
|
||||
mono_stack_walk
|
||||
mono_stack_walk_async_safe
|
||||
mono_stack_walk_no_il
|
||||
mono_store_remote_field
|
||||
mono_store_remote_field_new
|
||||
@@ -783,6 +804,7 @@ mono_string_chars
|
||||
mono_string_equal
|
||||
mono_string_from_bstr
|
||||
mono_string_from_utf16
|
||||
mono_string_from_utf32
|
||||
mono_string_hash
|
||||
mono_string_intern
|
||||
mono_string_is_interned
|
||||
@@ -791,8 +813,10 @@ mono_string_new
|
||||
mono_string_new_len
|
||||
mono_string_new_size
|
||||
mono_string_new_utf16
|
||||
mono_string_new_utf32
|
||||
mono_string_new_wrapper
|
||||
mono_string_to_utf16
|
||||
mono_string_to_utf32
|
||||
mono_string_to_utf8
|
||||
mono_string_to_utf8_checked
|
||||
mono_stringify_assembly_name
|
||||
@@ -802,9 +826,20 @@ mono_thread_cleanup
|
||||
mono_thread_create
|
||||
mono_thread_current
|
||||
mono_thread_detach
|
||||
mono_thread_detach_if_exiting
|
||||
mono_thread_exit
|
||||
mono_thread_get_main
|
||||
mono_thread_get_undeniable_exception
|
||||
mono_thread_info_clear_interruption
|
||||
mono_thread_info_exit
|
||||
mono_thread_info_finish_interrupt
|
||||
mono_thread_info_get_stack_bounds
|
||||
mono_thread_info_interrupt
|
||||
mono_thread_info_open_handle
|
||||
mono_thread_info_prepare_interrupt
|
||||
mono_thread_info_self_interrupt
|
||||
mono_thread_info_tls_get
|
||||
mono_thread_info_tls_set
|
||||
mono_thread_init
|
||||
mono_thread_is_foreign
|
||||
mono_thread_manage
|
||||
@@ -812,13 +847,22 @@ mono_thread_new_init
|
||||
mono_thread_set_main
|
||||
mono_thread_set_manage_callback
|
||||
mono_thread_stop
|
||||
mono_threads_attach_tools_thread
|
||||
mono_threads_core_clear_interruption
|
||||
mono_threads_core_finish_interrupt
|
||||
mono_threads_core_prepare_interrupt
|
||||
mono_threads_core_self_interrupt
|
||||
mono_threads_create_thread
|
||||
mono_threads_get_default_stacksize
|
||||
mono_threads_request_thread_dump
|
||||
mono_threads_set_default_stacksize
|
||||
mono_tls_key_get_offset
|
||||
mono_tls_key_set_offset
|
||||
mono_trace_set_level_string
|
||||
mono_trace_set_log_handler
|
||||
mono_trace_set_mask_string
|
||||
mono_trace_set_print_handler
|
||||
mono_trace_set_printerr_handler
|
||||
mono_type_create_from_typespec
|
||||
mono_type_full_name
|
||||
mono_type_generic_inst_is_valuetype
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\eglib\src;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;__i386__;TARGET_X86;_WIN32_WINNT=0x0502;WIN32;_WIN32;__WIN32__;_WINDOWS;WINDOWS;HOST_WIN32;TARGET_WIN32;_CRT_SECURE_NO_DEPRECATE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
||||
+41
-2
@@ -84,6 +84,7 @@ mono_class_from_mono_type
|
||||
mono_class_from_name
|
||||
mono_class_from_name_case
|
||||
mono_class_from_typeref
|
||||
mono_class_from_typeref_checked
|
||||
mono_class_get
|
||||
mono_class_get_byref_type
|
||||
mono_class_get_com_object_class
|
||||
@@ -161,10 +162,19 @@ mono_context_get
|
||||
mono_context_get_desc
|
||||
mono_context_init
|
||||
mono_context_set
|
||||
mono_counter_get_name
|
||||
mono_counter_get_section
|
||||
mono_counter_get_size
|
||||
mono_counter_get_type
|
||||
mono_counter_get_unit
|
||||
mono_counter_get_variance
|
||||
mono_counters_cleanup
|
||||
mono_counters_dump
|
||||
mono_counters_enable
|
||||
mono_counters_foreach
|
||||
mono_counters_register
|
||||
mono_counters_register_with_size
|
||||
mono_counters_sample
|
||||
mono_custom_attrs_construct
|
||||
mono_custom_attrs_free
|
||||
mono_custom_attrs_from_assembly
|
||||
@@ -251,6 +261,7 @@ mono_domain_try_unload
|
||||
mono_domain_unload
|
||||
mono_dwarf_escape_path
|
||||
mono_emit_native_call
|
||||
mono_enable_debug_domain_unload
|
||||
mono_environment_exitcode_get
|
||||
mono_environment_exitcode_set
|
||||
mono_error_cleanup
|
||||
@@ -327,7 +338,7 @@ mono_gc_reference_queue_add
|
||||
mono_gc_reference_queue_free
|
||||
mono_gc_reference_queue_new
|
||||
mono_gc_register_bridge_callbacks
|
||||
mono_gc_scan_for_specific_ref
|
||||
mono_gc_register_finalizer_callbacks
|
||||
mono_gc_toggleref_add
|
||||
mono_gc_toggleref_register_callback
|
||||
mono_gc_wait_for_bridge_processing
|
||||
@@ -543,7 +554,7 @@ mono_metadata_guid_heap
|
||||
mono_metadata_implmap_from_method
|
||||
mono_metadata_init
|
||||
mono_metadata_interfaces_from_typedef
|
||||
mono_metadata_load_generic_param_constraints
|
||||
mono_metadata_load_generic_param_constraints_checked
|
||||
mono_metadata_load_generic_params
|
||||
mono_metadata_locate
|
||||
mono_metadata_locate_token
|
||||
@@ -695,6 +706,7 @@ mono_profiler_install_thread_name
|
||||
mono_profiler_install_transition
|
||||
mono_profiler_load
|
||||
mono_profiler_set_events
|
||||
mono_profiler_set_statistical_mode
|
||||
mono_property_get_flags
|
||||
mono_property_get_get_method
|
||||
mono_property_get_name
|
||||
@@ -711,6 +723,7 @@ mono_property_set_value
|
||||
mono_ptr_class_get
|
||||
mono_raise_exception
|
||||
mono_realloc_native_code
|
||||
mono_reflection_assembly_get_assembly
|
||||
mono_reflection_free_type_info
|
||||
mono_reflection_get_custom_attrs
|
||||
mono_reflection_get_custom_attrs_blob
|
||||
@@ -743,6 +756,7 @@ mono_runtime_resource_check_limit
|
||||
mono_runtime_resource_limit
|
||||
mono_runtime_resource_set_callback
|
||||
mono_runtime_run_main
|
||||
mono_runtime_set_main_args
|
||||
mono_runtime_set_shutting_down
|
||||
mono_security_core_clr_get_options
|
||||
mono_security_core_clr_require_elevated_permissions
|
||||
@@ -755,6 +769,7 @@ mono_sem_wait
|
||||
mono_set_assemblies_path
|
||||
mono_set_break_policy
|
||||
mono_set_config_dir
|
||||
mono_set_crash_chaining
|
||||
mono_set_defaults
|
||||
mono_set_dirs
|
||||
mono_set_is_debugger_attached
|
||||
@@ -783,6 +798,7 @@ mono_signature_vararg_start
|
||||
mono_signbit_double
|
||||
mono_signbit_float
|
||||
mono_stack_walk
|
||||
mono_stack_walk_async_safe
|
||||
mono_stack_walk_no_il
|
||||
mono_store_remote_field
|
||||
mono_store_remote_field_new
|
||||
@@ -790,6 +806,7 @@ mono_string_chars
|
||||
mono_string_equal
|
||||
mono_string_from_bstr
|
||||
mono_string_from_utf16
|
||||
mono_string_from_utf32
|
||||
mono_string_hash
|
||||
mono_string_intern
|
||||
mono_string_is_interned
|
||||
@@ -798,8 +815,10 @@ mono_string_new
|
||||
mono_string_new_len
|
||||
mono_string_new_size
|
||||
mono_string_new_utf16
|
||||
mono_string_new_utf32
|
||||
mono_string_new_wrapper
|
||||
mono_string_to_utf16
|
||||
mono_string_to_utf32
|
||||
mono_string_to_utf8
|
||||
mono_string_to_utf8_checked
|
||||
mono_stringify_assembly_name
|
||||
@@ -809,9 +828,20 @@ mono_thread_cleanup
|
||||
mono_thread_create
|
||||
mono_thread_current
|
||||
mono_thread_detach
|
||||
mono_thread_detach_if_exiting
|
||||
mono_thread_exit
|
||||
mono_thread_get_main
|
||||
mono_thread_get_undeniable_exception
|
||||
mono_thread_info_clear_interruption
|
||||
mono_thread_info_exit
|
||||
mono_thread_info_finish_interrupt
|
||||
mono_thread_info_get_stack_bounds
|
||||
mono_thread_info_interrupt
|
||||
mono_thread_info_open_handle
|
||||
mono_thread_info_prepare_interrupt
|
||||
mono_thread_info_self_interrupt
|
||||
mono_thread_info_tls_get
|
||||
mono_thread_info_tls_set
|
||||
mono_thread_init
|
||||
mono_thread_is_foreign
|
||||
mono_thread_manage
|
||||
@@ -819,13 +849,22 @@ mono_thread_new_init
|
||||
mono_thread_set_main
|
||||
mono_thread_set_manage_callback
|
||||
mono_thread_stop
|
||||
mono_threads_attach_tools_thread
|
||||
mono_threads_core_clear_interruption
|
||||
mono_threads_core_finish_interrupt
|
||||
mono_threads_core_prepare_interrupt
|
||||
mono_threads_core_self_interrupt
|
||||
mono_threads_create_thread
|
||||
mono_threads_get_default_stacksize
|
||||
mono_threads_request_thread_dump
|
||||
mono_threads_set_default_stacksize
|
||||
mono_tls_key_get_offset
|
||||
mono_tls_key_set_offset
|
||||
mono_trace_set_level_string
|
||||
mono_trace_set_log_handler
|
||||
mono_trace_set_mask_string
|
||||
mono_trace_set_print_handler
|
||||
mono_trace_set_printerr_handler
|
||||
mono_type_create_from_typespec
|
||||
mono_type_full_name
|
||||
mono_type_generic_inst_is_valuetype
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
@echo off
|
||||
cd ..
|
||||
if exist config.h if not exist cygconfig.h copy config.h cygconfig.h
|
||||
if exist eglib\config.h if not exist eglib\cygconfig.h copy eglib\config.h eglib\cygconfig.h
|
||||
copy winconfig.h config.h
|
||||
copy eglib\winconfig.h eglib\config.h
|
||||
goto end
|
||||
:error
|
||||
echo fatal error: the VSDepenancies directory was not found in the "mono" directory
|
||||
|
||||
+6
-1
@@ -1,6 +1,10 @@
|
||||
/* config.h. Generated from config.h.in by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include "cygconfig.h"
|
||||
#else
|
||||
|
||||
/* The architecture this is running on */
|
||||
#if defined(_M_IA64)
|
||||
#define ARCHITECTURE "ia64"
|
||||
@@ -629,4 +633,5 @@
|
||||
/* #undef USE_MONO_MUTEX */
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.11"
|
||||
#define VERSION "3.12.0"
|
||||
#endif
|
||||
Reference in new issue
Block a user