mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-03 09:49:23 +02:00
Merge remote-tracking branch 'origin/GP-5270_d-millar_eng_options--SQUASHED'
This commit is contained in:
commit
6d65367390
3 changed files with 18 additions and 17 deletions
|
@ -21,6 +21,7 @@
|
||||||
::@env OPT_CREATE_FLAGS:int="1" "Create flags" "Creation flags"
|
::@env OPT_CREATE_FLAGS:int="1" "Create flags" "Creation flags"
|
||||||
::@env OPT_CREATE_ENGFLAGS:int="0" "Create flags (Engine)" "Engine-specific creation flags"
|
::@env OPT_CREATE_ENGFLAGS:int="0" "Create flags (Engine)" "Engine-specific creation flags"
|
||||||
::@env OPT_VERIFIER_FLAGS:int="0" "Verifier flags" "Verifier flags"
|
::@env OPT_VERIFIER_FLAGS:int="0" "Verifier flags" "Verifier flags"
|
||||||
|
::@env OPT_ENG_OPTIONS:int="0x20" "Engine options" "Options for AddEngineOptions (e.g. INITIAL_BREAK=0x20)"
|
||||||
|
|
||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
## ###
|
## ###
|
||||||
# IP: GHIDRA
|
# IP: GHIDRA
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
# You may obtain a copy of the License at
|
# You may obtain a copy of the License at
|
||||||
#
|
#
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
#
|
#
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
##
|
##
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
@ -57,7 +57,8 @@ def main():
|
||||||
os.getenv('OPT_TARGET_ENV'),
|
os.getenv('OPT_TARGET_ENV'),
|
||||||
os.getenv('OPT_CREATE_FLAGS'),
|
os.getenv('OPT_CREATE_FLAGS'),
|
||||||
os.getenv('OPT_CREATE_ENGFLAGS'),
|
os.getenv('OPT_CREATE_ENGFLAGS'),
|
||||||
os.getenv('OPT_VERIFIER_FLAGS'),
|
os.getenv('OPT_VERIFIER_FLAGS'),
|
||||||
|
os.getenv('OPT_ENG_OPTIONS'),
|
||||||
start_trace=False)
|
start_trace=False)
|
||||||
|
|
||||||
# TODO: HACK
|
# TODO: HACK
|
||||||
|
|
|
@ -270,7 +270,7 @@ def ghidra_trace_create(command=None, initial_break=True, timeout=DbgEng.WAIT_IN
|
||||||
|
|
||||||
|
|
||||||
@util.dbg.eng_thread
|
@util.dbg.eng_thread
|
||||||
def ghidra_trace_create_ext(command=None, initialDirectory='.', envVariables="\0\0", create_flags=1, create_flags_eng=0, verifier_flags=0, initial_break=True, timeout=DbgEng.WAIT_INFINITE, start_trace=True):
|
def ghidra_trace_create_ext(command=None, initialDirectory='.', envVariables="\0\0", create_flags=1, create_flags_eng=0, verifier_flags=0, engine_options=0x20, timeout=DbgEng.WAIT_INFINITE, start_trace=True):
|
||||||
"""
|
"""
|
||||||
Create a session.
|
Create a session.
|
||||||
"""
|
"""
|
||||||
|
@ -295,8 +295,7 @@ def ghidra_trace_create_ext(command=None, initialDirectory='.', envVariables="\0
|
||||||
if envVariables is not None and envVariables.endswith("/0/0") is False:
|
if envVariables is not None and envVariables.endswith("/0/0") is False:
|
||||||
envVariables += "/0/0"
|
envVariables += "/0/0"
|
||||||
dbg._client.CreateProcess2(command, options, initialDirectory, envVariables)
|
dbg._client.CreateProcess2(command, options, initialDirectory, envVariables)
|
||||||
if initial_break:
|
dbg._control.AddEngineOptions(int(engine_options))
|
||||||
dbg._control.AddEngineOptions(DbgEng.DEBUG_ENGINITIAL_BREAK)
|
|
||||||
if start_trace:
|
if start_trace:
|
||||||
ghidra_trace_start(command)
|
ghidra_trace_start(command)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue