blob: a083decf339b3290311bee3138a64090fc2e1cf8 (
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From 8fd53951d53ef8c5b62fe985665dad0545bb3161 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Mon, 4 Jun 2018 14:24:59 -0700
Subject: [PATCH] javascriptcore: Use 64-bit ints
Where required use 64-bit integers for casts.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Upstream-Status: Pending
---
.../JavaScriptCore/assembler/X86Assembler.h | 2 +-
.../javascriptcore/JavaScriptCore/runtime/JSValue.h | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
index ab3d05f..ed5965f 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
@@ -2033,7 +2033,7 @@ private:
}
}
-#if !CPU(X86_64)
+#if CPU(X86)
void memoryModRM(int reg, void* address)
{
// noBase + ModRmMemoryNoDisp means noBase + ModRmMemoryDisp32!
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
index 7584c52..958ac89 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
@@ -490,7 +490,11 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
+#if CPU(X86)
u.asBits.payload = reinterpret_cast<int32_t>(ptr);
+#else
+ u.asBits.payload = reinterpret_cast<int64_t>(ptr);
+#endif
#if ENABLE(JSC_ZOMBIES)
ASSERT(!isZombie());
#endif
@@ -502,7 +506,11 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
+#if CPU(X86)
u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
+#else
+ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
+#endif
#if ENABLE(JSC_ZOMBIES)
ASSERT(!isZombie());
#endif
--
2.17.1
|
