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

Merge remote-tracking branch 'origin/GP-2872_ghidorahrex_arm_v45t_blx'

Browse Source 
into patch (Closes #4320)
This commit is contained in:
Ryan Kurtz
2023-03-22 11:10:38 -04:00
parent 4d8ec78c74 f9eacc2a2a
commit 9b06b08de7
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Processors/ARM/data/languages/ARMTHUMBinstructions.sinc
+23 -4
View File
@@ -1443,22 +1443,31 @@ macro th_set_carry_for_asr(op1,shift_count) {
@ifndef VERSION_6T2
:bl^ItCond "#"^off is TMode=1 & ItCond & op11=0x1e & soffset11 [ off = inst_start + 4 + (soffset11 << 12); ]
:bl^ItCond "#"^off is TMode=1 & ItCond & op11=0x1e & soffset11 [ off = inst_start + 4 + (soffset11 << 12); ]
{
build ItCond;
lr = off:4;
}
:bl^ItCond "#"^off is TMode=1 & ItCond & op11=0x1f & offset11 [ off = offset11 << 1; ]
:bl^ItCond "#"^off is TMode=1 & ItCond & op11=0x1f & offset11 [ off = offset11 << 1; ]
{
build ItCond;
local dest = lr + off:4;
lr = inst_next|1;
SetThumbMode(1);
goto [dest];
call [dest];
}
:blx^ItCond "#"^off is TMode=1 & ItCond & op11=0x1d & offset11 & thc0000=0 [ off = offset11 << 1; ]
:bl^ItCond lr is TMode=1 & ItCond & op11=0x1f & offset11=0 & lr
{
build ItCond;
local dest = lr;
lr = inst_next|1;
SetThumbMode(1);
call [dest];
}
:blx^ItCond "#"^off is TMode=1 & ItCond & op11=0x1d & offset11 & thc0000=0 [ off = offset11 << 1; ]
{
build ItCond;
local dest = (lr & (~0x3)) + off:4;
@@ -1466,6 +1475,16 @@ macro th_set_carry_for_asr(op1,shift_count) {
SetThumbMode(0);
call [dest];
}
:blx^ItCond lr is TMode=1 & ItCond & op11=0x1d & offset11=0 & thc0000=0 & lr
{
build ItCond;
local dest = (lr & (~0x3));
lr = inst_next|1;
SetThumbMode(0);
call [dest];
}
@endif
:bl^ItCond ThAddr24 is TMode=1 & CALLoverride=1 & ItCond & (op11=0x1e; part2c1415=3 & part2c1212=1) & ThAddr24