mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-08-28 05:20:21 +00:00
Merge remote-tracking branch
'origin/GP-2499_ghidorahrex_avr8_W_register_fix' (Closes #4516)
This commit is contained in:
commit
9044307d54
|
@ -46,14 +46,14 @@ define space codebyte type=ram_space size=$(PCBYTESIZE) wordsize=1;
|
||||||
define $(REGISTER_SPACE) offset=0 size=1 [
|
define $(REGISTER_SPACE) offset=0 size=1 [
|
||||||
R0 R1 R2 R3 R4 R5 R6 R7 R8 R9
|
R0 R1 R2 R3 R4 R5 R6 R7 R8 R9
|
||||||
R10 R11 R12 R13 R14 R15 R16 R17 R18 R19
|
R10 R11 R12 R13 R14 R15 R16 R17 R18 R19
|
||||||
R20 R21 R22 R23 Wlo Whi Xlo Xhi Ylo Yhi
|
R20 R21 R22 R23 R24 R25 Xlo Xhi Ylo Yhi
|
||||||
Zlo Zhi
|
Zlo Zhi
|
||||||
];
|
];
|
||||||
|
|
||||||
define $(REGISTER_SPACE) offset=0 size=2 [
|
define $(REGISTER_SPACE) offset=0 size=2 [
|
||||||
R1R0 R3R2 R5R4 R7R6 R9R8
|
R1R0 R3R2 R5R4 R7R6 R9R8
|
||||||
R11R10 R13R12 R15R14 R17R16 R19R18
|
R11R10 R13R12 R15R14 R17R16 R19R18
|
||||||
R21R20 R23R22 W # Technically, manual has R25R24 instead of W.
|
R21R20 R23R22 R25R24
|
||||||
X Y Z
|
X Y Z
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -278,7 +278,7 @@ attach variables [ oplow3_flag op4to6_flag ] [
|
||||||
|
|
||||||
attach variables [ RdHi RrHi f3op2RdHi ] [
|
attach variables [ RdHi RrHi f3op2RdHi ] [
|
||||||
R16 R17 R18 R19
|
R16 R17 R18 R19
|
||||||
R20 R21 R22 R23 Wlo Whi Xlo Xhi Ylo Yhi
|
R20 R21 R22 R23 R24 R25 Xlo Xhi Ylo Yhi
|
||||||
Zlo Zhi ]
|
Zlo Zhi ]
|
||||||
;
|
;
|
||||||
attach variables [ RdHi3 RrHi3 ] [
|
attach variables [ RdHi3 RrHi3 ] [
|
||||||
|
@ -293,11 +293,11 @@ attach variables [ RdFull ] [
|
||||||
R0 R1 R2 R3 R4 R5 R6 R7 R8 R9
|
R0 R1 R2 R3 R4 R5 R6 R7 R8 R9
|
||||||
R10 R11 R12 R13 R14 R15
|
R10 R11 R12 R13 R14 R15
|
||||||
R16 R17 R18 R19
|
R16 R17 R18 R19
|
||||||
R20 R21 R22 R23 Wlo Whi Xlo Xhi Ylo Yhi
|
R20 R21 R22 R23 R24 R25 Xlo Xhi Ylo Yhi
|
||||||
Zlo Zhi
|
Zlo Zhi
|
||||||
];
|
];
|
||||||
attach variables [ Rdw2 ] [
|
attach variables [ Rdw2 ] [
|
||||||
W X Y Z
|
R25R24 X Y Z
|
||||||
];
|
];
|
||||||
attach variables [ Rstq ] [
|
attach variables [ Rstq ] [
|
||||||
Z Y
|
Z Y
|
||||||
|
@ -308,7 +308,7 @@ attach variables [ RstPtr ] [
|
||||||
attach variables [ Rdw4 Rrw4 op1RdPair ldswop1RdPair stswop2RdPair ] [
|
attach variables [ Rdw4 Rrw4 op1RdPair ldswop1RdPair stswop2RdPair ] [
|
||||||
R1R0 R3R2 R5R4 R7R6 R9R8
|
R1R0 R3R2 R5R4 R7R6 R9R8
|
||||||
R11R10 R13R12 R15R14 R17R16 R19R18
|
R11R10 R13R12 R15R14 R17R16 R19R18
|
||||||
R21R20 R23R22 W
|
R21R20 R23R22 R25R24
|
||||||
X Y Z
|
X Y Z
|
||||||
];
|
];
|
||||||
attach variables [ op1RrPairLow ] [
|
attach variables [ op1RrPairLow ] [
|
||||||
|
@ -317,7 +317,7 @@ attach variables [ op1RrPairLow ] [
|
||||||
];
|
];
|
||||||
attach variables [ op1RrPairHi op1RdPairHi f3op1RdPairHi ] [
|
attach variables [ op1RrPairHi op1RdPairHi f3op1RdPairHi ] [
|
||||||
R17R16 R19R18
|
R17R16 R19R18
|
||||||
R21R20 R23R22 W
|
R21R20 R23R22 R25R24
|
||||||
X Y Z
|
X Y Z
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<prototype name="__stdcall" extrapop="3" stackshift="3">
|
<prototype name="__stdcall" extrapop="3" stackshift="3">
|
||||||
<input>
|
<input>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="W"/> <!-- R25R24 -->
|
<register name="R25R24"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="R23R22"/>
|
<register name="R23R22"/>
|
||||||
|
@ -75,13 +75,13 @@
|
||||||
</input>
|
</input>
|
||||||
<output>
|
<output>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="W"/>
|
<register name="R25R24"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="3" maxsize="4">
|
<pentry minsize="3" maxsize="4">
|
||||||
<addr space="join" piece1="W" piece2="R23R22"/>
|
<addr space="join" piece1="R25R24" piece2="R23R22"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="5" maxsize="8">
|
<pentry minsize="5" maxsize="8">
|
||||||
<addr space="join" piece1="W" piece2="R23R22" piece3="R21R20" piece4="R19R18"/>
|
<addr space="join" piece1="R25R24" piece2="R23R22" piece3="R21R20" piece4="R19R18"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
</output>
|
</output>
|
||||||
<unaffected>
|
<unaffected>
|
||||||
|
@ -113,8 +113,8 @@
|
||||||
<register name="R21"/>
|
<register name="R21"/>
|
||||||
<register name="R22"/>
|
<register name="R22"/>
|
||||||
<register name="R23"/>
|
<register name="R23"/>
|
||||||
<register name="Wlo"/>
|
<register name="R24"/>
|
||||||
<register name="Whi"/>
|
<register name="R25"/>
|
||||||
<register name="Xlo"/>
|
<register name="Xlo"/>
|
||||||
<register name="Xhi"/>
|
<register name="Xhi"/>
|
||||||
<register name="Zlo"/>
|
<register name="Zlo"/>
|
||||||
|
@ -131,13 +131,13 @@
|
||||||
</input>
|
</input>
|
||||||
<output>
|
<output>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="W"/>
|
<register name="R25R24"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="3" maxsize="4">
|
<pentry minsize="3" maxsize="4">
|
||||||
<addr space="join" piece1="W" piece2="R23R22"/>
|
<addr space="join" piece1="R25R24" piece2="R23R22"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="5" maxsize="8">
|
<pentry minsize="5" maxsize="8">
|
||||||
<addr space="join" piece1="W" piece2="R23R22" piece3="R21R20" piece4="R19R18"/>
|
<addr space="join" piece1="R25R24" piece2="R23R22" piece3="R21R20" piece4="R19R18"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
</output>
|
</output>
|
||||||
<unaffected>
|
<unaffected>
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<prototype name="__stdcall" extrapop="2" stackshift="2">
|
<prototype name="__stdcall" extrapop="2" stackshift="2">
|
||||||
<input>
|
<input>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="W"/> <!-- R25R24 -->
|
<register name="R25R24"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="R23R22"/>
|
<register name="R23R22"/>
|
||||||
|
@ -75,13 +75,13 @@
|
||||||
</input>
|
</input>
|
||||||
<output>
|
<output>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="W"/>
|
<register name="R25R24"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="3" maxsize="4">
|
<pentry minsize="3" maxsize="4">
|
||||||
<addr space="join" piece1="W" piece2="R23R22"/>
|
<addr space="join" piece1="R25R24" piece2="R23R22"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
<pentry minsize="5" maxsize="8">
|
<pentry minsize="5" maxsize="8">
|
||||||
<addr space="join" piece1="W" piece2="R23R22" piece3="R21R20" piece4="R19R18"/>
|
<addr space="join" piece1="R25R24" piece2="R23R22" piece3="R21R20" piece4="R19R18"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
</output>
|
</output>
|
||||||
<unaffected>
|
<unaffected>
|
||||||
|
@ -113,8 +113,8 @@
|
||||||
<register name="R21"/>
|
<register name="R21"/>
|
||||||
<register name="R22"/>
|
<register name="R22"/>
|
||||||
<register name="R23"/>
|
<register name="R23"/>
|
||||||
<register name="Wlo"/>
|
<register name="R24"/>
|
||||||
<register name="Whi"/>
|
<register name="R25"/>
|
||||||
<register name="Xlo"/>
|
<register name="Xlo"/>
|
||||||
<register name="Xhi"/>
|
<register name="Xhi"/>
|
||||||
<register name="Zlo"/>
|
<register name="Zlo"/>
|
||||||
|
@ -131,7 +131,7 @@
|
||||||
</input>
|
</input>
|
||||||
<output>
|
<output>
|
||||||
<pentry minsize="1" maxsize="2">
|
<pentry minsize="1" maxsize="2">
|
||||||
<register name="W"/>
|
<register name="R25R24"/>
|
||||||
</pentry>
|
</pentry>
|
||||||
</output>
|
</output>
|
||||||
<unaffected>
|
<unaffected>
|
||||||
|
|
Loading…
Reference in a new issue