summaryrefslogtreecommitdiff
path: root/external/python3/ubsan.patch.0
blob: 36d2acf1c947eb45729a6f4cb5f746a65e07c463 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- Modules/_ctypes/libffi/src/x86/ffi64.c
+++ Modules/_ctypes/libffi/src/x86/ffi64.c
@@ -548,11 +548,15 @@
   tramp = (volatile unsigned short *) &closure->tramp[0];
 
   tramp[0] = 0xbb49;		/* mov <code>, %r11	*/
-  *((unsigned long long * volatile) &tramp[1])
-    = (unsigned long) ffi_closure_unix64;
+  tramp[1] = (unsigned long) ffi_closure_unix64;
+  tramp[2] = ((unsigned long) ffi_closure_unix64) >> 16;
+  tramp[3] = ((unsigned long) ffi_closure_unix64) >> 32;
+  tramp[4] = ((unsigned long) ffi_closure_unix64) >> 48;
   tramp[5] = 0xba49;		/* mov <data>, %r10	*/
-  *((unsigned long long * volatile) &tramp[6])
-    = (unsigned long) codeloc;
+  tramp[6] = (unsigned long) codeloc;
+  tramp[7] = ((unsigned long) codeloc) >> 16;
+  tramp[8] = ((unsigned long) codeloc) >> 32;
+  tramp[9] = ((unsigned long) codeloc) >> 48;
 
   /* Set the carry bit iff the function uses any sse registers.
      This is clc or stc, together with the first byte of the jmp.  */
--- Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
+++ Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
@@ -599,9 +599,15 @@
 	tramp = (volatile unsigned short*)&closure->tramp[0];
 
 	tramp[0] = 0xbb49;		/* mov <code>, %r11	*/
-	*(void* volatile*)&tramp[1] = ffi_closure_unix64;
+	tramp[1] = (unsigned short) ffi_closure_unix64;
+	tramp[2] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 16);
+	tramp[3] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 32);
+	tramp[4] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 48);
 	tramp[5] = 0xba49;		/* mov <data>, %r10	*/
-	*(void* volatile*)&tramp[6] = closure;
+	tramp[6] = (unsigned short) closure;
+	tramp[7] = (unsigned short) (((unsigned long)closure) >> 16);
+	tramp[8] = (unsigned short) (((unsigned long)closure) >> 32);
+	tramp[9] = (unsigned short) (((unsigned long)closure) >> 48);
 
 	/*	Set the carry bit if the function uses any sse registers.
 		This is clc or stc, together with the first byte of the jmp.  */