Author: martin
Date: 2007-10-31 10:58:25 -0500 (Wed, 31 Oct 2007)
New Revision: 88571

Modified:
   trunk/debugger/ChangeLog
   trunk/debugger/backend/ProcessServant.cs
Log:
2007-10-31  Martin Baulig  <[EMAIL PROTECTED]>

        Merged the Plophos branch.

        * backend/ProcessServant.cs: Reflect latest runtime changes.
        * backend/MonoThreadManager.cs: Reflect latest runtime changes.



Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog    2007-10-31 15:57:20 UTC (rev 88570)
+++ trunk/debugger/ChangeLog    2007-10-31 15:58:25 UTC (rev 88571)
@@ -2,6 +2,7 @@
 
        Merged the Plophos branch.
 
+       * backend/ProcessServant.cs: Reflect latest runtime changes.
        * backend/MonoThreadManager.cs: Reflect latest runtime changes.
 
        * backend/Inferior.cs

Modified: trunk/debugger/backend/ProcessServant.cs
===================================================================
--- trunk/debugger/backend/ProcessServant.cs    2007-10-31 15:57:20 UTC (rev 
88570)
+++ trunk/debugger/backend/ProcessServant.cs    2007-10-31 15:58:25 UTC (rev 
88571)
@@ -349,16 +349,19 @@
                {
                        TargetAddress ptr = inferior.ReadAddress 
(mono_manager.MonoDebuggerInfo.ThreadTable);
                        while (!ptr.IsNull) {
-                               int size = 24 + 
inferior.TargetMemoryInfo.TargetAddressSize;
+                               int size = 32 + 
inferior.TargetMemoryInfo.TargetAddressSize;
                                TargetReader reader = new TargetReader 
(inferior.ReadMemory (ptr, size));
 
                                long tid = reader.ReadLongInteger ();
                                TargetAddress lmf_addr = reader.ReadAddress ();
                                TargetAddress end_stack = reader.ReadAddress ();
 
+                               TargetAddress extended_notifications_addr = ptr 
+ 24;
+
                                if (inferior.TargetMemoryInfo.TargetAddressSize 
== 4)
                                        tid &= 0x00000000ffffffffL;
 
+                               reader.Offset += 8;
                                ptr = reader.ReadAddress ();
 
                                bool found = false;
@@ -366,7 +369,7 @@
                                        if (engine.TID != tid)
                                                continue;
 
-                                       engine.SetLMFAddress (lmf_addr);
+                                       engine.SetManagedThreadData (lmf_addr, 
extended_notifications_addr);
                                        engine.OnManagedThreadCreated 
(end_stack);
                                        found = true;
                                        break;

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

Reply via email to