Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 03:26:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-5347: fix for spaces

Browse Source 
GP-5347: fix for no args
GP-5347: typo
GP-5347: fix for lldb bat
This commit is contained in:
d-millar
2025-02-10 15:06:37 -05:00
parent cd15acddf7
commit 98da75584e
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/local-lldb.bat
+22 -13
View File
@@ -17,39 +17,48 @@
::@env OPT_START_CMD:StartCmd="process launch" "Run command" "The lldb command to actually run the target." ::@env OPT_START_CMD:StartCmd="process launch" "Run command" "The lldb command to actually run the target."
@echo off @echo off
set PYTHONPATH0=%GHIDRA_HOME%\Ghidra\Debug\Debugger-agent-gdb\pypkg\src set PYTHONPATH0=%GHIDRA_HOME%\Ghidra\Debug\Debugger-agent-lldb\pypkg\src
set PYTHONPATH1=%GHIDRA_HOME%\Ghidra\Debug\Debugger-rmi-trace\pypkg\src set PYTHONPATH1=%GHIDRA_HOME%\Ghidra\Debug\Debugger-rmi-trace\pypkg\src
IF EXIST %GHIDRA_HOME%\.git ( IF EXIST %GHIDRA_HOME%\.git (
set PYTHONPATH0=%GHIDRA_HOME%\Ghidra\Debug\Debugger-agent-gdb\build\pypkg\src set PYTHONPATH0=%GHIDRA_HOME%\Ghidra\Debug\Debugger-agent-lldb\build\pypkg\src
set PYTHONPATH1=%GHIDRA_HOME%\Ghidra\Debug\Debugger-rmi-trace\build\pypkg\src set PYTHONPATH1=%GHIDRA_HOME%\Ghidra\Debug\Debugger-rmi-trace\build\pypkg\src
) )
IF EXIST %GHIDRA_HOME%\ghidra\.git ( IF EXIST %GHIDRA_HOME%\ghidra\.git (
set PYTHONPATH0=%GHIDRA_HOME%\ghidra\Ghidra\Debug\Debugger-agent-gdb\build\pypkg\src set PYTHONPATH0=%GHIDRA_HOME%\ghidra\Ghidra\Debug\Debugger-agent-lldb\build\pypkg\src
set PYTHONPATH1=%GHIDRA_HOME%\ghidra\Ghidra\Debug\Debugger-rmi-trace\build\pypkg\src set PYTHONPATH1=%GHIDRA_HOME%\ghidra\Ghidra\Debug\Debugger-rmi-trace\build\pypkg\src
) )
set PYTHONPATH=%PYTHONPATH1%;%PYTHONPATH0%;%PYTHONPATH% set PYTHONPATH=%PYTHONPATH1%;%PYTHONPATH0%;%PYTHONPATH%
set target_image=%1 set target_image=%1
shift shift
set target_args=%* set target_args=<%*
IF DEFINED target_args ( IF '%target_image%'=="" (
argspart=-o "settings set target.run-args %target_args%"
)
IF "%target_image%"=="" (
"%OPT_LLDB_PATH%" ^ "%OPT_LLDB_PATH%" ^
-o "version" ^ -o "version" ^
-o "script import ghidralldb" ^ -o "script import ghidralldb" ^
-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"
) ELSE ( )
IF NOT '%target_image%'=="" IF "%target_args%"=="" (
"%OPT_LLDB_PATH%" ^ "%OPT_LLDB_PATH%" ^
-o "version" ^ -o "version" ^
-o "script import ghidralldb" ^ -o "script import ghidralldb" ^
-o "target create %target_image%" ^ -o "target create "%target_image%"" ^
%argspart% ^ -o "ghidra trace connect %GHIDRA_TRACE_RMI_ADDR%" ^
-o "ghidra trace start" ^
-o "ghidra trace sync-enable" ^
-o "%OPT_START_CMD%"
)
IF NOT '%target_image%'=="" IF NOT "%target_args%"=="" (
"%OPT_LLDB_PATH%" ^
-o "version" ^
-o "script import ghidralldb" ^
-o "target create "%target_image%"" ^
-o "settings set target.run-args %target_args%" ^
-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" ^
Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/arch.py
+5 -3
View File
@@ -132,9 +132,8 @@ default_compiler_map = {
'macosx': 'gcc', 'macosx': 'gcc',
'tvos': 'gcc', 'tvos': 'gcc',
'watchos': 'gcc', 'watchos': 'gcc',
'windows': 'Visual Studio', 'windows': 'windows',
# This may seem wrong, but Ghidra cspecs really describe the ABI 'Cygwin': 'windows',
'Cygwin': 'Visual Studio',
'default': 'default', 'default': 'default',
'unknown': 'default', 'unknown': 'default',
} }
@@ -206,6 +205,9 @@ def compute_ghidra_language():
# through them by endian and probably prefer default/simpler variants. The # through them by endian and probably prefer default/simpler variants. The
# heuristic for "simpler" will be 'default' then shortest variant id. # heuristic for "simpler" will be 'default' then shortest variant id.
arch = get_arch() arch = get_arch()
osabi = get_osabi()
if osabi == 'windows' and arch == 'i386':
arch = 'x86_64'
endian = get_endian() endian = get_endian()
lebe = ':BE:' if endian == 'big' else ':LE:' lebe = ':BE:' if endian == 'big' else ':LE:'
if not arch in language_map: if not arch in language_map: