mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-389_ArmSwitchFixup' into patch

Browse Source
This commit is contained in:
ghidra1
2020-12-14 12:35:04 -05:00
parent 19aec078e0 1f443a15b4
commit 5bffb5c6ed
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Processors/ARM/data/languages/ARM.cspec
View File

@@ -158,8 +158,7 @@
tmpptr = lr & 0xfffffffe; tmpptr = lr & 0xfffffffe;
offset = *:1 (tmpptr + r0); offset = *:1 (tmpptr + r0);
offset = offset * 2; lr = lr + 2 * zext(offset);
lr = lr + zext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;
@@ -177,8 +176,7 @@
tmpptr = lr & 0xfffffffe; tmpptr = lr & 0xfffffffe;
offset = *:1 (tmpptr + r0); offset = *:1 (tmpptr + r0);
offset = offset * 2; lr = lr + 2 * sext(offset);
lr = lr + sext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;
@@ -197,8 +195,7 @@
index = r0 * 2; index = r0 * 2;
offset = *:2 (tmpptr + index); offset = *:2 (tmpptr + index);
offset = offset * 2; lr = lr + 2 * sext(offset);
lr = lr + sext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;
@@ -217,8 +214,7 @@
index = r0 * 2; index = r0 * 2;
offset = *:2 (tmpptr + index); offset = *:2 (tmpptr + index);
offset = offset * 2; lr = lr + 2 * zext(offset);
lr = lr + zext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;

12
Ghidra/Processors/ARM/data/languages/ARM_v45.cspec
View File

@@ -120,8 +120,7 @@
tmpptr = lr & 0xfffffffe; tmpptr = lr & 0xfffffffe;
offset = *:1 (tmpptr + r0); offset = *:1 (tmpptr + r0);
offset = offset * 2; lr = lr + 2 * zext(offset);
lr = lr + zext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;
@@ -139,8 +138,7 @@
tmpptr = lr & 0xfffffffe; tmpptr = lr & 0xfffffffe;
offset = *:1 (tmpptr + r0); offset = *:1 (tmpptr + r0);
offset = offset * 2; lr = lr + 2 * sext(offset);
lr = lr + sext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;
@@ -159,8 +157,7 @@
index = r0 * 2; index = r0 * 2;
offset = *:2 (tmpptr + index); offset = *:2 (tmpptr + index);
offset = offset * 2; lr = lr + 2 * sext(offset);
lr = lr + sext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;
@@ -179,8 +176,7 @@
index = r0 * 2; index = r0 * 2;
offset = *:2 (tmpptr + index); offset = *:2 (tmpptr + index);
offset = offset * 2; lr = lr + 2 * zext(offset);
lr = lr + zext(offset);
ISAModeSwitch = (lr & 1) != 0; ISAModeSwitch = (lr & 1) != 0;
TB = ISAModeSwitch; TB = ISAModeSwitch;