Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

tools/Makefile.am

@@ -1,2 +1,3 @@
-SUBDIRS = locale-builder sgen
+SUBDIRS = locale-builder sgen monograph
+
 

tools/Makefile.in

@@ -208,6 +208,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISABLE_PERF_EVENTS = @DISABLE_PERF_EVENTS@
 DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
 DLLTOOL = @DLLTOOL@
 DOLT_BASH = @DOLT_BASH@
@@ -291,12 +292,15 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SGEN_DEFINES = @SGEN_DEFINES@
+SHARED_CFLAGS = @SHARED_CFLAGS@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
 SQLITE3 = @SQLITE3@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VTUNE_CFLAGS = @VTUNE_CFLAGS@
+VTUNE_LIBS = @VTUNE_LIBS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
 X11 = @X11@
 XATTR_LIB = @XATTR_LIB@
@@ -381,7 +385,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = locale-builder sgen
+SUBDIRS = locale-builder sgen monograph
 all: all-recursive
 
 .SUFFIXES:

tools/locale-builder/Constants.cs

@@ -41,8 +41,9 @@ namespace Mono.Tools.LocaleBuilder
 		public const int NUM_CALENDARS = 4;
 
 		public const int NUM_SHORT_DATE_PATTERNS = 14;
-		public const int NUM_LONG_DATE_PATTERNS = 8;
+		public const int NUM_LONG_DATE_PATTERNS = 10;
 		public const int NUM_SHORT_TIME_PATTERNS = 12;
 		public const int NUM_LONG_TIME_PATTERNS = 9;
+		public const int NUM_YEAR_MONTH_PATTERNS = 8;
 	}
 }

tools/locale-builder/DateTimeFormatEntry.cs

@@ -63,19 +63,13 @@ namespace Mono.Tools.LocaleBuilder
 		public string[] ShortTimePatterns = new string[Constants.NUM_SHORT_TIME_PATTERNS];
 		public string[] LongTimePatterns = new string[Constants.NUM_LONG_TIME_PATTERNS];
 		public string[] ShortestDayNames = new string[Constants.NUM_DAYS];
+		public string[] YearMonthPatterns = new string[Constants.NUM_YEAR_MONTH_PATTERNS];
 
 		public int Row;
 
 		public void AppendTableRow (StringBuilder builder)
 		{
 			builder.Append ("\t{");
-			builder.Append (EncodeStringIdx (LongDatePattern) + ", ");
-			builder.Append (EncodeStringIdx (ShortDatePattern) + ", ");
-
-			builder.Append (EncodeStringIdx (LongTimePattern) + ", ");
-			builder.Append (EncodeStringIdx (ShortTimePattern) + ", ");
-
-			builder.Append (EncodeStringIdx (YearMonthPattern) + ", ");
 			builder.Append (EncodeStringIdx (MonthDayPattern) + ", ");
 
 			builder.Append (EncodeStringIdx (AMDesignator) + ", ");
@@ -104,6 +98,8 @@ namespace Mono.Tools.LocaleBuilder
 			AppendPatterns (builder, ShortTimePatterns);
 			builder.Append (',');
 			AppendPatterns (builder, LongTimePatterns);
+			builder.Append (',');
+			AppendPatterns (builder, YearMonthPatterns);
 
 			builder.Append ('}');
 		}

tools/locale-builder/Makefile.in

@@ -148,6 +148,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISABLE_PERF_EVENTS = @DISABLE_PERF_EVENTS@
 DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
 DLLTOOL = @DLLTOOL@
 DOLT_BASH = @DOLT_BASH@
@@ -231,12 +232,15 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SGEN_DEFINES = @SGEN_DEFINES@
+SHARED_CFLAGS = @SHARED_CFLAGS@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
 SQLITE3 = @SQLITE3@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VTUNE_CFLAGS = @VTUNE_CFLAGS@
+VTUNE_LIBS = @VTUNE_LIBS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
 X11 = @X11@
 XATTR_LIB = @XATTR_LIB@

tools/locale-builder/Patterns.cs.REMOVED.git-id

@@ -1 +1 @@
-41b8aaf5ef1c6244ecf4b4846f0b34dd3de4b675
+b2e7e8b961017e7fb586222c7827496d7c82d1f7

tools/monograph/ChangeLog

