#include "image.h"
#include <glib.h>
#include "cil-coff.h"
-#include "private.h"
#include "mono-endian.h"
#include "verify.h"
#include <mono/metadata/class.h>
#include <mono/metadata/tokentype.h>
#include <mono/metadata/appdomain.h>
#include <mono/metadata/assembly.h>
+#include <mono/metadata/metadata-internals.h>
+#include <mono/metadata/rawbuffer.h>
+#include <mono/metadata/class-internals.h>
#include "mono/utils/mono-digest.h"
gboolean dump_data = TRUE;
{
printf ("%s: 0x%08x - 0x%08x [%d == 0x%08x]\n",
label,
- sh->data - meta->raw_metadata, sh->data + sh->size - meta->raw_metadata,
+ (int)(sh->data - meta->raw_metadata), (int)(sh->data + sh->size - meta->raw_metadata),
sh->size, sh->size);
}
+static void
+dump_metadata_header (MonoImage *meta)
+{
+ printf ("\nMetadata header:\n");
+ printf (" Version: %d.%d\n", meta->md_version_major, meta->md_version_minor);
+ printf (" Version string: %s\n", meta->version);
+}
+
static void
dump_metadata_ptrs (MonoImage *meta)
{
dump_metadata (MonoImage *meta)
{
int table;
-
+
+ dump_metadata_header (meta);
+
dump_metadata_ptrs (meta);
printf ("Rows:\n");
- for (table = 0; table < 64; table++){
+ for (table = 0; table < MONO_TABLE_NUM; table++){
if (meta->tables [table].rows == 0)
continue;
printf ("Table %s: %d records (%d bytes, at %p)\n",
dump_methoddef (image, iinfo->cli_cli_header.ch_entry_point);
}
-static void
+static int
dump_verify_info (MonoImage *image, int flags)
{
GSList *errors, *tmp;
- int count = 0;
+ int count = 0, verifiable = 0;
const char* desc [] = {
- "Ok", "Error", "Warning", NULL, "CLS"
+ "Ok", "Error", "Warning", NULL, "CLS", NULL, NULL, NULL, "Not Verifiable"
};
errors = mono_image_verify_tables (image, flags);
for (i = 0; i < m->rows; ++i) {
MonoMethod *method;
-
method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i+1), NULL);
errors = mono_method_verify (method, flags);
if (errors) {
char *sig;
- sig = mono_signature_get_desc (method->signature, FALSE);
- g_print ("In method: %s.%s::%s(%s)\n", method->klass->name_space, method->klass->name, method->name, sig);
+ MonoClass *klass = mono_method_get_class (method);
+ sig = mono_signature_get_desc (mono_method_signature (method), FALSE);
+ g_print ("In method: %s.%s::%s(%s)\n", mono_class_get_namespace (klass), mono_class_get_name (klass), mono_method_get_name (method), sig);
g_free (sig);
}
for (tmp = errors; tmp; tmp = tmp->next) {
MonoVerifyInfo *info = tmp->data;
g_print ("%s: %s\n", desc [info->status], info->message);
- if (info->status == MONO_VERIFY_ERROR)
+ if (info->status == MONO_VERIFY_ERROR) {
count++;
+ verifiable = 3;
+ }
+ if(info->status == MONO_VERIFY_NOT_VERIFIABLE) {
+ if (verifiable < 2)
+ verifiable = 2;
+ }
}
mono_free_verify_list (errors);
}
if (count)
g_print ("Error count: %d\n", count);
+ return verifiable;
}
static void
MonoImage *image;
char *file = NULL;
char *flags = NULL;
- const char *flag_desc [] = {"error", "warn", "cls", "all", "code", NULL};
- guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, MONO_VERIFY_ALL + 1};
+ const char *flag_desc [] = {"error", "warn", "cls", "all", "code", "fail-on-verifiable", "non-strict", NULL};
+ guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, MONO_VERIFY_ALL + 1, MONO_VERIFY_FAIL_FAST, MONO_VERIFY_NON_STRICT};
int i;
for (i = 1; i < argc; i++){
usage ();
mono_metadata_init ();
- mono_raw_buffer_init ();
- mono_images_init ();
- mono_assemblies_init ();
- mono_loader_init ();
+ mono_raw_buffer_init ();
+ mono_images_init ();
+ mono_assemblies_init ();
+ mono_loader_init ();
image = mono_image_open (file, NULL);
if (!image){
g_print ("Unknown verify flag %s\n", tok);
tok = strtok (NULL, ",");
}
- mono_init (file);
+ mono_init_from_assembly (file, file);
assembly = mono_assembly_open (file, NULL);
- dump_verify_info (assembly->image, f);
+
+ if (!assembly) {
+ g_print ("Could not open assembly %s\n", file);
+ return 4;
+ }
+
+ return dump_verify_info (assembly->image, f);
} else
mono_image_close (image);