[Squeak-Commits] squeak/platforms/win32/vm sqGnu.h,1.2,1.2.2.1 sqPlatformSpecific.h,1.9,1.9.2.1 sqWi

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/squeak/squeak/platforms/win32/vm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5323/vm

Modified Files:
      Tag: ned-branch
	sqGnu.h sqPlatformSpecific.h sqWin32.h sqWin32DirectInput.c 
	sqWin32GUID.c 
Log Message:
Initial GCC 3.3 changes

Index: sqGnu.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqGnu.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** sqGnu.h	11 May 2002 17:09:03 -0000	1.2
--- sqGnu.h	16 Jul 2004 18:21:35 -0000	1.2.2.1
***************
*** 176,236 ****
  #define PROFILE_BYTECODE(x) __asm__("movl %0, _bcProfileCurrent" : : "i" (x))
  
! #define PROFILE_BYTECODE_END __asm__("
! 	cmpl $0, _profilerActive;\
! 	je 0f;\
! 	pushl %ebx;\
! 	pushl %edx;\
! 	movl _bcProfileCurrent, %ebx;\
! 	pushl %eax; \
! 	rdtsc; \
! 	subl _bcProfileLow, %eax; \
! 	sbbl _bcProfileHigh, %edx; \
! 	incl _bcProfileCountTable(, %ebx, 4);\
! 	leal _bcProfileTable(, %%ebx, 8), %ebx;\
! 	addl %eax, 0(%ebx);\
! 	adcl %edx, 4(%ebx);\
! 	addl %eax, _bcProfileLow; \
! 	adcl %edx, _bcProfileHigh; \
! 	popl %eax;\
! 	popl %edx;\
! 	popl %ebx;\
! 	0:\
! 	");
  
! #define PROFILE_PRIMITIVE(x) __asm__("\
! 	cmpl $0, _profilerActive;\
! 	je 0f;\
! 	pushl %%edx;\
! 	pushl %%eax;\
! 	rdtsc;\
! 	movl %0, _primProfileCurrent;\
! 	movl %%eax, _primProfileLow;\
! 	movl %%edx, _primProfileHigh;\
! 	popl %%eax;\
! 	popl %%edx;\
! 	0:\
! 	" : /* no return */ : "i" (x));
  
! #define PROFILE_PRIMITIVE_END __asm__("\
! 	cmpl $0, _profilerActive;\
! 	je 0f;\
! 	pushl %ebx;\
! 	pushl %eax;\
! 	pushl %edx;\
! 	movl _primProfileCurrent, %ebx;\
! 	rdtsc;\
! 	subl _primProfileLow, %eax;\
! 	sbbl _primProfileHigh, %edx;\
! 	incl _primProfileCountTable(, %ebx, 4);\
! 	leal _primProfileTable(, %ebx, 8), %ebx;\
! 	addl %eax, 0(%ebx);\
! 	adcl %edx, 4(%ebx);\
! 	subl %eax, _bcProfileLow;\
! 	sbbl %edx, _bcProfileHigh;\
! 	popl %edx;\
! 	popl %eax;\
! 	popl %ebx;\
! 	0:\
! 	");
  
  #endif
--- 176,236 ----
  #define PROFILE_BYTECODE(x) __asm__("movl %0, _bcProfileCurrent" : : "i" (x))
  
! #define PROFILE_BYTECODE_END __asm__( \
! 	 "	cmpl $0, _profilerActive;\n" \
! 	 "	je 0f;\n" \
! 	 "	pushl %ebx;\n" \
! 	 "	pushl %edx;\n" \
! 	 "	movl _bcProfileCurrent, %ebx;\n" \
! 	 "	pushl %eax;\n" \
! 	 "	rdtsc;\n" \
! 	 "	subl _bcProfileLow, %eax;\n" \
! 	 "	sbbl _bcProfileHigh, %edx;\n" \
! 	 "	incl _bcProfileCountTable(, %ebx, 4);\n" \
! 	 "	leal _bcProfileTable(, %%ebx, 8), %ebx;\n" \
! 	 "	addl %eax, 0(%ebx);\n" \
! 	 "	adcl %edx, 4(%ebx);\n" \
! 	 "	addl %eax, _bcProfileLow;\n" \
! 	 "	adcl %edx, _bcProfileHigh;\n" \
! 	 "	popl %eax;\n" \
! 	 "	popl %edx;\n" \
! 	 "	popl %ebx;\n" \
! 	 "	0:\n" \
! 	);
  
! #define PROFILE_PRIMITIVE(x) __asm__(\
! 	"	cmpl $0, _profilerActive;\n" \
! 	"	je 0f;\n" \
! 	"	pushl %%edx;\n" \
! 	"	pushl %%eax;\n" \
! 	"	rdtsc;\n" \
! 	"	movl %0, _primProfileCurrent;\n" \
! 	"	movl %%eax, _primProfileLow;\n" \
! 	"	movl %%edx, _primProfileHigh;\n" \
! 	"	popl %%eax;\n" \
! 	"	popl %%edx;\n" \
! 	"	0:\n" \
! 	: /* no return */ : "i" (x));
  
! #define PROFILE_PRIMITIVE_END __asm__( \
! 	"	cmpl $0, _profilerActive;\n" \
! 	"	je 0f;\n" \
! 	"	pushl %ebx;\n" \
! 	"	pushl %eax;\n" \
! 	"	pushl %edx;\n" \
! 	"	movl _primProfileCurrent, %ebx;\n" \
! 	"	rdtsc;\n" \
! 	"	subl _primProfileLow, %eax;\n" \
! 	"	sbbl _primProfileHigh, %edx;\n" \
! 	"	incl _primProfileCountTable(, %ebx, 4);\n" \
! 	"	leal _primProfileTable(, %ebx, 8), %ebx;\n" \
! 	"	addl %eax, 0(%ebx);\n" \
! 	"	adcl %edx, 4(%ebx);\n" \
! 	"	subl %eax, _bcProfileLow;\n" \
! 	"	sbbl %edx, _bcProfileHigh;\n" \
! 	"	popl %edx;\n" \
! 	"	popl %eax;\n" \
! 	"	popl %ebx;\n" \
! 	"	0:\n" \
! 	);
  
  #endif

Index: sqPlatformSpecific.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqPlatformSpecific.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** sqPlatformSpecific.h	2 Nov 2003 19:52:40 -0000	1.9
--- sqPlatformSpecific.h	16 Jul 2004 18:21:35 -0000	1.9.2.1
***************
*** 62,66 ****
  extern int _lowResMSecs;
  #define ioLowResMSecs() _lowResMSecs
! #else error!
  #endif /* WIN32 */
  
--- 62,67 ----
  extern int _lowResMSecs;
  #define ioLowResMSecs() _lowResMSecs
! #else 
! #error "WIN32 not defined"
  #endif /* WIN32 */
  

Index: sqWin32.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** sqWin32.h	12 Nov 2003 22:38:21 -0000	1.14
--- sqWin32.h	16 Jul 2004 18:21:35 -0000	1.14.2.1
***************
*** 174,191 ****
  /* Several setup functions                              */
  /********************************************************/
! void SetupFilesAndPath();
! void SetupKeymap();
! void SetupWindows();
! void SetupPixmaps();
! void SetupPrinter();
! void SetupTimer();
! void SetupPreferences();
! void SetupMIDI();
  
  /********************************************************/
  /* Startup helper functions                             */
  /********************************************************/
! int findImageFile();
! int openImageFile();
  
  /********************************************************/
--- 174,191 ----
  /* Several setup functions                              */
  /********************************************************/
! void SetupFilesAndPath(void);
! void SetupKeymap(void);
! void SetupWindows(void);
! void SetupPixmaps(void);
! void SetupPrinter(void);
! void SetupTimer(void);
! void SetupPreferences(void);
! void SetupMIDI(void);
  
  /********************************************************/
  /* Startup helper functions                             */
  /********************************************************/
! int findImageFile(void);
! int openImageFile(void);
  
  /********************************************************/
***************
*** 203,208 ****
  /* Misc functions                                       */
  /********************************************************/
! void SetWindowSize();
! void ReleaseTimer();
  int printUsage(int level);
  
--- 203,208 ----
  /* Misc functions                                       */
  /********************************************************/
! void SetWindowSize(void);
! void ReleaseTimer(void);
  int printUsage(int level);
  
***************
*** 213,219 ****
  /* The external startup point for installing squeak as NT service */
  void sqServiceInstall(void);
! /* The main() function used by NT services */
  int sqServiceMain(void);
! /* The generic main() function for starting squeak */
  int sqMain(char *lpCmdLine, int nCmdShow);
  #endif
--- 213,219 ----
  /* The external startup point for installing squeak as NT service */
  void sqServiceInstall(void);
! /* The main(void) function used by NT services */
  int sqServiceMain(void);
! /* The generic main(void) function for starting squeak */
  int sqMain(char *lpCmdLine, int nCmdShow);
  #endif
***************
*** 417,420 ****
--- 417,421 ----
  #endif
  
+ 
  /******************************************************/
  /* Profiling support                                  */

Index: sqWin32DirectInput.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32DirectInput.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** sqWin32DirectInput.c	12 Nov 2003 22:36:55 -0000	1.3
--- sqWin32DirectInput.c	16 Jul 2004 18:21:35 -0000	1.3.2.1
***************
*** 25,35 ****
  
  #define DIRECTINPUT_VERSION 0x700 /* restrict to DX7 */
  #include <windows.h>
  #include <ole2.h>
  #include "sq.h"
- #ifdef __MINGW32__
- #define HMONITOR_DECLARED
- #undef WINNT
- #endif
  
  #include <dinput.h>
--- 25,32 ----
  
  #define DIRECTINPUT_VERSION 0x700 /* restrict to DX7 */
+ 
  #include <windows.h>
  #include <ole2.h>
  #include "sq.h"
  
  #include <dinput.h>

Index: sqWin32GUID.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32GUID.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** sqWin32GUID.c	8 Apr 2003 21:00:36 -0000	1.2
--- sqWin32GUID.c	16 Jul 2004 18:21:35 -0000	1.2.2.1
***************
*** 3,11 ****
  #include <windows.h>
  
  #ifdef __MINGW32__
! #define HMONITOR_DECLARED
! #undef WINNT
  #endif
  
  #include <ddraw.h>
  #include <dsound.h>
--- 3,16 ----
  #include <windows.h>
  
+ #if 0
  #ifdef __MINGW32__
! #if !defined HMONITOR_DECLARED
! #	define HMONITOR_DECLARED 1
! #endif
! #	undef WINNT
! #endif
  #endif
  
+ #if 0
  #include <ddraw.h>
  #include <dsound.h>
***************
*** 13,15 ****
  #include <dinput.h>
  
! 
--- 18,20 ----
  #include <dinput.h>
  
! #endif

[Squeak-Commits] squeak/platforms/win32/vm sqGnu.h,1.2,1.2.2.1 sqPlatformSpecific.h,1.9,1.9.2.1 sqWi

[Squeak-Commits] squeak/platforms/win32/vm sqGnu.h,1.2,1.2.2.1 sqPlatformSpecific.h,1.9,1.9.2.1 sqWin32.h,1.14,1.14.2.1 sqWin32DirectInput.c,1.3,1.3.2.1 sqWin32GUID.c,1.2,1.2.2.1