[Mplayer-cvslog] CVS: main/loader stubs.s,1.2,1.3 win32.c,1.12,1.13

[GEREOFFY]

Update of /cvsroot/mplayer/main/loader
In directory usw-pr-cvs1:/tmp/cvs-serv7869/loader

Modified Files:
	stubs.s win32.c 
Log Message:
applied solaris8/netbsd/other fixes patch by Jürgen Keil <jk at tools.de>

Index: stubs.s
===================================================================
RCS file: /cvsroot/mplayer/main/loader/stubs.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** stubs.s	2001/05/06 21:43:45	1.2
--- stubs.s	2001/06/05 18:40:44	1.3
***************
*** 1,12 ****
! 	.file	"stubs.c"
! 	.version  "01.01"
! gcc2_compiled.:
! .section	.rodata
! .LC0:
! 	.string	"Called unk_%s\n"
! .data
  	.align 4
  .globl unk_exp1
- 	.type	 unk_exp1, at function
  unk_exp1:
  	pushl %ebp
--- 1,6 ----
! 	.data
! .LC0:	.string	"Called unk_%s\n"
  	.align 4
  .globl unk_exp1
  unk_exp1:
  	pushl %ebp
***************
*** 27,36 ****
  	addl $8,%esp
  	xorl %eax,%eax
- 	jmp .L1
- 	.align 4
- .L1:
  	leave
  	ret
- .Lfe1:
- 	.size	 unk_exp1,.Lfe1-unk_exp1
- 	.ident	"GCC: (GNU) egcs-2.91.66 19990314/Linux (egcs-1.1.2 release)"
--- 21,24 ----

Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** win32.c	2001/05/07 13:23:55	1.12
--- win32.c	2001/06/05 18:40:44	1.13
***************
*** 703,712 ****
  	cachedsi.wProcessorRevision		= 0x0101;
  	
! #if defined(__FreeBSD__) || defined(__NetBSD__)
!         cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
!         cachedsi.wProcessorLevel= 5;
! 	PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
  	do_cpuid(regs);
! 	if (regs[3] & 0x00800000)
            PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
          cachedsi.dwNumberOfProcessors=1;
--- 703,729 ----
  	cachedsi.wProcessorRevision		= 0x0101;
  	
! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__)
  	do_cpuid(regs);
! 	switch ((regs[0] >> 8) & 0xf) {			// cpu family
! 	case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
! 		cachedsi.wProcessorLevel= 3;
! 		break;
! 	case 4: cachedsi.dwProcessorType = PROCESSOR_INTEL_486;
! 		cachedsi.wProcessorLevel= 4;
! 		break;
! 	case 5: cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
! 		cachedsi.wProcessorLevel= 5;
! 		break;
! 	case 6: cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
! 		cachedsi.wProcessorLevel= 5;
! 		break;
! 	default:cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
! 		cachedsi.wProcessorLevel= 5;
! 		break;
! 	}
! 	cachedsi.wProcessorRevision = regs[0] & 0xf;	// stepping
! 	if (regs[3] & (1 <<  8))
! 	  PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
! 	if (regs[3] & (1 << 23))
            PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
          cachedsi.dwNumberOfProcessors=1;


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog