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

Timestamp:

Aug 23, 2013, 1:50:01 PM (12 years ago)

Author:

[email protected]

Message:

Failure building with python3
​https://bugs.webkit.org/show_bug.cgi?id=106645

Patch by Laszlo Papp <​[email protected]> on 2013-08-23
Reviewed by Benjamin Poulain.

Use print functions instead of python statements to be compatible with python 3.X and 2.7 as well.
Archlinux has been using python3 and that is what causes issues while packaging QtWebKit along with Qt5.

• disassembler/udis86/itab.py:

(UdItabGenerator.genInsnTable):

• disassembler/udis86/ud_opcode.py:

(UdOpcodeTables.print_table):

• disassembler/udis86/ud_optable.py:

(UdOptableXmlParser.parseDef):
(UdOptableXmlParser.parse):
(printFn):

Location:

trunk/Source/JavaScriptCore/disassembler/udis86

Files:

• itab.py (modified) (2 diffs)
• ud_opcode.py (modified) (2 diffs)
• ud_optable.py (modified) (3 diffs)

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

@@ -269 +269 @@
             for i in range(len(opr)): 
                 if not (opr[i] in self.OperandDict.keys()):
-                    print "error: invalid operand declaration: %s\n" % opr[i]
+                    print("error: invalid operand declaration: %s\n" % opr[i])
                 opr_c[i] = "O_" + opr[i]
             opr = "%s %s %s" % (opr_c[0] + ",", opr_c[1] + ",", opr_c[2])
@@ -275 +275 @@
             for p in e['prefixes']:
                 if not ( p in self.PrefixDict.keys() ):
-                    print "error: invalid prefix specification: %s \n" % pfx
+                    print("error: invalid prefix specification: %s \n" % pfx)
                 pfx_c.append( self.PrefixDict[p] )
             if len(e['prefixes']) == 0:

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

@@ -219 +219 @@
 
     def print_table( self, table, pfxs ):
-        print "%s   |" % pfxs
+        print("%s   |" % pfxs)
         keys = table[ 'entries' ].keys()
         if ( len( keys ) ):
@@ -226 +226 @@
             e = table[ 'entries' ][ idx ]
             if e[ 'type' ] == 'insn':
-                print "%s   |-<%s>" % ( pfxs, idx ),
-                print  "%s %s" % ( e[ 'mnemonic' ], ' '.join( e[ 'operands'] ) )
+                print("%s   |-<%s>" % ( pfxs, idx )),
+                print("%s %s" % ( e[ 'mnemonic' ], ' '.join( e[ 'operands'] )))
             else:
-                print "%s   |-<%s> %s" % ( pfxs, idx, e['type'] )
+                print("%s   |-<%s> %s" % ( pfxs, idx, e['type'] ))
                 self.print_table( e, pfxs + '   |' )
 

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

@@ -51 +51 @@
                 ven = ( def_node.firstChild.data );
             else:
-                print "warning: invalid node - %s" % def_node.localName
+                print("warning: invalid node - %s" % def_node.localName)
                 continue
         return ( pfx, opc, opr, ven )
@@ -66 +66 @@
                 continue
             if insnNode.localName != "instruction":
-                print "warning: invalid insn node - %s" % insnNode.localName
+                print("warning: invalid insn node - %s" % insnNode.localName)
                 continue
 
@@ -85 +85 @@
 
 def printFn( pfx, mnm, opc, opr, ven ):
-    print 'def: ',
+    print('def: '),
     if len( pfx ):
-        print ' '.join( pfx ),
-    print "%s %s %s %s" % \
-            ( mnm, ' '.join( opc ), ' '.join( opr ), ven )
+        print(' '.join( pfx )),
+    print("%s %s %s %s" % \
+            ( mnm, ' '.join( opc ), ' '.join( opr ), ven ))