mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-21 11:31:43 +00:00
Merge remote-tracking branch 'origin/patch'
This commit is contained in:
commit
329f8b4a19
@ -10,8 +10,8 @@
|
|||||||
::@icon icon.debugger
|
::@icon icon.debugger
|
||||||
::@help TraceRmiLauncherServicePlugin#dbgeng_attach
|
::@help TraceRmiLauncherServicePlugin#dbgeng_attach
|
||||||
::@env OPT_PYTHON_EXE:file!="python" "Python command" "The path to the Python 3 interpreter. Omit the full path to resolve using the system PATH."
|
::@env OPT_PYTHON_EXE:file!="python" "Python command" "The path to the Python 3 interpreter. Omit the full path to resolve using the system PATH."
|
||||||
::@env OPT_TARGET_PID:int="" "Process id" "The target process id"
|
::@env OPT_TARGET_PID:int=0 "Process id" "The target process id"
|
||||||
::@env OPT_ATTACH_FLAGS:int="0" "Attach flags" "Attach flags"
|
::@env OPT_ATTACH_FLAGS:int=0 "Attach flags" "Attach flags"
|
||||||
::@env OPT_USE_DBGMODEL:bool=true "Use dbgmodel" "Load and use dbgmodel.dll if it is available."
|
::@env OPT_USE_DBGMODEL:bool=true "Use dbgmodel" "Load and use dbgmodel.dll if it is available."
|
||||||
::@env WINDBG_DIR:dir="" "Path to dbgeng.dll directory" "Path containing dbgeng and associated DLLS (if not Windows Kits)."
|
::@env WINDBG_DIR:dir="" "Path to dbgeng.dll directory" "Path containing dbgeng and associated DLLS (if not Windows Kits)."
|
||||||
|
|
||||||
|
@ -208,16 +208,11 @@ class DefaultMemoryMapper(object):
|
|||||||
self.defaultSpace = defaultSpace
|
self.defaultSpace = defaultSpace
|
||||||
|
|
||||||
def map(self, proc: int, offset: int):
|
def map(self, proc: int, offset: int):
|
||||||
if proc == 0:
|
space = self.defaultSpace
|
||||||
space = self.defaultSpace
|
|
||||||
else:
|
|
||||||
space = f'{self.defaultSpace}{proc}'
|
|
||||||
return self.defaultSpace, Address(space, offset)
|
return self.defaultSpace, Address(space, offset)
|
||||||
|
|
||||||
def map_back(self, proc: int, address: Address) -> int:
|
def map_back(self, proc: int, address: Address) -> int:
|
||||||
if address.space == self.defaultSpace and proc == 0:
|
if address.space == self.defaultSpace:
|
||||||
return address.offset
|
|
||||||
if address.space == f'{self.defaultSpace}{proc}':
|
|
||||||
return address.offset
|
return address.offset
|
||||||
raise ValueError(f"Address {address} is not in process {proc}")
|
raise ValueError(f"Address {address} is not in process {proc}")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user