From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Fri, 15 Aug 2014 13:03:24 +0000 (+0000)
Subject: Some cleanup post QGetTlsAddr commit
X-Git-Tag: svn/VALGRIND_3_10_0~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2101636621a1278fea453a75f186ea243bba063e;p=thirdparty%2Fvalgrind.git

Some cleanup post QGetTlsAddr commit
* remove useless commented line in hgtls.vgtest
* avoid some #ifdef in arch specific code, hoping to discover more compile
  time errors.


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

diff --git a/coregrind/m_gdbserver/valgrind-low-amd64.c b/coregrind/m_gdbserver/valgrind-low-amd64.c
index c48afc2382..36f3b5d3b8 100644
--- a/coregrind/m_gdbserver/valgrind-low-amd64.c
+++ b/coregrind/m_gdbserver/valgrind-low-amd64.c
@@ -348,11 +348,8 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_amd64)
-   return (CORE_ADDR**)(tst->arch.vex.guest_FS_ZERO + 0x8);
-#else
-   vg_assert(0);
-#endif
+   VexGuestAMD64State* amd64 = (VexGuestAMD64State*)&tst->arch.vex;
+   return (CORE_ADDR**)((CORE_ADDR)amd64->guest_FS_ZERO + 0x8);
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-arm.c b/coregrind/m_gdbserver/valgrind-low-arm.c
index 9516d005c8..68a5baa89a 100644
--- a/coregrind/m_gdbserver/valgrind-low-arm.c
+++ b/coregrind/m_gdbserver/valgrind-low-arm.c
@@ -288,12 +288,9 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_arm)
+   VexGuestARMState* arm = (VexGuestARMState*)&tst->arch.vex;
    // arm dtv is pointed to by TPIDRURO
-   return (CORE_ADDR**)(tst->arch.vex.guest_TPIDRURO);
-#else
-   vg_assert(0);
-#endif
+   return (CORE_ADDR**)((CORE_ADDR)arm->guest_TPIDRURO);
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-arm64.c b/coregrind/m_gdbserver/valgrind-low-arm64.c
index 56f4ba6a47..e9f0a9fb56 100644
--- a/coregrind/m_gdbserver/valgrind-low-arm64.c
+++ b/coregrind/m_gdbserver/valgrind-low-arm64.c
@@ -263,12 +263,9 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_arm64)
+   VexGuestARM64State* arm64 = (VexGuestARM64State*)&tst->arch.vex;
    // arm64 dtv is pointed to by TPIDR_EL0.
-   return (CORE_ADDR**)(tst->arch.vex.guest_TPIDR_EL0);
-#else
-   vg_assert(0);
-#endif
+   return (CORE_ADDR**)((CORE_ADDR)arm64->guest_TPIDR_EL0);
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-mips32.c b/coregrind/m_gdbserver/valgrind-low-mips32.c
index 1490867a74..91b40866a8 100644
--- a/coregrind/m_gdbserver/valgrind-low-mips32.c
+++ b/coregrind/m_gdbserver/valgrind-low-mips32.c
@@ -356,12 +356,10 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_mips32)
+   VexGuestMIPS32State* mips32 = (VexGuestMIPS32State*)&tst->arch.vex;
    // mips32 dtv location similar to ppc64
-   return (CORE_ADDR**)(tst->arch.vex.guest_ULR - 0x7000 - sizeof(CORE_ADDR));
-#else
-   vg_assert(0);
-#endif
+   return (CORE_ADDR**)((CORE_ADDR)mips32->guest_ULR 
+                        - 0x7000 - sizeof(CORE_ADDR));
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-mips64.c b/coregrind/m_gdbserver/valgrind-low-mips64.c
index d35df419f5..75be5dd52c 100644
--- a/coregrind/m_gdbserver/valgrind-low-mips64.c
+++ b/coregrind/m_gdbserver/valgrind-low-mips64.c
@@ -357,13 +357,10 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_mips64)
+   VexGuestMIPS64State* mips64 = (VexGuestMIPS64State*)&tst->arch.vex;
    // mips64 dtv location similar to ppc64
-   return (CORE_ADDR**)(tst->arch.vex.guest_ULR - 0x7000 - sizeof(CORE_ADDR));
-   return NULL;
-#else
-   vg_assert(0);
-#endif
+   return (CORE_ADDR**)((CORE_ADDR)mips64->guest_ULR 
+                        - 0x7000 - sizeof(CORE_ADDR));
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-ppc32.c b/coregrind/m_gdbserver/valgrind-low-ppc32.c
index 6d2d44e046..87e60728f1 100644
--- a/coregrind/m_gdbserver/valgrind-low-ppc32.c
+++ b/coregrind/m_gdbserver/valgrind-low-ppc32.c
@@ -334,13 +334,11 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_ppc32)
+   VexGuestPPC32State* ppc32 = (VexGuestPPC32State*)&tst->arch.vex;
    // ppc32 dtv is located just before the tcb, which is 0x7000 before
    // the thread id (r2)
