mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-03-14 12:53:10 -04:00
parent 85732bd6e0 26d3a2bc79
commit 86b7d45ba8
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java
View File

@@ -34,6 +34,7 @@ import javax.swing.tree.*;
import org.junit.Assert; import org.junit.Assert;
import ghidra.framework.ApplicationConfiguration;
import ghidra.util.*; import ghidra.util.*;
import ghidra.util.datastruct.WeakSet; import ghidra.util.datastruct.WeakSet;
import ghidra.util.exception.AssertException; import ghidra.util.exception.AssertException;
@@ -48,6 +49,18 @@ import utility.function.ExceptionalCallback;
* should use AbstractGenericTest instead * should use AbstractGenericTest instead
*/ */
public class AbstractGuiTest extends AbstractGenericTest { public class AbstractGuiTest extends AbstractGenericTest {
@Override
protected ApplicationConfiguration createApplicationConfiguration() {
// A simple way to signal that Gui tests are not headless
return new ApplicationConfiguration() {
@Override
public boolean isHeadless() {
return false;
}
};
}
/** /**
* Gets all windows in the system (including Frames). * Gets all windows in the system (including Frames).
* *

3
Ghidra/Processors/PowerPC/data/languages/ppc_instructions.sinc
View File

@@ -2285,7 +2285,8 @@ define pcodeop lswxOp;
#lwax r0,r2,r0 0x7c 02 02 aa #lwax r0,r2,r0 0x7c 02 02 aa
:lwax D,RA_OR_ZERO,B is OP=31 & D & RA_OR_ZERO & B & XOP_1_10=341 & BIT_0=0 :lwax D,RA_OR_ZERO,B is OP=31 & D & RA_OR_ZERO & B & XOP_1_10=341 & BIT_0=0
{ {
D = sext(*:4(RA_OR_ZERO)); ea:$(REGISTER_SIZE) = RA_OR_ZERO+B;
D = sext(*:4(ea));
} }
@endif @endif