Merge pull request #4 from cHemingway/itanium_demangler

Replace cxxfilt with itanium_demangler

.github/workflows/main.yml

@@ -20,6 +20,9 @@ jobs:
     steps:
     - name: Install gdb
       run: sudo apt-get install gdb
+      # Install python-setuptools system wide
+    - name: Install python-setuptools
+      run: sudo apt-get install python3-setuptools
        # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
     - name: Pip install

metal/serial/elfreader.py

@@ -6,7 +6,11 @@
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection
 
-import cxxfilt
+# Ignore SyntaxWarning for itanium_demangler
+import warnings
+warnings.filterwarnings("ignore",category=SyntaxWarning,module=r".*itanium_demangler")
+
+import itanium_demangler
 
 class Symbol:
     name: str
@@ -21,7 +25,7 @@ def __init__(self, name: str, address: int, symbol_type: str, demangled_name: Op
 
         if demangled_name is None:
             try:
-                self.demangled_name = cxxfilt.demangle(name.split('@')[0])
+                self.demangled_name = str(itanium_demangler.parse(name.split('@')[0]))
             except:
                 self.demangled_name = demangled_name
         else:

requirements.txt

@@ -1,6 +1,6 @@
 argparse~=1.4.0
 pcpp~=1.21
 pyelftools~=0.26
-cxxfilt~=0.2.1
+setuptools~=39.0.1
+itanium_demangler~=1.0
 twine~=3.1.1
-setuptools~=39.0.1

setup.py

@@ -24,7 +24,7 @@ def package_files(directory):
     url='http://pypi.python.org/pypi/metal_test',
     packages=['metal', 'metal.gdb', 'metal.serial'],
     package_data={'metal': package_files('src') + package_files('include')},
-    install_requires=['argparse', 'pcpp', 'pyelftools', 'cxxfilt'],
+    install_requires=['argparse', 'pcpp', 'pyelftools', 'itanium_demangler'],
     long_description=long_description,
     long_description_content_type='text/markdown',
     entry_points={