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

Timestamp:

Jan 30, 2019, 2:12:52 PM (6 years ago)

Author:

[email protected]

Message:

[JSC] Make disassembler data structures constant read-only data
​https://bugs.webkit.org/show_bug.cgi?id=194041

Reviewed by Mark Lam.

Bunch of disassembler data structures are not marked "const", which prevents the loader to put them in read-only region.
This patch makes them "const".

• disassembler/ARM64/A64DOpcode.cpp:
• disassembler/udis86/ud_itab.py:

(UdItabGenerator.genOpcodeTablesLookupIndex):
(UdItabGenerator.genInsnTable):
(UdItabGenerator.genMnemonicsList):
(genItabH):

• disassembler/udis86/udis86_decode.h:
• disassembler/udis86/udis86_syn.c:
• disassembler/udis86/udis86_syn.h:
• disassembler/udis86/udis86_types.h:

Location:

trunk/Source/JavaScriptCore/disassembler

Files:

• ARM64/A64DOpcode.cpp (modified) (1 diff)
• udis86/ud_itab.py (modified) (4 diffs)
• udis86/udis86_decode.h (modified) (1 diff)
• udis86/udis86_syn.c (modified) (1 diff)
• udis86/udis86_syn.h (modified) (1 diff)
• udis86/udis86_types.h (modified) (1 diff)

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

@@ -65 +65 @@
 { groupIndex, groupClass::mask, groupClass::pattern, groupClass::format }
 
-static OpcodeGroupInitializer opcodeGroupList[] = {
+static const OpcodeGroupInitializer opcodeGroupList[] = {
     OPCODE_GROUP_ENTRY(0x08, A64DOpcodeLoadStoreRegisterPair),
     OPCODE_GROUP_ENTRY(0x08, A64DOpcodeLoadStoreExclusive),

trunk/Source/JavaScriptCore/disassembler/udis86/ud_itab.py

@@ -250 +250 @@
     def genOpcodeTablesLookupIndex(self):
         self.ItabC.write( "\n\n"  );
-        self.ItabC.write( "struct ud_lookup_table_list_entry ud_lookup_table_list[] = {\n" )
+        self.ItabC.write( "const struct ud_lookup_table_list_entry ud_lookup_table_list[] = {\n" )
         for table in self.tables.getTableList():
             f0 = self.getTableName(table) + ","
@@ -261 +261 @@
 
     def genInsnTable( self ):
-        self.ItabC.write( "struct ud_itab_entry ud_itab[] = {\n" );
+        self.ItabC.write( "const struct ud_itab_entry ud_itab[] = {\n" );
         for insn in self.tables.getInsnList():
             opr_c = [ "O_NONE", "O_NONE", "O_NONE", "O_NONE" ]
@@ -294 +294 @@
         mnemonics = self.getMnemonicsList()
         self.ItabC.write( "\n\n"  );
-        self.ItabC.write( "const char* ud_mnemonics_str[] = {\n    " )
+        self.ItabC.write( "const char* const ud_mnemonics_str[] = {\n    " )
         self.ItabC.write( ",\n    ".join( [ "\"%s\"" % m for m in mnemonics ] ) )
         self.ItabC.write( "\n};\n" )
@@ -324 +324 @@
         self.ItabH.write( "\n" )
 
-        self.ItabH.write( "extern const char * ud_mnemonics_str[];\n" )
+        self.ItabH.write( "extern const char * const ud_mnemonics_str[];\n" )
 
         self.ItabH.write( "\n#endif /* UD_ITAB_H */\n" )

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

@@ -186 +186 @@
 };
      
-extern struct ud_itab_entry ud_itab[];
-extern struct ud_lookup_table_list_entry ud_lookup_table_list[];
+extern const struct ud_itab_entry ud_itab[];
+extern const struct ud_lookup_table_list_entry ud_lookup_table_list[];
 
 #endif /* UD_DECODE_H */

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

@@ -38 +38 @@
  *
  */
-const char* ud_reg_tab[] = 
+const char* const ud_reg_tab[] = 
 {
   "al",   "cl",   "dl",   "bl",

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

@@ -32 +32 @@
 #endif /* __UD_STANDALONE__ */
 
-extern const char* ud_reg_tab[];
+extern const char* const ud_reg_tab[];
 
 uint64_t ud_syn_rel_target(struct ud*, struct ud_operand*);

trunk/Source/JavaScriptCore/disassembler/udis86/udis86_types.h

@@ -232 +232 @@
   uint8_t   primary_opcode;
   void *    user_opaque_data;
-  struct ud_itab_entry * itab_entry;
-  struct ud_lookup_table_list_entry *le;
+  const struct ud_itab_entry * itab_entry;
+  const struct ud_lookup_table_list_entry *le;
 };