Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 06:12:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated remote vm debug command-line options

Browse Source
This commit is contained in:
dragonmacher
2021-03-23 13:45:33 -04:00
parent 1b36a099f4
commit ca2a6bbb0a
5 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/RuntimeScripts/Linux/support/launch.sh
+2 -4
View File
@@ -152,11 +152,9 @@ if [ "${MODE}" = "debug" ] || [ "${MODE}" = "debug-suspend" ]; then
SUSPEND=y SUSPEND=y
fi fi
VMARG_LIST+=" -Xdebug"
VMARG_LIST+=" -Xnoagent"
VMARG_LIST+=" -Djava.compiler=NONE"
VMARG_LIST+=" -Dlog4j.configuration=\"${DEBUG_LOG4J}\"" VMARG_LIST+=" -Dlog4j.configuration=\"${DEBUG_LOG4J}\""
VMARG_LIST+=" -Xrunjdwp:transport=dt_socket,server=y,suspend=${SUSPEND},address=${DEBUG_ADDRESS}" VMARG_LIST+=" -agentlib:jdwp=transport=dt_socket,server=y,suspend=${SUSPEND},address=${DEBUG_ADDRESS}"
elif [ "${MODE}" = "fg" ]; then elif [ "${MODE}" = "fg" ]; then
: :
Ghidra/RuntimeScripts/Windows/server/ghidraSvr.bat
+1 -1
View File
@@ -123,7 +123,7 @@ if "%JAVA_HOME%" == "" (
rem reestablish JAVA path based upon final JAVA_HOME rem reestablish JAVA path based upon final JAVA_HOME
set "JAVA=%JAVA_HOME%\bin\java.exe" set "JAVA=%JAVA_HOME%\bin\java.exe"
:: set DEBUG=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=*:18888 :: set DEBUG=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:18888
if "%OPTION%"=="console" ( if "%OPTION%"=="console" (
start "%APP_LONG_NAME%" "%JAVA%" %DEBUG% -jar "%WRAPPER_HOME%/wrapper.jar" -c "%WRAPPER_CONF%" start "%APP_LONG_NAME%" "%JAVA%" %DEBUG% -jar "%WRAPPER_HOME%/wrapper.jar" -c "%WRAPPER_CONF%"
Ghidra/RuntimeScripts/Windows/support/launch.bat
+1 -4
View File
@@ -136,11 +136,8 @@ if "%DEBUG%"=="y" (
set DEBUG_ADDRESS=127.0.0.1:18001 set DEBUG_ADDRESS=127.0.0.1:18001
) )
set VMARG_LIST=!VMARG_LIST! -Xdebug
set VMARG_LIST=!VMARG_LIST! -Xnoagent
set VMARG_LIST=!VMARG_LIST! -Djava.compiler=NONE
set VMARG_LIST=!VMARG_LIST! -Dlog4j.configuration="!DEBUG_LOG4J!" set VMARG_LIST=!VMARG_LIST! -Dlog4j.configuration="!DEBUG_LOG4J!"
set VMARG_LIST=!VMARG_LIST! -Xrunjdwp:transport=dt_socket,server=y,suspend=!SUSPEND!,address=!DEBUG_ADDRESS! set VMARG_LIST=!VMARG_LIST! -agentlib:jdwp=transport=dt_socket,server=y,suspend=!SUSPEND!,address=!DEBUG_ADDRESS!
goto continue3 goto continue3
) )
gradle/javaTestProject.gradle
+12 -4
View File
@@ -179,10 +179,18 @@ def initTestJVM(Task task, String rootDirName) {
'-Djdk.attach.allowAttachSelf', '-Djdk.attach.allowAttachSelf',
'-javaagent:' + jmockitPath, '-javaagent:' + jmockitPath,
'-DLock.DEBUG=true', '-DLock.DEBUG=true',
'-Xdebug', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort
'-Xnoagent',
'-Djava.compiler=NONE',
'-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=' + debugPort // Note: modern remote debug invocation;
// -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
//
// We removed these lines, which should not be needed in modern JVMs
// -Xdebug
// -Xnoagent
// -Djava.compiler=NONE
// -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000
} }
} }
/********************************************************************************* /*********************************************************************************
gradle/root/test.gradle
+12 -4
View File
@@ -347,10 +347,18 @@ def initTestJVM(Task task, String rootDirName) {
'-Djdk.attach.allowAttachSelf', '-Djdk.attach.allowAttachSelf',
'-javaagent:' + jmockitPath, '-javaagent:' + jmockitPath,
'-DLock.DEBUG=true', '-DLock.DEBUG=true',
'-Xdebug', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=' + debugPort
'-Xnoagent',
'-Djava.compiler=NONE',
'-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=' + debugPort // Note: modern remote debug invocation;
// -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
//
// We removed these lines, which should not be needed in modern JVMs
// -Xdebug
// -Xnoagent
// -Djava.compiler=NONE
// -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000
} }
} }