diff --git a/gdb-port/startup_scripts/shell_with_exit.sh b/gdb-port/startup_scripts/shell_with_exit.sh index 4bd4e6e677997f9c6d935209c4af6fd1ac051ffe..f6d1bc89514c86638cb388a18762c6132c853edd 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 a7572a6f7d2fbe49b9ea559bb381647e910160fe..0b40aab47ffaa1eb7e5ac8994fa9fedb342eac37 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 29beb5feca43cbe8a339fd3d55c6475205cd4da0..96db1d349ee97b913c6cda44ec89d035a419ffb0 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 = []