Author: martin
Date: 2007-06-06 09:21:33 -0400 (Wed, 06 Jun 2007)
New Revision: 78734
Modified:
branches/martin/debugger-dublin/debugger/backend/SingleSteppingEngine.cs
branches/martin/debugger-dublin/debugger/classes/SourceLocation.cs
branches/martin/debugger-dublin/debugger/languages/mono/MonoLanguageBackend.cs
Log:
We're passing a 'make check' again.
Modified:
branches/martin/debugger-dublin/debugger/backend/SingleSteppingEngine.cs
===================================================================
--- branches/martin/debugger-dublin/debugger/backend/SingleSteppingEngine.cs
2007-06-06 13:21:24 UTC (rev 78733)
+++ branches/martin/debugger-dublin/debugger/backend/SingleSteppingEngine.cs
2007-06-06 13:21:33 UTC (rev 78734)
@@ -3007,7 +3007,8 @@
"{0} rti resolving class
{1}:{2:x}", sse, image, token);
inferior.CallMethod (
- language.LookupClassFunc,
image.Address, token, ID);
+ language.LookupClassFunc,
image.Address, 0,
+ Function.MonoClass.Name, ID);
return;
}
Modified: branches/martin/debugger-dublin/debugger/classes/SourceLocation.cs
===================================================================
--- branches/martin/debugger-dublin/debugger/classes/SourceLocation.cs
2007-06-06 13:21:24 UTC (rev 78733)
+++ branches/martin/debugger-dublin/debugger/classes/SourceLocation.cs
2007-06-06 13:21:33 UTC (rev 78734)
@@ -202,8 +202,6 @@
public DynamicSourceLocation (MethodSource source, int line)
{
- Console.WriteLine ("DYNAMIC SOURCE: {0} {1}", source,
source.Function);
-
if (source.IsManaged) {
this.function = source.Function;
this.module = function.Module;
Modified:
branches/martin/debugger-dublin/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
---
branches/martin/debugger-dublin/debugger/languages/mono/MonoLanguageBackend.cs
2007-06-06 13:21:24 UTC (rev 78733)
+++
branches/martin/debugger-dublin/debugger/languages/mono/MonoLanguageBackend.cs
2007-06-06 13:21:33 UTC (rev 78734)
@@ -703,8 +703,14 @@
Method method_from_jit_info (TargetMemoryAccess target,
TargetAddress data)
{
- Console.WriteLine ("JIT INFO: {0}", data, data);
+ Console.WriteLine ("JIT INFO: {0}", data);
+ Method the_method = process.SymbolTableManager.Lookup
(data);
+
+ Console.WriteLine ("JIT INFO #1: {0}", data,
the_method);
+
+ return the_method;
+
try {
TargetBinaryReader reader = target.ReadMemory
(data, 16).GetReader ();
int size = reader.ReadInt32 ();
@@ -1005,6 +1011,8 @@
Method method = method_from_jit_info (inferior, data);
Console.WriteLine ("JIT BREAKPOINT #1: {0} {1} {2}",
idx, data, method);
+ if (method == null)
+ return;
MethodLoadedHandler handler = (MethodLoadedHandler)
method_load_handlers [idx];
if (handler != null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
