Author: martin
Date: 2007-04-04 07:00:46 -0400 (Wed, 04 Apr 2007)
New Revision: 75380

Modified:
   trunk/debugger/backend/SingleSteppingEngine.cs
   trunk/debugger/languages/mono/MonoClassType.cs
   trunk/debugger/languages/mono/MonoLanguageBackend.cs
Log:
Add error handling.

Modified: trunk/debugger/backend/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backend/SingleSteppingEngine.cs      2007-04-04 10:18:04 UTC 
(rev 75379)
+++ trunk/debugger/backend/SingleSteppingEngine.cs      2007-04-04 11:00:46 UTC 
(rev 75380)
@@ -2877,9 +2877,14 @@
                                goto out_frame_changed;
                        }
 
-                       EventResult result;
-                       if (CallbackCompleted (cevent, out args, out result))
-                               return result;
+                       try {
+                               EventResult result;
+                               if (CallbackCompleted (cevent, out args, out 
result))
+                                       return result;
+                       } catch (Exception ex) {
+                               RestoreStack ();
+                               return EventResult.CompletedCallback;
+                       }
 
                        if (stack_data != null) {
                                sse.restore_stack (stack_data);
@@ -3132,6 +3137,13 @@
                                TargetAddress klass = inferior.ReadAddress 
(method + 8);
                                TargetType class_type = language.GetClass 
(sse.Thread, klass);
 
+                               if (class_type == null) {
+                                       Result.ExceptionMessage = String.Format 
(
+                                               "Unable to get virtual method 
`{0}'.", Function.FullName);
+                                       Result.InvocationCompleted = true;
+                                       return true;
+                               }
+
                                if (!class_type.IsByRef) {
                                        TargetLocation new_loc = 
instance.Location.GetLocationAtOffset (
                                                2 * 
inferior.TargetInfo.TargetAddressSize);

Modified: trunk/debugger/languages/mono/MonoClassType.cs
===================================================================
--- trunk/debugger/languages/mono/MonoClassType.cs      2007-04-04 10:18:04 UTC 
(rev 75379)
+++ trunk/debugger/languages/mono/MonoClassType.cs      2007-04-04 11:00:46 UTC 
(rev 75380)
@@ -457,8 +457,8 @@
                        return null;
                }
 
-               public static TargetType ReadMonoClass (MonoLanguageBackend 
language,
-                                                       Thread target, 
TargetAddress address)
+               internal static TargetType ReadMonoClass (MonoLanguageBackend 
language,
+                                                         Thread target, 
TargetAddress address)
                {
                        TargetReader reader = new TargetReader (
                                target.ReadMemory (address, 
language.MonoMetadataInfo.KlassSize));

Modified: trunk/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
--- trunk/debugger/languages/mono/MonoLanguageBackend.cs        2007-04-04 
10:18:04 UTC (rev 75379)
+++ trunk/debugger/languages/mono/MonoLanguageBackend.cs        2007-04-04 
11:00:46 UTC (rev 75380)
@@ -333,7 +333,11 @@
                        if (type != null)
                                return type;
 
-                       return MonoClassType.ReadMonoClass (this, target, 
klass_address);
+                       try {
+                               return MonoClassType.ReadMonoClass (this, 
target, klass_address);
+                       } catch {
+                               return null;
+                       }
                }
 
                public MonoSymbolFile GetImage (TargetAddress address)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to