Improved exception stack frame displayed data. Added stack frame method address display.

diff --git a/mcs/class/corlib/System/Exception.cs b/mcs/class/corlib/System/Exception.cs
index d5d81dcd73926ac2a74d7629de56fcbf51b79958..5ccf4bd494b6cbc7f3069b6a5c1bfde5aa20f22e 100644 (file)
--- a/mcs/class/corlib/System/Exception.cs
+++ b/mcs/class/corlib/System/Exception.cs
@@ -208,12 +208,12 @@ namespace System
                                        if (internal_name != null)
                                                sb.Append (internal_name);
                                        else
-                                               sb.AppendFormat ("<0x{0:x5}> {1}", frame.GetNativeOffset (), unknown);
+                                               sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> {2}", frame.GetMethodAddress (), frame.GetNativeOffset (), unknown);
                                } else {
                                        GetFullNameForStackTrace (sb, frame.GetMethod ());
 
                                        if (frame.GetILOffset () == -1)
-                                               sb.AppendFormat (" <0x{0:x5}> ", frame.GetNativeOffset ());
+                                               sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> ", frame.GetMethodAddress (), frame.GetNativeOffset ());
                                        else
                                                sb.AppendFormat (" [0x{0:x5}] ", frame.GetILOffset ());