[Squeak-Commits] squeak/platforms/win32/vm sqWin32Intel.c,1.5,1.6

[Andreas R. <and...@us...>]

Update of /cvsroot/squeak/squeak/platforms/win32/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv26737

Modified Files:
	sqWin32Intel.c 
Log Message:
print loaded plugins in crashes; removed printer setup

Index: sqWin32Intel.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Intel.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sqWin32Intel.c	5 Sep 2002 19:33:54 -0000	1.5
--- sqWin32Intel.c	8 Mar 2003 21:06:15 -0000	1.6
***************
*** 380,421 ****
    /* print the above information */
    f = fopen("crash.dmp","a");
!   if(f)
!     {  time_t crashTime = time(NULL);
!        fprintf(f,"---------------------------------------------------------------------\n");
! 	   fprintf(f,"%s\n", ctime(&crashTime));
! 	   /* Print the exception code */
!        fprintf(f,"Exception code: %08X\nException addr: %08X\n",
! 			     exp->ExceptionRecord->ExceptionCode,
! 				 exp->ExceptionRecord->ExceptionAddress);
! 	   if(exp->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
! 		   /* For access violations print what actually happened */
! 		   fprintf(f,"Access violation (%s) at %08X\n",
! 			   (exp->ExceptionRecord->ExceptionInformation[0] ? "write access" : "read access"),
! 			   exp->ExceptionRecord->ExceptionInformation[1]);
! 	   }
! 	   fprintf(f,"EAX:%08X\tEBX:%08X\tECX:%08X\tEDX:%08X\n",
! 		   exp->ContextRecord->Eax,
! 		   exp->ContextRecord->Ebx,
! 		   exp->ContextRecord->Ecx,
! 		   exp->ContextRecord->Edx);
! 	   fprintf(f,"ESI:%08X\tEDI:%08X\tEBP:%08X\tESP:%08X\n",
! 		   exp->ContextRecord->Esi,
! 		   exp->ContextRecord->Edi,
! 		   exp->ContextRecord->Ebp,
! 		   exp->ContextRecord->Esp);
! 	   fprintf(f,"EIP:%08X\tEFL:%08X\n",
! 		   exp->ContextRecord->Eip,
! 		   exp->ContextRecord->EFlags);
! 	   fprintf(f,"FP Control: %08X\nFP Status:  %08X\nFP Tag:     %08X\n",
! 		   exp->ContextRecord->FloatSave.ControlWord,
! 		   exp->ContextRecord->FloatSave.StatusWord,
! 		   exp->ContextRecord->FloatSave.TagWord);
!        fprintf(f,"\n"
!                  "Current byte code: %d\n"
!                  "Primitive index: %d\n"
!                  "Stack dump follows:\n\n",
!                  byteCode,
!                  methodPrimitiveIndex());
      }
    fflush(f);
  
--- 380,436 ----
    /* print the above information */
    f = fopen("crash.dmp","a");
!   if(f){  
!     time_t crashTime = time(NULL);
!     fprintf(f,"---------------------------------------------------------------------\n");
!     fprintf(f,"%s\n", ctime(&crashTime));
!     /* Print the exception code */
!     fprintf(f,"Exception code: %08X\nException addr: %08X\n",
! 	    exp->ExceptionRecord->ExceptionCode,
! 	    exp->ExceptionRecord->ExceptionAddress);
!     if(exp->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
!       /* For access violations print what actually happened */
!       fprintf(f,"Access violation (%s) at %08X\n",
! 	      (exp->ExceptionRecord->ExceptionInformation[0] ? "write access" : "read access"),
! 	      exp->ExceptionRecord->ExceptionInformation[1]);
      }
+     fprintf(f,"EAX:%08X\tEBX:%08X\tECX:%08X\tEDX:%08X\n",
+ 	    exp->ContextRecord->Eax,
+ 	    exp->ContextRecord->Ebx,
+ 	    exp->ContextRecord->Ecx,
+ 	    exp->ContextRecord->Edx);
+     fprintf(f,"ESI:%08X\tEDI:%08X\tEBP:%08X\tESP:%08X\n",
+ 	    exp->ContextRecord->Esi,
+ 	    exp->ContextRecord->Edi,
+ 	    exp->ContextRecord->Ebp,
+ 	    exp->ContextRecord->Esp);
+     fprintf(f,"EIP:%08X\tEFL:%08X\n",
+ 	    exp->ContextRecord->Eip,
+ 	    exp->ContextRecord->EFlags);
+     fprintf(f,"FP Control: %08X\nFP Status:  %08X\nFP Tag:     %08X\n",
+ 	    exp->ContextRecord->FloatSave.ControlWord,
+ 	    exp->ContextRecord->FloatSave.StatusWord,
+ 	    exp->ContextRecord->FloatSave.TagWord);
+     /* print version information */
+     fprintf(f,"VM Version: %s\n", SQUEAK_VM_VERSION);
+     fflush(f);
+     fprintf(f,"\n"
+ 	    "Current byte code: %d\n"
+ 	    "Primitive index: %d\n",
+ 	    byteCode,
+ 	    methodPrimitiveIndex());
+     fflush(f);
+     /* print loaded plugins */
+     fprintf(f,"\nLoaded plugins:\n");
+     {
+       int index = 1;
+       char *pluginName;
+       while( (pluginName = ioListLoadedModule(index)) != NULL) {
+ 	fprintf(f,"\t%s\n", pluginName);
+ 	fflush(f);
+ 	index++;
+       }
+     }
+     fprintf(f, "\n\nStack dump:\n\n");
+   }
    fflush(f);
  
***************
*** 600,603 ****
--- 615,619 ----
  
    LoadPreferences();
+ 
    /* parse command line args */
    if(!parseArguments(strdup(GetCommandLine()), args))
***************
*** 670,674 ****
    SetupWindows();
    SetupPixmaps();
-   SetupPrinter();
    SetupService95();
    SetupTimer();
--- 686,689 ----