From 7f06e36e2e747a65a5565724bf5ab4d5cebd2c0e Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Thu, 6 May 2021 14:55:36 +0200
Subject: [PATCH] Remove `get` prefix from frida functions (#93)

* more docs

* more docs:

* more docu

* more docu

* finished docs

* cleaned up markup

* must_use tags added

* more docs

* cleanup get
---
 libafl_frida/src/asan_rt.rs |  4 ++--
 libafl_frida/src/gettls.c   |  2 +-
 libafl_frida/src/helper.rs  | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libafl_frida/src/asan_rt.rs b/libafl_frida/src/asan_rt.rs
index df510d5cb4..158acb6d03 100644
--- a/libafl_frida/src/asan_rt.rs
+++ b/libafl_frida/src/asan_rt.rs
@@ -612,7 +612,7 @@ pub extern "C" fn asan_mallinfo() -> *mut c_void {
 
 /// Get the current thread's TLS address
 extern "C" {
-    fn get_tls_ptr() -> *const c_void;
+    fn tls_ptr() -> *const c_void;
 }
 
 /// The frida address sanitizer runtime, providing address sanitization.
@@ -892,7 +892,7 @@ impl AsanRuntime {
 
     /// Determine the tls start, end for the currently running thread
     fn current_tls() -> (usize, usize) {
-        let tls_address = unsafe { get_tls_ptr() } as usize;
+        let tls_address = unsafe { tls_ptr() } as usize;
         // we need to mask off the highest byte, due to 'High Byte Ignore"
         #[cfg(target_os = "android")]
         let tls_address = tls_address & 0xffffffffffffff;
diff --git a/libafl_frida/src/gettls.c b/libafl_frida/src/gettls.c
index ba14df7489..ddf30b7de7 100644
--- a/libafl_frida/src/gettls.c
+++ b/libafl_frida/src/gettls.c
@@ -4,6 +4,6 @@ __declspec( thread ) int i = 0;
 __thread int i = 0;
 #endif
 
-void * get_tls_ptr() {
+void * tls_ptr() {
         return (void*)&i;
 }
diff --git a/libafl_frida/src/helper.rs b/libafl_frida/src/helper.rs
index 27a0612be7..623adac45d 100644
--- a/libafl_frida/src/helper.rs
+++ b/libafl_frida/src/helper.rs
@@ -193,12 +193,12 @@ const MAYBE_LOG_CODE: [u8; 60] = [
 ];
 
 #[cfg(target_arch = "aarch64")]
-fn get_pc(context: &CpuContext) -> usize {
+fn pc(context: &CpuContext) -> usize {
     context.pc() as usize
 }
 
 #[cfg(target_arch = "x86_64")]
-fn get_pc(context: &CpuContext) -> usize {
+fn pc(context: &CpuContext) -> usize {
     context.rip() as usize
 }
 
@@ -284,10 +284,10 @@ impl<'a> FridaInstrumentationHelper<'a> {
                                     let real_address = match helper
                                         .asan_runtime
                                         .borrow()
-                                        .real_address_for_stalked(get_pc(&context))
+                                        .real_address_for_stalked(pc(&context))
                                     {
                                         Some(address) => *address,
-                                        None => get_pc(&context),
+                                        None => pc(&context),
                                     };
                                     //let (range, (id, name)) = helper.ranges.get_key_value(&real_address).unwrap();
                                     //println!("{}:0x{:016x}", name, real_address - range.start);
@@ -341,7 +341,7 @@ impl<'a> FridaInstrumentationHelper<'a> {
     }
     #[cfg(target_arch = "aarch64")]
     #[inline]
-    fn get_writer_register(&self, reg: capstone::RegId) -> Aarch64Register {
+    fn writer_register(&self, reg: capstone::RegId) -> Aarch64Register {
         let regint: u16 = reg.0;
         Aarch64Register::from_u32(regint as u32).unwrap()
     }
@@ -361,9 +361,9 @@ impl<'a> FridaInstrumentationHelper<'a> {
     ) {
         let writer = output.writer();
 
-        let basereg = self.get_writer_register(basereg);
+        let basereg = self.writer_register(basereg);
         let indexreg = if indexreg.0 != 0 {
-            Some(self.get_writer_register(indexreg))
+            Some(self.writer_register(indexreg))
         } else {
             None
         };
@@ -556,7 +556,7 @@ impl<'a> FridaInstrumentationHelper<'a> {
 
     #[cfg(target_arch = "aarch64")]
     #[inline]
-    fn get_instruction_width(&self, instr: &Insn, operands: &Vec<arch::ArchOperand>) -> u32 {
+    fn instruction_width(&self, instr: &Insn, operands: &Vec<arch::ArchOperand>) -> u32 {
         use capstone::arch::arm64::Arm64Insn as I;
         use capstone::arch::arm64::Arm64Reg as R;
         use capstone::arch::arm64::Arm64Vas as V;
@@ -662,7 +662,7 @@ impl<'a> FridaInstrumentationHelper<'a> {
                     opmem.base(),
                     opmem.index(),
                     opmem.disp(),
-                    self.get_instruction_width(instr, &operands),
+                    self.instruction_width(instr, &operands),
                     arm64operand.shift,
                     arm64operand.ext,
                 ));