Merged with tip.

* src/vm/jit/i386/darwin/md-asm.h: Repaired --enable-cycles-stats.
* src/vm/jit/stacktrace.c: Likewise.

* src/cacaoh/dummy.c: Removed asm_criticalsections and
asm_getclassvalues_atomic. They have not been used anywhere in a long time.
* src/threads/critical.h: Likewise.
* src/vm/jit/i386/cygwin/md-asm.h: Likewise.
* src/vm/jit/i386/darwin/md-asm.h: Likewise.
* src/vm/jit/intrp/asmpart.c: Likewise.

* tests/regression/bugzilla/All.java: Added test case for PR65.

* src/vm/builtin.c (builtin_descriptorscompatible): Experimental fix for
bugzilla bug #65.

* tests/threads/threadInterrupt.java: Added brief comment explaining the
purpose of this test.
* tests/threads/waitAndInterrupt.java: Likewise.

* tests/weakref.java: New test for weak references.

Backed out changeset ecf451e74e7e

* tests/threads/threadInterrupt.java: Added brief comment explaining the
purpose of this test.
* tests/threads/waitAndInterrupt.java: Likewise.

* tests/regression/jasmin/Makefile.am (JAVA): Prefix LD_LIBRARY_PATH.
(JASMIN_TESTS): Removed.
(EXTRA_DIST): Removed JASMIN_TESTS, added $(srcdir)/*.j.
(build): Target added.
(run): Likewise.
* tests/regression/jasmin/runtest: Removed compilation of the tests.

* tests/regression/jasmin/test_verify_fail_jsr_multiple_returns.j:
Moved from here...
* tests/regression/jasmin/test_verify_fail_jsr_multiple_returns.j-no:
... to here.

* tests/regression/jasmin/test_verify_fail_jsr_recursion.j: Likewise.
* tests/regression/jasmin/test_verify_fail_jsr_recursion.j-no:
Likewise.

* tests/regression/jasmin/test_verify_fail_jsr_recursion_terminates.j:
Likewise.
* tests/regression/jasmin/test_verify_fail_jsr_recursion_terminates.j-no:
Likewise.

--HG--
rename : tests/regression/jasmin/test_verify_fail_jsr_multiple_returns.j => tests/regression/jasmin/test_verify_fail_jsr_multiple_returns.j-no
rename : tests/regression/jasmin/test_verify_fail_jsr_recursion.j => tests/regression/jasmin/test_verify_fail_jsr_recursion.j-no
rename : tests/regression/jasmin/test_verify_fail_jsr_recursion_terminates.j => tests/regression/jasmin/test_verify_fail_jsr_recursion_terminates.j-no

* tests/regression/Makefile.am (JAVACCMD): Added -source 1.5 -target
1.5 -nowarn.
(SOURCE_FILES): Removed HelloWorld.java.
(SIMPLE_JAVA_TESTS): Removed.
(run): Target added.
* tests/regression/HelloWorld.java: Removed.

* tests/regression/assertion/Makefile.am (JAVACCMD): Added -source 1.5
-target 1.5.
(run): Target added.

* tests/regression/bugzilla/Makefile.am (run): Target added.

* tests/regression/junit/Makefile.am (JAVACCMD): Added -source 1.5
-target 1.5 -nowarn (TODO: move this into a variable).
(run): Target added.

* configure.ac (AC_INIT): Bumped version to 0.99rc3.

* .hgignore: Added m4/libtool.m4, m4/ltoptions.m4, m4/ltsugar.m4,
m4/ltversion.m4, m4/lt~obsolete.m4.

* m4/jre-layout.m4 (AC_CHECK_WITH_JRE_LAYOUT): Renamed to
AC_CHECK_ENABLE_JRE_LAYOUT.
* configure.ac: Likewise.

* src/cacao/cacao.c: Renamed WITH_JRE_LAYOUT to ENABLE_JRE_LAYOUT.
* src/native/vm/gnu/gnu_classpath_VMSystemProperties.c: Likewise.
* src/vm/properties.c: Likewise.
* src/vm/vm.c: Likewise.
* src/vmcore/system.h: Likewise.

* .hgignore: Added doc/doxygen/html, doc/doxygen/latex.
* configure.ac (AC_CONFIG_FILES): Added doc/doxygen/Makefile.
* doc/Makefile.am (SUBDIRS): Added doxygen.
* doc/doxygen/Doxyfile: New file.
* doc/doxygen/Makefile.am: Likewise.

* src/vm/jit/arm/linux/md-os.c (md_executionstate_read): New function
(but not implemted yet).
(md_executionstate_write): Likewise.

* Merged in new trap code (twisti-branch).

* src/vm/jit/sparc64/Makefile.am (libarch_la_SOURCES): Added
md-trap.h.
* src/vm/jit/sparc64/codegen.c: Use new trap stuff.
* src/vm/jit/sparc64/emit.c: Likewise.
* src/vm/jit/sparc64/linux/md-os.c: Likewise.
* src/vm/jit/sparc64/md-trap.h: New file.
* src/vm/jit/sparc64/solaris/md-os.c: Use new trap stuff.

--HG--
branch : twisti

* src/vm/jit/powerpc64/md.c (md_patch_replacement_point): Use new trap
stuff.

--HG--
branch : twisti

* src/vm/jit/m68k/linux/md-os.h: Removed.
* src/vm/jit/m68k/linux/Makefile.am (libmd_la_SOURCES): Removed
md-os.h.

--HG--
branch : twisti

* src/vm/jit/patcher-common.c (patcher_handler): Fixed compiler
warnings.

--HG--
branch : twisti

* src/vm/jit/patcher-common.c (patcher_handler) [ENABLE_DISASSEMBLER]:
Use disassembler to print machine code.

--HG--
branch : twisti

* src/vm/jit/m68k/Makefile.am (libarch_la_SOURCES): Added md-trap.h.
* src/vm/jit/m68k/codegen.c: Use new trap stuff.
* src/vm/jit/m68k/emit.c: Likewise.
* src/vm/jit/m68k/linux/md-os.c: Likewise.
* src/vm/jit/m68k/md-trap.h: New file.

--HG--
branch : twisti

* src/vm/jit/codegen-common.c (codegen_start_native_call) [__I386__]:
Enable tracing native methods.
(codegen_finish_native_call): Likewise.

* Merged with tip.

* src/vm/jit/codegen-common.c (codegen_start_native_call): Added
__M68K__ to trace native methods.
(codegen_finish_native_call): Likewise.

* src/vm/jit/m68k/codegen.c (codegen_emit_stub_native): Removed old,
deprecated stuff (patcher and call trace).

* src/vm/jit/trace.c (trace_java_call_enter): Don't trace builtins, it
does not work (because of the ABI).
(trace_java_call_exit): Likewise.

* src/vmcore/method.h (method_is_builtin): New function.

* src/vm/jit/mips/linux/md-os.c (md_signal_handler_sigsegv): Added
patch from
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=441122#35.

* src/vm/jit/powerpc/Makefile.am (libarch_la_SOURCES): Added
md-trap.h.
* src/vm/jit/powerpc/codegen.c: Use new trap stuff.
* src/vm/jit/powerpc/emit.c: Likewise.
* src/vm/jit/powerpc/linux/md-os.c: Likewise.
* src/vm/jit/powerpc/md-trap.h: New file.

--HG--
branch : twisti

* src/vm/jit/s390/Makefile.am (libarch_la_SOURCES): Added md-trap.h.
* src/vm/jit/s390/codegen.c: Use new trap stuff.
* src/vm/jit/s390/emit.c: Likewise.
* src/vm/jit/s390/md-trap.h: New file.
* src/vm/jit/s390/md.c: Use new trap stuff.

--HG--
branch : twisti

* src/vm/jit/mips/Makefile.am (libarch_la_SOURCES): Added md-trap.h.
* src/vm/jit/mips/codegen.c: Use new trap stuff.
* src/vm/jit/mips/emit.c: Likewise.
* src/vm/jit/mips/linux/md-os.c: Likewise.
* src/vm/jit/mips/md-trap.h: New file.

--HG--
branch : twisti

* src/vm/jit/arm/Makefile.am (libarch_la_SOURCES): Added md-trap.h.
* src/vm/jit/arm/emit.c: Use new trap stuff.
* src/vm/jit/arm/linux/md-os.c: Likewise.
* src/vm/jit/arm/md-trap.h: New file.

--HG--
branch : twisti

* src/vm/jit/powerpc64/Makefile.am (libarch_la_SOURCES): Added
md-trap.h.
* src/vm/jit/powerpc64/codegen.c: Use new trap stuff.
* src/vm/jit/powerpc64/emit.c: Likewise.
* src/vm/jit/powerpc64/linux/md-os.c: Likewise.
* src/vm/jit/powerpc64/md-trap.h: New file.

--HG--
branch : twisti

* src/vm/jit/alpha/Makefile.am (libarch_la_SOURCES): Added md-trap.h.
* src/vm/jit/alpha/codegen.c: Use new trap stuff.
* src/vm/jit/alpha/emit.c: Likewise.
* src/vm/jit/alpha/linux/md-os.c: Likewise.
* src/vm/jit/alpha/md-trap.h: New file.
* src/vm/jit/alpha/md.c: Use new trap stuff.

--HG--
branch : twisti

* configure.ac (AC_INIT): Bumped version to 0.99rc2.

* Merged with ea434f5851f4.

* .hgignore: Removed tests/regression/codepatching/*.class.
* configure.ac (AC_CONFIG_FILES): Removed
tests/regression/codepatching/Makefile.
* tests/regression/Makefile.am (SUBDIRS): Removed codepatching.
* tests/regression/junit/All.java (suite): Added TestPatcher.
* tests/regression/junit/Makefile.am (EXTRA_DIST): Added $(srcdir) to
actually find the files.
* tests/regression/junit/TestPatcher.java: New file.

* tests/regression/codepatching/Makefile.am,
tests/regression/codepatching/aastoreconstClass.java,
tests/regression/codepatching/checkcastC.java,
tests/regression/codepatching/checkcastI.java,
tests/regression/codepatching/getfieldD.java,
tests/regression/codepatching/getfieldF.java,
tests/regression/codepatching/getfieldI.java,
tests/regression/codepatching/getfieldJ.java,
tests/regression/codepatching/getfieldL.java,
tests/regression/codepatching/getstaticD.java,
tests/regression/codepatching/getstaticF.java,
tests/regression/codepatching/getstaticI.java,
tests/regression/codepatching/getstaticJ.java,
tests/regression/codepatching/getstaticL.java,
tests/regression/codepatching/instanceofC.java,
tests/regression/codepatching/instanceofI.java,
tests/regression/codepatching/invokespecial.java,
tests/regression/codepatching/invokestatic.java,
tests/regression/codepatching/multianewarray.java,
tests/regression/codepatching/newarray.java,
tests/regression/codepatching/putfieldD.java,
tests/regression/codepatching/putfieldF.java,
tests/regression/codepatching/putfieldI.java,
tests/regression/codepatching/putfieldJ.java,
tests/regression/codepatching/putfieldL.java,
tests/regression/codepatching/putfieldconstC.java,
tests/regression/codepatching/putfieldconstD.java,
tests/regression/codepatching/putfieldconstF.java,
tests/regression/codepatching/putfieldconstI.java,
tests/regression/codepatching/putfieldconstJ.java,
tests/regression/codepatching/putfieldconstL.java,
tests/regression/codepatching/putstaticD.java,
tests/regression/codepatching/putstaticF.java,
tests/regression/codepatching/putstaticI.java,
tests/regression/codepatching/putstaticJ.java,
tests/regression/codepatching/putstaticL.java,
tests/regression/codepatching/putstaticconstC.java,
tests/regression/codepatching/putstaticconstD.java,
tests/regression/codepatching/putstaticconstF.java,
tests/regression/codepatching/putstaticconstI.java,
tests/regression/codepatching/putstaticconstJ.java,
tests/regression/codepatching/putstaticconstL.java,
tests/regression/codepatching/test.java: Removed.

* tests/Makefile.am (EXTRA_DIST): Added $(srcdir) to actually find the
files.
* tests/regression/bugzilla/Makefile.am: Likewise.

* src/threads/posix/lock.c (lock_record_notify): Skip the check for
interrupted. It was data-race ridden anyway.

* Merged with f9adc5b4d7f0.

* .hgignore: Added tests/regression/junit/*.class.

* configure.ac (AC_CONFIG_FILES): Added
tests/regression/junit/Makefile.

* tests/regression/Makefile.am (SUBDIRS): Added junit.
(SOURCE_FILES): Removed clinitexceptions.java.
(EXTRA_DIST): Removed clinitexceptions.2output.
(OUTPUT_JAVA_TESTS): Removed clinitexception.

* tests/regression/junit/All.java: Likewise.
* tests/regression/junit/Makefile.am: Likewise
* tests/regression/junit/TestExceptionInStaticClassInitializer.java:
Likewise.

* tests/regression/clinitexception.2output: Removed.
* tests/regression/clinitexception.java: Likewise.

* tests/regression/bugzilla/Makefile.am (build): Changed -cp to
-classpath so GCJ works too.
(check): Likewise.

* src/native/vm/gnu/java_lang_reflect_VMMethod.c (getDefaultValue):
Pass the correct method object to the Java method.

* src/vm/vm.c (vm_get_mainclass_from_jar): Print error when Main-Class
attribute not found.

* m4/jre-layout.m4 (AC_CHECK_WITH_JRE_LAYOUT): Fixed typo, used
enableval instead of withval.

* src/vm/jit/i386/darwin/md-os.c: Added md-trap.h (same as 42dc5863f378).

--HG--
branch : twisti

* src/vm/jit/i386/Makefile.am (libarch_la_SOURCES): Added md-trap.h.
* src/vm/jit/i386/codegen.c: Use new trap stuff.
* src/vm/jit/i386/emit.c: Likewise.
* src/vm/jit/i386/linux/md-os.c: Likewise.
* src/vm/jit/i386/md-trap.h: New file.

--HG--
branch : twisti

* src/vm/jit/x86_64/Makefile.am (libarch_la_SOURCES): Added md-trap.h.

--HG--
branch : twisti

* src/native/vm/gnu/gnu_classpath_jdwp_VMFrame.c: Use stdint-types.
* src/native/vm/gnu/gnu_classpath_jdwp_VMMethod.c,
src/native/vm/gnu/gnu_classpath_jdwp_VMVirtualMachine.c,
src/native/vm/gnu/java_lang_VMClass.c,
src/native/vm/gnu/java_lang_VMClassLoader.c,
src/native/vm/gnu/java_lang_VMSystem.c,
src/native/vm/gnu/java_lang_reflect_VMMethod.c: Likewise.

* src/native/vm/gnu/gnu_java_lang_management_VMMemoryMXBeanImpl.c: Use
stdint-types.

* src/cacaoh/dummy.c (heap_alloc_uncollectable): Use stdint-types.
* src/mm/boehm.c: Likewise.
* src/mm/gc-common.h: Likewise.

* src/vm/jit/trap.c: New file.
* src/vm/jit/trap.h: Likewise.

* src/vm/jit/Makefile.am [ENABLE_JIT] (TRAP_SOURCES): Added.
(libjit_la_SOURCES): Added TRAP_SOURCES.

* src/vm/exceptions.c (exceptions_init): Removed.
* src/vm/exceptions.h (EXCEPTION_HARDWARE_*): Removed.

* src/vm/signal.c (signal_handle): Removed.
* src/vm/signallocal.h: Likewise.

* src/vm/vm.c (vm_create): Removed exceptions_init call, added
trap_init call.

* src/vm/jit/x86_64/codegen.c: Use new trap stuff.
* src/vm/jit/x86_64/emit.c: Likewise.
* src/vm/jit/x86_64/linux/md-os.c: Likewise.
* src/vm/jit/x86_64/md-trap.h: New file.

--HG--
branch : twisti

* src/cacaoh/dummy.c: Use stdint-types.
* src/mm/memory.c,
src/mm/memory.h,
src/vm/builtin.c,
src/vm/builtin.h: Likewise.

* src/native/vm/sun/jvm.c (JVM_GetHostName): Use TRACEJVMCALLSENTER
and TRACEJVMCALLSEXIT.

* src/vm/jit/arm/codegen.h (SPLIT_LOAD): Removed.

* src/vm/jit/jit.h (stackptr): Removed.
(stackelement): Moved from here...
* src/vm/jit/stack.h (stackelement_t): ...to here.

* src/vm/jit/abi.h,
src/vm/jit/allocator/liveness.c,
src/vm/jit/allocator/lsra.c,
src/vm/jit/allocator/lsra.h,
src/vm/jit/allocator/simplereg.c,
src/vm/jit/alpha/md-abi.c,
src/vm/jit/arm/md-abi.c,
src/vm/jit/i386/asmpart.S,
src/vm/jit/i386/md-abi.c,
src/vm/jit/loop/analyze.c,
src/vm/jit/m68k/linux/md-abi.c,
src/vm/jit/mips/md-abi.c,
src/vm/jit/optimizing/lifetimes.h,
src/vm/jit/optimizing/lsra.c,
src/vm/jit/parse.c,
src/vm/jit/powerpc/darwin/md-abi.c,
src/vm/jit/powerpc/linux/md-abi.c,
src/vm/jit/powerpc/netbsd/md-abi.c,
src/vm/jit/powerpc64/linux/md-abi.c,
src/vm/jit/s390/md-abi.c,
src/vm/jit/sparc64/md-abi.c,
src/vm/jit/stack.c,
src/vm/jit/x86_64/md-abi.c: Replaced stackptr with stackelement_t*.

* src/native/vm/gnu/java_lang_VMRuntime.c: Compiler warning squashing.
* src/vm/jit/executionstate.c (executionstate_println): Likewise.

* autogen.sh: Fixed error output.

* autogen.sh: Support libtool-2.x.

* src/vmcore/system.h (system_scandir) [__LINUX__]: The signature is different
on various OSs.

* src/vm/jit/verify/typecheck.c (typecheck): Fixed compiler warning.

* src/native/vm/java_lang_Class.c: Removed.
* src/native/vm/java_lang_Class.h: Likewise.
* src/native/vm/Makefile.am (libnativevm_la_SOURCES): Removed
java_lang_Class.[ch].

* src/cacaoh/dummy.c (builtin_instanceof): New function.
(reflect_constructor_new, reflect_field_new, reflect_method_new):
Likewise.

* src/native/jni.c (_Jv_JNI_IsAssignableFrom): Use new class
functions.
(_Jv_JNI_IsInstanceOf): Likewise.

* src/native/vm/cldc1.1/java_lang_Class.c (forName): Implemented
directly.
(isInstance): Use new class functions.
(isAssignableFrom): Likewise.
(getName): Likewise.

* src/native/vm/gnu/java_lang_VMClass.c (isInstance): Likewise.
(isAssignableFrom): Likewise.
(getName): Likewise.
(getDeclaredClasses): Likewise.
(getDeclaredFields): Likewise.
(getDeclaredMethods): Likewise.
(getDeclaredConstructors): Likewise.
(forName): Implemented directly.
(getDeclaredAnnotations): Likewise.
(getEnclosingConstructor): Use new class functions.
(getEnclosingMethod): Likewise.
* src/native/vm/gnu/java_lang_VMThrowable.c (getStackTrace): Likewise.

* src/native/vm/reflect.h (_REFLECT_H): Added.

* src/native/vm/sun/jvm.c (JVM_GetStackTraceElement): Use new class
functions.
(JVM_GetClassName): Likewise.
(JVM_GetClassDeclaredFields): Likewise.
(JVM_GetClassDeclaredMethods): Likewise.
(JVM_GetClassDeclaredConstructors): Likewise.
(JVM_LoadLibrary): Use TRACEJVMCALLSENTER and TRACEJVMCALLSEXIT.
(JVM_FindLibraryEntry): Likewise.

* src/vmcore/class.c (class_is_assignable_from): New function.
(class_is_instance): Likewise.
(class_get_declaredconstructors): Likewise.
(class_get_declaredfields): Likewise.
(class_get_declaredmethods): Likewise.
(class_get_enclosingconstructor): Likewise.
(class_get_enclosingmethod): Renamed to class_get_enclosingmethod_raw.
class_get_enclosingmethod): Likewise.
* src/vmcore/class.h (class_get_classname): New function.

* src/vm/jit/code.h (codeinfo): Moved stackframesize outside of
ENABLE_REPLACEMENT.

* Merged twisti branch.

Dummy commit to remove twisti branch.
* NEWS: Useless.

--HG--
branch : twisti

Dummy commit to create twisti branch.
* NEWS: Useless.

--HG--
branch : twisti

* Merged with tip.

Reverted 40d6392fb38f.
* src/native/vm/sun/jvm.c (JVM_FindLibraryEntry): Using HPI function
crashes.

* Merged executionstate branch.

* src/vm/jit/i386/darwin/md-os.c (md_replace_executionstate_read):
Renamed to md_executionstate_read.
(md_replace_executionstate_write): Renamed to md_executionstate_write.

--HG--
branch : executionstate-branch

* src/native/vm/sun/jvm.c (JVM_FindLibraryEntry): Use HPI.

* src/vm/jit/powerpc/linux/md-os.c (md_executionstate_write): Fixed
comment typo.

--HG--
branch : executionstate-branch

* src/vm/jit/powerpc/linux/md-os.c (md_replace_executionstate_read):
Renamed to md_executionstate_read.
(md_replace_executionstate_write): Renamed to md_executionstate_write.

--HG--
branch : executionstate-branch

* Merged with tip.

* src/native/jni.h (_Jv_jni_invokeNative): Removed.

* src/native/jni.c (jni_GetPrimitiveArrayCritical): Implemented
correcly.
(jni_ReleasePrimitiveArrayCritical): Likewise.

* src/vm/jit/linenumbertable.c (linenumbertable_create): Changed the
direction of the list.
(linenumbertable_list_entry_add): Likewise.
(linenumbertable_list_entry_add_inline_start): Likewise.
(linenumbertable_list_entry_add_inline_end): Likewise.

* src/vm/jit/emit-common.c (emit_label_bccz): Code restructured.
(emit_label): Likewise.

* src/vm/jit/patcher-common.c (patcher_resolve): New function.
* src/vm/jit/patcher-common.h (patcher_resolve): Export.
* src/vm/jit/codegen-common.c (codegen_finish): Use patcher_resolve.

* src/vm/jit/verify/typeinfo.h (typeinfo): Renamed to typeinfo_t.
(typeinfo_mergedlist): Renamed to typeinfo_mergedlist_t.
(typedescriptor): Renamed to typedescriptor_t.

* src/vm/jit/reg.h,
src/vm/jit/verify/typecheck-builtins.inc,
src/vm/jit/verify/typecheck-common.h,
src/vm/jit/verify/typecheck-fields.inc,
src/vm/jit/verify/typecheck-invoke.inc,
src/vm/jit/verify/typecheck-stackbased.c,
src/vm/jit/verify/typecheck.c,
src/vm/jit/verify/typeinfo.c,
src/vm/resolve.c,
src/vm/resolve.h: Likewise.

* src/vmcore/references.h (parseddesc): Renamed to parseddesc_t.

* src/vmcore/descriptor.c: Likewise.

* src/vmcore/linker.h (_vftbl): Renamed class to clazz.

* src/native/jni.c,
src/native/llni.h,
src/vm/builtin.c,
src/vm/exceptions.c,
src/vm/jit/replace.c,
src/vm/jit/trace.c,
src/vm/jit/verify/typeinfo.c,
src/vmcore/class.c,
src/vmcore/linker.c: Likewise.

* src/vmcore/loader.h (classloader): Renamed to classloader_t.

* src/native/jni.c,
src/native/native.c,
src/native/native.h,
src/native/vm/gnu/gnu_classpath_VMStackWalker.c,
src/native/vm/gnu/java_lang_VMClass.c,
src/native/vm/gnu/java_lang_VMClassLoader.c,
src/native/vm/gnu/java_lang_VMRuntime.c,
src/native/vm/java_lang_Class.c,
src/native/vm/sun/jvm.c,
src/native/vm/sun_misc_Unsafe.c,
src/vm/jit/stacktrace.c,
src/vm/jit/stacktrace.h,
src/vmcore/class.c,
src/vmcore/class.h,
src/vmcore/classcache.c,
src/vmcore/classcache.h,
src/vmcore/loader.c: Likewise.

* src/vmcore/loader.h (classbuffer): Renamed class to clazz.

* src/vmcore/annotation.c,
src/vmcore/class.c,
src/vmcore/field.c,
src/vmcore/loader.c,
src/vmcore/method.c,
src/vmcore/stackmap.c,
src/vmcore/suck.c,
src/vmcore/zip.c: Likewise.

* src/vm/jit/s390/patcher.c (patcher_invokeinterface): Forgot to
rename class to clazz.

* src/vmcore/field.h (fieldinfo): Renamed class to clazz.

* src/native/vm/reflect.c,
src/vm/access.c,
src/vm/jit/alpha/codegen.c,
src/vm/jit/alpha/patcher.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/arm/patcher.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/i386/patcher.c,
src/vm/jit/intrp/codegen.c,
src/vm/jit/intrp/disass.c,
src/vm/jit/intrp/patcher.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/m68k/patcher.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/mips/patcher.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc/patcher.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/powerpc64/patcher.c,
src/vm/jit/python.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/patcher.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/sparc64/patcher.c,
src/vm/jit/verify/typecheck-fields.inc,
src/vm/jit/x86_64/codegen.c,
src/vm/jit/x86_64/patcher.c,
src/vm/resolve.c,
src/vmcore/annotation.c,
src/vmcore/field.c,
src/vmcore/references.h: Likewise.

* src/vmcore/method.h (methodinfo): Renamed class to clazz.

* src/cacaoh/headers.c,
src/native/native.c,
src/native/vm/gnu/java_lang_VMThrowable.c,
src/native/vm/reflect.c,
src/native/vm/sun/jvm.c,
src/toolbox/logging.c,
src/vm/access.c,
src/vm/exceptions.c,
src/vm/jit/alpha/codegen.c,
src/vm/jit/alpha/patcher.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/arm/patcher.c,
src/vm/jit/codegen-common.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/i386/patcher.c,
src/vm/jit/inline/inline.c,
src/vm/jit/intrp/asmpart.c,
src/vm/jit/intrp/codegen.c,
src/vm/jit/intrp/disass.c,
src/vm/jit/intrp/patcher.c,
src/vm/jit/jit.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/m68k/patcher.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/mips/patcher.c,
src/vm/jit/optimizing/dominators.c,
src/vm/jit/optimizing/lifetimes.c,
src/vm/jit/optimizing/lsra.c,
src/vm/jit/optimizing/ssa.c,
src/vm/jit/optimizing/ssa3.c,
src/vm/jit/optimizing/ssa_rename.c,
src/vm/jit/parse.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc/patcher.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/powerpc64/patcher.c,
src/vm/jit/python.c,
src/vm/jit/s390/codegen.c,
src/vm/jit/s390/md.c,
src/vm/jit/s390/patcher.c,
src/vm/jit/show.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/sparc64/patcher.c,
src/vm/jit/stacktrace.c,
src/vm/jit/trace.c,
src/vm/jit/verify/icmds.c,
src/vm/jit/verify/typecheck-common.c,
src/vm/jit/verify/typecheck-fields.inc,
src/vm/jit/verify/typecheck-invoke.inc,
src/vm/jit/verify/typecheck-stackbased-gen.inc,
src/vm/jit/verify/typecheck-stackbased.c,
src/vm/jit/verify/typecheck-typeinferer-gen.inc,
src/vm/jit/verify/typecheck-variablesbased-gen.inc,
src/vm/jit/x86_64/codegen.c,
src/vm/jit/x86_64/patcher.c,
src/vm/resolve.c,
src/vmcore/annotation.c,
src/vmcore/linker.c,
src/vmcore/loader.c,
src/vmcore/method.c,
src/vmcore/references.h: Likewise.

Merging darwin compile fixes -> trunk.

Merging fixes.

* src/native/vm/gnu/java_lang_VMThread.c (Java_java_lang_VMThread_getState):
Renamed thread_get_state because of a name conflict with mach headers.
* src/threads/thread.c (thread_print_info, threads_thread_is_alive):
Likewise.
* src/threads/thread.h: Likewise.

Merging fixes.

* src/threads/posix/thread-posix.c (threads_startup_thread): Compile fix.

* src/threads/posix/thread-posix.c (sem_*): Fixed compile errors.

* src/threads/thread.c (thread_set_state_runnable): Moved DEBUGTHREADS
into if, so the output is correct.
(thread_set_state_waiting): Likewise.
(thread_set_state_timed_waiting): Likewise.

* src/threads/thread.c (threads_thread_state_runnable): Renamed to
thread_set_state_runnable.
(threads_thread_state_waiting): Renamed to thread_set_state_waiting.
(threads_thread_state_timed_waiting): Renamed to
thread_set_state_timed_waiting.
(thread_set_state_terminated): Renamed to thread_set_state_terminated.
* src/threads/thread.h: Likewise.
* src/threads/posix/thread-posix.c: Use new function names.
* src/vm/signal.c: Likewise.