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

Merge branch

Browse Source 
'GP-6049_ghidorahrex_PR-8424_p1pkin_powerpc_branch_conditionals_fix_2'
into Ghidra_12.0 (Closes #8424)
This commit is contained in:
Ryan Kurtz
2025-11-20 12:40:33 -05:00
parent 5b1f67f360 22a5a22d82
commit 44eb432e86
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Processors/PowerPC/data/languages/ppc_common.sinc
View File

@@ -1862,8 +1862,8 @@ TOm: "" is TO { }
CTR_DEC: "z" is BO_3=1 {CTR = CTR-1; tmp:1 = (CTR == 0); export tmp; }
CTR_DEC: "nz" is BO_3=0 {CTR = CTR-1; tmp:1 = (CTR != 0); export tmp; }
CC_TF: "t" is BO_1=1 {}
CC_TF: "f" is BO_1=0 {}
CC_TF: "t" is BO_1=1 { tmp:1 = 1; export tmp; }
CC_TF: "f" is BO_1=0 { tmp:1 = 0; export tmp; }
# OP=19 & CC_D_OP & CC_OP & CC_B_OP & CR_D & CR_D_CC & XOP_1_10=129 & BIT_0=0

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

@@ -438,7 +438,7 @@
#bdnzf 4*cr2+eq,LAB_0000 0x40 0a 00 00
:bd^CTR_DEC^CC_TF^REL_ABS CC_OP,addressBD is $(NOTVLE) & OP=16 & CC_TF & REL_ABS & CTR_DEC & CC_OP & addressBD & BO_0=0 & BO_2=0 & LK=0
{
if (CTR_DEC && CC_OP) goto addressBD;
if (CTR_DEC && (CC_OP == CC_TF)) goto addressBD;
}
#bdzfl lt,FUN_0000 0x40 00 00 01
@@ -447,7 +447,7 @@
[ linkreg=0; globalset(inst_start,linkreg); ]
{
LR = inst_next;
if (!(CTR_DEC && CC_OP)) goto inst_next;
if (!(CTR_DEC && (CC_OP == CC_TF))) goto inst_next;
call addressBD;
}
@@ -688,7 +688,7 @@
:bd^CTR_DEC^CC_TF^"lr" CC_OP is $(NOTVLE) & OP=19 & CC_TF & CTR_DEC & CC_OP & BO_0=0 & BO_2=0 & BH=0 & LK=0 & BITS_13_15=0 & XOP_1_10=16
[ linkreg=0; globalset(inst_start,linkreg); ]
{
if (!(CTR_DEC && CC_OP)) goto inst_next;
if (!(CTR_DEC && (CC_OP == CC_TF))) goto inst_next;
goto [LR];
}
@@ -697,7 +697,7 @@
:bd^CTR_DEC^CC_TF^"lr" CC_OP,BH is $(NOTVLE) & OP=19 & CC_TF & CTR_DEC & CC_OP & BO_0=0 & BO_2=0 & BH & LK=0 & BITS_13_15=0 & XOP_1_10=16
[ linkreg=0; globalset(inst_start,linkreg); ]
{
if (!(CTR_DEC && CC_OP)) goto inst_next;
if (!(CTR_DEC && (CC_OP == CC_TF))) goto inst_next;
goto [LR];
}
@@ -708,7 +708,7 @@
{
tmp:$(REGISTER_SIZE) = LR;
LR = inst_next;
if (!(CTR_DEC && CC_OP)) goto inst_next;
if (!(CTR_DEC && (CC_OP == CC_TF))) goto inst_next;
call [tmp];
}
@@ -719,7 +719,7 @@
{
tmp:$(REGISTER_SIZE) = LR;
LR = inst_next;
if (!(CTR_DEC && CC_OP)) goto inst_next;
if (!(CTR_DEC && (CC_OP == CC_TF))) goto inst_next;
call [tmp];
}