Changeset 220753 in webkit for trunk/Source/JavaScriptCore/generate-bytecode-files

Timestamp:

Aug 15, 2017, 1:13:54 PM (8 years ago)

Author:

[email protected]

Message:

Enable named offsets into JSC bytecodes
​https://bugs.webkit.org/show_bug.cgi?id=175561

Reviewed by Mark Lam.

This patch adds the ability to add named offsets into JSC's
bytecodes. In the bytecode json file, instead of listing a
length, you can now list a set of names and their types. Each
opcode with an offsets property will have a struct named after the
opcode by in our C++ naming style. For example,
op_overrides_has_instance would become OpOverridesHasInstance. The
struct has the same memory layout as the instruction list has but
comes with handy named accessors.

As a first cut I converted the various instanceof bytecodes to use
named offsets.

As an example op_overrides_has_instance produces the following struct:

struct OpOverridesHasInstance {
public:

Opcode& opcode() { return *reinterpret_cast<Opcode*>(&m_opcode); }
const Opcode& opcode() const { return *reinterpret_cast<const Opcode*>(&m_opcode); }
int& dst() { return *reinterpret_cast<int*>(&m_dst); }
const int& dst() const { return *reinterpret_cast<const int*>(&m_dst); }
int& constructor() { return *reinterpret_cast<int*>(&m_constructor); }
const int& constructor() const { return *reinterpret_cast<const int*>(&m_constructor); }
int& hasInstanceValue() { return *reinterpret_cast<int*>(&m_hasInstanceValue); }
const int& hasInstanceValue() const { return *reinterpret_cast<const int*>(&m_hasInstanceValue); }

private:

friend class LLIntOffsetsExtractor;
std::aligned_storage<sizeof(Opcode), sizeof(Instruction)>::type m_opcode;
std::aligned_storage<sizeof(int), sizeof(Instruction)>::type m_dst;
std::aligned_storage<sizeof(int), sizeof(Instruction)>::type m_constructor;
std::aligned_storage<sizeof(int), sizeof(Instruction)>::type m_hasInstanceValue;

};

• CMakeLists.txt:
• DerivedSources.make:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/BytecodeList.json:
• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• generate-bytecode-files:
• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_overrides_has_instance):
(JSC::JIT::emit_op_instanceof):
(JSC::JIT::emitSlow_op_instanceof):
(JSC::JIT::emitSlow_op_instanceof_custom):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_overrides_has_instance):
(JSC::JIT::emit_op_instanceof):
(JSC::JIT::emitSlow_op_instanceof):
(JSC::JIT::emitSlow_op_instanceof_custom):

• llint/LLIntOffsetsExtractor.cpp:
• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:

File:

• trunk/Source/JavaScriptCore/generate-bytecode-files (modified) (8 diffs)

trunk/Source/JavaScriptCore/generate-bytecode-files

@@ -105 +105 @@
     return sha1.hexdigest()
 
+
+def toCpp(name):
+    camelCase = re.sub(r'([^a-z0-9].)', lambda c: c.group(0)[1].upper(), name)
+    CamelCase = camelCase[:1].upper() + camelCase[1:]
+    return CamelCase
+
+
+def writeInstructionAccessor(bytecodeHFile, typeName, name):
+    bytecodeHFile.write("    {0}& {1}() {{ return *reinterpret_cast<{0}*>(&m_{1}); }}\n".format(typeName, name))
+    bytecodeHFile.write("    const {0}& {1}() const {{ return *reinterpret_cast<const {0}*>(&m_{1}); }}\n".format(typeName, name))
+
+
+def writeInstructionMember(bytecodeHFile, typeName, name):
+    bytecodeHFile.write("    std::aligned_storage<sizeof({0}), sizeof(Instruction)>::type m_{1};\n".format(typeName, name))
+
+
+def writeStruct(bytecodeHFile, bytecode):
+    bytecodeHFile.write("struct {0} {{\n".format(toCpp(bytecode["name"])))
+    bytecodeHFile.write("public:\n")
+
+    writeInstructionAccessor(bytecodeHFile, "Opcode", "opcode")
+    for offset in bytecode["offsets"]:
+        for name, typeName in offset.iteritems():
+            writeInstructionAccessor(bytecodeHFile, typeName, name)
+
+    bytecodeHFile.write("\nprivate:\n")
+    bytecodeHFile.write("    friend class LLIntOffsetsExtractor;\n\n")
+
+    writeInstructionMember(bytecodeHFile, "Opcode", "opcode")
+    for offset in bytecode["offsets"]:
+        for name, typeName in offset.iteritems():
+            writeInstructionMember(bytecodeHFile, typeName, name)
+    bytecodeHFile.write("};\n\n")
+
+
 if __name__ == "__main__":
     parser = optparse.OptionParser(usage = "usage: %prog [--bytecodes_h <FILE>] [--init_bytecodes_asm <FILE>] <bytecode-json-file>")
     parser.add_option("-b", "--bytecodes_h", dest = "bytecodesHFileName", help = "generate bytecodes macro .h FILE", metavar = "FILE")
+    parser.add_option("-s", "--bytecode_structs_h", dest = "bytecodeStructsHFileName", help = "generate bytecodes macro .h FILE", metavar = "FILE")
     parser.add_option("-a", "--init_bytecodes_asm", dest = "initASMFileName", help="generate ASM bytecodes init FILE", metavar = "FILE")
     (options, args) = parser.parse_args()
@@ -122 +158 @@
 
     bytecodeHFilename = options.bytecodesHFileName
+    bytecodeStructsHFilename = options.bytecodeStructsHFileName
     initASMFileName = options.initASMFileName
 
-    if not bytecodeHFilename and not initASMFileName:
+    if not bytecodeHFilename and not initASMFileName and not bytecodeStructsHFilename:
         parser.print_help()
         exit(0)
@@ -133 +170 @@
         try:
             bytecodeHReadFile = open(bytecodeHFilename, "rb")
-            
+
             hashLine = bytecodeHReadFile.readline()
             if hashLine != hFileHashString:
@@ -141 +178 @@
         else:
             bytecodeHReadFile.close()
+
+    if bytecodeStructsHFilename:
+        try:
+            bytecodeStructsHReadFile = open(bytecodeStructsHFilename, "rb")
+
+            hashLine = bytecodeStructsHReadFile.readline()
+            if hashLine != hFileHashString:
+                needToGenerate = True
+        except:
+            needToGenerate = True
+        else:
+            bytecodeStructsHReadFile.close()
 
     if initASMFileName:
@@ -160 +209 @@
         bytecodeHFile = openOrExit(bytecodeHFilename, "wb")
 
+    if bytecodeStructsHFilename:
+        bytecodeStructsHFile = openOrExit(bytecodeStructsHFilename, "wb")
+
     if initASMFileName:
         initBytecodesFile = openOrExit(initASMFileName, "wb")
@@ -172 +224 @@
         bytecodeHFile.write(cCopyrightMsg % bytecodeJSONFile)
         bytecodeHFile.write("#pragma once\n\n")
+
+    if bytecodeStructsHFilename:
+        bytecodeStructsHFile.write(hFileHashString)
+        bytecodeStructsHFile.write(cCopyrightMsg % bytecodeJSONFile)
+        bytecodeStructsHFile.write("#pragma once\n\n")
+        bytecodeStructsHFile.write("#include \"Instruction.h\"\n")
+        bytecodeStructsHFile.write("\n")
 
     if initASMFileName:
@@ -194 +253 @@
                 if "length" in bytecode:
                     length = bytecode["length"]
+                elif "offsets" in bytecode:
+                    # Add one for the opcode
+                    length = len(bytecode["offsets"]) + 1
 
                 bytecodeHFile.write("    macro({0}, {1})".format(bytecode["name"], length))
@@ -201 +263 @@
             bytecodeHFile.write("\n\n")
             bytecodeHFile.write("#define NUMBER_OF_{0}_IDS {1}\n\n".format(section["macroNameComponent"], bytecodeNum))
+
+
+        if bytecodeStructsHFilename and section['emitInStructsFile']:
+            bytecodeStructsHFile.write("namespace JSC {\n\n")
+
+            for bytecode in section["bytecodes"]:
+                if not "offsets" in bytecode:
+                    continue
+                writeStruct(bytecodeStructsHFile, bytecode)
+
+            bytecodeStructsHFile.write("} // namespace JSC \n")
 
         if bytecodeHFilename and section['emitOpcodeIDStringValuesInHFile']: