mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 17:59:46 +02:00
Merge branch 'GP-0_ryanmkurtz_PR-8117_MTAwsl_lldb-arg-bug'
This commit is contained in:
commit
eaf6c42a7e
3 changed files with 11 additions and 11 deletions
|
@ -56,14 +56,14 @@ if [ -z "$target_args" ]
|
||||||
then
|
then
|
||||||
argspart=
|
argspart=
|
||||||
else
|
else
|
||||||
argspart=-o "settings set target.run-args $target_args"
|
argspart=("-o" "settings set target.run-args $target_args")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$OPT_ARCH" ]
|
if [ -z "$OPT_ARCH" ]
|
||||||
then
|
then
|
||||||
archcmd=
|
archcmd=
|
||||||
else
|
else
|
||||||
archcmd=-o "settings set target.default-arch $OPT_ARCH"
|
archcmd=("-o" "settings set target.default-arch $OPT_ARCH")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"$OPT_LLDB_PATH" \
|
"$OPT_LLDB_PATH" \
|
||||||
|
@ -71,9 +71,9 @@ fi
|
||||||
-o "script import ghidralldb" \
|
-o "script import ghidralldb" \
|
||||||
-o "platform select remote-android" \
|
-o "platform select remote-android" \
|
||||||
-o "platform connect connect://$OPT_HOST:$OPT_PORT" \
|
-o "platform connect connect://$OPT_HOST:$OPT_PORT" \
|
||||||
$archcmd \
|
"${archcmd[@]}" \
|
||||||
-o "target create \"$target_image\"" \
|
-o "target create \"$target_image\"" \
|
||||||
$argspart \
|
"${argspart[@]}" \
|
||||||
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
||||||
-o "ghidra trace start" \
|
-o "ghidra trace start" \
|
||||||
-o "ghidra trace sync-enable" \
|
-o "ghidra trace sync-enable" \
|
||||||
|
|
|
@ -46,13 +46,13 @@ if [ -z "$OPT_ARCH" ]
|
||||||
then
|
then
|
||||||
archcmd=
|
archcmd=
|
||||||
else
|
else
|
||||||
archcmd=-o "settings set target.default-arch $OPT_ARCH"
|
archcmd=("-o" "settings set target.default-arch $OPT_ARCH")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"$OPT_LLDB_PATH" \
|
"$OPT_LLDB_PATH" \
|
||||||
-o "version" \
|
-o "version" \
|
||||||
-o "script import ghidralldb" \
|
-o "script import ghidralldb" \
|
||||||
$archcmd \
|
"${archcmd[@]}" \
|
||||||
-o "kdp-remote $OPT_HOST" \
|
-o "kdp-remote $OPT_HOST" \
|
||||||
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
||||||
-o "ghidra trace start" \
|
-o "ghidra trace start" \
|
||||||
|
|
|
@ -55,14 +55,14 @@ if [ -z "$target_args" ]
|
||||||
then
|
then
|
||||||
argspart=
|
argspart=
|
||||||
else
|
else
|
||||||
argspart=-o "settings set target.run-args $target_args"
|
argspart=("-o" "settings set target.run-args $target_args")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$TARGET_TTY" ]
|
if [ -z "$TARGET_TTY" ]
|
||||||
then
|
then
|
||||||
ttypart=
|
ttypart=
|
||||||
else
|
else
|
||||||
ttypart=-o "settings set target.output-path $TTY_TARGET" -o "settings set target.input-path $TTY_TARGET"
|
ttypart=("-o" "settings set target.output-path $TTY_TARGET" "-o" "settings set target.input-path $TTY_TARGET")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$target_image" ]
|
if [ -z "$target_image" ]
|
||||||
|
@ -70,7 +70,7 @@ then
|
||||||
"$OPT_LLDB_PATH" \
|
"$OPT_LLDB_PATH" \
|
||||||
-o "version" \
|
-o "version" \
|
||||||
-o "script import ghidralldb" \
|
-o "script import ghidralldb" \
|
||||||
$ttypart \
|
"${ttypart[@]}" \
|
||||||
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
||||||
-o "ghidra trace start" \
|
-o "ghidra trace start" \
|
||||||
-o "ghidra trace sync-enable"
|
-o "ghidra trace sync-enable"
|
||||||
|
@ -79,8 +79,8 @@ else
|
||||||
-o "version" \
|
-o "version" \
|
||||||
-o "script import ghidralldb" \
|
-o "script import ghidralldb" \
|
||||||
-o "target create \"$target_image\"" \
|
-o "target create \"$target_image\"" \
|
||||||
$argspart \
|
"${argspart[@]}" \
|
||||||
$ttypart \
|
"${ttypart[@]}" \
|
||||||
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
-o "ghidra trace connect \"$GHIDRA_TRACE_RMI_ADDR\"" \
|
||||||
-o "ghidra trace start" \
|
-o "ghidra trace start" \
|
||||||
-o "ghidra trace sync-enable" \
|
-o "ghidra trace sync-enable" \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue