Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/emteere_GT-2722' into Ghidra_9.0.2

Browse Source
This commit is contained in:
ghidravore 2019-04-02 18:42:37 -04:00
commit 9ba25cb99c
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Ghidra/Processors/ARM/data/languages/ARM.ldefs
View File

@ -5,7 +5,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v8" variant="v8"
version="1.101" version="1.102"
slafile="ARM8_le.sla" slafile="ARM8_le.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -22,7 +22,7 @@
instructionEndian="little" instructionEndian="little"
size="32" size="32"
variant="v8LEInstruction" variant="v8LEInstruction"
version="1.101" version="1.102"
slafile="ARM8_le.sla" slafile="ARM8_le.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -37,7 +37,7 @@
endian="big" endian="big"
size="32" size="32"
variant="v8" variant="v8"
version="1.101" version="1.102"
slafile="ARM8_be.sla" slafile="ARM8_be.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -53,7 +53,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v7" variant="v7"
version="1.101" version="1.102"
slafile="ARM7_le.sla" slafile="ARM7_le.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -71,7 +71,7 @@
instructionEndian="little" instructionEndian="little"
size="32" size="32"
variant="v7LEInstruction" variant="v7LEInstruction"
version="1.101" version="1.102"
slafile="ARM7_le.sla" slafile="ARM7_le.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -86,7 +86,7 @@
endian="big" endian="big"
size="32" size="32"
variant="v7" variant="v7"
version="1.101" version="1.102"
slafile="ARM7_be.sla" slafile="ARM7_be.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -102,7 +102,7 @@
endian="little" endian="little"
size="32" size="32"
variant="Cortex" variant="Cortex"
version="1.101" version="1.102"
slafile="ARM7_le.sla" slafile="ARM7_le.sla"
processorspec="ARMCortex.pspec" processorspec="ARMCortex.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -117,7 +117,7 @@
endian="big" endian="big"
size="32" size="32"
variant="Cortex" variant="Cortex"
version="1.101" version="1.102"
slafile="ARM7_be.sla" slafile="ARM7_be.sla"
processorspec="ARMCortex.pspec" processorspec="ARMCortex.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -132,7 +132,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v6" variant="v6"
version="1.101" version="1.102"
slafile="ARM6_le.sla" slafile="ARM6_le.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -150,7 +150,7 @@
endian="big" endian="big"
size="32" size="32"
variant="v6" variant="v6"
version="1.101" version="1.102"
slafile="ARM6_be.sla" slafile="ARM6_be.sla"
processorspec="ARMt.pspec" processorspec="ARMt.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -168,7 +168,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v5t" variant="v5t"
version="1.101" version="1.102"
slafile="ARM5t_le.sla" slafile="ARM5t_le.sla"
processorspec="ARMt_v45.pspec" processorspec="ARMt_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -184,7 +184,7 @@
endian="big" endian="big"
size="32" size="32"
variant="v5t" variant="v5t"
version="1.101" version="1.102"
slafile="ARM5t_be.sla" slafile="ARM5t_be.sla"
processorspec="ARMt_v45.pspec" processorspec="ARMt_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -200,7 +200,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v5" variant="v5"
version="1.101" version="1.102"
slafile="ARM5_le.sla" slafile="ARM5_le.sla"
processorspec="ARM_v45.pspec" processorspec="ARM_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -232,7 +232,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v4t" variant="v4t"
version="1.101" version="1.102"
slafile="ARM4t_le.sla" slafile="ARM4t_le.sla"
processorspec="ARMt_v45.pspec" processorspec="ARMt_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -248,7 +248,7 @@
endian="big" endian="big"
size="32" size="32"
variant="v4t" variant="v4t"
version="1.101" version="1.102"
slafile="ARM4t_be.sla" slafile="ARM4t_be.sla"
processorspec="ARMt_v45.pspec" processorspec="ARMt_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -264,7 +264,7 @@
endian="little" endian="little"
size="32" size="32"
variant="v4" variant="v4"
version="1.101" version="1.102"
slafile="ARM4_le.sla" slafile="ARM4_le.sla"
processorspec="ARM_v45.pspec" processorspec="ARM_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"
@ -280,7 +280,7 @@
endian="big" endian="big"
size="32" size="32"
variant="v4" variant="v4"
version="1.101" version="1.102"
slafile="ARM4_be.sla" slafile="ARM4_be.sla"
processorspec="ARM_v45.pspec" processorspec="ARM_v45.pspec"
manualindexfile="../manuals/ARM.idx" manualindexfile="../manuals/ARM.idx"

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

@ -185,6 +185,7 @@ define token instrThumb (16)
thc0815=(8,15) thc0815=(8,15)
thc0915=(9,15) thc0915=(9,15)
thc1015=(10,15) thc1015=(10,15)
thc1112=(11,12)
thc1115=(11,15) thc1115=(11,15)
thc1215=(12,15) thc1215=(12,15)
thc1315=(13,15) thc1315=(13,15)
@ -1614,7 +1615,7 @@ define pcodeop IndexCheck;
@if defined(VERSION_6T2) || defined(VERSION_7) @if defined(VERSION_6T2) || defined(VERSION_7)
:cmp^ItCond^".w" Rn0003,ThumbExpandImm12 is TMode=1 & ItCond & (op11=0x1e & thc0909=0 & sop0508=13 & Rn0003; thc1515=0 & thc0811=15) & ThumbExpandImm12 :cmp^ItCond^".w" Rn0003,ThumbExpandImm12 is TMode=1 & ItCond & (op11=0x1e & thc0909=0 & thc0404=1 & sop0508=13 & Rn0003; thc1515=0 & thc0811=15) & ThumbExpandImm12
{ {
build ItCond; build ItCond;
th_subflags(Rn0003,ThumbExpandImm12); th_subflags(Rn0003,ThumbExpandImm12);
@ -2447,9 +2448,9 @@ define pcodeop ExclusiveAccess;
build CheckInIT_ZN; build CheckInIT_ZN;
} }
:mov^ItCond Rd0002,Rn0305 is TMode=1 & ItCond & op6=0x070 & Rn0305 & Rd0002 & CheckInIT_ZN :mov^ItCond Rd0002,Rn0305 is TMode=1 & ItCond & op6=0x000 & Rn0305 & Rd0002 & CheckInIT_ZN
{ {
build ItCond; build ItCond;
Rd0002 = Rn0305; Rd0002 = Rn0305;
resflags(Rd0002); resflags(Rd0002);
build CheckInIT_ZN; build CheckInIT_ZN;
@ -4482,7 +4483,7 @@ thumbEndianNess: "BE" is op0=0xb658 { export 1:1; }
:sub^ItCond sp,Immed7_4 is TMode=1 & ItCond & op7=0x161 & sp & Immed7_4 :sub^ItCond sp,Immed7_4 is TMode=1 & ItCond & op7=0x161 & sp & Immed7_4
{ {
build ItCond; build ItCond;
sp = sp - Immed7_4; sp = sp - Immed7_4;
} }
@if defined(VERSION_6T2) || defined(VERSION_7) @if defined(VERSION_6T2) || defined(VERSION_7)