2005-01-28 Zoltan Varga <vargaz@freemail.hu>

	* domain-internals.h: Put MonoJitInfo on a diet.

	* domain.c: Fix a warning.

svn path=/trunk/mono/; revision=39709

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index fb81603f77c7b8b8cfb0b69bc7416aeee35a9edc..5a856182170621bb15bd19b2374277d3c7cc45aa 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28  Zoltan Varga  <vargaz@freemail.hu>
+
+       * domain-internals.h: Put MonoJitInfo on a diet.
+
+       * domain.c: Fix a warning.
 
 Wed Jan 26 22:20:46 CET 2005 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index 735ea6b8855ce6cc0a06aead99d1dd4c9d367d98..433407f0eb075ca3d9d42ec9c12f9fd28e32a837 100644 (file)
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -48,9 +48,9 @@ typedef struct {
 struct _MonoJitInfo {
        MonoMethod *method;
        gpointer    code_start;
-       int         code_size;
        guint32     used_regs;
-       unsigned    num_clauses;
+       int         code_size;
+       guint32     num_clauses:24;
        /* Whenever the code is domain neutral or 'shared' */
        gboolean    domain_neutral:1;
        gboolean    cas_inited:1;
@@ -60,7 +60,7 @@ struct _MonoJitInfo {
        gboolean    cas_method_assert:1;
        gboolean    cas_method_deny:1;
        gboolean    cas_method_permitonly:1;
-       MonoJitExceptionInfo *clauses;
+       MonoJitExceptionInfo clauses [MONO_ZERO_LEN_ARRAY];
 };
 
 typedef struct {

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index ef55959470e9486908be7216b9beadc265aa8fda..beabe9aca253afe7aa67159c7544178e8a78825b 100644 (file)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -17,6 +17,7 @@
 #include <mono/os/gc_wrapper.h>
 
 #include <mono/metadata/object.h>
+#include <mono/metadata/object-internals.h>
 #include <mono/metadata/domain-internals.h>
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/assembly.h>