Changeset 224550 in webkit

Timestamp:

Nov 7, 2017, 2:52:34 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

Introduce a default RegisterSet constructor so that we can use { } notation.
​https://bugs.webkit.org/show_bug.cgi?id=179389

Reviewed by Saam Barati.

I also replaced uses of "RegisterSet()" with "{ }" where the use of "RegisterSet()"
does not add any code documentation value.

• b3/air/AirAllocateRegistersAndStackByLinearScan.cpp:
• b3/air/AirCode.cpp:

(JSC::B3::Air::Code::setRegsInPriorityOrder):

• b3/air/AirPrintSpecial.cpp:

(JSC::B3::Air::PrintSpecial::extraEarlyClobberedRegs):
(JSC::B3::Air::PrintSpecial::extraClobberedRegs):

• b3/air/testair.cpp:
• bytecode/PolymorphicAccess.h:

(JSC::AccessGenerationState::preserveLiveRegistersToStackForCall):
(JSC::AccessGenerationState::restoreLiveRegistersFromStackForCall):

• dfg/DFGJITCode.cpp:

(JSC::DFG::JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite):

• ftl/FTLJITCode.cpp:

(JSC::FTL::JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite):

• jit/JITCode.cpp:

(JSC::JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite):

• jit/RegisterSet.cpp:

(JSC::RegisterSet::reservedHardwareRegisters):
(JSC::RegisterSet::runtimeRegisters):
(JSC::RegisterSet::macroScratchRegisters):

• jit/RegisterSet.h:

(JSC::RegisterSet::RegisterSet):

• wasm/WasmB3IRGenerator.cpp:

(JSC::Wasm::B3IRGenerator::emitTierUpCheck):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/air/AirAllocateRegistersAndStackByLinearScan.cpp (modified) (1 diff)
• b3/air/AirCode.cpp (modified) (1 diff)
• b3/air/AirPrintSpecial.cpp (modified) (1 diff)
• b3/air/testair.cpp (modified) (1 diff)
• bytecode/PolymorphicAccess.h (modified) (2 diffs)
• dfg/DFGJITCode.cpp (modified) (1 diff)
• ftl/FTLJITCode.cpp (modified) (1 diff)
• jit/JITCode.cpp (modified) (1 diff)
• jit/RegisterSet.cpp (modified) (3 diffs)
• jit/RegisterSet.h (modified) (1 diff)
• wasm/WasmB3IRGenerator.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-11-07  Mark Lam  <mark.lam@apple.com>
+
+        Introduce a default RegisterSet constructor so that we can use { } notation.
+        https://bugs.webkit.org/show_bug.cgi?id=179389
+
+        Reviewed by Saam Barati.
+
+        I also replaced uses of "RegisterSet()" with "{ }" where the use of "RegisterSet()"
+        does not add any code documentation value.
+
+        * b3/air/AirAllocateRegistersAndStackByLinearScan.cpp:
+        * b3/air/AirCode.cpp:
+        (JSC::B3::Air::Code::setRegsInPriorityOrder):
+        * b3/air/AirPrintSpecial.cpp:
+        (JSC::B3::Air::PrintSpecial::extraEarlyClobberedRegs):
+        (JSC::B3::Air::PrintSpecial::extraClobberedRegs):
+        * b3/air/testair.cpp:
+        * bytecode/PolymorphicAccess.h:
+        (JSC::AccessGenerationState::preserveLiveRegistersToStackForCall):
+        (JSC::AccessGenerationState::restoreLiveRegistersFromStackForCall):
+        * dfg/DFGJITCode.cpp:
+        (JSC::DFG::JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite):
+        * ftl/FTLJITCode.cpp:
+        (JSC::FTL::JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite):
+        * jit/JITCode.cpp:
+        (JSC::JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite):
+        * jit/RegisterSet.cpp:
+        (JSC::RegisterSet::reservedHardwareRegisters):
+        (JSC::RegisterSet::runtimeRegisters):
+        (JSC::RegisterSet::macroScratchRegisters):
+        * jit/RegisterSet.h:
+        (JSC::RegisterSet::RegisterSet):
+        * wasm/WasmB3IRGenerator.cpp:
+        (JSC::Wasm::B3IRGenerator::emitTierUpCheck):
+
 2017-11-07  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/b3/air/AirAllocateRegistersAndStackByLinearScan.cpp

