1.1 --- a/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Fri Apr 30 04:27:25 2010 -0700
1.2 +++ b/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Fri Apr 30 08:37:24 2010 -0700
1.3 @@ -197,7 +197,7 @@
1.4 __ ld_ptr(cache, constantPoolCacheOopDesc::base_offset() +
1.5 ConstantPoolCacheEntry::flags_offset(), size);
1.6 __ and3(size, 0xFF, size); // argument size in words
1.7 - __ sll(size, Interpreter::logStackElementSize(), size); // each argument size in bytes
1.8 + __ sll(size, Interpreter::logStackElementSize, size); // each argument size in bytes
1.9 __ add(Lesp, size, Lesp); // pop arguments
1.10 __ dispatch_next(state, step);
1.11
1.12 @@ -495,7 +495,7 @@
1.13 // Set the saved SP after the register window save
1.14 //
1.15 assert_different_registers(Gargs, Glocals_size, Gframe_size, O5_savedSP);
1.16 - __ sll(Glocals_size, Interpreter::logStackElementSize(), Otmp1);
1.17 + __ sll(Glocals_size, Interpreter::logStackElementSize, Otmp1);
1.18 __ add(Gargs, Otmp1, Gargs);
1.19
1.20 if (native_call) {
1.21 @@ -511,7 +511,7 @@
1.22 __ lduh( size_of_locals, Otmp1 );
1.23 __ sub( Otmp1, Glocals_size, Glocals_size );
1.24 __ round_to( Glocals_size, WordsPerLong );
1.25 - __ sll( Glocals_size, Interpreter::logStackElementSize(), Glocals_size );
1.26 + __ sll( Glocals_size, Interpreter::logStackElementSize, Glocals_size );
1.27
1.28 // see if the frame is greater than one page in size. If so,
1.29 // then we need to verify there is enough stack space remaining
1.30 @@ -519,7 +519,7 @@
1.31 __ lduh( max_stack, Gframe_size );
1.32 __ add( Gframe_size, extra_space, Gframe_size );
1.33 __ round_to( Gframe_size, WordsPerLong );
1.34 - __ sll( Gframe_size, Interpreter::logStackElementSize(), Gframe_size);
1.35 + __ sll( Gframe_size, Interpreter::logStackElementSize, Gframe_size);
1.36
1.37 // Add in java locals size for stack overflow check only
1.38 __ add( Gframe_size, Glocals_size, Gframe_size );
1.39 @@ -1234,8 +1234,8 @@
1.40 // be updated!
1.41 __ lduh( size_of_locals, O2 );
1.42 __ lduh( size_of_parameters, O1 );
1.43 - __ sll( O2, Interpreter::logStackElementSize(), O2);
1.44 - __ sll( O1, Interpreter::logStackElementSize(), O1 );
1.45 + __ sll( O2, Interpreter::logStackElementSize, O2);
1.46 + __ sll( O1, Interpreter::logStackElementSize, O1 );
1.47 __ sub( Llocals, O2, O2 );
1.48 __ sub( Llocals, O1, O1 );
1.49
1.50 @@ -1470,8 +1470,8 @@
1.51 round_to(frame::interpreter_frame_vm_local_words,WordsPerLong);
1.52 // callee_locals and max_stack are counts, not the size in frame.
1.53 const int locals_size =
1.54 - round_to(callee_extra_locals * Interpreter::stackElementWords(), WordsPerLong);
1.55 - const int max_stack_words = max_stack * Interpreter::stackElementWords();
1.56 + round_to(callee_extra_locals * Interpreter::stackElementWords, WordsPerLong);
1.57 + const int max_stack_words = max_stack * Interpreter::stackElementWords;
1.58 return (round_to((max_stack_words
1.59 //6815692//+ methodOopDesc::extra_stack_words()
1.60 + rounded_vm_local_words
1.61 @@ -1570,11 +1570,11 @@
1.62
1.63 // preallocate stack space
1.64 intptr_t* esp = monitors - 1 -
1.65 - (tempcount * Interpreter::stackElementWords()) -
1.66 + (tempcount * Interpreter::stackElementWords) -
1.67 popframe_extra_args;
1.68
1.69 - int local_words = method->max_locals() * Interpreter::stackElementWords();
1.70 - int parm_words = method->size_of_parameters() * Interpreter::stackElementWords();
1.71 + int local_words = method->max_locals() * Interpreter::stackElementWords;
1.72 + int parm_words = method->size_of_parameters() * Interpreter::stackElementWords;
1.73 NEEDS_CLEANUP;
1.74 intptr_t* locals;
1.75 if (caller->is_interpreted_frame()) {
1.76 @@ -1662,7 +1662,7 @@
1.77 BasicObjectLock* mp = (BasicObjectLock*)monitors;
1.78
1.79 assert(interpreter_frame->interpreter_frame_method() == method, "method matches");
1.80 - assert(interpreter_frame->interpreter_frame_local_at(9) == (intptr_t *)((intptr_t)locals - (9 * Interpreter::stackElementSize())+Interpreter::value_offset_in_bytes()), "locals match");
1.81 + assert(interpreter_frame->interpreter_frame_local_at(9) == (intptr_t *)((intptr_t)locals - (9 * Interpreter::stackElementSize)), "locals match");
1.82 assert(interpreter_frame->interpreter_frame_monitor_end() == mp, "monitor_end matches");
1.83 assert(((intptr_t *)interpreter_frame->interpreter_frame_monitor_begin()) == ((intptr_t *)mp)+monitor_size, "monitor_begin matches");
1.84 assert(interpreter_frame->interpreter_frame_tos_address()-1 == esp, "esp matches");
1.85 @@ -1758,7 +1758,7 @@
1.86
1.87 // Compute size of arguments for saving when returning to deoptimized caller
1.88 __ lduh(Lmethod, in_bytes(methodOopDesc::size_of_parameters_offset()), Gtmp1);
1.89 - __ sll(Gtmp1, Interpreter::logStackElementSize(), Gtmp1);
1.90 + __ sll(Gtmp1, Interpreter::logStackElementSize, Gtmp1);
1.91 __ sub(Llocals, Gtmp1, Gtmp2);
1.92 __ add(Gtmp2, wordSize, Gtmp2);
1.93 // Save these arguments
