1.1 --- a/src/share/vm/interpreter/invocationCounter.cpp Thu Sep 02 11:40:02 2010 -0700
1.2 +++ b/src/share/vm/interpreter/invocationCounter.cpp Fri Sep 03 17:51:07 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -40,8 +40,7 @@
1.11 }
1.12
1.13 void InvocationCounter::set_carry() {
1.14 - _counter |= carry_mask;
1.15 -
1.16 + set_carry_flag();
1.17 // The carry bit now indicates that this counter had achieved a very
1.18 // large value. Now reduce the value, so that the method can be
1.19 // executed many more times before re-entering the VM.
1.20 @@ -52,7 +51,6 @@
1.21 if (old_count != new_count) set(state(), new_count);
1.22 }
1.23
1.24 -
1.25 void InvocationCounter::set_state(State state) {
1.26 assert(0 <= state && state < number_of_states, "illegal state");
1.27 int init = _init[state];
1.28 @@ -82,11 +80,6 @@
1.29 int InvocationCounter::InterpreterBackwardBranchLimit;
1.30 int InvocationCounter::InterpreterProfileLimit;
1.31
1.32 -// Tier1 limits
1.33 -int InvocationCounter::Tier1InvocationLimit;
1.34 -int InvocationCounter::Tier1BackEdgeLimit;
1.35 -
1.36 -
1.37
1.38 const char* InvocationCounter::state_as_string(State state) {
1.39 switch (state) {
1.40 @@ -146,8 +139,6 @@
1.41
1.42 InterpreterInvocationLimit = CompileThreshold << number_of_noncount_bits;
1.43 InterpreterProfileLimit = ((CompileThreshold * InterpreterProfilePercentage) / 100)<< number_of_noncount_bits;
1.44 - Tier1InvocationLimit = Tier2CompileThreshold << number_of_noncount_bits;
1.45 - Tier1BackEdgeLimit = Tier2BackEdgeThreshold << number_of_noncount_bits;
1.46
1.47 // When methodData is collected, the backward branch limit is compared against a
1.48 // methodData counter, rather than an InvocationCounter. In the former case, we
