Mercurial > hg > release > icedtea6-1.7
changeset 1714:e3b3dd42d933
2009-09-17 Gary Benson <gbenson@redhat.com>
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp:
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp:
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp:
* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:
* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp:
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
Replaced tabs with spaces and removed trailing whitespace.
line wrap: on
line diff
--- a/ChangeLog Wed Sep 16 10:04:31 2009 -0400 +++ b/ChangeLog Thu Sep 17 05:20:03 2009 -0400 @@ -1,3 +1,21 @@ +2009-09-17 Gary Benson <gbenson@redhat.com> + + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp: + * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp: + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: + * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: + * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: + * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp: + * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: + * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: + * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: + * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: + * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp: + * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp: + * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: + Replaced tabs with spaces and removed trailing whitespace. + 2009-09-16 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -37,10 +37,10 @@ def(_invokespecialresolved, "invokespecialresolved", "bjj", NULL, T_ILLEGAL, -1, true, _invokespecial); def(_invokestaticresolved, "invokestaticresolved", "bjj", NULL, T_ILLEGAL, 0, true, _invokestatic); - def(_dmac, "dmac", "b_", NULL, T_DOUBLE, -16, false, _dmul); + def(_dmac, "dmac", "b_", NULL, T_DOUBLE, -16, false, _dmul); - def(_iload_iload, "iload_iload", "bi_i",NULL, T_INT, 2, false, _iload); - def(_iload_iload_N, "ilaod_iload_N", "bi_", NULL, T_INT, 2, false, _iload); + def(_iload_iload, "iload_iload", "bi_i",NULL, T_INT, 2, false, _iload); + def(_iload_iload_N, "ilaod_iload_N", "bi_", NULL, T_INT, 2, false, _iload); def(_iload_0_iconst_N, "iload_0_iconst_N", "b_", NULL, T_INT, 2, false, _iload_0); def(_iload_1_iconst_N, "iload_1_iconst_N", "b_", NULL, T_INT, 2, false, _iload_1); @@ -60,15 +60,15 @@ def(_ior_u4store, "ior_u4store", "b_i", NULL, T_VOID, -2, false, _ior); def(_ixor_u4store, "ixor_u4store", "b_i", NULL, T_VOID, -2, false, _ixor); - def(_iload_0_iload, "iload_0_iload", "b_i", NULL, T_INT, 2, false, _iload_0); - def(_iload_1_iload, "iload_1_iload", "b_i", NULL, T_INT, 2, false, _iload_1); - def(_iload_2_iload, "iload_2_iload", "b_i", NULL, T_INT, 2, false, _iload_2); - def(_iload_3_iload, "iload_3_iload", "b_i", NULL, T_INT, 2, false, _iload_3); + def(_iload_0_iload, "iload_0_iload", "b_i", NULL, T_INT, 2, false, _iload_0); + def(_iload_1_iload, "iload_1_iload", "b_i", NULL, T_INT, 2, false, _iload_1); + def(_iload_2_iload, "iload_2_iload", "b_i", NULL, T_INT, 2, false, _iload_2); + def(_iload_3_iload, "iload_3_iload", "b_i", NULL, T_INT, 2, false, _iload_3); - def(_iload_0_iload_N, "iload_0_iload_N", "b_", NULL, T_INT, 2, false, _iload_0); - def(_iload_1_iload_N, "iload_1_iload_N", "b_", NULL, T_INT, 2, false, _iload_1); - def(_iload_2_iload_N, "iload_2_iload_N", "b_", NULL, T_INT, 2, false, _iload_2); - def(_iload_3_iload_N, "iload_3_iload_N", "b_", NULL, T_INT, 2, false, _iload_3); + def(_iload_0_iload_N, "iload_0_iload_N", "b_", NULL, T_INT, 2, false, _iload_0); + def(_iload_1_iload_N, "iload_1_iload_N", "b_", NULL, T_INT, 2, false, _iload_1); + def(_iload_2_iload_N, "iload_2_iload_N", "b_", NULL, T_INT, 2, false, _iload_2); + def(_iload_3_iload_N, "iload_3_iload_N", "b_", NULL, T_INT, 2, false, _iload_3); #endif // HOTSPOT_ASM }
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -24,41 +24,41 @@ */ #ifdef HOTSPOT_ASM -#define _iaccess_0 ((Bytecodes::Code)0xdb) -#define _iaccess_1 ((Bytecodes::Code)0xdc) -#define _iaccess_2 ((Bytecodes::Code)0xdd) -#define _iaccess_3 ((Bytecodes::Code)0xde) +#define _iaccess_0 ((Bytecodes::Code)0xdb) +#define _iaccess_1 ((Bytecodes::Code)0xdc) +#define _iaccess_2 ((Bytecodes::Code)0xdd) +#define _iaccess_3 ((Bytecodes::Code)0xde) -#define _invokeresolved ((Bytecodes::Code)0xdf) -#define _invokespecialresolved ((Bytecodes::Code)0xe0) -#define _invokestaticresolved ((Bytecodes::Code)0xe1) +#define _invokeresolved ((Bytecodes::Code)0xdf) +#define _invokespecialresolved ((Bytecodes::Code)0xe0) +#define _invokestaticresolved ((Bytecodes::Code)0xe1) -#define _iload_iload ((Bytecodes::Code)0xe3) -#define _iload_iload_N ((Bytecodes::Code)0xe4) +#define _iload_iload ((Bytecodes::Code)0xe3) +#define _iload_iload_N ((Bytecodes::Code)0xe4) -#define _dmac ((Bytecodes::Code)0xe6) +#define _dmac ((Bytecodes::Code)0xe6) - _iload_0_iconst_N , // 231 - _iload_1_iconst_N , // 232 - _iload_2_iconst_N , // 233 - _iload_3_iconst_N , // 234 - _iload_iconst_N , // 235 - _iadd_istore_N , // 236 - _isub_istore_N , // 237 - _iand_istore_N , // 238 - _ior_istore_N , // 239 - _ixor_istore_N , // 240 - _iadd_u4store , // 241 - _isub_u4store , // 242 - _iand_u4store , // 243 - _ior_u4store , // 244 - _ixor_u4store , // 245 - _iload_0_iload , // 246 - _iload_1_iload , // 247 - _iload_2_iload , // 248 - _iload_3_iload , // 249 - _iload_0_iload_N , // 250 - _iload_1_iload_N , // 251 - _iload_2_iload_N , // 252 - _iload_3_iload_N , // 253 + _iload_0_iconst_N , // 231 + _iload_1_iconst_N , // 232 + _iload_2_iconst_N , // 233 + _iload_3_iconst_N , // 234 + _iload_iconst_N , // 235 + _iadd_istore_N , // 236 + _isub_istore_N , // 237 + _iand_istore_N , // 238 + _ior_istore_N , // 239 + _ixor_istore_N , // 240 + _iadd_u4store , // 241 + _isub_u4store , // 242 + _iand_u4store , // 243 + _ior_u4store , // 244 + _ixor_u4store , // 245 + _iload_0_iload , // 246 + _iload_1_iload , // 247 + _iload_2_iload , // 248 + _iload_3_iload , // 249 + _iload_0_iload_N , // 250 + _iload_1_iload_N , // 251 + _iload_2_iload_N , // 252 + _iload_3_iload_N , // 253 #endif // HOTSPOT_ASM
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -105,7 +105,7 @@ // Trim back the stack to put the parameters at the top stack->set_sp(istate->stack() + 1); - + // Make the call Interpreter::invoke_method(callee, istate->callee_entry_point(), THREAD); fixup_after_potential_safepoint(); @@ -114,7 +114,7 @@ istate->set_stack(stack->sp() - 1); // Restore the stack - stack->set_sp(istate->stack_limit() + 1); + stack->set_sp(istate->stack_limit() + 1); // Resume the interpreter istate->set_msg(BytecodeInterpreter::method_resume); @@ -260,17 +260,17 @@ arguments = (void **) stack->alloc(handler->argument_count() * sizeof(void **)); void **dst = arguments; - + void *env = thread->jni_environment(); *(dst++) = &env; - + if (method->is_static()) { istate->set_oop_temp( method->constants()->pool_holder()->klass_part()->java_mirror()); mirror = istate->oop_temp_addr(); *(dst++) = &mirror; } - + intptr_t *src = locals; for (int i = dst - arguments; i < handler->argument_count(); i++) { ffi_type *type = handler->argument_type(i); @@ -297,7 +297,7 @@ } } - // Set up the Java frame anchor + // Set up the Java frame anchor thread->set_last_Java_frame(); // Change the thread state to _thread_in_native @@ -350,7 +350,7 @@ // Reset handle block thread->active_handles()->clear(); - + // Unlock if necessary. It seems totally wrong that this // is skipped in the event of an exception but apparently // the template interpreter does this so we do too. @@ -424,7 +424,7 @@ case T_LONG: SET_LOCALS_LONG(*(jlong *) result, 0); break; - + case T_FLOAT: SET_LOCALS_FLOAT(*(jfloat *) result, 0); break; @@ -516,8 +516,8 @@ case ltos: SET_LOCALS_LONG(object->long_field_acquire(entry->f2()), 0); - break; - + break; + case ftos: SET_LOCALS_FLOAT(object->float_field_acquire(entry->f2()), 0); break; @@ -554,8 +554,8 @@ case ltos: SET_LOCALS_LONG(object->long_field(entry->f2()), 0); - break; - + break; + case ftos: SET_LOCALS_FLOAT(object->float_field(entry->f2()), 0); break; @@ -607,7 +607,7 @@ if (free_stack < StackShadowPages * os::vm_page_size()) { return true; } - + return false; } @@ -850,14 +850,14 @@ intptr_t *stack_base = monitor_base - monitor_words; intptr_t *stack = stack_base - tempcount - 1; - BytecodeInterpreter::layout_interpreterState(istate, + BytecodeInterpreter::layout_interpreterState(istate, caller, NULL, - method, - locals, - stack, - stack_base, - monitor_base, + method, + locals, + stack, + stack_base, + monitor_base, NULL, is_top_frame); } @@ -921,7 +921,7 @@ ShouldNotCallThis(); #else return false; // make frame::print_value_on work -#endif // !PRODUCT +#endif // !PRODUCT } // Result handlers and convertors
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -148,7 +148,7 @@ value_result->d = *(jdouble *) tos_addr; break; - case T_OBJECT: + case T_OBJECT: case T_ARRAY: if (method->is_native()) { obj = get_interpreterState()->oop_temp(); @@ -395,7 +395,7 @@ intptr_t monitor = (intptr_t) ( (BasicObjectLock *) monitor_base - 1 - index); intptr_t offset = (intptr_t) addr - monitor; - + if (offset == BasicObjectLock::obj_offset_in_bytes()) snprintf(fieldbuf, buflen, "monitor[%d]->_obj", index); else if (offset == BasicObjectLock::lock_offset_in_bytes())
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -68,7 +68,7 @@ bool is_deoptimizer_frame() const; public: - frame sender_for_deoptimizer_frame(RegisterMap* map) const; + frame sender_for_deoptimizer_frame(RegisterMap* map) const; public: void zero_print_on_error(int index,
--- a/ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -69,7 +69,7 @@ case T_BYTE: ftype = &ffi_type_sint8; break; - + case T_SHORT: ftype = &ffi_type_sint16; break; @@ -85,7 +85,7 @@ case T_FLOAT: ftype = &ffi_type_float; break; - + case T_DOUBLE: ftype = &ffi_type_double; break; @@ -156,7 +156,7 @@ void SignatureHandlerLibrary::pd_set_handler(address handlerAddr) { InterpreterRuntime::SignatureHandler *handler = - InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr); + InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr); handler->finalize(); }
--- a/ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -37,7 +37,7 @@ int argument_count() const { return cif()->nargs; } - + ffi_type** argument_types() const { return (ffi_type**) (cif() + 1); }
--- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -50,7 +50,7 @@ int callee_param_count, int callee_locals, bool is_top_frame) { - return layout_activation(method, + return layout_activation(method, tempcount, popframe_extra_args, moncount,
--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -46,5 +46,5 @@ (address) CppInterpreter::normal_entry); #else Unimplemented(); -#endif // CC_INTERP +#endif // CC_INTERP }
--- a/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/stack_zero.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -90,7 +90,7 @@ } static ByteSize sp_offset() { return byte_offset_of(ZeroStack, _sp); - } + } }; @@ -99,7 +99,7 @@ class SharkFrame; class DeoptimizerFrame; -// +// // | ... | // +--------------------+ ------------------ // | ... | low addresses @@ -137,7 +137,7 @@ intptr_t value_of_word(int offset) const { return *addr_of_word(offset); } - + public: ZeroFrame *next() const { return (ZeroFrame *) value_of_word(next_frame_off);
--- a/ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -31,7 +31,7 @@ static address call_stub_return_pc() { return (address) -1; } - + static bool returns_to_call_stub(address return_pc) { return return_pc == call_stub_return_pc(); }
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -31,16 +31,16 @@ * __m68k_cmpxchg * * Atomically store newval in *ptr if *ptr is equal to oldval for user space. - * Returns newval on success and oldval if no exchange happened. - * This implementation is processor specific and works on + * Returns newval on success and oldval if no exchange happened. + * This implementation is processor specific and works on * 68020 68030 68040 and 68060. * * It will not work on ColdFire, 68000 and 68010 since they lack the CAS - * instruction. + * instruction. * Using a kernelhelper would be better for arch complete implementation. * */ - + static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) { int ret; __asm __volatile ("cas%.l %0,%2,%1" @@ -58,11 +58,11 @@ for (;;) { int prev = *ptr; if (prev != oldval) - return prev; + return prev; if (__m68k_cmpxchg (prev, newval, ptr) == newval) - // Success. - return prev; + // Success. + return prev; // We failed even though prev == oldval. Try again. } @@ -76,7 +76,7 @@ int prev = *ptr; if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value) - return prev + add_value; + return prev + add_value; } } @@ -88,7 +88,7 @@ int prev = *ptr; if (__m68k_cmpxchg (prev, newval, ptr) == prev) - return prev; + return prev; } } #endif // M68K @@ -119,11 +119,11 @@ for (;;) { int prev = *ptr; if (prev != oldval) - return prev; + return prev; if (__kernel_cmpxchg (prev, newval, ptr) == 0) - // Success. - return prev; + // Success. + return prev; // We failed even though prev == oldval. Try again. } @@ -137,7 +137,7 @@ int prev = *ptr; if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0) - return prev + add_value; + return prev + add_value; } } @@ -149,7 +149,7 @@ int prev = *ptr; if (__kernel_cmpxchg (prev, newval, ptr) == 0) - return prev; + return prev; } } #endif // ARM
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp Thu Sep 17 05:20:03 2009 -0400 @@ -25,11 +25,11 @@ #ifdef ARM -/* - * ARM Kernel helper for memory barrier. +/* + * ARM Kernel helper for memory barrier. * Using __asm __volatile ("":::"memory") does not work reliable on ARM * and gcc __sync_synchronize(); implementation does not use the kernel - * helper for all gcc versions so it is unreliable to use as well. + * helper for all gcc versions so it is unreliable to use as well. */ typedef void (__kernel_dmb_t) (void); #define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0) @@ -105,25 +105,25 @@ } inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { - intptr_t data = *p; + intptr_t data = *p; acquire(); - return data; + return data; } inline void* OrderAccess::load_ptr_acquire(volatile void* p) { void *data = *(void* volatile *)p; acquire(); - return data; + return data; } inline void* OrderAccess::load_ptr_acquire(const volatile void* p) { - void *data = *(void* const volatile *)p; - acquire(); + void *data = *(void* const volatile *)p; + acquire(); return data; } inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { release(); *p = v; } inline void OrderAccess::release_store(volatile jshort* p, jshort v) { release(); *p = v; } inline void OrderAccess::release_store(volatile jint* p, jint v) { release(); *p = v; } -inline void OrderAccess::release_store(volatile jlong* p, jlong v) +inline void OrderAccess::release_store(volatile jlong* p, jlong v) { release(); os::atomic_copy64(&v, p); } inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { release(); *p = v; } inline void OrderAccess::release_store(volatile jushort* p, jushort v) { release(); *p = v; }
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Wed Sep 16 10:04:31 2009 -0400 +++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Thu Sep 17 05:20:03 2009 -0400 @@ -172,7 +172,7 @@ else { fatal("recursive segv. expanding stack."); } - } + } } } @@ -228,7 +228,7 @@ "\n# OOO c_c_(___)"); } #endif // !PRODUCT - + const char *fmt = "caught unhandled signal %d"; char buf[64];