From 16ea75f91c48445810699375d28ba525084279c3 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Mon, 5 Nov 2007 08:39:48 -0700 Subject: [PATCH] preserve vm flags of bootstrap class (except for BootstrapFlag) in updateBootstrapClass() --- src/interpret.cpp | 4 ---- src/machine.cpp | 3 ++- src/machine.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/interpret.cpp b/src/interpret.cpp index 7b54c10b5e..02c59fb00c 100644 --- a/src/interpret.cpp +++ b/src/interpret.cpp @@ -1854,10 +1854,6 @@ interpret(Thread* t) object method = resolveMethod(t, codePool(t, code), index - 1); if (UNLIKELY(exception)) goto throw_; - - fprintf(stderr, "invokevirtual %s.%s\n", - &byteArrayBody(t, className(t, methodClass(t, method)), 0), - &byteArrayBody(t, methodName(t, method), 0)); unsigned parameterFootprint = methodParameterFootprint(t, method); if (LIKELY(peekObject(t, sp - parameterFootprint))) { diff --git a/src/machine.cpp b/src/machine.cpp index 2ffe5e217f..6bd47b96f0 100644 --- a/src/machine.cpp +++ b/src/machine.cpp @@ -1377,7 +1377,8 @@ updateBootstrapClass(Thread* t, object bootstrapClass, object class_) ENTER(t, Thread::ExclusiveState); - classVmFlags(t, bootstrapClass) = classVmFlags(t, class_); + classVmFlags(t, bootstrapClass) &= ~BootstrapFlag; + classVmFlags(t, bootstrapClass) |= classVmFlags(t, class_); classFlags(t, bootstrapClass) = classFlags(t, class_); set(t, bootstrapClass, ClassSuper, classSuper(t, class_)); diff --git a/src/machine.h b/src/machine.h index 7c8aa1a8f1..f6bbb6181a 100644 --- a/src/machine.h +++ b/src/machine.h @@ -29,7 +29,7 @@ const bool Verbose = false; const bool DebugRun = false; const bool DebugStack = false; const bool DebugMonitors = false; -const bool DebugReferences = true; +const bool DebugReferences = false; const uintptr_t HashTakenMark = 1; const uintptr_t ExtendedMark = 2;