[Dotgnu-pnet-commits] CVS: pnet/ildasm ildasm_method.c,1.11,1.12

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/ildasm
In directory subversions:/tmp/cvs-serv9162/ildasm

Modified Files:
        ildasm_method.c 
Log Message:


Dump the "field" or "method" prefix on "ldtoken" opcodes in the assembler.


Index: ildasm_method.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ildasm/ildasm_method.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ildasm_method.c     13 Dec 2002 06:48:00 -0000      1.11
--- ildasm_method.c     4 Jan 2003 00:44:33 -0000       1.12
***************
*** 97,101 ****
   */
  static void DumpToken(ILImage *image, FILE *outstream,
!                                         int flags, unsigned long token)
  {
        ILClass *info;
--- 97,102 ----
   */
  static void DumpToken(ILImage *image, FILE *outstream,
!                                         int flags, unsigned long token,
!                                         int prefixWithKind)
  {
        ILClass *info;
***************
*** 144,147 ****
--- 145,152 ----
                        {
                        dumpField:
+                               if(prefixWithKind)
+                               {
+                                       fputs("field ", outstream);
+                               }
                                ILDumpType(outstream, image, 
ILField_Type(field), flags);
                                putc(' ', outstream);
***************
*** 172,175 ****
--- 177,184 ----
                        if(method)
                        {
+                               if(prefixWithKind)
+                               {
+                                       fputs("method ", outstream);
+                               }
                                ILDumpMethodType(outstream, image,
                                                                 
ILMethod_Signature(method), flags,
***************
*** 198,201 ****
--- 207,214 ----
                                           because this may be a "vararg" call 
that has
                                           type information supplied in the 
call site */
+                                       if(prefixWithKind)
+                                       {
+                                               fputs("method ", outstream);
+                                       }
                                        method = (ILMethod *)member;
                                        ILDumpMethodType(outstream, image,
***************
*** 610,614 ****
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)));
                        }
                        break;
--- 623,634 ----
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)), 0);
!                       }
!                       break;
! 
!                       case IL_OPCODE_ARGS_LDTOKEN:
!                       {
!                               DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)), 1);
                        }
                        break;
***************
*** 651,655 ****
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)));
                        }
                        break;
--- 671,675 ----
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)), 0);
                        }
                        break;
***************
*** 658,662 ****
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)));
                        }
                        break;
--- 678,682 ----
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)), 0);
                        }
                        break;
***************
*** 665,669 ****
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)));
                        }
                        break;
--- 685,689 ----
                        {
                                DumpToken(image, outstream, flags,
!                                             (unsigned 
long)(IL_READ_UINT32(temp + args)), 0);
                        }
                        break;
***************
*** 902,906 ****
                        fputs(" catch ", outstream);
                        DumpToken(image, outstream, flags | 
ILDASM_SUPPRESS_PREFIX,
!                                         tempClause->extraArg);
                }
                fprintf(outstream, " handler ?L%lx to ?L%lx\n",
--- 922,926 ----
                        fputs(" catch ", outstream);
                        DumpToken(image, outstream, flags | 
ILDASM_SUPPRESS_PREFIX,
!                                         tempClause->extraArg, 0);
                }
                fprintf(outstream, " handler ?L%lx to ?L%lx\n",