about summary refs log tree commit diff
diff options
context:
space:
mode:
authorhexcoder- <heiko@hexco.de>2021-07-16 23:31:53 +0200
committerhexcoder- <heiko@hexco.de>2021-07-16 23:31:53 +0200
commita705b1548f903a8cc3f85ec960b5d09a7d7a3ee7 (patch)
tree6a7d0b573d808c1ef7b3c803cbc1975c22058bd3
parentb13b8c7e55836292330ad661e9a0386f7e0d3a91 (diff)
downloadafl++-a705b1548f903a8cc3f85ec960b5d09a7d7a3ee7.tar.gz
small changes for ARM 32-bit (compiles now, but does not work)
-rw-r--r--frida_mode/GNUmakefile8
-rw-r--r--frida_mode/src/ctx/ctx_arm32.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/frida_mode/GNUmakefile b/frida_mode/GNUmakefile
index 44dfafe3..fad183e1 100644
--- a/frida_mode/GNUmakefile
+++ b/frida_mode/GNUmakefile
@@ -53,6 +53,10 @@ ifeq "$(ARCH)" "aarch64"
  ARCH:=arm64
 endif
 
+ifeq "$(ARCH)" "armv7l"
+ ARCH:=armhf
+endif
+
 ifeq "$(ARCH)" "i686"
  ARCH:=x86
 endif
@@ -83,8 +87,12 @@ ifeq "$(ARCH)" "arm64"
 # 15.0.0 Not released for aarch64 yet
 GUM_DEVKIT_VERSION=14.2.18
 else
+ifeq "$(ARCH)" "armhf"
+GUM_DEVKIT_VERSION=14.2.18
+else
 GUM_DEVKIT_VERSION=15.0.0
 endif
+endif
 GUM_DEVKIT_FILENAME=frida-gumjs-devkit-$(GUM_DEVKIT_VERSION)-$(OS)-$(ARCH).tar.xz
 GUM_DEVKIT_URL="https://github.com/frida/frida/releases/download/$(GUM_DEVKIT_VERSION)/$(GUM_DEVKIT_FILENAME)"
 
diff --git a/frida_mode/src/ctx/ctx_arm32.c b/frida_mode/src/ctx/ctx_arm32.c
index a354c117..9fc70fb4 100644
--- a/frida_mode/src/ctx/ctx_arm32.c
+++ b/frida_mode/src/ctx/ctx_arm32.c
@@ -6,7 +6,7 @@
 
 #if defined(__arm__)
 
-gsize ctx_read_reg(GumIA32CpuContext *ctx, x86_reg reg) {
+gsize ctx_read_reg(GumArmCpuContext *ctx, arm_reg reg) {
 
   FATAL("ctx_read_reg unimplemented for this architecture");