From eb33b3994d06de418222e664cb1c17369436e93c Mon Sep 17 00:00:00 2001 From: "Kinney, Michael D" Date: Tue, 2 Apr 2019 13:09:09 -0700 Subject: EmulatorPkg/Unix: Rename GdbRun to GdbRun.sh https://bugzilla.tianocore.org/show_bug.cgi?id=1657 Add .sh file extension to the shell script GdbRun so changes to this file will pass PatchCheck.py. Also update all scripts that execute GdbRun to execute GdbRun.sh instead. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Jordan Justen --- EmulatorPkg/Unix/GdbRun | 73 ---------------------- EmulatorPkg/Unix/GdbRun.sh | 73 ++++++++++++++++++++++ EmulatorPkg/Unix/Host/Host.c | 2 +- .../xcode_project.xcodeproj/default.pbxuser | 2 +- .../xcode_project.xcodeproj/default.pbxuser | 2 +- EmulatorPkg/build.sh | 2 +- 6 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 EmulatorPkg/Unix/GdbRun create mode 100644 EmulatorPkg/Unix/GdbRun.sh (limited to 'EmulatorPkg') diff --git a/EmulatorPkg/Unix/GdbRun b/EmulatorPkg/Unix/GdbRun deleted file mode 100644 index 8c761ff2c9..0000000000 --- a/EmulatorPkg/Unix/GdbRun +++ /dev/null @@ -1,73 +0,0 @@ -## @file -# GDB startup script -# -# Copyright (c) 2011, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -# -# Gdb will set $_exitcode when the program exits. Pre-init it to an unlikely -# return value. -# -set $_exitcode = 42 - -# -# Gdb will call hook-stop on each break. Check to see if $_exitcode was -# changed from the value we pre-initialized it to. If so, the program -# had exited, so gdb should now quit. -# -define hook-stop - if $_exitcode != 42 - quit - else - source Host.gdb - end -end - -# -# We keep track of the number of symbol files we have loaded via gdb -# scripts in the $SymbolFilesAdded variable -# -set $SymbolFileChangesCount = 0 - -# -# This macro adds a symbols file for gdb -# -# @param $arg0 - Symbol file changes number -# @param $arg1 - Symbol file name -# @param $arg2 - Image address -# -define AddFirmwareSymbolFile - if $SymbolFileChangesCount < $arg0 - add-symbol-file $arg1 $arg2 - set $SymbolFileChangesCount = $arg0 - end -end - -# -# This macro removes a symbols file for gdb -# -# @param $arg0 - Symbol file changes number -# @param $arg1 - Symbol file name -# -define RemoveFirmwareSymbolFile - if $SymbolFileChangesCount < $arg0 - # - # Currently there is not a method to remove a single symbol file - # - set $SymbolFileChangesCount = $arg0 - end -end - -if gInXcode == 1 - # in Xcode the program is already runing. Issuing a run command - # will cause a fatal debugger error. The break point sciprt that - # is used to source this script sets gInCode to 1. -else - # - # Start the program running - # - run -end diff --git a/EmulatorPkg/Unix/GdbRun.sh b/EmulatorPkg/Unix/GdbRun.sh new file mode 100644 index 0000000000..8c761ff2c9 --- /dev/null +++ b/EmulatorPkg/Unix/GdbRun.sh @@ -0,0 +1,73 @@ +## @file +# GDB startup script +# +# Copyright (c) 2011, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +# +# Gdb will set $_exitcode when the program exits. Pre-init it to an unlikely +# return value. +# +set $_exitcode = 42 + +# +# Gdb will call hook-stop on each break. Check to see if $_exitcode was +# changed from the value we pre-initialized it to. If so, the program +# had exited, so gdb should now quit. +# +define hook-stop + if $_exitcode != 42 + quit + else + source Host.gdb + end +end + +# +# We keep track of the number of symbol files we have loaded via gdb +# scripts in the $SymbolFilesAdded variable +# +set $SymbolFileChangesCount = 0 + +# +# This macro adds a symbols file for gdb +# +# @param $arg0 - Symbol file changes number +# @param $arg1 - Symbol file name +# @param $arg2 - Image address +# +define AddFirmwareSymbolFile + if $SymbolFileChangesCount < $arg0 + add-symbol-file $arg1 $arg2 + set $SymbolFileChangesCount = $arg0 + end +end + +# +# This macro removes a symbols file for gdb +# +# @param $arg0 - Symbol file changes number +# @param $arg1 - Symbol file name +# +define RemoveFirmwareSymbolFile + if $SymbolFileChangesCount < $arg0 + # + # Currently there is not a method to remove a single symbol file + # + set $SymbolFileChangesCount = $arg0 + end +end + +if gInXcode == 1 + # in Xcode the program is already runing. Issuing a run command + # will cause a fatal debugger error. The break point sciprt that + # is used to source this script sets gInCode to 1. +else + # + # Start the program running + # + run +end diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c index 0755f69d4d..febfb1f44c 100644 --- a/EmulatorPkg/Unix/Host/Host.c +++ b/EmulatorPkg/Unix/Host/Host.c @@ -113,7 +113,7 @@ main ( // // Xcode does not support sourcing gdb scripts directly, so the Xcode XML - // has a break point script to source the GdbRun script. + // has a break point script to source the GdbRun.sh script. // SecGdbConfigBreak (); diff --git a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser index 85913859c3..7c13f047d2 100644 --- a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser +++ b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser @@ -180,7 +180,7 @@ }; BA11A11E0FB10E2200D06FEC /* XCBreakpointCommandAction */ = { isa = XCBreakpointCommandAction; - command = "set gInXcode=1\nsource ../../../../EmulatorPkg/Unix/GdbRun"; + command = "set gInXcode=1\nsource ../../../../EmulatorPkg/Unix/GdbRun.sh"; fallbackIsa = XCBreakpointAction; logCommand = 0; useDebuggerSideImplementation = 1; diff --git a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser index 7e7ce697af..d8bd924660 100644 --- a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser +++ b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser @@ -180,7 +180,7 @@ }; BA11A11E0FB10E2200D06FEC /* XCBreakpointCommandAction */ = { isa = XCBreakpointCommandAction; - command = "set gInXcode=1\nsource ../../../../EmulatorPkg/Unix/GdbRun"; + command = "set gInXcode=1\nsource ../../../../EmulatorPkg/Unix/GdbRun.sh"; fallbackIsa = XCBreakpointAction; logCommand = 0; useDebuggerSideImplementation = 1; diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh index 89fd26baca..558b65e88b 100755 --- a/EmulatorPkg/build.sh +++ b/EmulatorPkg/build.sh @@ -227,7 +227,7 @@ if [[ "$RUN_EMULATOR" == "yes" ]]; then ;; esac - /usr/bin/gdb $BUILD_ROOT_ARCH/Host -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun + /usr/bin/gdb $BUILD_ROOT_ARCH/Host -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun.sh exit fi -- cgit v1.2.3