Merge remote-tracking branch 'origin/GT-2744_GhidorahRex_PR-362_ARM_THUMB'

This commit is contained in:
ghidra1 2019-05-09 17:38:41 -04:00
commit 7403e884a8
2 changed files with 3 additions and 3 deletions

View File

@ -1103,7 +1103,7 @@ with : ARMcondCk=1 {
resflags(Rd0811);
}
:add^thSBIT_CZNO^ItCond^".w" Rd0811,sp,thshift2 is TMode=1 & ItCond & op11=0x1e & thc0910=1 & sop0508=8 & thSBIT_CZNO & sop0003=0xd & sp; thc1515=0 & Rd0811 & thshift2
:add^thSBIT_CZNO^ItCond^".w" Rd0811,sp,thshift2 is TMode=1 & ItCond & op11=0x1d & thc0910=1 & sop0508=8 & thSBIT_CZNO & sop0003=0xd & sp; thc1515=0 & Rd0811 & thshift2
{
build ItCond;
build thshift2;

View File

@ -2339,9 +2339,9 @@ ArmPCRelImmed12: reloff is U23=0 & immed & rotate
coprocessor_function(t_cpn,t_op1,t_op2,CRd,CRn,CRm);
}
@if defined(VERSION_6K)
@if defined(VERSION_6K) || defined(VERSION_7)
:clrex is c0031=0xf57ff01f {
:clrex is $(AMODE) & c0031=0xf57ff01f {
ClearExclusiveLocal();
}