Mercurial > hg > release > icedtea6-1.11
changeset 1937:2b86a59d4446
Whitespace fixes
line wrap: on
line diff
--- a/ChangeLog Tue Feb 23 12:08:37 2010 -0500 +++ b/ChangeLog Tue Feb 23 17:36:57 2010 +0000 @@ -1,3 +1,38 @@ +2010-02-23 Gary Benson <gbenson@redhat.com> + + * ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes. + * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise. + * ports/hotspot/src/share/vm/includeDB_shark: Likewise. + * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise. + * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise. + 2010-02-23 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
--- a/ports/hotspot/make/linux/makefiles/shark.make Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/make/linux/makefiles/shark.make Tue Feb 23 17:36:57 2010 +0000 @@ -20,7 +20,7 @@ # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, # CA 95054 USA or visit www.sun.com if you need additional information or # have any questions. -# +# # # Sets make macros for making Shark version of VM
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -20,7 +20,7 @@ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or * have any questions. - * + * */ // Set the default values for platform dependent flags used by the @@ -50,7 +50,7 @@ define_pd_global(intx, NewRatio, 12 ); define_pd_global(intx, NewSizeThreadIncrease, 4*K ); define_pd_global(intx, InitialCodeCacheSize, 160*K); -define_pd_global(intx, ReservedCodeCacheSize, 32*M ); +define_pd_global(intx, ReservedCodeCacheSize, 32*M ); define_pd_global(bool, ProfileInterpreter, false); define_pd_global(intx, CodeCacheExpansionSize, 32*K ); define_pd_global(uintx, CodeCacheMinBlockLength, 1 );
--- a/ports/hotspot/src/share/vm/includeDB_shark Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/includeDB_shark Tue Feb 23 17:36:57 2010 +0000 @@ -20,7 +20,7 @@ // Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, // CA 95054 USA or visit www.sun.com if you need additional information or // have any questions. -// +// // // NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -44,7 +44,7 @@ if (SharkTraceBytecodes) tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc())); - + if (has_trap() && trap_bci() == bci()) { do_trap(trap_request()); return; @@ -95,7 +95,7 @@ } } break; - } + } } switch (bc()) { @@ -294,25 +294,25 @@ xpop(); xpop(); break; - case Bytecodes::_swap: + case Bytecodes::_swap: a = xpop(); b = xpop(); xpush(a); xpush(b); - break; + break; case Bytecodes::_dup: a = xpop(); xpush(a); xpush(a); break; - case Bytecodes::_dup_x1: + case Bytecodes::_dup_x1: a = xpop(); b = xpop(); xpush(a); xpush(b); xpush(a); break; - case Bytecodes::_dup_x2: + case Bytecodes::_dup_x2: a = xpop(); b = xpop(); c = xpop(); @@ -321,7 +321,7 @@ xpush(b); xpush(a); break; - case Bytecodes::_dup2: + case Bytecodes::_dup2: a = xpop(); b = xpop(); xpush(b); @@ -394,7 +394,7 @@ do_irem(); break; case Bytecodes::_ineg: - a = pop(); + a = pop(); push(SharkValue::create_jint( builder()->CreateNeg(a->jint_value()), a->zero_checked())); break; @@ -470,7 +470,7 @@ do_lrem(); break; case Bytecodes::_lneg: - a = pop(); + a = pop(); push(SharkValue::create_jlong( builder()->CreateNeg(a->jlong_value()), a->zero_checked())); break; @@ -547,18 +547,18 @@ break; case Bytecodes::_fdiv: b = pop(); - a = pop(); + a = pop(); push(SharkValue::create_jfloat( builder()->CreateFDiv(a->jfloat_value(), b->jfloat_value()))); break; case Bytecodes::_frem: b = pop(); - a = pop(); + a = pop(); push(SharkValue::create_jfloat( builder()->CreateFRem(a->jfloat_value(), b->jfloat_value()))); break; case Bytecodes::_fneg: - a = pop(); + a = pop(); push(SharkValue::create_jfloat( builder()->CreateFNeg(a->jfloat_value()))); break; @@ -583,18 +583,18 @@ break; case Bytecodes::_ddiv: b = pop(); - a = pop(); + a = pop(); push(SharkValue::create_jdouble( builder()->CreateFDiv(a->jdouble_value(), b->jdouble_value()))); break; case Bytecodes::_drem: b = pop(); - a = pop(); + a = pop(); push(SharkValue::create_jdouble( builder()->CreateFRem(a->jdouble_value(), b->jdouble_value()))); break; case Bytecodes::_dneg: - a = pop(); + a = pop(); push(SharkValue::create_jdouble( builder()->CreateFNeg(a->jdouble_value()))); break; @@ -627,7 +627,7 @@ break; case Bytecodes::_i2l: - a = pop(); + a = pop(); push(SharkValue::create_jlong( builder()->CreateIntCast( a->jint_value(), SharkType::jlong_type(), true), a->zero_checked())); @@ -907,7 +907,7 @@ default: ShouldNotReachHere(); - } + } } int SharkBlock::switch_key(int i) { @@ -920,7 +920,7 @@ default: ShouldNotReachHere(); - } + } } int SharkBlock::switch_dest(int i) { @@ -933,7 +933,7 @@ default: ShouldNotReachHere(); - } + } } void SharkBlock::do_div_or_rem(bool is_long, bool is_rem) { @@ -966,7 +966,7 @@ builder()->CreateICmpEQ(a, p), builder()->CreateICmpEQ(b, q)), special_case, general_case); - + builder()->SetInsertPoint(special_case); Value *special_result; if (is_rem) { @@ -1033,12 +1033,12 @@ BasicType basic_type = field->type()->basic_type(); const Type *stack_type = SharkType::to_stackType(basic_type); const Type *field_type = SharkType::to_arrayType(basic_type); - + Value *addr = builder()->CreateAddressOfStructEntry( object, in_ByteSize(field->offset_in_bytes()), PointerType::getUnqual(field_type), "addr"); - + // Do the access if (is_get) { Value *field_value = builder()->CreateLoad(addr); @@ -1057,7 +1057,7 @@ field_value, field_type, basic_type != T_CHAR); builder()->CreateStore(field_value, addr); - + if (!field->type()->is_primitive_type()) builder()->CreateUpdateBarrierSet(oopDesc::bs(), addr);
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -55,11 +55,11 @@ // Entry state protected: virtual SharkState* entry_state(); - + // Current state private: SharkState* initial_current_state(); - + public: SharkState* current_state() { if (_current_state == NULL) @@ -72,7 +72,7 @@ _current_state = current_state; } - // Local variables + // Local variables protected: SharkValue* local(int index) { SharkValue *value = current_state()->local(index); @@ -208,7 +208,7 @@ void do_lrem() { do_div_or_rem(true, true); } - void do_div_or_rem(bool is_long, bool is_rem); + void do_div_or_rem(bool is_long, bool is_rem); // get* and put* private: @@ -257,7 +257,7 @@ int switch_dest(int i); virtual void do_switch(); - + // invoke* protected: virtual void do_call();
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -127,7 +127,7 @@ case 'F': case 'D': return PointerType::getUnqual(make_type(tolower(type), false)); - + // VM objects case 'T': return SharkType::thread_type(); @@ -535,4 +535,4 @@ BasicBlock* SharkBuilder::CreateBlock(BasicBlock* ip, const char* name) const { return BasicBlock::Create( SharkContext::current(), name, GetInsertBlock()->getParent(), ip); -} +}
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -149,7 +149,7 @@ llvm::Value* memset(); llvm::Value* unimplemented(); llvm::Value* should_not_reach_here(); - llvm::Value* dump(); + llvm::Value* dump(); // Public interface to low-level non-VM calls. public: @@ -164,10 +164,10 @@ llvm::Value* value, llvm::Value* len, llvm::Value* align); - llvm::CallInst* CreateUnimplemented(const char* file, int line); - llvm::CallInst* CreateShouldNotReachHere(const char* file, int line); + llvm::CallInst* CreateUnimplemented(const char* file, int line); + llvm::CallInst* CreateShouldNotReachHere(const char* file, int line); NOT_PRODUCT(llvm::CallInst* CreateDump(llvm::Value* value)); - + // Flags for CreateMemoryBarrier. public: enum BarrierFlags {
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -105,7 +105,7 @@ *value, offset); - oopmap()->set_oop(slot2reg(offset)); + oopmap()->set_oop(slot2reg(offset)); } void SharkDecacher::process_pc_slot(int offset) { @@ -114,7 +114,7 @@ builder()->code_buffer_address(pc_offset()), stack()->slot_addr(offset)); } - + void SharkDecacher::start_locals() { // Create the array we'll record our local variables in _locarray = new GrowableArray<ScopeValue*>(max_locals());}
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -58,7 +58,7 @@ private: int _bci; - + protected: int bci() const { return _bci; @@ -101,7 +101,7 @@ void process_oop_tmp_slot(llvm::Value** value, int offset); void process_method_slot(llvm::Value** value, int offset); void process_pc_slot(int offset); - + void start_locals(); void process_local_slot(int index, SharkValue** value, int offset); @@ -131,7 +131,7 @@ // stack[3] local[0] jint normal normal // // high addresses this end - + SharkValue *value = *addr; if (value) { if (value->is_jobject())
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -48,7 +48,7 @@ MutexLocker locker(execution_engine_lock()); // Make LLVM safe for multithreading - if (!llvm_start_multithreaded()) + if (!llvm_start_multithreaded()) fatal("llvm_start_multithreaded() failed"); // Initialize the native target @@ -161,7 +161,7 @@ // Emit the entry point SharkEntry *entry = (SharkEntry *) cb.malloc(sizeof(SharkEntry)); - + // Build the LLVM IR for the method Function *function = SharkFunction::build(env, &builder, flow, name); @@ -182,7 +182,7 @@ ExceptionHandlerTable handler_table; ImplicitExceptionTable inc_table; - + env->register_method(target, entry_bci, &offsets, @@ -255,7 +255,7 @@ llvm::DebugFlag = true; } else { - llvm::SetCurrentDebugType(""); + llvm::SetCurrentDebugType(""); llvm::DebugFlag = false; } #else @@ -314,7 +314,7 @@ break; execution_engine()->freeMachineCodeForFunction(function); - function->eraseFromParent(); + function->eraseFromParent(); } }
--- a/ports/hotspot/src/share/vm/shark/sharkContext.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkContext.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -92,7 +92,7 @@ _to_stackType[i] = jint_type(); _to_arrayType[i] = jbyte_type(); break; - + case T_BYTE: _to_stackType[i] = jint_type(); _to_arrayType[i] = jbyte_type();
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -168,7 +168,7 @@ assert(type != NULL, "unhandled type"); return result; } - + public: const llvm::Type* to_stackType(BasicType type) const { return map_type(_to_stackType, type);
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -97,10 +97,10 @@ SharkTopLevelBlock *locker = new SharkTopLevelBlock(this, start_block->ciblock()); locker->add_incoming(entry_state); - + set_block_insertion_point(start_block->entry_block()); locker->acquire_method_lock(); - + entry_state = locker->current_state(); } } @@ -144,7 +144,7 @@ SharkState* _state; BasicBlock* _check_block; BasicBlock* _continue_block; - + public: SharkTopLevelBlock* block() const { return _block; @@ -154,10 +154,10 @@ } int bci() const { return _bci; - } + } SharkState* state() const { return _state; - } + } BasicBlock* check_block() const { return _check_block; }
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -28,7 +28,7 @@ class SharkFunction : public SharkTargetInvariants { friend class SharkStackWithNormalFrame; - + public: static llvm::Function* build(ciEnv* env, SharkBuilder* builder, @@ -79,7 +79,7 @@ } const llvm::FunctionType* entry_point_type() const { if (is_osr()) - return SharkType::osr_entry_point_type(); + return SharkType::osr_entry_point_type(); else return SharkType::entry_point_type(); }
--- a/ports/hotspot/src/share/vm/shark/sharkInliner.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkInliner.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -81,7 +81,7 @@ ciBytecodeStream _iter; SharkState* _entry_state; ciMethod* _target; - + public: ciBytecodeStream* iter() { return &_iter; @@ -103,7 +103,7 @@ int max_stack() const { return target()->max_stack(); } - + // Inlinability check public: bool is_inlinable(); @@ -259,7 +259,7 @@ case Bytecodes::_lconst_0: push(false); push(false); - break; + break; case Bytecodes::_lconst_1: push(true); push(false); @@ -402,25 +402,25 @@ pop(); pop(); break; - case Bytecodes::_swap: + case Bytecodes::_swap: a = pop(); b = pop(); push(a); push(b); - break; + break; case Bytecodes::_dup: a = pop(); push(a); push(a); break; - case Bytecodes::_dup_x1: + case Bytecodes::_dup_x1: a = pop(); b = pop(); push(a); push(b); push(a); break; - case Bytecodes::_dup_x2: + case Bytecodes::_dup_x2: a = pop(); b = pop(); c = pop(); @@ -429,7 +429,7 @@ push(b); push(a); break; - case Bytecodes::_dup2: + case Bytecodes::_dup2: a = pop(); b = pop(); push(b); @@ -499,7 +499,7 @@ break; case Bytecodes::_ineg: break; - + case Bytecodes::_ladd: case Bytecodes::_lsub: case Bytecodes::_lmul: @@ -584,7 +584,7 @@ pop(); push(false); break; - + case Bytecodes::_dcmpl: case Bytecodes::_dcmpg: pop();
--- a/ports/hotspot/src/share/vm/shark/sharkInliner.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkInliner.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -26,7 +26,7 @@ class SharkInliner : public AllStatic { public: static bool attempt_inline(ciMethod* target, SharkState* state); - + private: static bool may_be_inlinable(ciMethod* target); };
--- a/ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -133,7 +133,7 @@ case vmIntrinsics::_currentThread: do_Thread_currentThread(); break; - + // sun.misc.Unsafe case vmIntrinsics::_compareAndSwapInt: do_Unsafe_compareAndSwapInt(); @@ -149,7 +149,7 @@ SharkValue *sb = state()->pop(); SharkValue *sa = state()->pop(); Value *a = sa->jint_value(); - Value *b = sb->jint_value(); + Value *b = sb->jint_value(); // Perform the test BasicBlock *ip = builder()->GetBlockInsertionPoint();
--- a/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -80,7 +80,7 @@ assert(_thread == NULL, "thread already set"); _thread = thread; } - + // Objects that handle various aspects of the compilation. protected: DebugInformationRecorder* debug_info() const {
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -84,5 +84,5 @@ void deallocateMemForFunction(const llvm::Function* F); #endif unsigned char *allocateSpace(intptr_t Size, - unsigned int Alignment); + unsigned int Alignment); };
--- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -143,8 +143,8 @@ builder()->CreateBr(merge); builder()->SetInsertPoint(not_null); - builder()->CreateBr(merge); - + builder()->CreateBr(merge); + builder()->SetInsertPoint(merge); phi = builder()->CreatePHI(box_type, "boxed_object"); phi->addIncoming(ConstantPointerNull::get(box_type), null); @@ -172,7 +172,7 @@ param_types.push_back(param_type); param_values.push_back( builder()->CreateLoad(stack()->slot_addr(adjusted_offset, param_type))); - } + } } // The oopmap is now complete, and everything is written @@ -254,7 +254,7 @@ thread_state, LLVMValue::jint_constant(0)), do_safepoint, safepointed); - + builder()->SetInsertPoint(do_safepoint); builder()->CreateCall( builder()->check_special_condition_for_native_trans(), thread); @@ -311,7 +311,7 @@ // Reset handle block CreateResetHandleBlock(); - // Unlock if necessary. + // Unlock if necessary. if (is_synchronized()) Unimplemented(); @@ -329,7 +329,7 @@ case T_BYTE: needs_cast = true; break; - + case T_CHAR: case T_SHORT: needs_cast = true; @@ -342,7 +342,7 @@ } builder()->CreateStore( - result, + result, builder()->CreateIntToPtr( result_addr, PointerType::getUnqual(SharkType::to_stackType(result_type))));
--- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -25,7 +25,7 @@ class SharkNativeWrapper : public SharkCompileInvariants { friend class SharkStackWithNativeFrame; - + public: static SharkNativeWrapper* build(SharkBuilder* builder, methodHandle target,
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -53,7 +53,7 @@ if (PrintBiasedLockingStatistics) Atomic::inc(BiasedLocking::slow_path_entry_count_addr()); - Handle object(thread, lock->obj()); + Handle object(thread, lock->obj()); assert(Universe::heap()->is_in_reserved_or_null(object()), "should be"); if (UseBiasedLocking) { // Retry fast entry if bias is revoked to avoid unnecessary inflation @@ -66,23 +66,23 @@ JRT_ENTRY(void, SharkRuntime::monitorexit(JavaThread* thread, BasicObjectLock* lock)) - Handle object(thread, lock->obj()); + Handle object(thread, lock->obj()); assert(Universe::heap()->is_in_reserved_or_null(object()), "should be"); if (lock == NULL || object()->is_unlocked()) { THROW(vmSymbols::java_lang_IllegalMonitorStateException()); } ObjectSynchronizer::slow_exit(object(), lock->lock(), thread); JRT_END - + JRT_ENTRY(void, SharkRuntime::new_instance(JavaThread* thread, int index)) klassOop k_oop = method(thread)->constants()->klass_at(index, CHECK); instanceKlassHandle klass(THREAD, k_oop); - + // Make sure we are not instantiating an abstract klass klass->check_valid_for_instantiation(true, CHECK); // Make sure klass is initialized - klass->initialize(CHECK); + klass->initialize(CHECK); // At this point the class may not be fully initialized // because of recursive initialization. If it is fully @@ -99,7 +99,7 @@ // If we have a breakpoint, then we don't rewrite // because the _breakpoint bytecode would be lost. oop obj = klass->allocate_instance(CHECK); - thread->set_vm_result(obj); + thread->set_vm_result(obj); JRT_END JRT_ENTRY(void, SharkRuntime::newarray(JavaThread* thread, @@ -141,7 +141,7 @@ char msg[jintAsStringSize]; snprintf(msg, sizeof(msg), "%d", index); Exceptions::_throw_msg( - thread, file, line, + thread, file, line, vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), msg); JRT_END @@ -150,7 +150,7 @@ const char* file, int line)) Exceptions::_throw_msg( - thread, file, line, + thread, file, line, vmSymbols::java_lang_NullPointerException(), ""); JRT_END @@ -201,7 +201,7 @@ // Push another dummy frame thread->push_zero_frame(FakeStubFrame::build(stack)); - + // Fill in the skeleton frames thread->set_last_Java_frame(); Deoptimization::unpack_frames(thread, Deoptimization::Unpack_uncommon_trap); @@ -210,7 +210,7 @@ // Pop our dummy frame thread->pop_zero_frame(); - // Jump into the interpreter + // Jump into the interpreter #ifdef CC_INTERP CppInterpreter::main_loop(number_of_frames - 1, thread); #else
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -67,11 +67,11 @@ } static intptr_t tos_at(JavaThread *thread, int offset) { return *(thread->zero_stack()->sp() + offset); - } + } // Non-VM calls public: static void dump(const char *name, intptr_t value); - static bool is_subtype_of(klassOop check_klass, klassOop object_klass); + static bool is_subtype_of(klassOop check_klass, klassOop object_klass); static void uncommon_trap(JavaThread* thread, int trap_request); };
--- a/ports/hotspot/src/share/vm/shark/sharkStack.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkStack.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -61,7 +61,7 @@ offset += stack_words; // Monitors - _monitors_slots_offset = offset; + _monitors_slots_offset = offset; offset += monitor_words; // Temporary oop slot @@ -86,7 +86,7 @@ Value *fp = slot_addr(offset++); // Local variables - _locals_slots_offset = offset; + _locals_slots_offset = offset; offset += locals_words; // Push the frame @@ -106,7 +106,7 @@ void SharkStack::CreateHardStackOverflowCheck(Value* sp) { BasicBlock *overflow = CreateBlock("stack_overflow"); BasicBlock *no_overflow = CreateBlock("no_overflow"); - + builder()->CreateCondBr( builder()->CreateICmpULT(sp, stack_base()), overflow, no_overflow); @@ -115,7 +115,7 @@ builder()->CreateUnimplemented(__FILE__, __LINE__); builder()->CreateUnreachable(); - builder()->SetInsertPoint(no_overflow); + builder()->SetInsertPoint(no_overflow); } // Check that a stack overflow is not imminent, throwing a
--- a/ports/hotspot/src/share/vm/shark/sharkStack.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkStack.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -56,7 +56,7 @@ // BasicBlock creation protected: virtual llvm::BasicBlock* CreateBlock(const char* name = "") const = 0; - + // Interface with the Zero stack private: llvm::Value* zero_stack() const { @@ -101,7 +101,7 @@ llvm::StoreInst* CreateStoreFramePointer(llvm::Value* value) { return builder()->CreateStore(value, frame_pointer_addr()); } - llvm::Value* CreatePopFrame(int result_slots); + llvm::Value* CreatePopFrame(int result_slots); // Interface with the frame anchor private: @@ -181,7 +181,7 @@ llvm::Value* slot_addr(int offset, const llvm::Type* type = NULL, const char* name = "") const; - + llvm::Value* monitor_addr(int index) const { return slot_addr( monitor_offset(index), @@ -199,7 +199,7 @@ monitor_header_offset(index), SharkType::intptr_type(), "displaced_header_addr"); - } + } // oopmap helpers public:
--- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -50,7 +50,7 @@ value = value->clone(); push(value); } - } + } set_num_monitors(state ? state->num_monitors() : 0); } @@ -211,11 +211,11 @@ } value = SharkValue::create_generic(type, NULL, i == 0 && !is_static()); break; - + case ciTypeFlow::StateVector::T_NULL: value = SharkValue::null(); break; - + case ciTypeFlow::StateVector::T_BOTTOM: break; @@ -228,7 +228,7 @@ } set_local(i, value); } - SharkNormalEntryCacher(block->function(), method).scan(this); + SharkNormalEntryCacher(block->function(), method).scan(this); } SharkOSREntryState::SharkOSREntryState(SharkTopLevelBlock* block, @@ -252,7 +252,7 @@ case T_ARRAY: value = SharkValue::create_generic(type, NULL, false); break; - + case ciTypeFlow::StateVector::T_NULL: value = SharkValue::null(); break; @@ -357,12 +357,12 @@ // Monitors set_num_monitors(block->ciblock()->monitor_count()); - builder()->SetInsertPoint(saved_insert_point); + builder()->SetInsertPoint(saved_insert_point); } void SharkPHIState::add_incoming(SharkState* incoming_state) { BasicBlock *predecessor = builder()->GetInsertBlock(); - + // Method ((PHINode *) method())->addIncoming(incoming_state->method(), predecessor); @@ -379,11 +379,11 @@ assert((stack(i) == NULL) == (incoming_state->stack(i) == NULL), "oops"); if (stack(i)) stack(i)->addIncoming(incoming_state->stack(i), predecessor); - } + } // Monitors assert(num_monitors() == incoming_state->num_monitors(), "should be"); // Temporary oop slot - assert(oop_tmp() == incoming_state->oop_tmp(), "should be"); + assert(oop_tmp() == incoming_state->oop_tmp(), "should be"); }
--- a/ports/hotspot/src/share/vm/shark/sharkState.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -184,5 +184,5 @@ } public: - void add_incoming(SharkState* incoming_state); + void add_incoming(SharkState* incoming_state); };
--- a/ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -87,13 +87,13 @@ } } } - + void SharkStateScanner::locals_integrity_checks(SharkState* state) { for (int i = 0; i < max_locals(); i++) { if (state->local(i)) { if (state->local(i)->is_two_word()) assert(state->local(i + 1) == NULL, "should be"); } - } + } } #endif // !PRODUCT
--- a/ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -61,7 +61,7 @@ virtual void process_method_slot(llvm::Value** value, int offset) {} virtual void process_pc_slot(int offset) {} virtual void end_frame_header() {} - + virtual void start_locals() {} virtual void process_local_slot(int index, SharkValue** value, int offset) {} virtual void end_locals() {}
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue Feb 23 17:36:57 2010 +0000 @@ -54,7 +54,7 @@ return; } break; - + case Bytecodes::_getfield: case Bytecodes::_getstatic: case Bytecodes::_putfield: @@ -115,7 +115,7 @@ break; } } - + // Trap if typeflow trapped (and we didn't before) if (ciblock()->has_trap()) { set_trap( @@ -177,7 +177,7 @@ } } } - + void SharkTopLevelBlock::initialize() { char name[28]; snprintf(name, sizeof(name), @@ -271,7 +271,7 @@ } else { iter()->force_bci(start()); - set_current_state(saved_state); + set_current_state(saved_state); zero_check_value(value, continue_block); } } @@ -318,7 +318,7 @@ } else { builder()->CreateUnimplemented(__FILE__, __LINE__); - } + } Value *pending_exception = get_pending_exception(); clear_pending_exception(); @@ -351,7 +351,7 @@ clear_pending_exception(); handle_exception(pending_exception, EX_CHECK_FULL); - set_current_state(saved_state); + set_current_state(saved_state); builder()->SetInsertPoint(in_bounds); } @@ -377,7 +377,7 @@ action ^= EAM_MONITOR_FUDGE; } clear_pending_exception(); - handle_exception(pending_exception, action); + handle_exception(pending_exception, action); set_current_state(saved_state); builder()->SetInsertPoint(no_exception); @@ -486,7 +486,7 @@ builder()->SetInsertPoint(do_safepoint); call_vm(builder()->safepoint(), EX_CHECK_FULL); - BasicBlock *safepointed_block = builder()->GetInsertBlock(); + BasicBlock *safepointed_block = builder()->GetInsertBlock(); builder()->CreateBr(safepointed); builder()->SetInsertPoint(safepointed); @@ -521,7 +521,7 @@ if (_can_reach_visited) return false; _can_reach_visited = true; - + if (!has_trap()) { for (int i = 0; i < num_successors(); i++) { if (successor(i)->can_reach_helper(other)) @@ -558,7 +558,7 @@ in_ByteSize(oopDesc::klass_offset_in_bytes()), SharkType::oop_type(), "klass"); - + Value *klass_part = builder()->CreateAddressOfStructEntry( klass, in_ByteSize(klassOopDesc::klass_part_offset_in_bytes()), @@ -581,7 +581,7 @@ builder()->SetInsertPoint(do_call); call_vm(builder()->register_finalizer(), receiver, EX_CHECK_FULL); - BasicBlock *branch_block = builder()->GetInsertBlock(); + BasicBlock *branch_block = builder()->GetInsertBlock(); builder()->CreateBr(done); builder()->SetInsertPoint(done); @@ -672,7 +672,7 @@ case T_DOUBLE: push(SharkValue::create_jdouble(value)); break; - + case T_OBJECT: push(SharkValue::create_generic(element_type, value, false)); break; @@ -828,7 +828,7 @@ switchinst->addCase( LLVMValue::jint_constant(switch_key(i)), dest_block->entry_block()); - dest_block->add_incoming(current_state()); + dest_block->add_incoming(current_state()); } } } @@ -861,7 +861,7 @@ } // Attempt to find a monomorphic target for this call using - // class heirachy analysis. + // class heirachy analysis. ciInstanceKlass *calling_klass = caller->holder(); ciMethod* monomorphic_target = dest_method->find_monomorphic_target(calling_klass, klass, actual_receiver); @@ -1000,7 +1000,7 @@ builder()->SetInsertPoint(got_null); builder()->CreateUnimplemented(__FILE__, __LINE__); builder()->CreateUnreachable(); - + builder()->SetInsertPoint(not_null); builder()->CreateCondBr( builder()->CreateICmpEQ(itable_iklass, iklass), @@ -1037,7 +1037,7 @@ itableMethodEntry::method_offset_in_bytes())), PointerType::getUnqual(SharkType::methodOop_type())), "callee"); -} +} void SharkTopLevelBlock::do_call() { // Set frequently used booleans @@ -1165,7 +1165,7 @@ return false; } - + void SharkTopLevelBlock::do_instance_check() { // Get the class we're checking against bool will_link; @@ -1189,7 +1189,7 @@ else do_trapping_instance_check(check_klass); } - + bool SharkTopLevelBlock::maybe_do_instanceof_if() { // Get the class we're checking against bool will_link; @@ -1202,7 +1202,7 @@ // Keep a copy of the object we're checking SharkValue *old_object = xstack(0); - + // Get the class of the object we're checking ciKlass *object_klass = old_object->type()->as_klass(); @@ -1268,7 +1268,7 @@ // Pop the object off the stack Value *object = pop()->jobject_value(); - + // Null objects aren't instances of anything builder()->CreateCondBr( builder()->CreateICmpEQ(object, LLVMValue::null()), @@ -1314,7 +1314,7 @@ LLVMValue::jint_constant(IC_NOT_INSTANCE), not_instance); BasicBlock *nonnull_block = builder()->GetInsertBlock(); builder()->CreateBr(merge2); - + // Second merge builder()->SetInsertPoint(merge2); PHINode *result = builder()->CreatePHI( @@ -1371,7 +1371,7 @@ builder()->SetInsertPoint(is_null); set_current_state(saved_state); if (bc() == Bytecodes::_checkcast) { - push(SharkValue::create_generic(klass, pop()->jobject_value(), false)); + push(SharkValue::create_generic(klass, pop()->jobject_value(), false)); } else { pop(); @@ -1395,7 +1395,7 @@ BasicBlock *push_object = NULL; SharkState *fast_state = NULL; - + Value *tlab_object = NULL; Value *heap_object = NULL; Value *fast_object = NULL; @@ -1448,7 +1448,7 @@ // Heap allocation Value *top_addr = builder()->CreateIntToPtr( - LLVMValue::intptr_constant((intptr_t) Universe::heap()->top_addr()), + LLVMValue::intptr_constant((intptr_t) Universe::heap()->top_addr()), PointerType::getUnqual(SharkType::intptr_type()), "top_addr"); @@ -1721,7 +1721,7 @@ builder()->monitorenter(), monitor_addr, exception_action | EAM_MONITOR_FUDGE); BasicBlock *acquired_slow = builder()->GetInsertBlock(); - builder()->CreateBr(lock_acquired); + builder()->CreateBr(lock_acquired); // All done builder()->SetInsertPoint(lock_acquired); @@ -1766,13 +1766,13 @@ // Create an edge for the state merge builder()->SetInsertPoint(released_fast); SharkState *fast_state = current_state()->copy(); - builder()->CreateBr(lock_released); + builder()->CreateBr(lock_released); // Need to drop into the runtime to release this one builder()->SetInsertPoint(slow_path); call_vm(builder()->monitorexit(), monitor_addr, exception_action); BasicBlock *released_slow = builder()->GetInsertBlock(); - builder()->CreateBr(lock_released); + builder()->CreateBr(lock_released); // All done builder()->SetInsertPoint(lock_released);
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -52,7 +52,7 @@ SharkStack* stack() const { return function()->stack(); } - + // Typeflow properties public: int index() const { @@ -69,7 +69,7 @@ } ciType* stack_type_at_entry(int slot) const { return ciblock()->stack_type_at(slot); - } + } int start() const { return ciblock()->start(); }
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp Tue Feb 23 12:08:37 2010 -0500 +++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp Tue Feb 23 17:36:57 2010 +0000 @@ -25,7 +25,7 @@ // Items on the stack and in local variables are tracked using // SharkValue objects. -// +// // All SharkValues are one of two core types, SharkNormalValue // and SharkAddressValue, but no code outside this file should // ever refer to those directly. The split is because of the @@ -34,7 +34,7 @@ // popped by ret only exist at compile time. Having separate // classes for these allows us to check that our jsr handling // is correct, via assertions. -// +// // There is one more type, SharkPHIValue, which is a subclass // of SharkNormalValue with a couple of extra methods. Use of // SharkPHIValue outside of this file is acceptable, so long @@ -163,7 +163,7 @@ class SharkNormalValue : public SharkValue { friend class SharkValue; - + protected: SharkNormalValue(ciType* type, llvm::Value* value, bool zero_checked) : _type(type), _llvm_value(value), _zero_checked(zero_checked) {} @@ -290,7 +290,7 @@ bool equal_to(SharkValue* other) const; // Type access - public: + public: BasicType basic_type() const; int size() const; bool is_address() const;