Merge pull request #33 from draperlaboratory/main

LLVM 19 aarch64 now supports preserve_none
purseclab · Aug 3, 2024 · 84d6271 · 84d6271
2 parents 657f748 + 874b56d
commit 84d6271
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ InsertDataPatch              | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 |
 RemoveDataPatch              | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | ⬜ | ⬜ |
 ModifyDataPatch              | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | ⬜ | ⬜ |
 InsertInstructionPatch (ASM) | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | ⬜ | ⬜ |
-InsertInstructionPatch (C)   | 🟥 | 🟩 | 🟥 | 🟨 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 |
+InsertInstructionPatch (C)   | 🟥 | 🟩 | 🟥 | 🟩 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 | 🟥 |
 RemoveInstructionPatch       | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | ⬜ | ⬜ |
 ModifyInstructionPatch       | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | ⬜ | ⬜ |
 InsertFunctionPatch          | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | 🟩 | ⬜ | ⬜ |

diff --git a/src/patcherex2/components/archinfo/aarch64.py b/src/patcherex2/components/archinfo/aarch64.py
@@ -50,9 +50,31 @@ class Aarch64Info:
 
     cc = {
         "Linux": ["x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7"],
-        # TODO: update LinuxPreserveNone once aarch64 support lands
-        # in LLVM for preserve_none, currently defaults to Linux
-        "LinuxPreserveNone": ["x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7"],
+        "LinuxPreserveNone": [
+            "x20",
+            "x21",
+            "x22",
+            "x23",
+            "x24",
+            "x25",
+            "x26",
+            "x27",
+            "x28",
+            "x0",
+            "x1",
+            "x2",
+            "x3",
+            "x4",
+            "x5",
+            "x6",
+            "x7",
+            "x10",
+            "x11",
+            "x12",
+            "x13",
+            "x14",
+            "x9",
+        ],
     }
     callee_saved = {
         "Linux": [