Bug 1629791 part 1 - Rename MOpcodes.h to MOpcodesGenerated.h and LOpcodes to LOpcodesGenerated.h. r=iain

Most other generated SpiderMonkey files have the 'Generated' suffix so let's
follow that convention.

Differential Revision: https://phabricator.services.mozilla.com/D70993

--HG--
extra : moz-landing-system : lando

config/check_spidermonkey_style.py

@@ -64,8 +64,8 @@ included_inclnames_to_ignore = set([
     'frontend/smoosh_generated.h',        # generated in $OBJDIR
     'gc/StatsPhasesGenerated.h',         # generated in $OBJDIR
     'gc/StatsPhasesGenerated.inc',       # generated in $OBJDIR
-    'jit/LOpcodes.h',           # generated in $OBJDIR
-    'jit/MOpcodes.h',           # generated in $OBJDIR
+    'jit/LOpcodesGenerated.h',           # generated in $OBJDIR
+    'jit/MOpcodesGenerated.h',           # generated in $OBJDIR
     'jscustomallocator.h',      # provided by embedders;  allowed to be missing
     'js-config.h',              # generated in $OBJDIR
     'fdlibm.h',                 # fdlibm

js/src/jit/GenerateOpcodeFiles.py

@@ -2,8 +2,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/.
 
-# This script generates jit/LOpcodes.h (list of LIR instructions) and
-# jit/MOpcodes.h (list of MIR instructions) from MIR.h and LIR files.
+# This script generates jit/LOpcodesGenerated.h (list of LIR instructions) and
+# jit/MOpcodesGenerated.h (list of MIR instructions) from MIR.h and LIR files.
 
 import re
 
@@ -53,9 +53,9 @@ def generate_header(c_out, inputs, pat, includeguard, listname):
 
 def generate_mir_header(c_out, *inputs):
     pat = re.compile(r"^\s*INSTRUCTION_HEADER(_WITHOUT_TYPEPOLICY)?\((?P<name>\w+)\);?$")
-    generate_header(c_out, inputs, pat, 'jit_MOpcodes_h', 'MIR_OPCODE_LIST')
+    generate_header(c_out, inputs, pat, 'jit_MOpcodesGenerated_h', 'MIR_OPCODE_LIST')
 
 
 def generate_lir_header(c_out, *inputs):
     pat = re.compile(r"^\s*LIR_HEADER\((?P<name>\w+)\);?$")
-    generate_header(c_out, inputs, pat, 'jit_LOpcodes_h', 'LIR_OPCODE_LIST')
+    generate_header(c_out, inputs, pat, 'jit_LOpcodesGenerated_h', 'LIR_OPCODE_LIST')

js/src/jit/LIR.h

@@ -17,7 +17,7 @@
 #include "jit/FixedList.h"
 #include "jit/InlineList.h"
 #include "jit/JitAllocPolicy.h"
-#include "jit/LOpcodes.h"
+#include "jit/LOpcodesGenerated.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
 #include "jit/Registers.h"
@@ -784,7 +784,8 @@ class LNode {
   LIR_OPCODE_LIST(LIROP)
 #undef LIROP
 
-// Note: GenerateOpcodeFiles.py generates LOpcodes.h based on this macro.
+// Note: GenerateOpcodeFiles.py generates LOpcodesGenerated.h based on this
+// macro.
 #define LIR_HEADER(opcode) \
   static constexpr LNode::Opcode classOpcode = LNode::Opcode::opcode;
 };

js/src/jit/MIR.h

@@ -25,7 +25,7 @@
 #include "jit/InlineList.h"
 #include "jit/JitAllocPolicy.h"
 #include "jit/MacroAssembler.h"
-#include "jit/MOpcodes.h"
+#include "jit/MOpcodesGenerated.h"
 #include "jit/TIOracle.h"
 #include "jit/TypePolicy.h"
 #include "js/HeapAPI.h"
@@ -1085,7 +1085,7 @@ class MInstruction : public MDefinition, public InlineListNode<MInstruction> {
   virtual MIRType typePolicySpecialization() = 0;
 };
 
-// Note: GenerateOpcodeFiles.py generates MOpcodes.h based on the
+// Note: GenerateOpcodeFiles.py generates MOpcodesGenerated.h based on the
 // INSTRUCTION_HEADER* macros.
 #define INSTRUCTION_HEADER_WITHOUT_TYPEPOLICY(opcode) \
   static const Opcode classOpcode = Opcode::opcode;   \

js/src/jit/moz.build

@@ -240,15 +240,15 @@ elif CONFIG['JS_CODEGEN_MIPS32'] or CONFIG['JS_CODEGEN_MIPS64']:
             ]
 
 
-# Generate jit/MOpcodes.h from jit/MIR.h
-GeneratedFile('MOpcodes.h',
+# Generate jit/MOpcodesGenerated.h from jit/MIR.h
+GeneratedFile('MOpcodesGenerated.h',
               script='GenerateOpcodeFiles.py',
               entry_point='generate_mir_header',
               inputs=['MIR.h'])
 
-# Generate jit/LOpcodes.h from jit/LIR.h, jit/shared/LIR-shared.h, and
+# Generate jit/LOpcodesGenerated.h from jit/LIR.h, jit/shared/LIR-shared.h, and
 # platform-specific LIR files.
-GeneratedFile('LOpcodes.h',
+GeneratedFile('LOpcodesGenerated.h',
               script='GenerateOpcodeFiles.py',
               entry_point='generate_lir_header',
               inputs=lir_inputs)