update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / drd / drd_load_store.c

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_load_store.c b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_load_store.c
index 2b6d6f50266219d513374e3b0f35e497701d07ab..a1888347e36fff81e7db7c8f85cf65e42e824bac 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_load_store.c
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/drd_load_store.c
@@ -1,8 +1,8 @@
-/* -*- mode: C; c-basic-offset: 3; -*- */
+/* -*- mode: C; c-basic-offset: 3; indent-tabs-mode: nil; -*- */
 /*
   This file is part of drd, a thread error detector.
 
-  Copyright (C) 2006-2010 Bart Van Assche <bart.vanassche@gmail.com>.
+  Copyright (C) 2006-2011 Bart Van Assche <bvanassche@acm.org>.
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -48,6 +48,8 @@
 #define STACK_POINTER_OFFSET OFFSET_ppc64_GPR1
 #elif defined(VGA_arm)
 #define STACK_POINTER_OFFSET OFFSET_arm_R13
+#elif defined(VGA_s390x)
+#define STACK_POINTER_OFFSET OFFSET_s390x_r15
 #else
 #error Unknown architecture.
 #endif
@@ -149,8 +151,8 @@ VG_REGPARM(2) void DRD_(trace_load)(Addr addr, SizeT size)
 {
 #ifdef ENABLE_DRD_CONSISTENCY_CHECKS
    /* The assert below has been commented out because of performance reasons.*/
-   tl_assert(thread_get_running_tid()
-             == VgThreadIdToDrdThreadId(VG_(get_running_tid())));
+   tl_assert(DRD_(thread_get_running_tid)()
+             == DRD_(VgThreadIdToDrdThreadId)(VG_(get_running_tid())));
 #endif
 
    if (DRD_(running_thread_is_recording_loads)()
@@ -215,8 +217,8 @@ VG_REGPARM(2) void DRD_(trace_store)(Addr addr, SizeT size)
 {
 #ifdef ENABLE_DRD_CONSISTENCY_CHECKS
    /* The assert below has been commented out because of performance reasons.*/
-   tl_assert(thread_get_running_tid()
-             == VgThreadIdToDrdThreadId(VG_(get_running_tid())));
+   tl_assert(DRD_(thread_get_running_tid)()
+             == DRD_(VgThreadIdToDrdThreadId)(VG_(get_running_tid())));
 #endif
 
    if (DRD_(running_thread_is_recording_stores)()