-   return (CORE_ADDR**)(tst->arch.vex.guest_GPR2 - 0x7000 - sizeof(CORE_ADDR));
-#else
-   vg_assert(0);
-#endif
+   return (CORE_ADDR**)((CORE_ADDR)ppc32->guest_GPR2
+                        - 0x7000 - sizeof(CORE_ADDR));
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-ppc64.c b/coregrind/m_gdbserver/valgrind-low-ppc64.c
index 490322d5cf..349c9bb25b 100644
--- a/coregrind/m_gdbserver/valgrind-low-ppc64.c
+++ b/coregrind/m_gdbserver/valgrind-low-ppc64.c
@@ -331,13 +331,11 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_ppc64be) || defined(VGA_ppc64le)
+   VexGuestPPC64State* ppc64 = (VexGuestPPC64State*)&tst->arch.vex;
    // ppc64 dtv is located just before the tcb, which is 0x7000 before 
    // the thread id (r13)
-   return (CORE_ADDR**)(tst->arch.vex.guest_GPR13 - 0x7000 - sizeof(CORE_ADDR));
-#else
-   vg_assert(0);
-#endif
+   return (CORE_ADDR**)((CORE_ADDR)ppc64->guest_GPR13 
+                        - 0x7000 - sizeof(CORE_ADDR));
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-s390x.c b/coregrind/m_gdbserver/valgrind-low-s390x.c
index 8ba5180b8b..3a963be20d 100644
--- a/coregrind/m_gdbserver/valgrind-low-s390x.c
+++ b/coregrind/m_gdbserver/valgrind-low-s390x.c
@@ -199,14 +199,11 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_s390x)
+   VexGuestS390XState* s390x = (VexGuestS390XState*)&tst->arch.vex;
    // Thread pointer is in a0 (high 32 bits) and a1. Dtv is the second word.
-   return (CORE_ADDR**)(((CORE_ADDR)tst->arch.vex.guest_a0 << 32 
-                         | (CORE_ADDR)tst->arch.vex.guest_a1)
+   return (CORE_ADDR**)((Addr)((Addr64)s390x->guest_a0 << 32
+                              | (Addr64)s390x->guest_a1)
                         + sizeof(CORE_ADDR));
-#else
-   vg_assert(0);
-#endif
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/coregrind/m_gdbserver/valgrind-low-x86.c b/coregrind/m_gdbserver/valgrind-low-x86.c
index 43ac1eb9b6..ffe124be38 100644
--- a/coregrind/m_gdbserver/valgrind-low-x86.c
+++ b/coregrind/m_gdbserver/valgrind-low-x86.c
@@ -259,14 +259,14 @@ const char* target_xml (Bool shadow_mode)
 
 static CORE_ADDR** target_get_dtv (ThreadState *tst)
 {
-#if defined(VGA_x86)
+   VexGuestX86State* x86 = (VexGuestX86State*)&tst->arch.vex;
    // FIXME: should make the below formally visible from VEX.
    extern ULong x86g_use_seg_selector ( HWord ldt, HWord gdt,
                                         UInt seg_selector, UInt virtual_addr );
 
-   ULong dtv_loc_g = x86g_use_seg_selector (tst->arch.vex.guest_LDT,
-                                            tst->arch.vex.guest_GDT,
-                                            tst->arch.vex.guest_GS,
+   ULong dtv_loc_g = x86g_use_seg_selector (x86->guest_LDT,
+                                            x86->guest_GDT,
+                                            x86->guest_GS,
                                             0x4);
    if (dtv_loc_g == 1ULL << 32) {
       dlog(0, "Error getting x86 dtv\n");
@@ -275,9 +275,6 @@ static CORE_ADDR** target_get_dtv (ThreadState *tst)
       CORE_ADDR dtv_loc = dtv_loc_g;
       return (CORE_ADDR**)dtv_loc;
    }
-#else
-   vg_assert(0);
-#endif
 }
 
 static struct valgrind_target_ops low_target = {
diff --git a/gdbserver_tests/hgtls.vgtest b/gdbserver_tests/hgtls.vgtest
index 60a73b9a90..42bc68d77d 100644
--- a/gdbserver_tests/hgtls.vgtest
+++ b/gdbserver_tests/hgtls.vgtest
@@ -9,4 +9,3 @@ argsB: --quiet -l 60 --nx ../none/tests/tls
 stdinB: hgtls.stdinB.gdb
 stdoutB_filter: filter_gdb
 stderrB_filter: filter_make_empty
-# stderrB_filter_args: hg01_all_ok.c