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

Merge remote-tracking branch

Browse Source 
'origin/GP-2499_ghidorahrex_avr8_W_register_fix'  (Closes #4516)
This commit is contained in:
Ryan Kurtz
2022-10-05 09:58:13 -04:00
parent 4ed60c8790 3ca6b5d2de
commit 9044307d54
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Processors/Atmel/data/languages/avr8.sinc
+7 -7
View File
@@ -46,14 +46,14 @@ define space codebyte type=ram_space size=$(PCBYTESIZE) wordsize=1;
define $(REGISTER_SPACE) offset=0 size=1 [
R0 R1 R2 R3 R4 R5 R6 R7 R8 R9
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
];
define $(REGISTER_SPACE) offset=0 size=2 [
R1R0 R3R2 R5R4 R7R6 R9R8
R11R10 R13R12 R15R14 R17R16 R19R18
R21R20 R23R22 W # Technically, manual has R25R24 instead of W.
R21R20 R23R22 R25R24
X Y Z
];
@@ -278,7 +278,7 @@ attach variables [ oplow3_flag op4to6_flag ] [
attach variables [ RdHi RrHi f3op2RdHi ] [
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 ]
;
attach variables [ RdHi3 RrHi3 ] [
@@ -293,11 +293,11 @@ attach variables [ RdFull ] [
R0 R1 R2 R3 R4 R5 R6 R7 R8 R9
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
];
attach variables [ Rdw2 ] [
W X Y Z
R25R24 X Y Z
];
attach variables [ Rstq ] [
Z Y
@@ -308,7 +308,7 @@ attach variables [ RstPtr ] [
attach variables [ Rdw4 Rrw4 op1RdPair ldswop1RdPair stswop2RdPair ] [
R1R0 R3R2 R5R4 R7R6 R9R8
R11R10 R13R12 R15R14 R17R16 R19R18
R21R20 R23R22 W
R21R20 R23R22 R25R24
X Y Z
];
attach variables [ op1RrPairLow ] [
@@ -317,7 +317,7 @@ attach variables [ op1RrPairLow ] [
];
attach variables [ op1RrPairHi op1RdPairHi f3op1RdPairHi ] [
R17R16 R19R18
R21R20 R23R22 W
R21R20 R23R22 R25R24
X Y Z
];
Ghidra/Processors/Atmel/data/languages/avr8egcc.cspec
+9 -9
View File
@@ -41,7 +41,7 @@
<prototype name="__stdcall" extrapop="3" stackshift="3">
<input>
<pentry minsize="1" maxsize="2">
<register name="W"/> <!-- R25R24 -->
<register name="R25R24"/>
</pentry>
<pentry minsize="1" maxsize="2">
<register name="R23R22"/>
@@ -75,13 +75,13 @@
</input>
<output>
<pentry minsize="1" maxsize="2">
<register name="W"/>
<register name="R25R24"/>
</pentry>
<pentry minsize="3" maxsize="4">
<addr space="join" piece1="W" piece2="R23R22"/>
<addr space="join" piece1="R25R24" piece2="R23R22"/>
</pentry>
<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>
</output>
<unaffected>
@@ -113,8 +113,8 @@
<register name="R21"/>
<register name="R22"/>
<register name="R23"/>
<register name="Wlo"/>
<register name="Whi"/>
<register name="R24"/>
<register name="R25"/>
<register name="Xlo"/>
<register name="Xhi"/>
<register name="Zlo"/>
@@ -131,13 +131,13 @@
</input>
<output>
<pentry minsize="1" maxsize="2">
<register name="W"/>
<register name="R25R24"/>
</pentry>
<pentry minsize="3" maxsize="4">
<addr space="join" piece1="W" piece2="R23R22"/>
<addr space="join" piece1="R25R24" piece2="R23R22"/>
</pentry>
<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>
</output>
<unaffected>
Ghidra/Processors/Atmel/data/languages/avr8gcc.cspec
+7 -7
View File
@@ -41,7 +41,7 @@
<prototype name="__stdcall" extrapop="2" stackshift="2">
<input>
<pentry minsize="1" maxsize="2">
<register name="W"/> <!-- R25R24 -->
<register name="R25R24"/>
</pentry>
<pentry minsize="1" maxsize="2">
<register name="R23R22"/>
@@ -75,13 +75,13 @@
</input>
<output>
<pentry minsize="1" maxsize="2">
<register name="W"/>
<register name="R25R24"/>
</pentry>
<pentry minsize="3" maxsize="4">
<addr space="join" piece1="W" piece2="R23R22"/>
<addr space="join" piece1="R25R24" piece2="R23R22"/>
</pentry>
<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>
</output>
<unaffected>
@@ -113,8 +113,8 @@
<register name="R21"/>
<register name="R22"/>
<register name="R23"/>
<register name="Wlo"/>
<register name="Whi"/>
<register name="R24"/>
<register name="R25"/>
<register name="Xlo"/>
<register name="Xhi"/>
<register name="Zlo"/>
@@ -131,7 +131,7 @@
</input>
<output>
<pentry minsize="1" maxsize="2">
<register name="W"/>
<register name="R25R24"/>
</pentry>
</output>
<unaffected>