Changeset 262096 in webkit for trunk/Source/JavaScriptCore/shell

Timestamp:

May 22, 2020, 10:55:53 PM (5 years ago)

Author:

[email protected]

Message:

[PlayStation] Enable JSC shell to run
​https://bugs.webkit.org/show_bug.cgi?id=212294

Reviewed by Ross Kirsling.

.:

• Source/cmake/OptionsPlayStation.cmake:

Source/JavaScriptCore:

• shell/PlatformPlayStation.cmake:

Set working directory for Visual Studio

• shell/playstation/Initializer.cpp:

Load libJavaScriptCore as we now build it as SHARED.

Location:

trunk/Source/JavaScriptCore/shell

Files:

• PlatformPlayStation.cmake (modified) (1 diff)
• playstation/Initializer.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/shell/PlatformPlayStation.cmake

@@ -20 +20 @@
 set(PLAYSTATION_jsc_PROCESS_NAME "JSCShell")
 set(PLAYSTATION_jsc_MAIN_THREAD_NAME "JSCShell")
+
+# Set the debugger working directory for Visual Studio
+if (${CMAKE_GENERATOR} MATCHES "Visual Studio")
+    set_target_properties(jsc PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+endif ()

trunk/Source/JavaScriptCore/shell/playstation/Initializer.cpp

@@ -30 +30 @@
 #include <dlfcn.h>
 
+static void loadLibraryOrExit(const char* name)
+{
+    if (!dlopen(name, RTLD_NOW)) {
+        fprintf(stderr, "Failed to load %s.\n", name);
+        exit(EXIT_FAILURE);
+    }
+}
+
 __attribute__((constructor(101)))
 static void initializer(void)
 {
-    void* handle = dlopen("SystemServices", RTLD_NOW);
-    if (!handle)
-        exit(1);
-    handle = dlopen("Perf", RTLD_NOW);
-    if (!handle)
-        exit(1);
-    handle = dlopen("PosixWebKit", RTLD_NOW);
-    if (!handle)
-        exit(1);
+    loadLibraryOrExit("SystemServices");
+    loadLibraryOrExit("Perf");
+    loadLibraryOrExit("PosixWebKit");
+    loadLibraryOrExit("libJavaScriptCore");
 }