Fix detour_does_code_end_function for ARM64 (#348)

m417z · web-flow · commit 6ea3f166fdb1 · 2025-06-19T18:09:20.000-07:00
It incorrectly returned FALSE for br &lt;reg&gt; instructions.
diff --git a/src/detours.cpp b/src/detours.cpp
@@ -1228,7 +1228,7 @@ inline BOOL detour_does_code_end_function(PBYTE pbCode)
     if (detour_is_code_os_patched(pbCode)) {
         return FALSE;
     }
-    if ((Opcode & 0xfffffc1f) == 0xd65f0000 ||      // br <reg>
+    if ((Opcode & 0xffbffc1f) == 0xd61f0000 ||      // ret/br <reg>
         (Opcode & 0xfc000000) == 0x14000000) {      // b <imm26>
         return TRUE;
     }

Original file line number	Diff line number	Diff line change
`@@ -1228,7 +1228,7 @@ inline BOOL detour_does_code_end_function(PBYTE pbCode)`
`1228`	`1228`	`if (detour_is_code_os_patched(pbCode)) {`
`1229`	`1229`	`return FALSE;`
`1230`	`1230`	`}`
`1231`		`- if ((Opcode & 0xfffffc1f) == 0xd65f0000 \|\| // br <reg>`
	`1231`	`+ if ((Opcode & 0xffbffc1f) == 0xd61f0000 \|\| // ret/br <reg>`
`1232`	`1232`	`(Opcode & 0xfc000000) == 0x14000000) { // b <imm26>`
`1233`	`1233`	`return TRUE;`
`1234`	`1234`	`}`