From 94a83ac5d10d82b090ebe9584bbf49ab5330fb88 Mon Sep 17 00:00:00 2001 From: zoltan Date: Thu, 5 Oct 2006 16:08:10 +0000 Subject: [PATCH] 2006-10-05 Zoltan Varga * loader.c (mono_method_signature): Fix a use of MONO_TABLE_METHOD missed earlier. * metadata.c (mono_metadata_get_param_attrs): Ditto. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@66295 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 4 ++++ mono/metadata/loader.c | 2 +- mono/metadata/metadata.c | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 9615aafd2..d66a6dd45 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,5 +1,9 @@ 2006-10-05 Zoltan Varga + * loader.c (mono_method_signature): Fix a use of MONO_TABLE_METHOD missed earlier. + + * metadata.c (mono_metadata_get_param_attrs): Ditto. + * row-indexes.h: Add definitions for *Ptr tables. * metadata-internals.h (MonoImage): Add an 'uncompressed_metadata' flag. diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c index 49590d349..53e985a0a 100644 --- a/mono/metadata/loader.c +++ b/mono/metadata/loader.c @@ -1792,7 +1792,7 @@ mono_method_signature (MonoMethod *m) idx = mono_metadata_token_index (m->token); img = m->klass->image; - sig = mono_metadata_blob_heap (img, mono_metadata_decode_row_col (&img->tables [MONO_TABLE_METHOD], idx - 1, MONO_METHOD_SIGNATURE)); + sig = mono_metadata_blob_heap (img, mono_metadata_decode_table_row_col (img, MONO_TABLE_METHOD, idx - 1, MONO_METHOD_SIGNATURE)); g_assert (!m->klass->generic_class); container = m->generic_container; diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c index e0a758e87..9e28653fb 100644 --- a/mono/metadata/metadata.c +++ b/mono/metadata/metadata.c @@ -1617,16 +1617,16 @@ mono_metadata_get_param_attrs (MonoImage *m, int def) MonoTableInfo *paramt = &m->tables [MONO_TABLE_PARAM]; MonoTableInfo *methodt = &m->tables [MONO_TABLE_METHOD]; guint32 cols [MONO_PARAM_SIZE]; - guint lastp, i, param_index = mono_metadata_decode_row_col (methodt, def - 1, MONO_METHOD_PARAMLIST); + guint lastp, i, param_index = mono_metadata_decode_table_row_col (m, MONO_TABLE_METHOD, def - 1, MONO_METHOD_PARAMLIST); int *pattrs = NULL; if (def < methodt->rows) - lastp = mono_metadata_decode_row_col (methodt, def, MONO_METHOD_PARAMLIST); + lastp = mono_metadata_decode_table_row_col (m, MONO_TABLE_METHOD, def, MONO_METHOD_PARAMLIST); else lastp = paramt->rows + 1; for (i = param_index; i < lastp; ++i) { - mono_metadata_decode_row (paramt, i - 1, cols, MONO_PARAM_SIZE); + mono_metadata_decode_table_row (m, MONO_TABLE_PARAM, i - 1, cols, MONO_PARAM_SIZE); if (cols [MONO_PARAM_FLAGS]) { if (!pattrs) pattrs = g_new0 (int, 1 + (lastp - param_index)); -- 2.11.4.GIT