From fa32067e458f0ba2651d933a7de973d5f5f607a0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 12 Oct 2005 10:50:56 +0000 Subject: [PATCH] Fix x86 specific declaration-before-statement warnings. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4907 --- coregrind/m_syswrap/syswrap-x86-linux.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c index 0ce3db1fd..e96f8982d 100644 --- a/coregrind/m_syswrap/syswrap-x86-linux.c +++ b/coregrind/m_syswrap/syswrap-x86-linux.c @@ -115,6 +115,8 @@ static Addr allocstack ( ThreadId tid ) static void run_a_thread_NORETURN ( Word tidW ) { ThreadId tid = (ThreadId)tidW; + VgSchedReturnCode src; + Int c; VG_(debugLog)(1, "syswrap-x86-linux", "run_a_thread_NORETURN(tid=%lld): " @@ -122,14 +124,14 @@ static void run_a_thread_NORETURN ( Word tidW ) (ULong)tidW); /* Run the thread all the way through. */ - VgSchedReturnCode src = ML_(thread_wrapper)(tid); + src = ML_(thread_wrapper)(tid); VG_(debugLog)(1, "syswrap-x86-linux", "run_a_thread_NORETURN(tid=%lld): " "ML_(thread_wrapper) done\n", (ULong)tidW); - Int c = VG_(count_living_threads)(); + c = VG_(count_living_threads)(); vg_assert(c >= 1); /* stay sane */ if (c == 1) { @@ -146,13 +148,15 @@ static void run_a_thread_NORETURN ( Word tidW ) } else { + ThreadState *tst; + VG_(debugLog)(1, "syswrap-x86-linux", "run_a_thread_NORETURN(tid=%lld): " "not last one standing\n", (ULong)tidW); /* OK, thread is dead, but others still exist. Just exit. */ - ThreadState *tst = VG_(get_ThreadState)(tid); + tst = VG_(get_ThreadState)(tid); /* This releases the run lock */ VG_(exit_thread)(tid); @@ -220,10 +224,12 @@ asm( */ void VG_(main_thread_wrapper_NORETURN)(ThreadId tid) { + Addr esp; + VG_(debugLog)(1, "syswrap-x86-linux", "entering VG_(main_thread_wrapper_NORETURN)\n"); - Addr esp = allocstack(tid); + esp = allocstack(tid); /* If we can't even allocate the first thread's stack, we're hosed. Give up. */