提交: 33d4cee08b472a080785c78fb5b7a3ca36216d8c - mingw-wsl-patches-win64 (hg)

Fork of Keith's WSL Patch Queue for my Win64 work

Commit MetaInfo

• 修订版: 33d4cee08b472a080785c78fb5b7a3ca36216d8c (tree)
• 时间: 2019-04-21 21:44:26
• 作者: Cesar Strauss <cestrauss@gmai...>
• Commiter: Cesar Strauss

Log Message

Reworked "cpu features" patch to fully build on 64 bits.

更改概述

• modified: cpu-features-x86-64.patch
• modified: series

差异

diff -r e94c4e392059 -r 33d4cee08b47 cpu-features-x86-64.patch
--- a/cpu-features-x86-64.patch	Sat Apr 20 12:22:48 2019 +0000
+++ b/cpu-features-x86-64.patch	Sun Apr 21 12:44:26 2019 +0000
@@ -1,5 +1,6 @@
 # HG changeset patch
 # Parent 66b461070c4b063621a1af46c9fbf17323ce536a
+# Parent  d1de6110347aee4b3c939b68fcc9de1087c5e9c3
 Make CPU features initialization code x86-64 compliant.
 
 * cpu_features.sx (CPUID_FLAG) [__x86_64__]: Omit check.
@@ -16,9 +17,7 @@
 diff --git a/mingwrt/cpu_features.sx b/mingwrt/cpu_features.sx
 --- a/mingwrt/cpu_features.sx
 +++ b/mingwrt/cpu_features.sx
-@@ -40,12 +40,37 @@
- #define RH_FLAG(BITNUM)		(1 << ((BITNUM) - 8))
- 
+@@ -42,8 +42,33 @@
  #define CPUID_FLAG		RX_FLAG(21)	/* EFLAGS bit 21 */
  
  #define FXSAVE_BUFSIZ		       512
@@ -53,11 +52,7 @@
  
  /* FIXME: is this optimization really worthwhile here?  It breaks,
   * with older GAS versions, (such as that commonly deployed in the
-  * GCC-3.4.5 era, and earlier)!
-  *
-@@ -70,11 +95,15 @@
- .def	___cpu_features_init;	.scl	2;	.type	32;	.endef
- 
+@@ -72,7 +97,11 @@
  ___cpu_features_init:
  
  .cfi_startproc
@@ -70,11 +65,7 @@
   * supported by the host CPU, we try to toggle the CPUID flag bit within the
   * EFLAGS register, (ultimately leaving it unchanged).
   */
- 		pushf				/* save original flags state */
- 		pushf				/* duplicate them in both... */
-@@ -95,18 +124,20 @@
-  */
- 		xor	eax, edx		/* isolate CPUID_FLAG state  */
+@@ -97,14 +126,16 @@
  		test	eax, CPUID_FLAG		/* did it change?	     */
  		je	90f			/* no: quit immediately      */
  
@@ -90,15 +81,11 @@
 -.cfi_def_cfa_offset	8
 -.cfi_offset		ebx, -8
 +.cfi_def_cfa_offset	CFI_OFFSET_BASE(2)
-+.cfi_offset		ebx, -CFI_OFFSET_BASE(2)
++.cfi_offset		rbx, -CFI_OFFSET_BASE(2)
  
  /* First, we must perform a level zero CPUID enquiry, to determine the
   * maximum level of interrogation which is supported.
-  */
- 		xor	eax, eax		/* zero request level code   */
-@@ -168,48 +199,48 @@ 15:
- /* We must create a local stack frame, with the stack pointer aligned to a
-  * sixteen byte boundary, in which to allocate an FXSAVE buffer; (failure to
+@@ -170,44 +201,44 @@
   * align this correctly will raise an unhandled exception, and GCC cannot be
   * trusted to get this right in C language code).
   */
@@ -160,11 +147,7 @@
  
  		cmp	ebx, FXTEST_BITS	/* SSE flags were changed?   */
  		jne	20f			/* no: skip SSE detection    */
- 
- /* If we're still here, then the operating system should support SSE;
-@@ -268,14 +299,14 @@ 30:		chk	CPUID_CAP(3DNOWP)
-  */
- 		or	DWORD PTR ___cpu_features, eax
+@@ -270,10 +301,10 @@
  
  /* ...we restore the preserved state of the EBX register...
   */
@@ -178,5 +161,3 @@
  
  /* ...and return to the C runtime initialization procedure.
   */
- 90:		ret
- 

diff -r e94c4e392059 -r 33d4cee08b47 series
--- a/series	Sat Apr 20 12:22:48 2019 +0000
+++ b/series	Sun Apr 21 12:44:26 2019 +0000
@@ -1,6 +1,6 @@
 win64-context.patch #+win64
+cpu-features-x86-64.patch #+win64
 win64-time-typedef.patch #+win64
-cpu-features-x86-64.patch #+win64
 alloca-testing.patch #+void #-void
 winerror-winsock2-update.patch #+void #-void
 winnls-self-contained.patch #+self-contained