From 4e7fe439d7fe9cefb8cae5e79a1caa7aa4f0b45b Mon Sep 17 00:00:00 2001
From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Fri, 28 Feb 2020 13:48:12 +0000
Subject: [PATCH] misc: string.join has been removed in python3

In general string methods are deprecated in favour of str ones

Change-Id: Ifba04e0b70be29e5a82a67cf11837f740de57e32
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26244
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/arch/arm/isa/insts/mem.isa          |  2 +-
 src/arch/isa_parser.py                  | 11 +++++------
 src/arch/micro_asm.py                   |  1 -
 src/arch/mips/isa/formats/util.isa      |  2 +-
 src/arch/power/isa/formats/util.isa     |  2 +-
 src/arch/riscv/isa/formats/mem.isa      |  2 +-
 src/arch/sparc/isa/formats/mem/swap.isa |  6 +++---
 src/python/m5/util/code_formatter.py    |  3 +--
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/arch/arm/isa/insts/mem.isa b/src/arch/arm/isa/insts/mem.isa
index 14a3267a0..0087a24dc 100644
--- a/src/arch/arm/isa/insts/mem.isa
+++ b/src/arch/arm/isa/insts/mem.isa
@@ -57,7 +57,7 @@ let {{
             # This shouldn't be part of the eaCode, but until the exec templates
             # are converted over it's the easiest place to put it.
             eaCode += '\n    unsigned memAccessFlags = '
-            eaCode += (string.join(memFlags, '|') + ';')
+            eaCode += ('|'.join(memFlags) + ';')
 
             codeBlobs["ea_code"] = eaCode
 
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
index 8d0fee22d..49b3b0729 100755
--- a/src/arch/isa_parser.py
+++ b/src/arch/isa_parser.py
@@ -41,7 +41,6 @@ from __future__ import with_statement, print_function
 import os
 import sys
 import re
-import string
 import inspect, traceback
 # get type names
 from types import *
@@ -231,7 +230,7 @@ class Format(object):
         self.params = params
         label = 'def format ' + id
         self.user_code = compile(fixPythonIndentation(code), label, 'exec')
-        param_list = string.join(params, ", ")
+        param_list = ", ".join(params)
         f = '''def defInst(_code, _context, %s):
                 my_locals = vars().copy()
                 exec _code in _context, my_locals
@@ -1399,7 +1398,7 @@ def makeFlagConstructor(flag_list):
             i += 1
     pre = '\n\tflags['
     post = '] = true;'
-    code = pre + string.join(flag_list, post + pre) + post
+    code = pre + (post + pre).join(flag_list) + post
     return code
 
 # Assume all instruction flags are of the form 'IsFoo'
@@ -1584,7 +1583,7 @@ class ISAParser(Grammar):
         # file where it was included.
         self.fileNameStack = Stack()
 
-        symbols = ('makeList', 're', 'string')
+        symbols = ('makeList', 're')
         self.exportContext = dict([(s, eval(s)) for s in symbols])
 
         self.maxInstSrcRegs = 0
@@ -2597,7 +2596,7 @@ StaticInstPtr
         (?<!\w)      # neg. lookbehind assertion: prevent partial matches
         ((%s)(?:_(%s))?)   # match: operand with optional '_' then suffix
         (?!\w)       # neg. lookahead assertion: prevent partial matches
-        ''' % (string.join(operands, '|'), string.join(extensions, '|'))
+        ''' % ('|'.join(operands), '|'.join(extensions))
 
         self.operandsRE = re.compile(operandsREString, re.MULTILINE|re.VERBOSE)
 
@@ -2605,7 +2604,7 @@ StaticInstPtr
         # groups are returned (base and ext, not full name as above).
         # Used for subtituting '_' for '.' to make C++ identifiers.
         operandsWithExtREString = r'(?<!\w)(%s)_(%s)(?!\w)' \
-            % (string.join(operands, '|'), string.join(extensions, '|'))
+            % ('|'.join(operands), '|'.join(extensions))
 
         self.operandsWithExtRE = \
             re.compile(operandsWithExtREString, re.MULTILINE)
diff --git a/src/arch/micro_asm.py b/src/arch/micro_asm.py
index 2745004ee..536f70994 100644
--- a/src/arch/micro_asm.py
+++ b/src/arch/micro_asm.py
@@ -29,7 +29,6 @@ from __future__ import print_function
 import os
 import sys
 import re
-import string
 import traceback
 # get type names
 from types import *
diff --git a/src/arch/mips/isa/formats/util.isa b/src/arch/mips/isa/formats/util.isa
index 5e6918b57..39ece7a2d 100644
--- a/src/arch/mips/isa/formats/util.isa
+++ b/src/arch/mips/isa/formats/util.isa
@@ -50,7 +50,7 @@ def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags,
 
     if mem_flags:
         mem_flags = [ 'Request::%s' % flag for flag in mem_flags ]
-        s = '\n\tmemAccessFlags = ' + string.join(mem_flags, '|') + ';'
+        s = '\n\tmemAccessFlags = ' + '|'.join(mem_flags) + ';'
         iop.constructor += s
 
     # select templates
diff --git a/src/arch/power/isa/formats/util.isa b/src/arch/power/isa/formats/util.isa
index 582e62f6f..1bb78e6ad 100644
--- a/src/arch/power/isa/formats/util.isa
+++ b/src/arch/power/isa/formats/util.isa
@@ -100,7 +100,7 @@ def LoadStoreBase(name, Name, ea_code, memacc_code, mem_flags, inst_flags,
                         inst_flags)
 
     if mem_flags:
-        s = '\n\tmemAccessFlags = ' + string.join(mem_flags, '|') + ';'
+        s = '\n\tmemAccessFlags = ' + '|'.join(mem_flags) + ';'
         iop.constructor += s
 
     fullExecTemplate = eval(exec_template_base + 'Execute')
diff --git a/src/arch/riscv/isa/formats/mem.isa b/src/arch/riscv/isa/formats/mem.isa
index 175eff999..faaae6f77 100644
--- a/src/arch/riscv/isa/formats/mem.isa
+++ b/src/arch/riscv/isa/formats/mem.isa
@@ -73,7 +73,7 @@ def LoadStoreBase(name, Name, offset_code, ea_code, memacc_code, mem_flags,
 
     if mem_flags:
         mem_flags = [ 'Request::%s' % flag for flag in mem_flags ]
-        s = '\n\tmemAccessFlags = ' + string.join(mem_flags, '|') + ';'
+        s = '\n\tmemAccessFlags = ' + '|'.join(mem_flags) + ';'
         iop.constructor += s
 
     # select templates
diff --git a/src/arch/sparc/isa/formats/mem/swap.isa b/src/arch/sparc/isa/formats/mem/swap.isa
index 7a287066b..ef13385bd 100644
--- a/src/arch/sparc/isa/formats/mem/swap.isa
+++ b/src/arch/sparc/isa/formats/mem/swap.isa
@@ -124,7 +124,7 @@ let {{
 def format Swap(code, postacc_code, mem_flags, *opt_flags) {{
     mem_flags = makeList(mem_flags)
     mem_flags = [ 'Request::%s' % flag for flag in mem_flags ]
-    flags = string.join(mem_flags, '|')
+    flags = '|'.join(mem_flags)
 
     (header_output,
      decoder_output,
@@ -137,7 +137,7 @@ def format SwapAlt(code, postacc_code, mem_flags, *opt_flags) {{
     mem_flags = makeList(mem_flags)
     mem_flags = [ 'Request::%s' % flag for flag in mem_flags ]
     mem_flags.append("EXT_ASI")
-    flags = string.join(mem_flags, '|')
+    flags = '|'.join(mem_flags)
     (header_output,
      decoder_output,
      exec_output,
@@ -169,7 +169,7 @@ def format CasAlt(code, postacc_code, mem_flags, *opt_flags) {{
     mem_flags = makeList(mem_flags)
     mem_flags = [ 'Request::%s' % flag for flag in mem_flags ]
     mem_flags.append("EXT_ASI")
-    flags = string.join(mem_flags, '|')
+    flags = '|'.join(mem_flags)
     (header_output,
      decoder_output,
      exec_output,
diff --git a/src/python/m5/util/code_formatter.py b/src/python/m5/util/code_formatter.py
index 9870430d6..f441df0af 100644
--- a/src/python/m5/util/code_formatter.py
+++ b/src/python/m5/util/code_formatter.py
@@ -35,7 +35,6 @@ except ImportError:
 import inspect
 import os
 import re
-import string
 
 class lookup(object):
     def __init__(self, formatter, frame, *args, **kwargs):
@@ -164,7 +163,7 @@ class code_formatter(object):
         f.close()
 
     def __str__(self):
-        data = string.join(self._data, '')
+        data = ''.join(self._data)
         self._data = [ data ]
         return data
 
-- 
2.30.2