Bug 1168750 - SharedStubs: (part1) Rename BaselineRegisters.h and BaselineHelpers.h, r=jandem

js/src/jit/BaselineCompiler.cpp

@@ -8,7 +8,6 @@
 
 #include "mozilla/UniquePtr.h"
 
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/FixedList.h"
@@ -19,6 +18,7 @@
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"
 #endif
+#include "jit/SharedICHelpers.h"
 #include "jit/VMFunctions.h"
 #include "vm/TraceLogging.h"
 

js/src/jit/BaselineFrameInfo.h

@@ -10,9 +10,9 @@
 #include "mozilla/Alignment.h"
 
 #include "jit/BaselineFrame.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/FixedList.h"
 #include "jit/MacroAssembler.h"
+#include "jit/SharedICRegisters.h"
 
 namespace js {
 namespace jit {

js/src/jit/BaselineIC.cpp

@@ -17,7 +17,6 @@
 #include "builtin/Eval.h"
 #include "builtin/SIMD.h"
 #include "jit/BaselineDebugModeOSR.h"
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineJIT.h"
 #include "jit/JitSpewer.h"
 #include "jit/Linker.h"
@@ -25,6 +24,7 @@
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"
 #endif
+#include "jit/SharedICHelpers.h"
 #include "jit/VMFunctions.h"
 #include "js/Conversions.h"
 #include "vm/Opcodes.h"

js/src/jit/BaselineIC.h

@@ -16,7 +16,7 @@
 
 #include "builtin/TypedObject.h"
 #include "jit/BaselineJIT.h"
-#include "jit/BaselineRegisters.h"
+#include "jit/SharedICRegisters.h"
 #include "vm/ArrayObject.h"
 #include "vm/ReceiverGuard.h"
 #include "vm/TypedArrayCommon.h"

js/src/jit/SharedICHelpers.h

@@ -4,19 +4,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_BaselineHelpers_h
-#define jit_BaselineHelpers_h
+#ifndef jit_SharedICHelpers_h
+#define jit_SharedICHelpers_h
 
 #if defined(JS_CODEGEN_X86)
-# include "jit/x86/BaselineHelpers-x86.h"
+# include "jit/x86/SharedICHelpers-x86.h"
 #elif defined(JS_CODEGEN_X64)
-# include "jit/x64/BaselineHelpers-x64.h"
+# include "jit/x64/SharedICHelpers-x64.h"
 #elif defined(JS_CODEGEN_ARM)
-# include "jit/arm/BaselineHelpers-arm.h"
+# include "jit/arm/SharedICHelpers-arm.h"
 #elif defined(JS_CODEGEN_MIPS)
-# include "jit/mips/BaselineHelpers-mips.h"
+# include "jit/mips/SharedICHelpers-mips.h"
 #elif defined(JS_CODEGEN_NONE)
-# include "jit/none/BaselineHelpers-none.h"
+# include "jit/none/SharedICHelpers-none.h"
 #else
 # error "Unknown architecture!"
 #endif
@@ -27,4 +27,4 @@ namespace jit {
 } // namespace jit
 } // namespace js
 
-#endif /* jit_BaselineHelpers_h */
+#endif /* jit_SharedICHelpers_h */

js/src/jit/SharedICRegisters.h

@@ -4,19 +4,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_BaselineRegisters_h
-#define jit_BaselineRegisters_h
+#ifndef jit_SharedICRegisters_h
+#define jit_SharedICRegisters_h
 
 #if defined(JS_CODEGEN_X86)
-# include "jit/x86/BaselineRegisters-x86.h"
+# include "jit/x86/SharedICRegisters-x86.h"
 #elif defined(JS_CODEGEN_X64)
-# include "jit/x64/BaselineRegisters-x64.h"
+# include "jit/x64/SharedICRegisters-x64.h"
 #elif defined(JS_CODEGEN_ARM)
-# include "jit/arm/BaselineRegisters-arm.h"
+# include "jit/arm/SharedICRegisters-arm.h"
 #elif defined(JS_CODEGEN_MIPS)
-# include "jit/mips/BaselineRegisters-mips.h"
+# include "jit/mips/SharedICRegisters-mips.h"
 #elif defined(JS_CODEGEN_NONE)
-# include "jit/none/BaselineRegisters-none.h"
+# include "jit/none/SharedICRegisters-none.h"
 #else
 # error "Unknown architecture!"
 #endif
@@ -27,4 +27,4 @@ namespace jit {
 } // namespace jit
 } // namespace js
 
-#endif /* jit_BaselineRegisters_h */
+#endif /* jit_SharedICRegisters_h */

js/src/jit/arm/BaselineIC-arm.cpp

@@ -5,10 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jit/BaselineCompiler.h"
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/Linker.h"
+#include "jit/SharedICHelpers.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/arm/SharedICHelpers-arm.h

