From e245b1b256ff4fb7c1d5f08632666d97d550b302 Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Tue, 1 Apr 2008 10:24:53 +0200 Subject: [PATCH] * src/threads/posix/threads.c: Renamed from here... * src/threads/posix/threads.h, src/threads/threads-common.c, src/threads/threads-common.h: Likewise. * src/threads/posix/thread-posix.c: ...to here. * src/threads/posix/thread-posix.h, src/threads/thread.c, src/threads/thread.h: Likewise. * src/mm/cacao-gc/gc.c, src/mm/cacao-gc/gc.h, src/mm/cacao-gc/rootset.c, src/mm/cacao-gc/rootset.h, src/mm/codememory.c, src/mm/dumpmemory.c, src/mm/memory.c, src/native/jni.c, src/native/jvmti/cacaodbg.c, src/native/jvmti/cacaodbg.h, src/native/jvmti/jvmti.c, src/native/llni.c, src/native/llni.h, src/native/localref.c, src/native/vm/cldc1.1/java_lang_Thread.c, src/native/vm/gnu/java_lang_VMThread.c, src/native/vm/sun/jvm.c, src/threads/Makefile.am, src/threads/posix/lock.c, src/threads/posix/Makefile.am, src/threads/threadlist.c, src/threads/threadlist.h, src/toolbox/logging.c, src/vm/builtin.c, src/vm/exceptions.c, src/vm/finalizer.c, src/vm/jit/alpha/linux/md-os.c, src/vm/jit/arm/linux/md-os.c, src/vm/jit/codegen-common.c, src/vm/jit/i386/darwin/md-os.c, src/vm/jit/i386/linux/md-os.c, src/vm/jit/inline/inline.c, src/vm/jit/intrp/asmpart.c, src/vm/jit/intrp/engine.c, src/vm/jit/jit.c, src/vm/jit/methodtree.c, src/vm/jit/optimizing/profile.c, src/vm/jit/optimizing/recompile.c, src/vm/jit/powerpc/codegen.c, src/vm/jit/powerpc/darwin/md-os.c, src/vm/jit/powerpc/linux/md-os.c, src/vm/jit/powerpc64/linux/md-os.c, src/vm/jit/replace.c, src/vm/jit/s390/md.c, src/vm/jit/show.c, src/vm/jit/stacktrace.c, src/vm/jit/trace.c, src/vm/jit/x86_64/freebsd/md-os.c, src/vm/jit/x86_64/linux/md-os.c, src/vm/signal.c, src/vm/vm.c: Changed filename occurrences. --HG-- rename : src/threads/posix/threads.c => src/threads/posix/thread-posix.c rename : src/threads/posix/threads.h => src/threads/posix/thread-posix.h rename : src/threads/threads-common.c => src/threads/thread.c rename : src/threads/threads-common.h => src/threads/thread.h --- src/mm/cacao-gc/gc.c | 2 +- src/mm/cacao-gc/gc.h | 2 +- src/mm/cacao-gc/rootset.c | 2 +- src/mm/cacao-gc/rootset.h | 2 +- src/mm/codememory.c | 2 +- src/mm/dumpmemory.c | 2 +- src/mm/memory.c | 2 +- src/native/jni.c | 2 +- src/native/jvmti/cacaodbg.c | 2 +- src/native/jvmti/cacaodbg.h | 2 +- src/native/jvmti/jvmti.c | 2 +- src/native/llni.c | 8 +++----- src/native/llni.h | 2 +- src/native/localref.c | 2 +- src/native/vm/cldc1.1/java_lang_Thread.c | 2 +- src/native/vm/gnu/java_lang_VMThread.c | 2 +- src/native/vm/sun/jvm.c | 2 +- src/threads/Makefile.am | 4 ++-- src/threads/posix/Makefile.am | 4 ++-- src/threads/posix/lock.c | 2 +- src/threads/posix/{threads.c => thread-posix.c} | 6 ++---- src/threads/posix/{threads.h => thread-posix.h} | 2 +- src/threads/{threads-common.c => thread.c} | 4 ++-- src/threads/{threads-common.h => thread.h} | 4 ++-- src/threads/threadlist.c | 2 +- src/threads/threadlist.h | 2 +- src/toolbox/logging.c | 11 ++++++----- src/vm/builtin.c | 2 +- src/vm/exceptions.c | 2 +- src/vm/finalizer.c | 2 +- src/vm/jit/alpha/linux/md-os.c | 2 +- src/vm/jit/arm/linux/md-os.c | 2 +- src/vm/jit/codegen-common.c | 2 +- src/vm/jit/i386/darwin/md-os.c | 8 +++----- src/vm/jit/i386/linux/md-os.c | 8 +++----- src/vm/jit/inline/inline.c | 2 +- src/vm/jit/intrp/asmpart.c | 2 +- src/vm/jit/intrp/engine.c | 2 +- src/vm/jit/jit.c | 1 - src/vm/jit/methodtree.c | 2 +- src/vm/jit/optimizing/profile.c | 2 +- src/vm/jit/optimizing/recompile.c | 2 +- src/vm/jit/powerpc/codegen.c | 1 - src/vm/jit/powerpc/darwin/md-os.c | 2 +- src/vm/jit/powerpc/linux/md-os.c | 2 +- src/vm/jit/powerpc64/linux/md-os.c | 2 +- src/vm/jit/replace.c | 2 +- src/vm/jit/s390/md.c | 2 +- src/vm/jit/show.c | 2 +- src/vm/jit/stacktrace.c | 2 +- src/vm/jit/trace.c | 2 +- src/vm/jit/x86_64/freebsd/md-os.c | 2 +- src/vm/jit/x86_64/linux/md-os.c | 8 +++----- src/vm/signal.c | 6 +----- src/vm/vm.c | 2 +- 55 files changed, 71 insertions(+), 86 deletions(-) rename src/threads/posix/{threads.c => thread-posix.c} (99%) rename src/threads/posix/{threads.h => thread-posix.h} (99%) rename src/threads/{threads-common.c => thread.c} (99%) rename src/threads/{threads-common.h => thread.h} (98%) diff --git a/src/mm/cacao-gc/gc.c b/src/mm/cacao-gc/gc.c index 076577b88..1f8f5db41 100644 --- a/src/mm/cacao-gc/gc.c +++ b/src/mm/cacao-gc/gc.c @@ -31,7 +31,7 @@ #include "vm/types.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "compact.h" #include "copy.h" diff --git a/src/mm/cacao-gc/gc.h b/src/mm/cacao-gc/gc.h index 2b4cf29d0..31060381d 100644 --- a/src/mm/cacao-gc/gc.h +++ b/src/mm/cacao-gc/gc.h @@ -35,7 +35,7 @@ #include "config.h" #include "vm/types.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/list.h" #include "vm/jit/replace.h" diff --git a/src/mm/cacao-gc/rootset.c b/src/mm/cacao-gc/rootset.c index 233510704..89ac2c201 100644 --- a/src/mm/cacao-gc/rootset.c +++ b/src/mm/cacao-gc/rootset.c @@ -33,7 +33,7 @@ #include "mm/memory.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/mm/cacao-gc/rootset.h b/src/mm/cacao-gc/rootset.h index a6847da0a..e61315f55 100644 --- a/src/mm/cacao-gc/rootset.h +++ b/src/mm/cacao-gc/rootset.h @@ -31,7 +31,7 @@ typedef struct rootset_t rootset_t; #include "config.h" #include "vm/types.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/jit/replace.h" #include "vmcore/method.h" diff --git a/src/mm/codememory.c b/src/mm/codememory.c index ae6e61faa..7d2fd89c8 100644 --- a/src/mm/codememory.c +++ b/src/mm/codememory.c @@ -30,7 +30,7 @@ #include /* REMOVEME */ #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "mm/codememory.h" #include "mm/memory.h" diff --git a/src/mm/dumpmemory.c b/src/mm/dumpmemory.c index c8f8108f2..0dc191515 100644 --- a/src/mm/dumpmemory.c +++ b/src/mm/dumpmemory.c @@ -30,7 +30,7 @@ #include "mm/dumpmemory.h" #include "mm/memory.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vmcore/options.h" diff --git a/src/mm/memory.c b/src/mm/memory.c index fd4b0f388..21bd05e6e 100644 --- a/src/mm/memory.c +++ b/src/mm/memory.c @@ -47,7 +47,7 @@ #include "native/native.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/native/jni.c b/src/native/jni.c index e2b947d19..50a19fd46 100644 --- a/src/native/jni.c +++ b/src/native/jni.c @@ -91,7 +91,7 @@ struct java_lang_ClassLoader; #endif #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/native/jvmti/cacaodbg.c b/src/native/jvmti/cacaodbg.c index 793586ea5..cb319e78c 100644 --- a/src/native/jvmti/cacaodbg.c +++ b/src/native/jvmti/cacaodbg.c @@ -33,7 +33,7 @@ #include "vm/jit/asmpart.h" #include "vm/stringlocal.h" #include "toolbox/logging.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include #include diff --git a/src/native/jvmti/cacaodbg.h b/src/native/jvmti/cacaodbg.h index c6602eacb..3d6bf6138 100644 --- a/src/native/jvmti/cacaodbg.h +++ b/src/native/jvmti/cacaodbg.h @@ -25,7 +25,7 @@ #ifndef _CACAODBG_H #define _CACAODBG_H -#include "threads/threads-common.h" +#include "threads/thread.h" #include "native/jvmti/jvmti.h" #include "native/include/java_lang_String.h" #include diff --git a/src/native/jvmti/jvmti.c b/src/native/jvmti/jvmti.c index 94dc07bba..9573aa7aa 100644 --- a/src/native/jvmti/jvmti.c +++ b/src/native/jvmti/jvmti.c @@ -52,7 +52,7 @@ #include "vm/options.h" #include "vm/stringlocal.h" #include "mm/memory.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "threads/lock-common.h" #include "vm/exceptions.h" #include "native/include/java_util_Vector.h" diff --git a/src/native/llni.c b/src/native/llni.c index f23e0a782..e9df0d643 100644 --- a/src/native/llni.c +++ b/src/native/llni.c @@ -1,9 +1,7 @@ /* src/native/llni.c - low level native interfarce (LLNI) - Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -29,7 +27,7 @@ #include -#include "threads/threads-common.h" +#include "threads/thread.h" /* LLNI critical sections ****************************************************** diff --git a/src/native/llni.h b/src/native/llni.h index 03966b7db..865d2b962 100644 --- a/src/native/llni.h +++ b/src/native/llni.h @@ -53,7 +53,7 @@ #include "native/localref.h" -#include "threads/threads-common.h" +#include "threads/thread.h" /* LLNI macros ***************************************************************** diff --git a/src/native/localref.c b/src/native/localref.c index c9440f678..8e364b515 100644 --- a/src/native/localref.c +++ b/src/native/localref.c @@ -32,7 +32,7 @@ #include "native/localref.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/native/vm/cldc1.1/java_lang_Thread.c b/src/native/vm/cldc1.1/java_lang_Thread.c index f61c1c194..22c0dbb28 100644 --- a/src/native/vm/cldc1.1/java_lang_Thread.c +++ b/src/native/vm/cldc1.1/java_lang_Thread.c @@ -34,7 +34,7 @@ #include "native/include/java_lang_Thread.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/native/vm/gnu/java_lang_VMThread.c b/src/native/vm/gnu/java_lang_VMThread.c index e66bcfe90..1b2ea7147 100644 --- a/src/native/vm/gnu/java_lang_VMThread.c +++ b/src/native/vm/gnu/java_lang_VMThread.c @@ -39,7 +39,7 @@ #include "native/include/java_lang_Thread.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/exceptions.h" #include "vm/stringlocal.h" diff --git a/src/native/vm/sun/jvm.c b/src/native/vm/sun/jvm.c index 1b562b1b0..0321039f9 100644 --- a/src/native/vm/sun/jvm.c +++ b/src/native/vm/sun/jvm.c @@ -70,7 +70,7 @@ #include "native/vm/sun/hpi.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" #include "toolbox/list.h" diff --git a/src/threads/Makefile.am b/src/threads/Makefile.am index 6ba1d51d8..844235966 100644 --- a/src/threads/Makefile.am +++ b/src/threads/Makefile.am @@ -44,8 +44,8 @@ libthreads_la_SOURCES = \ lock-common.h \ threadlist.c \ threadlist.h \ - threads-common.c \ - threads-common.h + thread.c \ + thread.h libthreads_la_LIBADD = \ $(THREAD_LIB) diff --git a/src/threads/posix/Makefile.am b/src/threads/posix/Makefile.am index 1b452ac15..1ea176c9a 100644 --- a/src/threads/posix/Makefile.am +++ b/src/threads/posix/Makefile.am @@ -32,8 +32,8 @@ libposix_la_SOURCES = \ lock.c \ lock.h \ threadlist-posix.c \ - threads.c \ - threads.h + thread-posix.c \ + thread-posix.h ## Local variables: diff --git a/src/threads/posix/lock.c b/src/threads/posix/lock.c index d1028c685..9dfd45712 100644 --- a/src/threads/posix/lock.c +++ b/src/threads/posix/lock.c @@ -40,7 +40,7 @@ #include "threads/lock-common.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "threads/posix/lock.h" diff --git a/src/threads/posix/threads.c b/src/threads/posix/thread-posix.c similarity index 99% rename from src/threads/posix/threads.c rename to src/threads/posix/thread-posix.c index 17708a7bd..8756cdcc8 100644 --- a/src/threads/posix/threads.c +++ b/src/threads/posix/thread-posix.c @@ -1,4 +1,4 @@ -/* src/threads/posix/threads.c - native threads support +/* src/threads/posix/thread-posix.c - POSIX thread functions Copyright (C) 1996-2005, 2006, 2007, 2008 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO @@ -75,9 +75,7 @@ #include "threads/lock-common.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" - -#include "threads/posix/threads.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/threads/posix/threads.h b/src/threads/posix/thread-posix.h similarity index 99% rename from src/threads/posix/threads.h rename to src/threads/posix/thread-posix.h index 63b52414e..73106f19f 100644 --- a/src/threads/posix/threads.h +++ b/src/threads/posix/thread-posix.h @@ -1,4 +1,4 @@ -/* src/threads/posix/threads.h - native threads header +/* src/threads/posix/thread-posix.h - POSIX thread functions Copyright (C) 1996-2005, 2006, 2007, 2008 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO diff --git a/src/threads/threads-common.c b/src/threads/thread.c similarity index 99% rename from src/threads/threads-common.c rename to src/threads/thread.c index 6637f0e56..1552eff4f 100644 --- a/src/threads/threads-common.c +++ b/src/threads/thread.c @@ -1,4 +1,4 @@ -/* src/threads/threads-common.c - machine independent thread functions +/* src/threads/thread.c - machine independent thread functions Copyright (C) 2007, 2008 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO @@ -52,7 +52,7 @@ #include "threads/critical.h" #include "threads/lock-common.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/threads/threads-common.h b/src/threads/thread.h similarity index 98% rename from src/threads/threads-common.h rename to src/threads/thread.h index a0dc51a80..7de0b1d91 100644 --- a/src/threads/threads-common.h +++ b/src/threads/thread.h @@ -1,4 +1,4 @@ -/* src/threads/threads-common.h - machine independent thread functions +/* src/threads/thread.h - machine independent thread functions Copyright (C) 2007, 2008 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO @@ -29,7 +29,7 @@ #include "config.h" #if defined(ENABLE_THREADS) -# include "threads/posix/threads.h" +# include "threads/posix/thread-posix.h" #else # include "threads/none/threads.h" #endif diff --git a/src/threads/threadlist.c b/src/threads/threadlist.c index ffb4abdd5..898f8f83d 100644 --- a/src/threads/threadlist.c +++ b/src/threads/threadlist.c @@ -30,7 +30,7 @@ #include "mm/memory.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/list.h" diff --git a/src/threads/threadlist.h b/src/threads/threadlist.h index d3b1659e6..b3dd2cbf3 100644 --- a/src/threads/threadlist.h +++ b/src/threads/threadlist.h @@ -30,7 +30,7 @@ #include -#include "threads/threads-common.h" +#include "threads/thread.h" /* function prototypes ********************************************************/ diff --git a/src/toolbox/logging.c b/src/toolbox/logging.c index 7080954e8..2643846f4 100644 --- a/src/toolbox/logging.c +++ b/src/toolbox/logging.c @@ -1,9 +1,7 @@ /* src/toolbox/logging.c - contains logging functions - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -34,9 +32,12 @@ #include "vm/types.h" #include "mm/memory.h" -#include "threads/threads-common.h" + +#include "threads/thread.h" + #include "toolbox/logging.h" #include "toolbox/util.h" + #include "vm/global.h" #if defined(ENABLE_STATISTICS) diff --git a/src/vm/builtin.c b/src/vm/builtin.c index ab58b68b1..239bb284c 100644 --- a/src/vm/builtin.c +++ b/src/vm/builtin.c @@ -54,7 +54,7 @@ #include "native/llni.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" #include "toolbox/util.h" diff --git a/src/vm/exceptions.c b/src/vm/exceptions.c index 707328ec7..b0a23012a 100644 --- a/src/vm/exceptions.c +++ b/src/vm/exceptions.c @@ -45,7 +45,7 @@ #include "native/include/java_lang_Throwable.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/util.h" diff --git a/src/vm/finalizer.c b/src/vm/finalizer.c index eac3fdb61..833efbfb1 100644 --- a/src/vm/finalizer.c +++ b/src/vm/finalizer.c @@ -32,7 +32,7 @@ #include "mm/memory.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/alpha/linux/md-os.c b/src/vm/jit/alpha/linux/md-os.c index 76058bbe3..c080a7bc2 100644 --- a/src/vm/jit/alpha/linux/md-os.c +++ b/src/vm/jit/alpha/linux/md-os.c @@ -35,7 +35,7 @@ #include "vm/jit/alpha/md.h" #include "vm/jit/alpha/md-abi.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/arm/linux/md-os.c b/src/vm/jit/arm/linux/md-os.c index 4ba5ae1f6..486f18fc3 100644 --- a/src/vm/jit/arm/linux/md-os.c +++ b/src/vm/jit/arm/linux/md-os.c @@ -50,7 +50,7 @@ typedef struct ucontext { #define scontext_t struct sigcontext -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/exceptions.h" #include "vm/signallocal.h" diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c index c840f0e6b..466ca80a1 100644 --- a/src/vm/jit/codegen-common.c +++ b/src/vm/jit/codegen-common.c @@ -75,7 +75,7 @@ #include "native/include/java_lang_Class.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/i386/darwin/md-os.c b/src/vm/jit/i386/darwin/md-os.c index 371bd6b95..c1bd25b3f 100644 --- a/src/vm/jit/i386/darwin/md-os.c +++ b/src/vm/jit/i386/darwin/md-os.c @@ -1,9 +1,7 @@ /* src/vm/jit/i386/darwin/md-os.c - machine dependent i386 Darwin functions - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -37,7 +35,7 @@ #include "vm/jit/i386/codegen.h" #include "vm/jit/i386/md.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/i386/linux/md-os.c b/src/vm/jit/i386/linux/md-os.c index 13a585970..de50d8115 100644 --- a/src/vm/jit/i386/linux/md-os.c +++ b/src/vm/jit/i386/linux/md-os.c @@ -1,9 +1,7 @@ /* src/vm/jit/i386/linux/md-os.c - machine dependent i386 Linux functions - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -37,7 +35,7 @@ #include "vm/jit/i386/codegen.h" #include "vm/jit/i386/md.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c index e44fe6320..e3d968a68 100644 --- a/src/vm/jit/inline/inline.c +++ b/src/vm/jit/inline/inline.c @@ -35,7 +35,7 @@ #include "mm/memory.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/vm/jit/intrp/asmpart.c b/src/vm/jit/intrp/asmpart.c index d6cde194f..aee1f03ec 100644 --- a/src/vm/jit/intrp/asmpart.c +++ b/src/vm/jit/intrp/asmpart.c @@ -31,7 +31,7 @@ #include "arch.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/intrp/engine.c b/src/vm/jit/intrp/engine.c index 29c190590..1e98d1e8b 100644 --- a/src/vm/jit/intrp/engine.c +++ b/src/vm/jit/intrp/engine.c @@ -39,7 +39,7 @@ #include "mm/memory.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c index 2c0905e03..0802f4d6e 100644 --- a/src/vm/jit/jit.c +++ b/src/vm/jit/jit.c @@ -39,7 +39,6 @@ #include "toolbox/logging.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" #include "vm/global.h" #include "vm/initialize.h" diff --git a/src/vm/jit/methodtree.c b/src/vm/jit/methodtree.c index 430f109ab..e825ed89e 100644 --- a/src/vm/jit/methodtree.c +++ b/src/vm/jit/methodtree.c @@ -29,7 +29,7 @@ #include "mm/memory.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/avl.h" diff --git a/src/vm/jit/optimizing/profile.c b/src/vm/jit/optimizing/profile.c index e117f03b5..319b2289a 100644 --- a/src/vm/jit/optimizing/profile.c +++ b/src/vm/jit/optimizing/profile.c @@ -33,7 +33,7 @@ #include "mm/memory.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/stringlocal.h" diff --git a/src/vm/jit/optimizing/recompile.c b/src/vm/jit/optimizing/recompile.c index d5ee4aa19..aa6198913 100644 --- a/src/vm/jit/optimizing/recompile.c +++ b/src/vm/jit/optimizing/recompile.c @@ -33,7 +33,7 @@ #include "mm/memory.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/list.h" diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c index 67dd76f8f..8ff8c6c35 100644 --- a/src/vm/jit/powerpc/codegen.c +++ b/src/vm/jit/powerpc/codegen.c @@ -42,7 +42,6 @@ #include "native/native.h" #include "threads/lock-common.h" -#include "threads/threads-common.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/powerpc/darwin/md-os.c b/src/vm/jit/powerpc/darwin/md-os.c index 20e69c635..44b0f73d8 100644 --- a/src/vm/jit/powerpc/darwin/md-os.c +++ b/src/vm/jit/powerpc/darwin/md-os.c @@ -35,7 +35,7 @@ #include "vm/jit/powerpc/codegen.h" #include "vm/jit/powerpc/darwin/md-abi.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/powerpc/linux/md-os.c b/src/vm/jit/powerpc/linux/md-os.c index c0488347b..f6395dcd6 100644 --- a/src/vm/jit/powerpc/linux/md-os.c +++ b/src/vm/jit/powerpc/linux/md-os.c @@ -35,7 +35,7 @@ #include "vm/jit/powerpc/md.h" #include "vm/jit/powerpc/linux/md-abi.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/powerpc64/linux/md-os.c b/src/vm/jit/powerpc64/linux/md-os.c index fdc40e395..1dcc8feee 100644 --- a/src/vm/jit/powerpc64/linux/md-os.c +++ b/src/vm/jit/powerpc64/linux/md-os.c @@ -35,7 +35,7 @@ #include "vm/jit/powerpc64/md.h" #include "vm/jit/powerpc64/linux/md-abi.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/jit/replace.c b/src/vm/jit/replace.c index 68cc8e5a6..20fff572f 100644 --- a/src/vm/jit/replace.c +++ b/src/vm/jit/replace.c @@ -38,7 +38,7 @@ #include "mm/memory.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/vm/jit/s390/md.c b/src/vm/jit/s390/md.c index 074f5f25c..a350c7024 100644 --- a/src/vm/jit/s390/md.c +++ b/src/vm/jit/s390/md.c @@ -34,7 +34,7 @@ #include "vm/jit/s390/md-abi.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/exceptions.h" #include "vm/signallocal.h" diff --git a/src/vm/jit/show.c b/src/vm/jit/show.c index 7f04037f3..bfb033167 100644 --- a/src/vm/jit/show.c +++ b/src/vm/jit/show.c @@ -51,7 +51,7 @@ #if defined(ENABLE_DEBUG_FILTER) # include # include -# include "threads/threads-common.h" +# include "threads/thread.h" #endif diff --git a/src/vm/jit/stacktrace.c b/src/vm/jit/stacktrace.c index 7905136e4..91a26c674 100644 --- a/src/vm/jit/stacktrace.c +++ b/src/vm/jit/stacktrace.c @@ -51,7 +51,7 @@ # include "native/include/java_lang_VMThrowable.h" #endif -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/vm/jit/trace.c b/src/vm/jit/trace.c index 62d2b5a3f..72113f03e 100644 --- a/src/vm/jit/trace.c +++ b/src/vm/jit/trace.c @@ -37,7 +37,7 @@ #include "native/include/java_lang_String.h" #include "native/include/java_lang_Throwable.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/vm/jit/x86_64/freebsd/md-os.c b/src/vm/jit/x86_64/freebsd/md-os.c index 305600e2b..6e4a2b227 100644 --- a/src/vm/jit/x86_64/freebsd/md-os.c +++ b/src/vm/jit/x86_64/freebsd/md-os.c @@ -29,7 +29,7 @@ #include #include -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/signallocal.h" diff --git a/src/vm/jit/x86_64/linux/md-os.c b/src/vm/jit/x86_64/linux/md-os.c index d4bbbac8e..1a2e7dbf0 100644 --- a/src/vm/jit/x86_64/linux/md-os.c +++ b/src/vm/jit/x86_64/linux/md-os.c @@ -1,9 +1,7 @@ /* src/vm/jit/x86_64/linux/md-os.c - machine dependent x86_64 Linux functions - Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -39,7 +37,7 @@ #include "vm/jit/x86_64/codegen.h" #include "vm/jit/x86_64/md.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "vm/builtin.h" #include "vm/exceptions.h" diff --git a/src/vm/signal.c b/src/vm/signal.c index 3b6595d5a..14e18c873 100644 --- a/src/vm/signal.c +++ b/src/vm/signal.c @@ -43,11 +43,7 @@ #include "native/llni.h" -#if defined(ENABLE_THREADS) -# include "threads/threads-common.h" -#else -# include "threads/none/threads.h" -#endif +#include "threads/thread.h" #include "toolbox/logging.h" diff --git a/src/vm/vm.c b/src/vm/vm.c index c9f884e7b..238242b59 100644 --- a/src/vm/vm.c +++ b/src/vm/vm.c @@ -60,7 +60,7 @@ #include "threads/lock-common.h" #include "threads/threadlist.h" -#include "threads/threads-common.h" +#include "threads/thread.h" #include "toolbox/logging.h" -- 2.25.1