@@ -372 +372 @@
 
         m_active.clear();
-        m_activeRegs = RegisterSet();
+        m_activeRegs = { };
         
         size_t clobberIndex = 0;

trunk/Source/JavaScriptCore/b3/air/AirCode.cpp

@@ -90 +90 @@
 {
     regsInPriorityOrderImpl(bank) = regs;
-    m_mutableRegs = RegisterSet();
+    m_mutableRegs = { };
     forEachBank(
         [&] (Bank bank) {

trunk/Source/JavaScriptCore/b3/air/AirPrintSpecial.cpp

@@ -92 +92 @@
 RegisterSet PrintSpecial::extraEarlyClobberedRegs(Inst&)
 {
-    return RegisterSet();
+    return { };
 }
 
 RegisterSet PrintSpecial::extraClobberedRegs(Inst&)
 {
-    return RegisterSet();
+    return { };
 }
 

trunk/Source/JavaScriptCore/b3/air/testair.cpp

@@ -1877 +1877 @@
     B3::BasicBlock* b3Root = proc.addBlock();
     B3::PatchpointValue* patchpoint = b3Root->appendNew<B3::PatchpointValue>(proc, B3::Void, B3::Origin());
-    patchpoint->clobber(RegisterSet()); 
+    patchpoint->clobber({ }); 
     patchpoint->setGenerator(
         [=] (CCallHelpers& jit, const B3::StackmapGenerationParams&) {

trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234 +234 @@
     const RegisterSet& calculateLiveRegistersForCallAndExceptionHandling();
 
-    SpillState preserveLiveRegistersToStackForCall(const RegisterSet& extra = RegisterSet());
+    SpillState preserveLiveRegistersToStackForCall(const RegisterSet& extra = { });
 
     void restoreLiveRegistersFromStackForCallWithThrownException(const SpillState&);
-    void restoreLiveRegistersFromStackForCall(const SpillState&, const RegisterSet& dontRestore = RegisterSet());
+    void restoreLiveRegistersFromStackForCall(const SpillState&, const RegisterSet& dontRestore = { });
 
     const RegisterSet& liveRegistersForCall();

trunk/Source/JavaScriptCore/dfg/DFGJITCode.cpp

@@ -118 +118 @@
     }
 
-    return RegisterSet();
+    return { };
 }
 

trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp

@@ -144 +144 @@
         }
     }
-    return RegisterSet();
+    return { };
 }
 

trunk/Source/JavaScriptCore/jit/JITCode.cpp

@@ -223 +223 @@
 RegisterSet JITCode::liveRegistersToPreserveAtExceptionHandlingCallSite(CodeBlock*, CallSiteIndex)
 {
-    return RegisterSet();
+    return { };
 }
 #endif

trunk/Source/JavaScriptCore/jit/RegisterSet.cpp

@@ -55 +55 @@
     return RegisterSet(ARMRegisters::lr, ARMRegisters::pc);
 #else
-    return RegisterSet();
+    return { };
 #endif
 }
@@ -64 +64 @@
     return RegisterSet(GPRInfo::tagTypeNumberRegister, GPRInfo::tagMaskRegister);
 #else
-    return RegisterSet();
+    return { };
 #endif
 }
@@ -102 +102 @@
     return result;
 #else
-    return RegisterSet();
+    return { };
 #endif
 }

trunk/Source/JavaScriptCore/jit/RegisterSet.h

@@ -41 +41 @@
 class RegisterSet {
 public:
+    RegisterSet() { }
+
     template<typename... Regs>
     explicit RegisterSet(Regs... regs)

trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp

@@ -920 +920 @@
 
             const unsigned extraPaddingBytes = 0;
-            RegisterSet registersToSpill = RegisterSet();
+            RegisterSet registersToSpill = { };
             registersToSpill.add(GPRInfo::argumentGPR1);
             unsigned numberOfStackBytesUsedForRegisterPreservation = ScratchRegisterAllocator::preserveRegistersToStackForCall(jit, registersToSpill, extraPaddingBytes);