@@ -4,13 +4,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_arm_BaselineHelpers_arm_h
-#define jit_arm_BaselineHelpers_arm_h
+#ifndef jit_arm_SharedICHelpers_arm_h
+#define jit_arm_SharedICHelpers_arm_h
 
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/MacroAssembler.h"
+#include "jit/SharedICRegisters.h"
 
 namespace js {
 namespace jit {
@@ -316,4 +316,4 @@ EmitStubGuardFailure(MacroAssembler& masm)
 } // namespace jit
 } // namespace js
 
-#endif /* jit_arm_BaselineHelpers_arm_h */
+#endif /* jit_arm_SharedICHelpers_arm_h */

js/src/jit/arm/SharedICRegisters-arm.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_arm_BaselineRegisters_arm_h
-#define jit_arm_BaselineRegisters_arm_h
+#ifndef jit_arm_SharedICRegisters_arm_h
+#define jit_arm_SharedICRegisters_arm_h
 
 #include "jit/MacroAssembler.h"
 
@@ -51,4 +51,4 @@ static MOZ_CONSTEXPR_VAR FloatRegister FloatReg1      = d1;
 } // namespace jit
 } // namespace js
 
-#endif /* jit_arm_BaselineRegisters_arm_h */
+#endif /* jit_arm_SharedICRegisters_arm_h */

js/src/jit/arm/Trampoline-arm.cpp

@@ -6,7 +6,7 @@
 
 #include "jscompartment.h"
 
-#include "jit/arm/BaselineHelpers-arm.h"
+#include "jit/arm/SharedICHelpers-arm.h"
 #include "jit/Bailouts.h"
 #include "jit/JitCompartment.h"
 #include "jit/JitFrames.h"

js/src/jit/mips/BaselineIC-mips.cpp

@@ -7,10 +7,10 @@
 #include "jsiter.h"
 
 #include "jit/BaselineCompiler.h"
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/Linker.h"
+#include "jit/SharedICHelpers.h"
 
 #include "jsboolinlines.h"
 

js/src/jit/mips/MacroAssembler-mips.cpp

@@ -11,11 +11,11 @@
 
 #include "jit/Bailouts.h"
 #include "jit/BaselineFrame.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/JitFrames.h"
 #include "jit/MacroAssembler.h"
 #include "jit/mips/Simulator-mips.h"
 #include "jit/MoveEmitter.h"
+#include "jit/SharedICRegisters.h"
 
 #include "jit/MacroAssembler-inl.h"
 

js/src/jit/mips/SharedICHelpers-mips.h

@@ -4,13 +4,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_mips_BaselineHelpers_mips_h
-#define jit_mips_BaselineHelpers_mips_h
+#ifndef jit_mips_SharedICHelpers_mips_h
+#define jit_mips_SharedICHelpers_mips_h
 
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/MacroAssembler.h"
+#include "jit/SharedICRegisters.h"
 
 namespace js {
 namespace jit {
@@ -326,4 +326,4 @@ EmitStubGuardFailure(MacroAssembler& masm)
 } // namespace jit
 } // namespace js
 
-#endif /* jit_mips_BaselineHelpers_mips_h */
+#endif /* jit_mips_SharedICHelpers_mips_h */

js/src/jit/mips/SharedICRegisters-mips.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_mips_BaselineRegisters_mips_h
-#define jit_mips_BaselineRegisters_mips_h
+#ifndef jit_mips_SharedICRegisters_mips_h
+#define jit_mips_SharedICRegisters_mips_h
 
 #include "jit/MacroAssembler.h"
 
@@ -41,4 +41,4 @@ static MOZ_CONSTEXPR_VAR FloatRegister FloatReg1 = f2;
 } // namespace jit
 } // namespace js
 
-#endif /* jit_mips_BaselineRegisters_mips_h */
+#endif /* jit_mips_SharedICRegisters_mips_h */

js/src/jit/mips/Trampoline-mips.cpp

@@ -14,7 +14,7 @@
 #include "jit/JitSpewer.h"
 #include "jit/Linker.h"
 #include "jit/mips/Bailouts-mips.h"
-#include "jit/mips/BaselineHelpers-mips.h"
+#include "jit/mips/SharedICHelpers-mips.h"
 #ifdef JS_ION_PERF
 # include "jit/PerfSpewer.h"
 #endif

js/src/jit/none/SharedICHelpers-none.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_none_BaselineHelpers_none_h
-#define jit_none_BaselineHelpers_none_h
+#ifndef jit_none_SharedICHelpers_none_h
+#define jit_none_SharedICHelpers_none_h
 
 namespace js {
 namespace jit {
@@ -35,4 +35,4 @@ template <typename T> inline void EmitPreBarrier(MacroAssembler&, T, MIRType) {
 } // namespace jit
 } // namespace js
 
-#endif /* jit_none_BaselineHelpers_none_h */
+#endif /* jit_none_SharedICHelpers_none_h */

js/src/jit/none/SharedICRegisters-none.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_none_BaselineRegisters_none_h
-#define jit_none_BaselineRegisters_none_h
+#ifndef jit_none_SharedICRegisters_none_h
+#define jit_none_SharedICRegisters_none_h
 
 #include "jit/MacroAssembler.h"
 
@@ -31,5 +31,5 @@ static MOZ_CONSTEXPR_VAR FloatRegister FloatReg1 = { FloatRegisters::invalid_reg
 } // namespace jit
 } // namespace js
 
-#endif /* jit_none_BaselineRegisters_none_h */
+#endif /* jit_none_SharedICRegisters_none_h */
 

js/src/jit/x64/BaselineIC-x64.cpp

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
+#include "jit/SharedICHelpers.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x64/SharedICHelpers-x64.h

@@ -4,13 +4,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_x64_BaselineHelpers_x64_h
-#define jit_x64_BaselineHelpers_x64_h
+#ifndef jit_x64_SharedICHelpers_x64_h
+#define jit_x64_SharedICHelpers_x64_h
 
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/MacroAssembler.h"
+#include "jit/SharedICRegisters.h"
 
 namespace js {
 namespace jit {
@@ -286,4 +286,4 @@ EmitStubGuardFailure(MacroAssembler& masm)
 } // namespace jit
 } // namespace js
 
-#endif /* jit_x64_BaselineHelpers_x64_h */
+#endif /* jit_x64_SharedICHelpers_x64_h */

js/src/jit/x64/SharedICRegisters-x64.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_x64_BaselineRegisters_x64_h
-#define jit_x64_BaselineRegisters_x64_h
+#ifndef jit_x64_SharedICRegisters_x64_h
+#define jit_x64_SharedICRegisters_x64_h
 
 #include "jit/MacroAssembler.h"
 
@@ -32,4 +32,4 @@ static MOZ_CONSTEXPR_VAR FloatRegister FloatReg1      = xmm1;
 } // namespace jit
 } // namespace js
 
-#endif /* jit_x64_BaselineRegisters_x64_h */
+#endif /* jit_x64_SharedICRegisters_x64_h */

js/src/jit/x64/Trampoline-x64.cpp

@@ -12,7 +12,7 @@
 # include "jit/PerfSpewer.h"
 #endif
 #include "jit/VMFunctions.h"
-#include "jit/x64/BaselineHelpers-x64.h"
+#include "jit/x64/SharedICHelpers-x64.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x86-shared/BaselineIC-x86-shared.cpp

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
+#include "jit/SharedICHelpers.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x86/BaselineIC-x86.cpp

@@ -5,10 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "jit/BaselineCompiler.h"
-#include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/Linker.h"
+#include "jit/SharedICHelpers.h"
 
 using namespace js;
 using namespace js::jit;

js/src/jit/x86/SharedICHelpers-x86.h

@@ -4,13 +4,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_x86_BaselineHelpers_x86_h
-#define jit_x86_BaselineHelpers_x86_h
+#ifndef jit_x86_SharedICHelpers_x86_h
+#define jit_x86_SharedICHelpers_x86_h
 
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
-#include "jit/BaselineRegisters.h"
 #include "jit/MacroAssembler.h"
+#include "jit/SharedICRegisters.h"
 
 namespace js {
 namespace jit {
@@ -293,4 +293,4 @@ EmitStubGuardFailure(MacroAssembler& masm)
 } // namespace jit
 } // namespace js
 
-#endif /* jit_x86_BaselineHelpers_x86_h */
+#endif /* jit_x86_SharedICHelpers_x86_h */

js/src/jit/x86/SharedICRegisters-x86.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jit_x86_BaselineRegisters_x86_h
-#define jit_x86_BaselineRegisters_x86_h
+#ifndef jit_x86_SharedICRegisters_x86_h
+#define jit_x86_SharedICRegisters_x86_h
 
 #include "jit/MacroAssembler.h"
 
@@ -35,4 +35,4 @@ static MOZ_CONSTEXPR_VAR FloatRegister FloatReg1      = xmm1;
 } // namespace jit
 } // namespace js
 
-#endif /* jit_x86_BaselineRegisters_x86_h */
+#endif /* jit_x86_SharedICRegisters_x86_h */

js/src/jit/x86/Trampoline-x86.cpp

@@ -16,7 +16,7 @@
 # include "jit/PerfSpewer.h"
 #endif
 #include "jit/VMFunctions.h"
-#include "jit/x86/BaselineHelpers-x86.h"
+#include "jit/x86/SharedICHelpers-x86.h"
 
 #include "jsscriptinlines.h"