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

Merge remote-tracking branch 'origin/GP-6629-dragonmacher-decompiler-snapshot-cache-patch' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-13 19:12:21 -04:00
parent 3b831d9a04 a3e13d50ae
commit 07f7e455a8
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerController.java
+8
View File
@@ -207,6 +207,14 @@ public class DecompilerController {
decompilerMgr.resetDecompiler(); decompilerMgr.resetDecompiler();
} }
/**
* Adds the given data to the cache. Meant for internal use only.
* @param data the data
*/
public void addToCache(DecompileData data) {
updateCache(data);
}
//================================================================================================== //==================================================================================================
// Methods call by the DecompilerManager // Methods call by the DecompilerManager
//================================================================================================== //==================================================================================================
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerProvider.java
+5 -3
View File
@@ -725,11 +725,13 @@ public class DecompilerProvider extends NavigatableComponentProviderAdapter
ViewerPosition myViewPosition = controller.getDecompilerPanel().getViewerPosition(); ViewerPosition myViewPosition = controller.getDecompilerPanel().getViewerPosition();
newProvider.doSetProgram(program); newProvider.doSetProgram(program);
// Any change in the HighlightTokens should be delivered to the new panel // initialize the new provider's cache and then set the location
DecompilerPanel myPanel = getDecompilerPanel(); DecompileData myDecompileData = controller.getDecompileData();
newProvider.setLocation(currentLocation, myPanel.getViewerPosition()); newProvider.controller.addToCache(myDecompileData);
newProvider.setLocation(currentLocation, myViewPosition);
// transfer any state after the new decompiler is initialized // transfer any state after the new decompiler is initialized
DecompilerPanel myPanel = getDecompilerPanel();
DecompilerPanel newPanel = newProvider.getDecompilerPanel(); DecompilerPanel newPanel = newProvider.getDecompilerPanel();
newProvider.doWhenNotBusy(() -> { newProvider.doWhenNotBusy(() -> {
newPanel.setViewerPosition(myViewPosition); newPanel.setViewerPosition(myViewPosition);