From a47d6d090f42487a889af56c8894bb5d88e87ca5 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Mon, 13 Mar 2023 14:50:48 -0700 Subject: [PATCH] Add missing changes from ARCH removal. I somehow didn't upload these fixes from the review. So doing that now. Test: Unit tests pass. Change-Id: Ia17e480eb972db4f7be6947c0e6567632c65431f --- scripts/stack | 5 +---- scripts/stack_core.py | 4 ---- scripts/symbol.py | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/stack b/scripts/stack index 2e83ff2af..713bbc3c4 100755 --- a/scripts/stack +++ b/scripts/stack @@ -44,10 +44,7 @@ def main(): args = parser.parse_args() if args.arch: - if args.arch == "arm" or args.arch == "x86": - symbol.ARCH_IS_32BIT = True - else: - symbol.ARCH_IS_32BIT = False + symbol.ARCH_IS_32BIT = not "64" in args.arch if args.symbols_dir: symbol.SYMBOLS_DIR = args.symbols_dir if args.symbols_zip: diff --git a/scripts/stack_core.py b/scripts/stack_core.py index 021617a60..5bbc1d8f6 100755 --- a/scripts/stack_core.py +++ b/scripts/stack_core.py @@ -584,10 +584,6 @@ class RegisterPatternTests(unittest.TestCase): lines = example_crash.split('\n') symbol.SetBitness(lines) tc.UpdateBitnessRegexes() - if symbol.ARCH_IS_32BIT: - print("32 Bit Arch") - else: - print("64 Bit Arch") for line in lines: tc.ProcessLine(line) is_register = (re.search(stupid_pattern, line) is not None) diff --git a/scripts/symbol.py b/scripts/symbol.py index bfdc29eb6..f4c239535 100755 --- a/scripts/symbol.py +++ b/scripts/symbol.py @@ -580,7 +580,7 @@ class FormatSymbolWithoutParametersTests(unittest.TestCase): def test_nested(self): self.assertEqual(FormatSymbolWithoutParameters("foo(int i)::bar(int j)"), "foo::bar") - def test_unballanced(self): + def test_unbalanced(self): self.assertEqual(FormatSymbolWithoutParameters("foo(bar(int i)"), "foo(bar(int i)") self.assertEqual(FormatSymbolWithoutParameters("foo)bar(int i)"), "foo)bar(int i)") self.assertEqual(FormatSymbolWithoutParameters("foo