From 18b1d5b6a1b502230459e2e101f8b7e841a19503 Mon Sep 17 00:00:00 2001 From: ghidorahrex Date: Mon, 11 Mar 2024 15:50:45 +0000 Subject: [PATCH 1/2] GP-4419: Fixed pcode for ppc lwax instruction --- Ghidra/Processors/PowerPC/data/languages/ppc_instructions.sinc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Ghidra/Processors/PowerPC/data/languages/ppc_instructions.sinc b/Ghidra/Processors/PowerPC/data/languages/ppc_instructions.sinc index 4b1e5e1a05..bc731d6b29 100644 --- a/Ghidra/Processors/PowerPC/data/languages/ppc_instructions.sinc +++ b/Ghidra/Processors/PowerPC/data/languages/ppc_instructions.sinc @@ -2285,7 +2285,8 @@ define pcodeop lswxOp; #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 { - D = sext(*:4(RA_OR_ZERO)); + ea:$(REGISTER_SIZE) = RA_OR_ZERO+B; + D = sext(*:4(ea)); } @endif From 59e103ec2cdf14b5c07299aa4e39a7f3442fb5f4 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:42:09 -0400 Subject: [PATCH 2/2] Test fixes --- .../src/main/java/generic/test/AbstractGuiTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java b/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java index 2e7bc58151..883986df6d 100644 --- a/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java +++ b/Ghidra/Framework/Gui/src/main/java/generic/test/AbstractGuiTest.java @@ -34,6 +34,7 @@ import javax.swing.tree.*; import org.junit.Assert; +import ghidra.framework.ApplicationConfiguration; import ghidra.util.*; import ghidra.util.datastruct.WeakSet; import ghidra.util.exception.AssertException; @@ -48,6 +49,18 @@ import utility.function.ExceptionalCallback; * should use AbstractGenericTest instead */ 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). *