[Dotgnu-pnet-commits] CVS: pnet/engine lib_diag.c,1.10,1.11

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv25237/engine

Modified Files:
        lib_diag.c 
Log Message:
Remove the skipFrames hack


Index: lib_diag.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/lib_diag.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** lib_diag.c  26 Dec 2002 09:26:39 -0000      1.10
--- lib_diag.c  26 May 2003 04:29:13 -0000      1.11
***************
*** 406,415 ****
  #ifdef IL_CONFIG_REFLECTION
        ILInt32 num;
-       ILInt32 skipFrames;
-       int sawNormal;
        ILCallFrame *frame;
        ILObject *array;
        PackedStackFrame *data;
-       ILMethod *method;
        unsigned char *start;
        ILClass *classInfo;
--- 406,412 ----
***************
*** 418,454 ****
           where the exception constructors stop and real code starts */
        num = 0;
-       skipFrames = 0;
-       sawNormal = 0;
        frame = _ILGetCallFrame(thread, 0);
        while(frame != 0)
        {
!               if(!sawNormal)
!               {
!                       method = frame->method;
!                       if(frame->method)
!                       {
!                               if(ILMethod_IsConstructor(frame->method) &&
!                                  thread->process->exceptionClass &&
!                                  
ILClassInheritsFrom(ILMethod_Owner(frame->method),
!                                                                          
thread->process->exceptionClass))
!                               {
!                                       ++skipFrames;
!                               }
!                               else
!                               {
!                                       sawNormal = 1;
!                                       ++num;
!                               }
!                       }
!                       else
!                       {
!                               sawNormal = 1;
!                               ++num;
!                       }
!               }
!               else
!               {
!                       ++num;
!               }
                frame = _ILGetNextCallFrame(thread, frame);
        }
--- 415,422 ----
           where the exception constructors stop and real code starts */
        num = 0;
        frame = _ILGetCallFrame(thread, 0);
        while(frame != 0)
        {
!               ++num;
                frame = _ILGetNextCallFrame(thread, frame);
        }
***************
*** 483,487 ****
        /* Fill the array with the packed stack data */
        data = (PackedStackFrame *)ArrayToBuffer(array);
!       frame = _ILGetCallFrame(thread, skipFrames);
        while(frame != 0 && num > 0)
        {
--- 451,455 ----
        /* Fill the array with the packed stack data */
        data = (PackedStackFrame *)ArrayToBuffer(array);
!       frame = _ILGetCallFrame(thread, 0);
        while(frame != 0 && num > 0)
        {