Changeset 254843 in webkit for trunk/Source/JavaScriptCore/disassembler

Timestamp:

Jan 20, 2020, 8:01:50 PM (5 years ago)

Author:

[email protected]

Message:

Platform.h is out of control Part 8: Macros are used inconsistently
​https://bugs.webkit.org/show_bug.cgi?id=206425

Reviewed by Darin Adler.

Source/bmalloc:

• bmalloc/BPlatform.h:

Update OS_EFFECTIVE_ADDRESS_WIDTH to match WTF definition, add needed OS macros.

Source/JavaScriptCore:

• assembler/ARM64Assembler.h:

(JSC::ARM64Assembler::cacheFlush):
(JSC::ARM64Assembler::xOrSp):
(JSC::ARM64Assembler::xOrZr):

• assembler/ARM64Registers.h:
• assembler/ARMv7Assembler.h:

(JSC::ARMv7Assembler::cacheFlush):

• assembler/ARMv7Registers.h:
• assembler/AssemblerCommon.h:

(JSC::isDarwin):

• b3/air/AirCCallingConvention.cpp:
• jit/ExecutableAllocator.h:
• jit/ThunkGenerators.cpp:
• jsc.cpp:
• runtime/MathCommon.cpp:

Use OS(DARWIN) more consistently for darwin level functionality.

• bytecode/CodeOrigin.h:
• runtime/JSString.h:

Update to use OS_CONSTANT.

• disassembler/ARM64/A64DOpcode.cpp:
• disassembler/ARM64Disassembler.cpp:
• disassembler/UDis86Disassembler.cpp:
• disassembler/UDis86Disassembler.h:
• disassembler/X86Disassembler.cpp:
• disassembler/udis86/udis86.c:
• disassembler/udis86/udis86_decode.c:
• disassembler/udis86/udis86_itab_holder.c:
• disassembler/udis86/udis86_syn-att.c:
• disassembler/udis86/udis86_syn-intel.c:
• disassembler/udis86/udis86_syn.c:
• interpreter/Interpreter.cpp:
• interpreter/Interpreter.h:
• interpreter/InterpreterInlines.h:

(JSC::Interpreter::getOpcodeID):

• llint/LowLevelInterpreter.cpp:
• tools/SigillCrashAnalyzer.cpp:

Switch to using ENABLE rather than USE for features internal to WebKit

Source/WTF:

Start addressing FIXMEs added to Platform.h (and helper files) during previous
cleanup work.

• Renames WTF_CPU_EFFECTIVE_ADDRESS_WIDTH to WTF_OS_CONSTANT_EFFECTIVE_ADDRESS_WIDTH, making it available via new macro OS_CONSTANT(...), and syncs bmalloc redefinition.
• Renames:

USE_LLINT_EMBEDDED_OPCODE_ID to ENABLE_LLINT_EMBEDDED_OPCODE_ID
USE_UDIS86 to ENABLE_UDIS86
USE_ARM64_DISASSEMBLER to ENABLE_ARM64_DISASSEMBLER

Enable is more appropriate here as these enable functionality within webkit.

• Removes undefs that are no longer needed due to only defining the macro once now.
• Removes dead defined(LP64) check after PLATFORM(MAC) macOS is always 64-bit these days.

• wtf/Packed.h:

(WTF::alignof):

• wtf/Platform.h:
• wtf/PlatformEnable.h:
• wtf/PlatformOS.h:
• wtf/WTFAssertions.cpp:
• wtf/text/StringCommon.h:

Tools:

• TestWebKitAPI/Tests/WTF/Packed.cpp:

(TestWebKitAPI::TEST):
Update to use OS_CONSTANT.

Location:

trunk/Source/JavaScriptCore/disassembler

Files:

• ARM64/A64DOpcode.cpp (modified) (2 diffs)
• ARM64Disassembler.cpp (modified) (2 diffs)
• UDis86Disassembler.cpp (modified) (2 diffs)
• UDis86Disassembler.h (modified) (1 diff)
• X86Disassembler.cpp (modified) (2 diffs)
• udis86/udis86.c (modified) (2 diffs)
• udis86/udis86_decode.c (modified) (2 diffs)
• udis86/udis86_itab_holder.c (modified) (1 diff)
• udis86/udis86_syn-att.c (modified) (2 diffs)
• udis86/udis86_syn-intel.c (modified) (2 diffs)
• udis86/udis86_syn.c (modified) (2 diffs)

trunk/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#if USE(ARM64_DISASSEMBLER)
+#if ENABLE(ARM64_DISASSEMBLER)
 
 #include "A64DOpcode.h"
@@ -1561 +1561 @@
 } } // namespace JSC::ARM64Disassembler
 
-#endif // USE(ARM64_DISASSEMBLER)
+#endif // ENABLE(ARM64_DISASSEMBLER)

trunk/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp

@@ -27 +27 @@
 #include "Disassembler.h"
 
-#if USE(ARM64_DISASSEMBLER)
+#if ENABLE(ARM64_DISASSEMBLER)
 
 #include "A64DOpcode.h"
@@ -54 +54 @@
 } // namespace JSC
 
-#endif // USE(ARM64_DISASSEMBLER)
+#endif // ENABLE(ARM64_DISASSEMBLER)
 

trunk/Source/JavaScriptCore/disassembler/UDis86Disassembler.cpp

@@ -27 +27 @@
 #include "UDis86Disassembler.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "MacroAssemblerCodeRef.h"
@@ -60 +60 @@
 } // namespace JSC
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 

trunk/Source/JavaScriptCore/disassembler/UDis86Disassembler.h

@@ -30 +30 @@
 namespace JSC {
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 bool tryToDisassembleWithUDis86(const MacroAssemblerCodePtr<DisassemblyPtrTag>&, size_t, const char* prefix, PrintStream& out);
 
-#else // USE(UDIS86)
+#else // ENABLE(UDIS86)
 
 inline bool tryToDisassembleWithUDis86(const MacroAssemblerCodePtr<DisassemblyPtrTag>&, size_t, const char*, PrintStream&) { return false; }
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 
 } // namespace JSC

trunk/Source/JavaScriptCore/disassembler/X86Disassembler.cpp

@@ -27 +27 @@
 #include "Disassembler.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "MacroAssemblerCodeRef.h"
@@ -42 +42 @@
 } // namespace JSC
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)

trunk/Source/JavaScriptCore/disassembler/udis86/udis86.c

@@ -27 +27 @@
 #include "config.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "udis86_udint.h"
@@ -458 +458 @@
 }
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 
 /* vim:set ts=2 sw=2 expandtab */

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_decode.c

@@ -27 +27 @@
 #include "config.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "udis86_udint.h"
@@ -1267 +1267 @@
 }
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 
 /*

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_itab_holder.c

@@ -26 +26 @@
 #include "config.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "udis86_itab.c"

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-att.c

@@ -27 +27 @@
 #include "config.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "udis86_types.h"
@@ -229 +229 @@
 }
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 
 /*

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn-intel.c

@@ -27 +27 @@
 #include "config.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "udis86_types.h"
@@ -225 +225 @@
 }
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 
 /*

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_syn.c

@@ -27 +27 @@
 #include "config.h"
 
-#if USE(UDIS86)
+#if ENABLE(UDIS86)
 
 #include "udis86_types.h"
@@ -213 +213 @@
 }
 
-#endif // USE(UDIS86)
+#endif // ENABLE(UDIS86)
 
 /*