author | Jingning Ji <jingning.ji@oracle.com> |
Fri, 16 Sep 2016 16:06:45 -0700 | |
changeset 6919 | 7972aae0fb03 |
permissions | -rw-r--r-- |
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
1 |
Fixes endian issue in GFX on sparc and fixes atomic operations. |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
2 |
Will not send upstream. |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
3 |
|
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
4 |
diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
5 |
--- a/js/src/jit/AtomicOperations.h |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
6 |
+++ b/js/src/jit/AtomicOperations.h |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
7 |
@@ -297,17 +297,17 @@ AtomicOperations::isLockfree(int32_t siz |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
8 |
#if defined(JS_CODEGEN_ARM) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
9 |
# include "jit/arm/AtomicOperations-arm.h" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
10 |
#elif defined(JS_CODEGEN_ARM64) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
11 |
# include "jit/arm64/AtomicOperations-arm64.h" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
12 |
#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
13 |
# include "jit/mips-shared/AtomicOperations-mips-shared.h" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
14 |
#elif defined(__ppc64__) || defined(__PPC64_) \ |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
15 |
|| defined(__ppc64le__) || defined(__PPC64LE__) \ |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
16 |
- || defined(__ppc__) || defined(__PPC__) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
17 |
+ || defined(__ppc__) || defined(__PPC__) || defined(__sparc) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
18 |
# include "jit/none/AtomicOperations-ppc.h" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
19 |
#elif defined(JS_CODEGEN_NONE) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
20 |
# include "jit/none/AtomicOperations-none.h" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
21 |
#elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
22 |
# include "jit/x86-shared/AtomicOperations-x86-shared.h" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
23 |
#else |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
24 |
# error "Atomic operations must be defined for this platform" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
25 |
#endif |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
26 |
--- a/gfx/2d/Types.h Tue May 3 14:20:54 2016 |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
27 |
+++ b/gfx/2d/Types.h Tue May 3 13:43:00 2016 |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
28 |
@@ -61,15 +61,8 @@ |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
29 |
// The following values are endian-independent synonyms. The _UINT32 suffix |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
30 |
// indicates that the name reflects the layout when viewed as a uint32_t |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
31 |
// value. |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
32 |
-#if MOZ_LITTLE_ENDIAN |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
33 |
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
34 |
X8R8G8B8_UINT32 = B8G8R8X8 // 0x00RRGGBB |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
35 |
-#elif MOZ_BIG_ENDIAN |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
36 |
- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
37 |
- X8R8G8B8_UINT32 = X8R8G8B8 // 0x00RRGGBB |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
38 |
-#else |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
39 |
-# error "bad endianness" |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
40 |
-#endif |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
41 |
}; |
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
42 |
|
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
diff
changeset
|
43 |
inline bool IsOpaque(SurfaceFormat aFormat) |