@@ -0,0 +1,115 @@
+
+Wed Feb 24 15:56:52 CET 2010 Paolo Molaro <lupus@ximian.com>
+
+	* Makefile.am, monograph.c: update to the new API/ABI.
+
+2009-08-18  Christian Hergert  <chris@dronelabs.com>
+
+	* monograph.c: Fix printf warnings.
+
+Mon Sep 10 15:03:06 CEST 2007 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: added --size option to collect size statistics
+	per-type (best used with a pipe to sort -n -k3).
+
+2007-03-13  Jonathan Chambers  <joncham@gmail.com>
+
+	* monograph.vcproj: Move to msvc directory.
+	
+2007-03-13  Jonathan Chambers  <joncham@gmail.com>
+
+	* monograph.vcproj: Begin WIN64 port.
+	
+Fri Jan 26 12:37:14 CET 2007 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: warning fixes.
+
+Tue Mar 21 16:01:26 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: fixes to be able to deal with 2.0 assemblies
+	and more stats.
+
+Wed Feb 22 15:11:37 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: update after MonoMethodHeader changes.
+
+Tue Jan 24 18:57:46 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: misc fixes and parent depth stats.
+
+2005-05-26  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* monograph.vcproj: Project file for monograph.
+
+2005-03-29  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* monograph.c: Add mono-compiler.h header to allow/ease compilation
+	with non-GCC compilers. Fix default loading of mscorlib.dll.
+
+2005-02-09  Ben Maurer  <bmaurer@ximian.com>
+
+	* monograph.c (print_method): Don't use method->info, as this will
+	be removed soon.
+
+2005-02-03  Zoltan Varga  <vargaz@freemail.hu>
+
+	* monograph.c: Fix warnings.
+
+Mon May 24 13:36:53 CEST 2004 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: default assembly name is "mscorlib" now.
+
+2003-11-12  Jackson Harper  <jackson@ximian.com>
+
+	* monograph.c: Change default assembly name to mscorlib.dll
+	
+Thu Feb  6 02:43:23 PST 2003 Piers Haken <piersh@friskit.com>
+
+	* monograph.c: more warning cleanups
+
+Tue Jan 28 18:53:08 CET 2003 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: more stats added.
+
+Mon Oct 7 12:25:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: added a --stats command line option to gather
+	statistics about the assembly code.
+
+2002-08-28  Dick Porter  <dick@ximian.com>
+
+	* Makefile.am: Export HOST_CC for w32 builds
+
+Fri Jul 19 14:23:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: simple stats on opcode size.
+
+Thu Mar 28 15:18:50 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: some warning cleanups.
+
+Mon Mar 11 11:58:27 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: update --help output, Make error messages less
+	intimidating and more informative.
+
+Mon Mar 11 11:16:53 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: removed method signature and searching helpers
+	that are now provided in libmetadata. Added --control-flow option to
+	create a control flow graph of a method, with basic blocks etc.
+
+Wed Feb 20 17:53:59 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: added -i option to create a graph of the types
+	implementing an interface.
+
+Tue Feb 19 12:24:15 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: fix typo. Update for changes in mono_init ().
+
+Mon Feb 18 14:37:17 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: First commit: program to generate call graphs
+	or type hierarchies from CIL programs.
+

tools/monograph/Makefile.am

@@ -0,0 +1,60 @@
+
+if HOST_WIN32
+export HOST_CC
+endif
+
+if DISABLE_EXECUTABLES
+runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
+else
+if !SHARED_MONO
+static_libs=	\
+	$(top_builddir)/mono/metadata/libmonoruntime-static.la	\
+	$(top_builddir)/mono/io-layer/libwapi.la	\
+	$(top_builddir)/mono/utils/libmonoutils.la \
+	$(GLIB_LIBS) $(LIBICONV) \
+	$(LIBGC_STATIC_LIBS)
+
+runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA) $(static_libs)
+else
+runtime_lib=$(top_builddir)/mono/mini/$(LIBMONO_LA)
+endif
+endif
+
+if DISABLE_EXECUTABLES
+bin_PROGRAMS =
+else
+if DISABLE_LIBRARIES
+bin_PROGRAMS =
+else
+if SUPPORT_BOEHM
+bin_PROGRAMS = monograph
+endif
+endif
+endif
+
+AM_CPPFLAGS = 				\
+	-I$(top_srcdir)			\
+	$(GLIB_CFLAGS)
+
+monograph_LDADD = \
+	$(runtime_lib)			\
+	$(GLIB_LIBS)			\
+	$(LLVM_LIBS)			\
+	$(LIBICONV)			\
+	-lm
+
+if PLATFORM_DARWIN
+monograph_LDFLAGS=-framework CoreFoundation
+endif
+
+GRAPHS=System.Object System.Enum System.Attribute System.ValueType System.Reflection.MemberInfo
+OUT=$(GRAPHS:=.jpeg)
+
+graphs: $(OUT)
+
+%.jpeg: monograph
+	./monograph -n -o $*.png corlib.dll $*
+	convert -geometry '480x360>' $*.png $*.jpeg
+
+EXTRA_DIST = ChangeLog
+

tools/sgen/Makefile.in

@@ -197,6 +197,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISABLE_PERF_EVENTS = @DISABLE_PERF_EVENTS@
 DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
 DLLTOOL = @DLLTOOL@
 DOLT_BASH = @DOLT_BASH@
@@ -280,12 +281,15 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SGEN_DEFINES = @SGEN_DEFINES@
+SHARED_CFLAGS = @SHARED_CFLAGS@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
 SQLITE3 = @SQLITE3@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VTUNE_CFLAGS = @VTUNE_CFLAGS@
+VTUNE_LIBS = @VTUNE_LIBS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
 X11 = @X11@
 XATTR_LIB = @XATTR_LIB@