haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

QtWebKit: cleanup patchset

Browse Source 
* rework MachineStackMarker
* remove unneeded cast to void* from patchset
* disable threaded compositor
This commit is contained in:
Gerasim Troeglazov
2019-01-13 15:28:22 +10:00
parent 1f50a07997
commit d75c74cdba
2 changed files with 86 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

718
dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20180120.patchset
View File

@@ -1,58 +1,9 @@
From 3c86dc978b5babad5d17fe3f110bb52e7d683472 Mon Sep 17 00:00:00 2001
From 6fa51ba42c90a763e62c68f214fae419a9475994 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 30 Jul 2018 20:43:21 +1000
Subject: Fix build for Haiku
diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index 8e93a7e..0d4c02d 100644
--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -4397,7 +4397,7 @@ bool ByteCodeParser::parseBlock(unsigned limit)
nodeType = GetGlobalVar;
else
nodeType = GetGlobalLexicalVariable;
- Node* value = addToGraph(nodeType, OpInfo(operand), OpInfo(prediction));
+ Node* value = addToGraph(nodeType, OpInfo((void*)operand), OpInfo(prediction));
if (resolveType == GlobalLexicalVar || resolveType == GlobalLexicalVarWithVarInjectionChecks)
addToGraph(CheckNotEmpty, value);
set(VirtualRegister(dst), value);
@@ -4427,7 +4427,7 @@ bool ByteCodeParser::parseBlock(unsigned limit)
}
SpeculatedType prediction = getPrediction();
set(VirtualRegister(dst),
- addToGraph(GetClosureVar, OpInfo(operand), OpInfo(prediction), scopeNode));
+ addToGraph(GetClosureVar, OpInfo((void*)operand), OpInfo(prediction), scopeNode));
break;
}
case UnresolvedProperty:
@@ -4500,7 +4500,7 @@ bool ByteCodeParser::parseBlock(unsigned limit)
case GlobalVarWithVarInjectionChecks: {
if (getPutInfo.initializationMode() != Initialization && (resolveType == GlobalLexicalVar || resolveType == GlobalLexicalVarWithVarInjectionChecks)) {
SpeculatedType prediction = SpecEmpty;
- Node* value = addToGraph(GetGlobalLexicalVariable, OpInfo(operand), OpInfo(prediction));
+ Node* value = addToGraph(GetGlobalLexicalVariable, OpInfo((void*)operand), OpInfo(prediction));
addToGraph(CheckNotEmpty, value);
}
@@ -4510,7 +4510,7 @@ bool ByteCodeParser::parseBlock(unsigned limit)
ASSERT_UNUSED(entry, watchpoints == entry.watchpointSet());
}
Node* valueNode = get(VirtualRegister(value));
- addToGraph(PutGlobalVariable, OpInfo(operand), weakJSConstant(scopeObject), valueNode);
+ addToGraph(PutGlobalVariable, OpInfo((void*)operand), weakJSConstant(scopeObject), valueNode);
if (watchpoints && watchpoints->state() != IsInvalidated) {
// Must happen after the store. See comment for GetGlobalVar.
addToGraph(NotifyWrite, OpInfo(watchpoints));
@@ -4525,7 +4525,7 @@ bool ByteCodeParser::parseBlock(unsigned limit)
Node* scopeNode = get(VirtualRegister(scope));
Node* valueNode = get(VirtualRegister(value));
- addToGraph(PutClosureVar, OpInfo(operand), scopeNode, valueNode);
+ addToGraph(PutClosureVar, OpInfo((void*)operand), scopeNode, valueNode);
if (watchpoints && watchpoints->state() != IsInvalidated) {
// Must happen after the store. See comment for GetGlobalVar.
diff --git a/Source/JavaScriptCore/heap/HeapStatistics.cpp b/Source/JavaScriptCore/heap/HeapStatistics.cpp
index 12d12ce..15ed177 100644
--- a/Source/JavaScriptCore/heap/HeapStatistics.cpp
@@ -66,585 +17,6 @@ index 12d12ce..15ed177 100644
void HeapStatistics::initialize()
{
diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
index 883914f..3f96e5f 100644
--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -23,16 +23,14 @@
#include "MachineStackMarker.h"
#include "ConservativeRoots.h"
-#include "GPRInfo.h"
#include "Heap.h"
#include "JSArray.h"
#include "JSCInlines.h"
-#include "LLIntPCRanges.h"
-#include "MacroAssembler.h"
#include "VM.h"
#include <setjmp.h>
#include <stdlib.h>
#include <wtf/StdLibExtras.h>
+#include <wtf/Platform.h>
#if OS(DARWIN)
@@ -65,55 +63,27 @@
#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
#include <signal.h>
-// We use SIGUSR2 to suspend and resume machine threads in JavaScriptCore.
static const int SigThreadSuspendResume = SIGUSR2;
-static StaticLock globalSignalLock;
-thread_local static std::atomic<JSC::MachineThreads::Thread*> threadLocalCurrentThread;
-static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
+#if defined(SA_RESTART)
+static void pthreadSignalHandlerSuspendResume(int)
{
- // Touching thread local atomic types from signal handlers is allowed.
- JSC::MachineThreads::Thread* thread = threadLocalCurrentThread.load();
-
- if (thread->suspended.load(std::memory_order_acquire)) {
- // This is signal handler invocation that is intended to be used to resume sigsuspend.
- // So this handler invocation itself should not process.
- //
- // When signal comes, first, the system calls signal handler. And later, sigsuspend will be resumed. Signal handler invocation always precedes.
- // So, the problem never happens that suspended.store(true, ...) will be executed before the handler is called.
- // http://pubs.opengroup.org/onlinepubs/009695399/functions/sigsuspend.html
- return;
- }
-
- ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
-#if CPU(PPC)
- thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
-#else
- thread->suspendedMachineContext = userContext->uc_mcontext;
-#endif
-
- // Allow suspend caller to see that this thread is suspended.
- // sem_post is async-signal-safe function. It means that we can call this from a signal handler.
- // http://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_04.html#tag_02_04_03
- //
- // And sem_post emits memory barrier that ensures that suspendedMachineContext is correctly saved.
- // http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_11
- sem_post(&thread->semaphoreForSuspendResume);
-
- // Reaching here, SigThreadSuspendResume is blocked in this handler (this is configured by sigaction's sa_mask).
- // So before calling sigsuspend, SigThreadSuspendResume to this thread is deferred. This ensures that the handler is not executed recursively.
- sigset_t blockedSignalSet;
- sigfillset(&blockedSignalSet);
- sigdelset(&blockedSignalSet, SigThreadSuspendResume);
- sigsuspend(&blockedSignalSet);
-
- // Allow resume caller to see that this thread is resumed.
- sem_post(&thread->semaphoreForSuspendResume);
+ sigset_t signalSet;
+ sigemptyset(&signalSet);
+ sigaddset(&signalSet, SigThreadSuspendResume);
+ sigsuspend(&signalSet);
}
+#endif // defined(SA_RESTART)
#endif // USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
#endif
+// HAIKU hooks on POSIX, but adds some specifics. So it can't be part of the
+// #if-chain above.
+#if OS(HAIKU)
+#include <OS.h>
+#endif
+
using namespace WTF;
namespace JSC {
@@ -184,6 +154,8 @@ static inline PlatformThread getCurrentPlatformThread()
return pthread_mach_thread_np(pthread_self());
#elif OS(WINDOWS)
return GetCurrentThreadId();
+#elif OS(HAIKU)
+ return find_thread(NULL);
#elif USE(PTHREADS)
return pthread_self();
#endif
@@ -225,7 +197,7 @@ Thread* MachineThreads::Thread::createForCurrentThread()
bool MachineThreads::Thread::operator==(const PlatformThread& other) const
{
-#if OS(DARWIN) || OS(WINDOWS)
+#if OS(DARWIN) || OS(WINDOWS) || OS(HAIKU)
return platformThread == other;
#elif USE(PTHREADS)
return !!pthread_equal(platformThread, other);
@@ -333,35 +305,24 @@ MachineThreads::Thread::Thread(const PlatformThread& platThread, void* base, voi
, stackBase(base)
, stackEnd(end)
{
-#if OS(WINDOWS)
- ASSERT(platformThread == GetCurrentThreadId());
- bool isSuccessful =
- DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(),
- &platformThreadHandle, 0, FALSE, DUPLICATE_SAME_ACCESS);
- RELEASE_ASSERT(isSuccessful);
-#elif USE(PTHREADS) && !OS(DARWIN)
- threadLocalCurrentThread.store(this);
-
- // Signal handlers are process global configuration.
- static std::once_flag initializeSignalHandler;
- std::call_once(initializeSignalHandler, [] {
- // Intentionally block SigThreadSuspendResume in the handler.
- // SigThreadSuspendResume will be allowed in the handler by sigsuspend.
- struct sigaction action;
- sigemptyset(&action.sa_mask);
- sigaddset(&action.sa_mask, SigThreadSuspendResume);
-
- action.sa_sigaction = pthreadSignalHandlerSuspendResume;
- action.sa_flags = SA_RESTART | SA_SIGINFO;
- sigaction(SigThreadSuspendResume, &action, 0);
- });
+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && defined(SA_RESTART)
+ // if we have SA_RESTART, enable SIGUSR2 debugging mechanism
+ struct sigaction action;
+ action.sa_handler = pthreadSignalHandlerSuspendResume;
+ sigemptyset(&action.sa_mask);
+ action.sa_flags = SA_RESTART;
+ sigaction(SigThreadSuspendResume, &action, 0);
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SigThreadSuspendResume);
pthread_sigmask(SIG_UNBLOCK, &mask, 0);
-
- sem_init(&semaphoreForSuspendResume, /* Only available in this process. */ 0, /* Initial value for the semaphore. */ 0);
+#elif OS(WINDOWS)
+ ASSERT(platformThread == GetCurrentThreadId());
+ bool isSuccessful =
+ DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(),
+ &platformThreadHandle, 0, FALSE, DUPLICATE_SAME_ACCESS);
+ RELEASE_ASSERT(isSuccessful);
#endif
}
@@ -369,8 +330,6 @@ MachineThreads::Thread::~Thread()
{
#if OS(WINDOWS)
CloseHandle(platformThreadHandle);
-#elif USE(PTHREADS) && !OS(DARWIN)
- sem_destroy(&semaphoreForSuspendResume);
#endif
}
@@ -379,32 +338,15 @@ bool MachineThreads::Thread::suspend()
#if OS(DARWIN)
kern_return_t result = thread_suspend(platformThread);
return result == KERN_SUCCESS;
+#elif OS(HAIKU)
+ status_t result = suspend_thread(platformThread);
+ return result == B_OK;
#elif OS(WINDOWS)
bool threadIsSuspended = (SuspendThread(platformThreadHandle) != (DWORD)-1);
ASSERT(threadIsSuspended);
return threadIsSuspended;
#elif USE(PTHREADS)
- ASSERT_WITH_MESSAGE(getCurrentPlatformThread() != platformThread, "Currently we don't support suspend the current thread itself.");
- {
- // During suspend, suspend or resume should not be executed from the other threads.
- // We use global lock instead of per thread lock.
- // Consider the following case, there are threads A and B.
- // And A attempt to suspend B and B attempt to suspend A.
- // A and B send signals. And later, signals are delivered to A and B.
- // In that case, both will be suspended.
- LockHolder lock(globalSignalLock);
- if (!suspendCount) {
- // Ideally, we would like to use pthread_sigqueue. It allows us to pass the argument to the signal handler.
- // But it can be used in a few platforms, like Linux.
- // Instead, we use Thread* stored in the thread local storage to pass it to the signal handler.
- if (pthread_kill(platformThread, SigThreadSuspendResume) == ESRCH)
- return false;
- sem_wait(&semaphoreForSuspendResume);
- // Release barrier ensures that this operation is always executed after all the above processing is done.
- suspended.store(true, std::memory_order_release);
- }
- ++suspendCount;
- }
+ pthread_kill(platformThread, SigThreadSuspendResume);
return true;
#else
#error Need a way to suspend threads on this platform
@@ -415,28 +357,12 @@ void MachineThreads::Thread::resume()
{
#if OS(DARWIN)
thread_resume(platformThread);
+#elif OS(HAIKU)
+ resume_thread(platformThread);
#elif OS(WINDOWS)
ResumeThread(platformThreadHandle);
#elif USE(PTHREADS)
- {
- // During resume, suspend or resume should not be executed from the other threads.
- LockHolder lock(globalSignalLock);
- if (suspendCount == 1) {
- // When allowing SigThreadSuspendResume interrupt in the signal handler by sigsuspend and SigThreadSuspendResume is actually issued,
- // the signal handler itself will be called once again.
- // There are several ways to distinguish the handler invocation for suspend and resume.
- // 1. Use different signal numbers. And check the signal number in the handler.
- // 2. Use some arguments to distinguish suspend and resume in the handler. If pthread_sigqueue can be used, we can take this.
- // 3. Use thread local storage with atomic variables in the signal handler.
- // In this implementaiton, we take (3). suspended flag is used to distinguish it.
- if (pthread_kill(platformThread, SigThreadSuspendResume) == ESRCH)
- return;
- sem_wait(&semaphoreForSuspendResume);
- // Release barrier ensures that this operation is always executed after all the above processing is done.
- suspended.store(false, std::memory_order_release);
- }
- --suspendCount;
- }
+ pthread_kill(platformThread, SigThreadSuspendResume);
#else
#error Need a way to resume threads on this platform
#endif
@@ -481,18 +407,20 @@ size_t MachineThreads::Thread::getRegisters(Thread::Registers& registers)
regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL;
GetThreadContext(platformThreadHandle, &regs);
return sizeof(CONTEXT);
+#elif OS(HAIKU)
+ get_thread_info(platformThread, &regs);
+ return sizeof(thread_info);
#elif USE(PTHREADS)
- pthread_attr_init(&regs.attribute);
+ pthread_attr_init(&regs);
#if HAVE(PTHREAD_NP_H) || OS(NETBSD)
#if !OS(OPENBSD)
// e.g. on FreeBSD 5.4, neundorf@kde.org
- pthread_attr_get_np(platformThread, &regs.attribute);
+ pthread_attr_get_np(platformThread, &regs);
#endif
#else
// FIXME: this function is non-portable; other POSIX systems may have different np alternatives
- pthread_getattr_np(platformThread, &regs.attribute);
+ pthread_getattr_np(platformThread, &regs);
#endif
- regs.machineContext = suspendedMachineContext;
return 0;
#else
#error Need a way to get thread registers on this platform
@@ -534,6 +462,9 @@ void* MachineThreads::Thread::Registers::stackPointer() const
#endif // __DARWIN_UNIX03
// end OS(DARWIN)
+#elif OS(HAIKU)
+ return reinterpret_cast<void*>(regs.stack_base);
+
#elif OS(WINDOWS)
#if CPU(ARM)
@@ -549,40 +480,6 @@ void* MachineThreads::Thread::Registers::stackPointer() const
#endif
#elif USE(PTHREADS)
-
-#if OS(FREEBSD) && ENABLE(JIT)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rsp);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_SP]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_sp);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[29]);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__) && ENABLE(JIT)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RSP]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_sp);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.sp);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[29]);
-#else
-#error Unknown Architecture
-#endif
-
-#else
void* stackBase = 0;
size_t stackSize = 0;
#if OS(OPENBSD)
@@ -591,13 +488,11 @@ void* MachineThreads::Thread::Registers::stackPointer() const
stackBase = (void*)((size_t) ss.ss_sp - ss.ss_size);
stackSize = ss.ss_size;
#else
- int rc = pthread_attr_getstack(&regs.attribute, &stackBase, &stackSize);
+ int rc = pthread_attr_getstack(&regs, &stackBase, &stackSize);
#endif
(void)rc; // FIXME: Deal with error code somehow? Seems fatal.
ASSERT(stackBase);
return static_cast<char*>(stackBase) + stackSize;
-#endif
-
#else
#error Need a way to get the stack pointer for another thread on this platform
#endif
@@ -649,39 +544,6 @@ void* MachineThreads::Thread::Registers::framePointer() const
#error Unknown Architecture
#endif
-#elif OS(FREEBSD)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rbp);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__)
-
-// The following sequence depends on glibc's sys/ucontext.h.
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RBP]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_fp);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[29]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[30]);
-#else
-#error Unknown Architecture
-#endif
-
#else
#error Need a way to get the frame pointer for another thread on this platform
#endif
@@ -731,141 +593,17 @@ void* MachineThreads::Thread::Registers::instructionPointer() const
#error Unknown Architecture
#endif
-#elif OS(FREEBSD)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rip);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__)
-
-// The following sequence depends on glibc's sys/ucontext.h.
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RIP]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_pc);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
-#else
-#error Unknown Architecture
-#endif
-
#else
#error Need a way to get the instruction pointer for another thread on this platform
#endif
}
-void* MachineThreads::Thread::Registers::llintPC() const
-{
- // LLInt uses regT4 as PC.
-#if OS(DARWIN)
-
-#if __DARWIN_UNIX03
-
-#if CPU(X86)
- static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__esi);
-#elif CPU(X86_64)
- static_assert(LLInt::LLIntPC == X86Registers::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__r8);
-#elif CPU(ARM)
- static_assert(LLInt::LLIntPC == ARMRegisters::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__r[8]);
-#elif CPU(ARM64)
- static_assert(LLInt::LLIntPC == ARM64Registers::x4, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.__x[4]);
-#else
-#error Unknown Architecture
-#endif
-
-#else // !__DARWIN_UNIX03
-#if CPU(X86)
- static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.esi);
-#elif CPU(X86_64)
- static_assert(LLInt::LLIntPC == X86Registers::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>(regs.r8);
-#else
-#error Unknown Architecture
-#endif
-
-#endif // __DARWIN_UNIX03
-
-// end OS(DARWIN)
-#elif OS(WINDOWS)
-
-#if CPU(ARM)
- static_assert(LLInt::LLIntPC == ARMRegisters::r8, "Wrong LLInt PC.");
- return reinterpret_cast<void*>((uintptr_t) regs.R8);
-#elif CPU(MIPS)
-#error Dont know what to do with mips. Do we even need this?
-#elif CPU(X86)
- static_assert(LLInt::LLIntPC == X86Registers::esi, "Wrong LLInt PC.");
- return reinterpret_cast<void*>((uintptr_t) regs.Esi);
-#elif CPU(X86_64)
- static_assert(LLInt::LLIntPC == X86Registers::r10, "Wrong LLInt PC.");
- return reinterpret_cast<void*>((uintptr_t) regs.R10);
-#else
-#error Unknown Architecture
-#endif
-
-#elif OS(FREEBSD)
-
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_r8);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);
-#else
-#error Unknown Architecture
-#endif
-
-#elif defined(__GLIBC__)
-
-// The following sequence depends on glibc's sys/ucontext.h.
-#if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
-#elif CPU(X86_64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_R8]);
-#elif CPU(ARM)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_r8);
-#elif CPU(ARM64)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[4]);
-#elif CPU(MIPS)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[12]);
-#else
-#error Unknown Architecture
-#endif
-
-#else
-#error Need a way to get the LLIntPC for another thread on this platform
-#endif
-}
#endif // ENABLE(SAMPLING_PROFILER)
void MachineThreads::Thread::freeRegisters(Thread::Registers& registers)
{
Thread::Registers::PlatformRegisters& regs = registers.regs;
-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
- pthread_attr_destroy(&regs.attribute);
+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(HAIKU)
+ pthread_attr_destroy(&regs);
#else
UNUSED_PARAM(regs);
#endif
diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.h b/Source/JavaScriptCore/heap/MachineStackMarker.h
index a16f0da..6b7473e 100644
--- a/Source/JavaScriptCore/heap/MachineStackMarker.h
+++ b/Source/JavaScriptCore/heap/MachineStackMarker.h
@@ -29,24 +29,16 @@
#if OS(DARWIN)
#include <mach/thread_act.h>
-#endif
-
-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
-#include <semaphore.h>
-#include <signal.h>
-// Using signal.h didn't make mcontext_t and ucontext_t available on FreeBSD.
-// This bug has been fixed in FreeBSD 11.0-CURRENT, so this workaround can be
-// removed after FreeBSD 10.x goes EOL.
-// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=207079
-#if OS(FREEBSD)
-#include <ucontext.h>
-#endif
+#elif OS(HAIKU)
+#include <OS.h>
#endif
#if OS(DARWIN)
typedef mach_port_t PlatformThread;
#elif OS(WINDOWS)
typedef DWORD PlatformThread;
+#elif OS(HAIKU)
+typedef thread_id PlatformThread;
#elif USE(PTHREADS)
typedef pthread_t PlatformThread;
#endif // OS(DARWIN)
@@ -84,7 +76,6 @@ public:
#if ENABLE(SAMPLING_PROFILER)
void* framePointer() const;
void* instructionPointer() const;
- void* llintPC() const;
#endif // ENABLE(SAMPLING_PROFILER)
#if OS(DARWIN)
@@ -106,11 +97,10 @@ public:
#elif OS(WINDOWS)
typedef CONTEXT PlatformRegisters;
+#elif OS(HAIKU)
+ typedef thread_info PlatformRegisters;
#elif USE(PTHREADS)
- struct PlatformRegisters {
- pthread_attr_t attribute;
- mcontext_t machineContext;
- };
+ typedef pthread_attr_t PlatformRegisters;
#else
#error Need a thread register struct for this platform
#endif
@@ -133,11 +123,6 @@ public:
void* stackEnd;
#if OS(WINDOWS)
HANDLE platformThreadHandle;
-#elif USE(PTHREADS) && !OS(DARWIN)
- sem_t semaphoreForSuspendResume;
- mcontext_t suspendedMachineContext;
- int suspendCount { 0 };
- std::atomic<bool> suspended { false };
#endif
};
diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h b/Source/ThirdParty/ANGLE/src/common/platform.h
index 56db297..c98bfdd 100644
--- a/Source/ThirdParty/ANGLE/src/common/platform.h
@@ -1036,10 +408,10 @@ index 51a3ffb..bbf3cb0 100644
#endif
RefPtr<ProcessLauncher> protector(this);
--
2.16.4
2.19.1
From 01bb69f94e9df50baae69751a9c2b4f8aa71aeec Mon Sep 17 00:00:00 2001
From f1a5eddd7c4681e79f6b061519960db76b7ef43c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 31 Jul 2018 21:15:51 +1000
Subject: Fix build with gcc7
@@ -1059,10 +431,10 @@ index 0fcd4df..6672ce3 100644
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
--
2.16.4
2.19.1
From c93ab7a0f196e85abbd327dc42323feba861ec77 Mon Sep 17 00:00:00 2001
From cb95581e9dfc13d93e3eca20503e179ac077d5d2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 6 Aug 2018 19:05:44 +1000
Subject: Enable SubtleCrypto via gnutls
@@ -2114,5 +1486,83 @@ index 003fdca..8b55902 100644
set(USE_MEDIA_FOUNDATION OFF)
set(USE_QT_MULTIMEDIA OFF)
--
2.16.4
2.19.1
From 0a5bc6121fba8b2c58ca319eacfc326c55aa5b79 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 13 Jan 2019 13:37:51 +1000
Subject: Rework MachineStackMarker
diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
index 883914f..0a554d8 100644
--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -58,6 +58,10 @@
#include <pthread.h>
#endif
+#if OS(HAIKU)
+#include <OS.h>
+#endif
+
#if HAVE(PTHREAD_NP_H)
#include <pthread_np.h>
#endif
@@ -481,6 +485,10 @@ size_t MachineThreads::Thread::getRegisters(Thread::Registers& registers)
regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL;
GetThreadContext(platformThreadHandle, &regs);
return sizeof(CONTEXT);
+#elif OS(HAIKU)
+ thread_id haikuThread = get_pthread_thread_id(platformThread);
+ get_thread_info(haikuThread, &regs);
+ return sizeof(thread_info);
#elif USE(PTHREADS)
pthread_attr_init(&regs.attribute);
#if HAVE(PTHREAD_NP_H) || OS(NETBSD)
@@ -534,6 +542,8 @@ void* MachineThreads::Thread::Registers::stackPointer() const
#endif // __DARWIN_UNIX03
// end OS(DARWIN)
+#elif OS(HAIKU)
+ return reinterpret_cast<void*>(regs.stack_base);
#elif OS(WINDOWS)
#if CPU(ARM)
@@ -864,7 +874,7 @@ void* MachineThreads::Thread::Registers::llintPC() const
void MachineThreads::Thread::freeRegisters(Thread::Registers& registers)
{
Thread::Registers::PlatformRegisters& regs = registers.regs;
-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(HAIKU)
pthread_attr_destroy(&regs.attribute);
#else
UNUSED_PARAM(regs);
diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.h b/Source/JavaScriptCore/heap/MachineStackMarker.h
index a16f0da..9c48fb1 100644
--- a/Source/JavaScriptCore/heap/MachineStackMarker.h
+++ b/Source/JavaScriptCore/heap/MachineStackMarker.h
@@ -31,6 +31,10 @@
#include <mach/thread_act.h>
#endif
+#if OS(HAIKU)
+#include <OS.h>
+#endif
+
#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
#include <semaphore.h>
#include <signal.h>
@@ -106,6 +110,8 @@ public:
#elif OS(WINDOWS)
typedef CONTEXT PlatformRegisters;
+#elif OS(HAIKU)
+ typedef thread_info PlatformRegisters;
#elif USE(PTHREADS)
struct PlatformRegisters {
pthread_attr_t attribute;
--
2.19.1

4
dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe
View File

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io"
COPYRIGHT="2015-2018 The Qt Company Ltd."
LICENSE="BSD (3-clause)
GNU LGPL v2.1"
REVISION="3"
REVISION="4"
srcGitRev="72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da"
SOURCE_URI="https://github.com/qt/qtwebkit/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="2e393e7429387437cbfef56ec839329663e9b136ea68997d1e1cdd2f4d9d3ae0"
@@ -185,7 +185,7 @@ BUILD()
-DENABLE_FTPDIR=ON \
-DENABLE_MEDIA_SOURCE=OFF \
-DENABLE_SAMPLING_PROFILER=OFF \
-DENABLE_THREADED_COMPOSITOR=ON \
-DENABLE_THREADED_COMPOSITOR=OFF \
-DENABLE_TOOLS=OFF \
-DENABLE_SUBTLE_CRYPTO=ON \
-DENABLE_FULLSCREEN_API=ON \