GP-0 fix DWARF and Golang register mapping info for AARCH64

NationalSecurityAgency · May 7, 2024 · 31f4e55 · 31f4e55
1 parent 837b5bb
commit 31f4e55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Ghidra/Processors/AARCH64/data/languages/AARCH64.dwarf b/Ghidra/Processors/AARCH64/data/languages/AARCH64.dwarf
@@ -1,7 +1,7 @@
 <dwarf>
  <register_mappings>
  <register_mapping dwarf="0" ghidra="x0" auto_count="31"/> <!-- x0..x30 -->
- <register_mapping dwarf="31" ghidra="xzr" stackpointer="true"/>
+ <register_mapping dwarf="31" ghidra="sp" stackpointer="true"/>
  <register_mapping dwarf="64" ghidra="q0" auto_count="32"/> <!-- q0..q31 -->
  </register_mappings>
  <call_frame_cfa value="0"/>

diff --git a/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info b/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
@@ -5,6 +5,6 @@
  <float_registers list="q0,q1,q2,q3,q4,q5,q6,q7,q8,q9,q10,q11,q12,q13,q14,q15"/>
  <stack initialoffset="8" maxalign="8"/>
  <current_goroutine register="x28"/>
- <zero_register register="ZR"/>
+ <zero_register register="xzr" builtin="true"/>
  </register_info>
 </golang>