From 32b67dc9c999be655bb23564e4e2e3ac29799ad4 Mon Sep 17 00:00:00 2001
From: pompolic <pompolic@special-circumstanc.es>
Date: Tue, 8 Nov 2022 21:15:42 +0100
Subject: [PATCH] Remove debug code, disable pagination in non-interactive
scripts
---
gdb-port/startup_scripts/shell_with_exit.sh | 4 +++-
gdb-port/startup_scripts/tests.sh | 4 +++-
gdb-port/top-level-parse.py | 7 +------
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/gdb-port/startup_scripts/shell_with_exit.sh b/gdb-port/startup_scripts/shell_with_exit.sh
index 4bd4e6e..f6d1bc8 100755
--- a/gdb-port/startup_scripts/shell_with_exit.sh
+++ b/gdb-port/startup_scripts/shell_with_exit.sh
@@ -1,6 +1,8 @@
#!/bin/bash
-gdb -ex "set python print-stack full" -ex "source perf-instrumentation/gdb-port/parser.py" -ex "source perf-instrumentation/gdb-port/utility-commands.py" -ex "source perf-instrumentation/gdb-port/commands.py" -ex "source perf-instrumentation/gdb-port/hammer-breakpoints.py" -ex "source perf-instrumentation/gdb-port/ast.py" -ex "source perf-instrumentation/gdb-port/breakpoint-manager.py" -ex "source perf-instrumentation/gdb-port/top-level-parse.py" -ex "hammer-parse-stop-at-pos 50" -ex "source perf-instrumentation/gdb-port/parser-type-instrumentation-gdb.py" -ex "source perf-instrumentation/gdb-port/parser-name-instrumentation-gdb.py" \
+gdb \
+-ex "set pagination off" \
+-ex "set python print-stack full" -ex "source perf-instrumentation/gdb-port/parser.py" -ex "source perf-instrumentation/gdb-port/utility-commands.py" -ex "source perf-instrumentation/gdb-port/commands.py" -ex "source perf-instrumentation/gdb-port/hammer-breakpoints.py" -ex "source perf-instrumentation/gdb-port/ast.py" -ex "source perf-instrumentation/gdb-port/breakpoint-manager.py" -ex "source perf-instrumentation/gdb-port/top-level-parse.py" -ex "hammer-parse-stop-at-pos 50" -ex "source perf-instrumentation/gdb-port/parser-type-instrumentation-gdb.py" -ex "source perf-instrumentation/gdb-port/parser-name-instrumentation-gdb.py" \
-ex "hammer-parse-step 7" \
-ex "python [gdb.execute('hammer-parse-apply') for x in range(8)]" \
-ex "set confirm off" \
diff --git a/gdb-port/startup_scripts/tests.sh b/gdb-port/startup_scripts/tests.sh
index a7572a6..0b40aab 100755
--- a/gdb-port/startup_scripts/tests.sh
+++ b/gdb-port/startup_scripts/tests.sh
@@ -1,4 +1,6 @@
#!/bin/bash
-gdb -ex "set python print-stack full" -ex "source perf-instrumentation/gdb-port/parser.py" -ex "source perf-instrumentation/gdb-port/utility-commands.py" -ex "source perf-instrumentation/gdb-port/commands.py" -ex "source perf-instrumentation/gdb-port/hammer-breakpoints.py" -ex "source perf-instrumentation/gdb-port/ast.py" -ex "source perf-instrumentation/gdb-port/breakpoint-manager.py" -ex "source perf-instrumentation/gdb-port/top-level-parse.py" -ex "hammer-parse-stop-at-pos 50" -ex "source perf-instrumentation/gdb-port/parser-type-instrumentation-gdb.py" -ex "source perf-instrumentation/gdb-port/parser-name-instrumentation-gdb.py" -ex "source perf-instrumentation/gdb-port/tests/unit/top-level-parse.py" -ex "source perf-instrumentation/gdb-port/tests/unit/breakpoint-manager.py" -ex "source perf-instrumentation/gdb-port/tests/unit/hammer-breakpoints.py" -ex "source perf-instrumentation/gdb-port/tests/unit/ast.py" -ex "source perf-instrumentation/gdb-port/tests/run_unittest_main.py" --args pdf t/000143.pdf
+gdb \
+-ex "set pagination off" \
+-ex "set python print-stack full" -ex "source perf-instrumentation/gdb-port/parser.py" -ex "source perf-instrumentation/gdb-port/utility-commands.py" -ex "source perf-instrumentation/gdb-port/commands.py" -ex "source perf-instrumentation/gdb-port/hammer-breakpoints.py" -ex "source perf-instrumentation/gdb-port/ast.py" -ex "source perf-instrumentation/gdb-port/breakpoint-manager.py" -ex "source perf-instrumentation/gdb-port/top-level-parse.py" -ex "hammer-parse-stop-at-pos 50" -ex "source perf-instrumentation/gdb-port/parser-type-instrumentation-gdb.py" -ex "source perf-instrumentation/gdb-port/parser-name-instrumentation-gdb.py" -ex "source perf-instrumentation/gdb-port/tests/unit/top-level-parse.py" -ex "source perf-instrumentation/gdb-port/tests/unit/breakpoint-manager.py" -ex "source perf-instrumentation/gdb-port/tests/unit/hammer-breakpoints.py" -ex "source perf-instrumentation/gdb-port/tests/unit/ast.py" -ex "source perf-instrumentation/gdb-port/tests/run_unittest_main.py" --args pdf t/000143.pdf
diff --git a/gdb-port/top-level-parse.py b/gdb-port/top-level-parse.py
index 29beb5f..96db1d3 100644
--- a/gdb-port/top-level-parse.py
+++ b/gdb-port/top-level-parse.py
@@ -337,12 +337,7 @@ class TopLevelParse:
if w == 0:
print("all tokens passed to display are zero-width")
return
- try:
- tokenmap_val_list = [dict(token, addr=hex(key)) for key, token in self.input_token_map.items() if (token['start'] >= start and token['start'] <= end)]
- except TypeError as te:
- print("DEBUG: problem token in print_input_chunk()")
- print(self.input_token_map)
- raise te
+ tokenmap_val_list = [dict(token, addr=hex(key)) for key, token in self.input_token_map.items() if (token['start'] >= start and token['start'] <= end)]
numrows = min(rows, len(tokenmap_val_list))
h = numrows
charbuf_dynamic = []
--
GitLab