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

Browse Source 
'origin/GP-5206_ghidorahrex_PR-6598_danlehmann_arm_fix_mrs_apsr' into
patch (Closes #6598, Closes #6597)
This commit is contained in:
Ryan Kurtz
2026-06-12 14:21:01 -04:00
parent 9ce5c5984c 1de7de83e4
commit 6fd250d041
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
View File

@@ -2931,12 +2931,12 @@ define pcodeop getProcessStackPointerLimit;
@if defined(VERSION_7M)
msripsr: "i" is thc0000=1 { }
msripsr: is thc0000=0 { }
msrepsr: "e" is thc0101=1 { }
msrepsr: is thc0101=0 { }
msrapsr: is thc0202=1 { }
msrapsr: "a" is thc0202=0 & Rn0003 {
msripsr: "i" is Rn0003; thc0000=1 { }
msripsr: is Rn0003; thc0000=0 { }
msrepsr: "e" is Rn0003; thc0101=1 { }
msrepsr: is Rn0003; thc0101=0 { }
msrapsr: is Rn0003; thc0202=1 { }
msrapsr: "a" is Rn0003; thc0202=0 {
cpsr = cpsr | (Rn0003 & 0xf8000000);
writeAPSR_nzcvq(cpsr);
}
@@ -2944,11 +2944,11 @@ msrapsr: "a" is thc0202=0 & Rn0003 {
msrpsr: msripsr^msrepsr^msrapsr^"psr" is msripsr & msrepsr & msrapsr {
build msrapsr;
}
msrpsr: "xpsr" is sysm02=3 & msrapsr {
msrpsr: "xpsr" is (Rn0003 ; sysm02=3) & msrapsr {
build msrapsr;
}
:msr^ItCond msrpsr,Rn0003 is TMode=1 & ItCond & op4=0xf38 & Rn0003; op12=0x8 & th_psrmask=8 & sysm37=0 & msrpsr
:msr^ItCond msrpsr,Rn0003 is TMode=1 & ItCond & (op4=0xf38 & Rn0003; op12=0x8 & th_psrmask=8 & sysm37=0) & msrpsr
{
build ItCond;
build msrpsr;