You've already forked linux-packaging-mono
Imported Upstream version 5.20.0.180
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
0e2d47d1c8
commit
0510252385
@@ -25,15 +25,23 @@ bin_PROGRAMS =
|
||||
else
|
||||
if SUPPORT_SGEN
|
||||
bin_PROGRAMS = monograph
|
||||
noinst_LIBRARIES = libmonograph.a
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@)
|
||||
libmonograph_a_CFLAGS = @CXX_ADD_CFLAGS@
|
||||
|
||||
monograph_SOURCES =
|
||||
libmonograph_a_SOURCES = monograph.c
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
monograph_LDADD = \
|
||||
libmonograph_a-monograph.$(OBJEXT) \
|
||||
$(runtime_lib) \
|
||||
$(glib_libs) \
|
||||
$(LLVM_LIBS)
|
||||
@@ -50,5 +58,3 @@ graphs: $(OUT)
|
||||
%.jpeg: monograph
|
||||
./monograph -n -o $*.png corlib.dll $*
|
||||
convert -geometry '480x360>' $*.png $*.jpeg
|
||||
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
|
||||
VPATH = @srcdir@
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
@@ -84,7 +85,8 @@ subdir = tools/monograph
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/apple-target.m4 \
|
||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
|
||||
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
|
||||
@@ -96,11 +98,22 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
LIBRARIES = $(noinst_LIBRARIES)
|
||||
ARFLAGS = cru
|
||||
AM_V_AR = $(am__v_AR_@AM_V@)
|
||||
am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
|
||||
am__v_AR_0 = @echo " AR " $@;
|
||||
am__v_AR_1 =
|
||||
libmonograph_a_AR = $(AR) $(ARFLAGS)
|
||||
libmonograph_a_LIBADD =
|
||||
am_libmonograph_a_OBJECTS = libmonograph_a-monograph.$(OBJEXT)
|
||||
libmonograph_a_OBJECTS = $(am_libmonograph_a_OBJECTS)
|
||||
am__installdirs = "$(DESTDIR)$(bindir)"
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
monograph_SOURCES = monograph.c
|
||||
monograph_OBJECTS = monograph.$(OBJEXT)
|
||||
monograph_DEPENDENCIES = $(runtime_lib) $(glib_libs)
|
||||
am_monograph_OBJECTS =
|
||||
monograph_OBJECTS = $(am_monograph_OBJECTS)
|
||||
monograph_DEPENDENCIES = libmonograph_a-monograph.$(OBJEXT) \
|
||||
$(runtime_lib) $(glib_libs)
|
||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||
am__v_lt_0 = --silent
|
||||
@@ -138,8 +151,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
|
||||
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
am__v_CCLD_1 =
|
||||
SOURCES = monograph.c
|
||||
DIST_SOURCES = monograph.c
|
||||
SOURCES = $(libmonograph_a_SOURCES) $(monograph_SOURCES)
|
||||
DIST_SOURCES = $(libmonograph_a_SOURCES) $(monograph_SOURCES)
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
@@ -191,7 +204,7 @@ CCASDEPMODE = @CCASDEPMODE@
|
||||
CCASFLAGS = @CCASFLAGS@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@)
|
||||
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
@@ -201,6 +214,7 @@ CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CXXFLAGS_COMMON = @CXXFLAGS_COMMON@
|
||||
CXX_ADD_CFLAGS = @CXX_ADD_CFLAGS@
|
||||
CXX_REMOVE_CFLAGS = @CXX_REMOVE_CFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
@@ -274,6 +288,22 @@ MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
|
||||
MONO_JEMALLOC_ASSERT = @MONO_JEMALLOC_ASSERT@
|
||||
MONO_JEMALLOC_DEFAULT = @MONO_JEMALLOC_DEFAULT@
|
||||
MONO_JEMALLOC_ENABLED = @MONO_JEMALLOC_ENABLED@
|
||||
MONO_NATIVE_CC = @MONO_NATIVE_CC@
|
||||
MONO_NATIVE_CFLAGS = @MONO_NATIVE_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_CFLAGS = @MONO_NATIVE_COMPAT_CFLAGS@
|
||||
MONO_NATIVE_COMPAT_LDFLAGS = @MONO_NATIVE_COMPAT_LDFLAGS@
|
||||
MONO_NATIVE_CPPFLAGS = @MONO_NATIVE_CPPFLAGS@
|
||||
MONO_NATIVE_CXX = @MONO_NATIVE_CXX@
|
||||
MONO_NATIVE_CXXFLAGS = @MONO_NATIVE_CXXFLAGS@
|
||||
MONO_NATIVE_LDFLAGS = @MONO_NATIVE_LDFLAGS@
|
||||
MONO_NATIVE_LIBADD = @MONO_NATIVE_LIBADD@
|
||||
MONO_NATIVE_LIBRARY_NAME = @MONO_NATIVE_LIBRARY_NAME@
|
||||
MONO_NATIVE_PLATFORM = @MONO_NATIVE_PLATFORM@
|
||||
MONO_NATIVE_PLATFORM_TYPE = @MONO_NATIVE_PLATFORM_TYPE@
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT = @MONO_NATIVE_PLATFORM_TYPE_COMPAT@
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = @MONO_NATIVE_PLATFORM_TYPE_UNIFIED@
|
||||
MONO_NATIVE_UNIFIED_CFLAGS = @MONO_NATIVE_UNIFIED_CFLAGS@
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS = @MONO_NATIVE_UNIFIED_LDFLAGS@
|
||||
MSGFMT = @MSGFMT@
|
||||
MSGFMT_015 = @MSGFMT_015@
|
||||
MSGMERGE = @MSGMERGE@
|
||||
@@ -405,11 +435,16 @@ glib_libs = $(top_builddir)/mono/eglib/libeglib.la
|
||||
@DISABLE_EXECUTABLES_FALSE@ $(top_builddir)/mono/utils/libmonoutils.la \
|
||||
@DISABLE_EXECUTABLES_FALSE@ $(glib_libs)
|
||||
|
||||
@DISABLE_EXECUTABLES_FALSE@@DISABLE_LIBRARIES_FALSE@@SUPPORT_SGEN_TRUE@noinst_LIBRARIES = libmonograph.a
|
||||
libmonograph_a_CFLAGS = @CXX_ADD_CFLAGS@
|
||||
monograph_SOURCES =
|
||||
libmonograph_a_SOURCES = monograph.c
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
monograph_LDADD = \
|
||||
libmonograph_a-monograph.$(OBJEXT) \
|
||||
$(runtime_lib) \
|
||||
$(glib_libs) \
|
||||
$(LLVM_LIBS)
|
||||
@@ -451,6 +486,14 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
|
||||
clean-noinstLIBRARIES:
|
||||
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
|
||||
|
||||
libmonograph.a: $(libmonograph_a_OBJECTS) $(libmonograph_a_DEPENDENCIES) $(EXTRA_libmonograph_a_DEPENDENCIES)
|
||||
$(AM_V_at)-rm -f libmonograph.a
|
||||
$(AM_V_AR)$(libmonograph_a_AR) libmonograph.a $(libmonograph_a_OBJECTS) $(libmonograph_a_LIBADD)
|
||||
$(AM_V_at)$(RANLIB) libmonograph.a
|
||||
install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
|
||||
@@ -511,7 +554,7 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monograph.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmonograph_a-monograph.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
@@ -537,6 +580,20 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
||||
|
||||
libmonograph_a-monograph.o: monograph.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmonograph_a_CFLAGS) $(CFLAGS) -MT libmonograph_a-monograph.o -MD -MP -MF $(DEPDIR)/libmonograph_a-monograph.Tpo -c -o libmonograph_a-monograph.o `test -f 'monograph.c' || echo '$(srcdir)/'`monograph.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmonograph_a-monograph.Tpo $(DEPDIR)/libmonograph_a-monograph.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='monograph.c' object='libmonograph_a-monograph.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmonograph_a_CFLAGS) $(CFLAGS) -c -o libmonograph_a-monograph.o `test -f 'monograph.c' || echo '$(srcdir)/'`monograph.c
|
||||
|
||||
libmonograph_a-monograph.obj: monograph.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmonograph_a_CFLAGS) $(CFLAGS) -MT libmonograph_a-monograph.obj -MD -MP -MF $(DEPDIR)/libmonograph_a-monograph.Tpo -c -o libmonograph_a-monograph.obj `if test -f 'monograph.c'; then $(CYGPATH_W) 'monograph.c'; else $(CYGPATH_W) '$(srcdir)/monograph.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmonograph_a-monograph.Tpo $(DEPDIR)/libmonograph_a-monograph.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='monograph.c' object='libmonograph_a-monograph.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmonograph_a_CFLAGS) $(CFLAGS) -c -o libmonograph_a-monograph.obj `if test -f 'monograph.c'; then $(CYGPATH_W) 'monograph.c'; else $(CYGPATH_W) '$(srcdir)/monograph.c'; fi`
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
|
||||
@@ -627,7 +684,7 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(PROGRAMS)
|
||||
all-am: Makefile $(LIBRARIES) $(PROGRAMS)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(bindir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
@@ -664,7 +721,8 @@ maintainer-clean-generic:
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
|
||||
clean-am: clean-binPROGRAMS clean-generic clean-libtool \
|
||||
clean-noinstLIBRARIES mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
@@ -735,15 +793,16 @@ uninstall-am: uninstall-binPROGRAMS
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
|
||||
clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
|
||||
ctags ctags-am distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-binPROGRAMS \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
clean-binPROGRAMS clean-generic clean-libtool \
|
||||
clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
|
||||
distclean-compile distclean-generic distclean-libtool \
|
||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-binPROGRAMS install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-html install-html-am install-info \
|
||||
install-info-am install-man install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
|
||||
|
||||
@@ -35,7 +35,7 @@ output_type_edge (MonoClass *first, MonoClass *second) {
|
||||
}
|
||||
|
||||
static void
|
||||
print_subtypes (MonoImage *image, MonoClass *class, int depth) {
|
||||
print_subtypes (MonoImage *image, MonoClass *klass, int depth) {
|
||||
int i, token;
|
||||
const MonoTableInfo *t;
|
||||
MonoClass *child;
|
||||
@@ -45,7 +45,7 @@ print_subtypes (MonoImage *image, MonoClass *class, int depth) {
|
||||
|
||||
t = mono_image_get_table_info (image, MONO_TABLE_TYPEDEF);
|
||||
|
||||
token = mono_metadata_token_index (mono_class_get_type_token (class));
|
||||
token = mono_metadata_token_index (mono_class_get_type_token (klass));
|
||||
token <<= MONO_TYPEDEFORREF_BITS;
|
||||
token |= MONO_TYPEDEFORREF_TYPEDEF;
|
||||
|
||||
@@ -53,22 +53,22 @@ print_subtypes (MonoImage *image, MonoClass *class, int depth) {
|
||||
for (i = 0; i < mono_table_info_get_rows (t); ++i) {
|
||||
if (token == mono_metadata_decode_row_col (t, i, MONO_TYPEDEF_EXTENDS)) {
|
||||
child = mono_class_get (image, MONO_TOKEN_TYPE_DEF | (i + 1));
|
||||
output_type_edge (class, child);
|
||||
output_type_edge (klass, child);
|
||||
print_subtypes (image, child, depth);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
type_graph (MonoImage *image, const char* cname) {
|
||||
MonoClass *class;
|
||||
type_graph (MonoImage *image, const char* const_cname) {
|
||||
MonoClass *klass;
|
||||
MonoClass *parent;
|
||||
MonoClass *child;
|
||||
const char *name_space;
|
||||
char *p;
|
||||
int depth = 0;
|
||||
|
||||
cname = g_strdup (cname);
|
||||
char *cname = g_strdup (const_cname);
|
||||
p = strrchr (cname, '.');
|
||||
if (p) {
|
||||
name_space = cname;
|
||||
@@ -77,26 +77,26 @@ type_graph (MonoImage *image, const char* cname) {
|
||||
} else {
|
||||
name_space = "";
|
||||
}
|
||||
class = mono_class_from_name (image, name_space, cname);
|
||||
if (!class) {
|
||||
klass = mono_class_from_name (image, name_space, cname);
|
||||
if (!klass) {
|
||||
g_print ("class %s.%s not found\n", name_space, cname);
|
||||
exit (1);
|
||||
}
|
||||
fprintf (output, "digraph blah {\n");
|
||||
fprintf (output, "%s", graph_properties);
|
||||
child = class;
|
||||
child = klass;
|
||||
/* go back and print the parents for the node as well: not sure it's a good idea */
|
||||
for (parent = mono_class_get_parent (class); parent; parent = mono_class_get_parent (parent)) {
|
||||
for (parent = mono_class_get_parent (klass); parent; parent = mono_class_get_parent (parent)) {
|
||||
output_type_edge (parent, child);
|
||||
child = parent;
|
||||
}
|
||||
print_subtypes (image, class, depth);
|
||||
print_subtypes (image, klass, depth);
|
||||
fprintf (output, "}\n");
|
||||
}
|
||||
|
||||
static void
|
||||
interface_graph (MonoImage *image, const char* cname) {
|
||||
MonoClass *class;
|
||||
interface_graph (MonoImage *image, const char* const_cname) {
|
||||
MonoClass *klass;
|
||||
MonoClass *child;
|
||||
const char *name_space;
|
||||
char *p;
|
||||
@@ -104,7 +104,7 @@ interface_graph (MonoImage *image, const char* cname) {
|
||||
guint32 token, i, count = 0;
|
||||
const MonoTableInfo *intf = mono_image_get_table_info (image, MONO_TABLE_INTERFACEIMPL);
|
||||
|
||||
cname = g_strdup (cname);
|
||||
char *cname = g_strdup (const_cname);
|
||||
p = strrchr (cname, '.');
|
||||
if (p) {
|
||||
name_space = cname;
|
||||
@@ -113,8 +113,8 @@ interface_graph (MonoImage *image, const char* cname) {
|
||||
} else {
|
||||
name_space = "";
|
||||
}
|
||||
class = mono_class_from_name (image, name_space, cname);
|
||||
if (!class) {
|
||||
klass = mono_class_from_name (image, name_space, cname);
|
||||
if (!klass) {
|
||||
g_print ("interface %s.%s not found\n", name_space, cname);
|
||||
exit (1);
|
||||
}
|
||||
@@ -122,7 +122,7 @@ interface_graph (MonoImage *image, const char* cname) {
|
||||
fprintf (output, "digraph interface {\n");
|
||||
fprintf (output, "%s", graph_properties);
|
||||
/* TODO: handle inetrface defined in one image and class defined in another. */
|
||||
token = mono_metadata_token_index (mono_class_get_type_token (class));
|
||||
token = mono_metadata_token_index (mono_class_get_type_token (klass));
|
||||
token <<= MONO_TYPEDEFORREF_BITS;
|
||||
token |= MONO_TYPEDEFORREF_TYPEDEF;
|
||||
for (i = 0; i < mono_table_info_get_rows (intf); ++i) {
|
||||
@@ -130,13 +130,13 @@ interface_graph (MonoImage *image, const char* cname) {
|
||||
/*g_print ("index: %d [%d implements %d]\n", index, cols [MONO_INTERFACEIMPL_CLASS], cols [MONO_INTERFACEIMPL_INTERFACE]);*/
|
||||
if (token == cols [MONO_INTERFACEIMPL_INTERFACE]) {
|
||||
child = mono_class_get (image, MONO_TOKEN_TYPE_DEF | cols [MONO_INTERFACEIMPL_CLASS]);
|
||||
output_type_edge (class, child);
|
||||
output_type_edge (klass, child);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
fprintf (output, "}\n");
|
||||
if (verbose && !count)
|
||||
g_print ("No class implements %s.%s\n", mono_class_get_namespace (class), mono_class_get_name (class));
|
||||
g_print ("No class implements %s.%s\n", mono_class_get_namespace (klass), mono_class_get_name (klass));
|
||||
|
||||
}
|
||||
|
||||
@@ -554,7 +554,7 @@ get_signature (MonoMethod *method) {
|
||||
|
||||
if (!hash)
|
||||
hash = g_hash_table_new (g_direct_hash, g_direct_equal);
|
||||
if ((result = g_hash_table_lookup (hash, method)))
|
||||
if ((result = (char*)g_hash_table_lookup (hash, method)))
|
||||
return result;
|
||||
|
||||
res = g_string_new ("");
|
||||
@@ -743,8 +743,8 @@ link_bblock (MonoBasicBlock *from, MonoBasicBlock* to)
|
||||
static int
|
||||
compare_bblock (const void *a, const void *b)
|
||||
{
|
||||
MonoBasicBlock * const *ab = a;
|
||||
MonoBasicBlock * const *bb = b;
|
||||
MonoBasicBlock * const *ab = (MonoBasicBlock * const *)a;
|
||||
MonoBasicBlock * const *bb = (MonoBasicBlock * const *)b;
|
||||
|
||||
return (*ab)->cil_code - (*bb)->cil_code;
|
||||
}
|
||||
@@ -752,7 +752,7 @@ compare_bblock (const void *a, const void *b)
|
||||
static GPtrArray*
|
||||
mono_method_find_bblocks (MonoMethodHeader *header)
|
||||
{
|
||||
const unsigned char *ip, *end, *start;
|
||||
const unsigned char *ip, *end;
|
||||
const MonoOpcode *opcode;
|
||||
guint32 i, block_end = 0;
|
||||
GPtrArray *result = g_ptr_array_new ();
|
||||
@@ -777,8 +777,7 @@ mono_method_find_bblocks (MonoMethodHeader *header)
|
||||
|
||||
/* handle exception code blocks... */
|
||||
while (ip < end) {
|
||||
start = ip;
|
||||
if ((target = g_hash_table_lookup (table, ip)) && target != bb) {
|
||||
if ((target = (MonoBasicBlock*)g_hash_table_lookup (table, ip)) && target != bb) {
|
||||
if (!block_end)
|
||||
link_bblock (bb, target);
|
||||
bb = target;
|
||||
@@ -786,7 +785,7 @@ mono_method_find_bblocks (MonoMethodHeader *header)
|
||||
}
|
||||
if (block_end) {
|
||||
/*fprintf (stderr, "processing bbclok at IL_%04x\n", ip - header->code);*/
|
||||
if (!(bb = g_hash_table_lookup (table, ip))) {
|
||||
if (!(bb = (MonoBasicBlock*)g_hash_table_lookup (table, ip))) {
|
||||
bb = g_new0 (MonoBasicBlock, 1);
|
||||
bb->cil_code = ip;
|
||||
g_ptr_array_add (result, bb);
|
||||
@@ -849,7 +848,7 @@ mono_method_find_bblocks (MonoMethodHeader *header)
|
||||
ip += 4;
|
||||
}
|
||||
if (opcode->flow_type == MONO_FLOW_COND_BRANCH) {
|
||||
if (!(target = g_hash_table_lookup (table, ip))) {
|
||||
if (!(target = (MonoBasicBlock*)g_hash_table_lookup (table, ip))) {
|
||||
target = g_new0 (MonoBasicBlock, 1);
|
||||
target->cil_code = ip;
|
||||
g_ptr_array_add (result, target);
|
||||
@@ -857,7 +856,7 @@ mono_method_find_bblocks (MonoMethodHeader *header)
|
||||
}
|
||||
link_bblock (bb, target);
|
||||
}
|
||||
if (!(target = g_hash_table_lookup (table, ip + i))) {
|
||||
if (!(target = (MonoBasicBlock*)g_hash_table_lookup (table, ip + i))) {
|
||||
target = g_new0 (MonoBasicBlock, 1);
|
||||
target->cil_code = ip + i;
|
||||
g_ptr_array_add (result, target);
|
||||
@@ -877,7 +876,7 @@ mono_method_find_bblocks (MonoMethodHeader *header)
|
||||
for (i = 0; i < n; i++) {
|
||||
itarget = st + read32 (ip);
|
||||
ip += 4;
|
||||
if (!(target = g_hash_table_lookup (table, itarget))) {
|
||||
if (!(target = (MonoBasicBlock*)g_hash_table_lookup (table, itarget))) {
|
||||
target = g_new0 (MonoBasicBlock, 1);
|
||||
target->cil_code = (const guchar*)itarget;
|
||||
g_ptr_array_add (result, target);
|
||||
@@ -940,7 +939,7 @@ df_visit (MonoBasicBlock *bb, int *dfn, const unsigned char* code)
|
||||
++(*dfn);
|
||||
bb->dfn = *dfn;
|
||||
for (tmp = bb->out_bb; tmp; tmp = tmp->next) {
|
||||
next = tmp->data;
|
||||
next = (MonoBasicBlock*)tmp->data;
|
||||
if (!next->dfn) {
|
||||
if (!bb->cil_code)
|
||||
fprintf (output, "\t\"DF entry\" -> \"IL_%04x (%d)\"\n", (unsigned int)(next->cil_code - code), *dfn + 1);
|
||||
@@ -979,7 +978,7 @@ print_method_cfg (MonoMethod *method) {
|
||||
for (i = 0; i < bblocks->len; ++i) {
|
||||
bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
|
||||
for (tmp = bb->out_bb; tmp; tmp = tmp->next) {
|
||||
target = tmp->data;
|
||||
target = (MonoBasicBlock*)tmp->data;
|
||||
fprintf (output, "\tB%p -> B%p\n", bb, target);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user