From: Petar Jovanovic <mips32r2@gmail.com>
Date: Tue, 3 Jul 2012 21:02:42 +0000 (+0000)
Subject: Including additional header file to syswrap-linux.c to see VG_(get_SP).
X-Git-Tag: svn/VALGRIND_3_8_0~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b52be6035b5921278ab4b39b4c6b43cf1f2fb5c;p=thirdparty%2Fvalgrind.git

Including additional header file to syswrap-linux.c to see VG_(get_SP).

Removing a warning of 'implicit declaration of function vgPlain_get_SP' when
compiled for MIPS. Done by including an appropriate header file.
Also, minor style issue correction for  #define PSRAn_BE(n,s,t,a) macro.


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

diff --git a/coregrind/m_syswrap/priv_types_n_macros.h b/coregrind/m_syswrap/priv_types_n_macros.h
index 9040148cff..609c908959 100644
--- a/coregrind/m_syswrap/priv_types_n_macros.h
+++ b/coregrind/m_syswrap/priv_types_n_macros.h
@@ -509,10 +509,10 @@ static inline UWord getERR ( SyscallStatus* st ) {
    in memory at the highest address.
 */
 #if (defined(VGP_mips32_linux) && defined (_MIPSEB))
- #define PSRAn_BE(n,s,t,a)                                         \
-    do {                                                           \
+ #define PSRAn_BE(n,s,t,a)                                        \
+    do {                                                          \
       Addr next = layout->s_arg##n + sizeof(UWord) +              \
-                  VG_(threads)[tid].arch.vex.guest_r29;           \
+                  VG_(get_SP)(tid);                               \
       vg_assert(sizeof(t) <= sizeof(UWord));                      \
       VG_(tdict).track_pre_mem_read(                              \
          Vg_CoreSysCallArgInMem, tid, s"("#a")",                  \
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index d82b1f0fbb..ce716782d5 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -47,6 +47,7 @@
 #include "pub_core_libcprint.h"
 #include "pub_core_libcproc.h"
 #include "pub_core_libcsignal.h"
+#include "pub_core_machine.h"      // VG_(get_SP)
 #include "pub_core_mallocfree.h"
 #include "pub_core_tooliface.h"
 #include "pub_core_options.h"