From: Nicholas Nethercote <njn@valgrind.org>
Date: Sat, 27 Nov 2004 13:42:42 +0000 (+0000)
Subject: Fix a couple of minor ARM things -- frame pointer is R11, it seems, and
X-Git-Tag: svn/VALGRIND_3_0_0~1196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c40ff3902e3e5d83b163d520ef6ca4ba44d5b1bf;p=thirdparty%2Fvalgrind.git

Fix a couple of minor ARM things -- frame pointer is R11, it seems, and
programs get loaded at 0x00008000.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3122
---

diff --git a/coregrind/arm/Makefile.am b/coregrind/arm/Makefile.am
index cf6d8d6d84..2ea09dabbd 100644
--- a/coregrind/arm/Makefile.am
+++ b/coregrind/arm/Makefile.am
@@ -26,4 +26,4 @@ stage2.lds: Makefile
 	$(CC) -Wl,--verbose -nostdlib 2>&1 | sed \
 		-e '1,/^=====\+$$/d' \
 		-e '/^=====\+$$/d' \
-		-e 's/0x08048000/kickstart_base/g' > $@ || rm -f $@
+		-e 's/0x00008000/kickstart_base/g' > $@ || rm -f $@
diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index 26b234dca7..4e895741d4 100644
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -41,15 +41,15 @@
    Interesting registers
    ------------------------------------------------------------------ */
 // Vex field names
-// Not sure, but I think:
+// XXX: Not sure, but I think:
 //   r11 = frame pointer
-//   r12 = ip (??)
+//   r12 = "implicit parameter" (neither caller-save, nor callee-save)
 //   r13 = stack pointer
 //   r14 = link register
 //   r15 = program counter
 #define ARCH_INSTR_PTR        guest_R15
-#define ARCH_STACK_PTR        guest_R13   // XXX ???
-#define ARCH_FRAME_PTR        guest_R0    // XXX ???
+#define ARCH_STACK_PTR        guest_R13
+#define ARCH_FRAME_PTR        guest_R11
 
 #define ARCH_CLREQ_ARGS       guest_R0
 #define ARCH_CLREQ_RET        guest_R0
@@ -57,7 +57,7 @@
 
 // Register numbers, for vg_symtab2.c
 #define R_STACK_PTR           13
-#define R_FRAME_PTR           0           // XXX ???
+#define R_FRAME_PTR           11
 
 // Stack frame layout and linkage
 // XXX ToDo: ???