/hg/icedtea6: 2009-09-17 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Thu Sep 17 02:26:30 PDT 2009
changeset e3b3dd42d933 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e3b3dd42d933
author: Gary Benson <gbenson at redhat.com>
date: Thu Sep 17 05:20:03 2009 -0400
2009-09-17 Gary Benson <gbenson at 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.
diffstat:
15 files changed, 120 insertions(+), 102 deletions(-)
ChangeLog | 18 ++
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 22 +--
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 66 +++++-----
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 40 +++---
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 6
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 2
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 28 ++--
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 18 +-
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 4
diffs (truncated from 574 to 500 lines):
diff -r ea0d2d9445ce -r e3b3dd42d933 ChangeLog
--- 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-16 Gary Benson <gbenson at redhat
+2009-09-17 Gary Benson <gbenson at 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 at redhat.com>
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp
--- 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 @@ void Bytecodes::pd_initialize() {
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 @@ void Bytecodes::pd_initialize() {
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
}
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
--- 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
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- 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 @@ void CppInterpreter::main_loop(int recur
// 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 @@ void CppInterpreter::main_loop(int recur
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 @@ void CppInterpreter::native_entry(method
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 @@ void CppInterpreter::native_entry(method
}
}
- // 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 @@ void CppInterpreter::native_entry(method
// 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 @@ void CppInterpreter::native_entry(method
case T_LONG:
SET_LOCALS_LONG(*(jlong *) result, 0);
break;
-
+
case T_FLOAT:
SET_LOCALS_FLOAT(*(jfloat *) result, 0);
break;
@@ -516,8 +516,8 @@ void CppInterpreter::accessor_entry(meth
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 @@ void CppInterpreter::accessor_entry(meth
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 @@ bool CppInterpreter::stack_overflow_immi
if (free_stack < StackShadowPages * os::vm_page_size()) {
return true;
}
-
+
return false;
}
@@ -850,14 +850,14 @@ int AbstractInterpreter::layout_activati
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 @@ bool CppInterpreter::contains(address pc
ShouldNotCallThis();
#else
return false; // make frame::print_value_on work
-#endif // !PRODUCT
+#endif // !PRODUCT
}
// Result handlers and convertors
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- 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 @@ BasicType frame::interpreter_frame_resul
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 @@ void ZeroFrame::identify_vp_word(int
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())
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- 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,
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
--- 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 @@ void InterpreterRuntime::SignatureHandle
case T_BYTE:
ftype = &ffi_type_sint8;
break;
-
+
case T_SHORT:
ftype = &ffi_type_sint16;
break;
@@ -85,7 +85,7 @@ void InterpreterRuntime::SignatureHandle
case T_FLOAT:
ftype = &ffi_type_float;
break;
-
+
case T_DOUBLE:
ftype = &ffi_type_double;
break;
@@ -156,7 +156,7 @@ IRT_END
void SignatureHandlerLibrary::pd_set_handler(address handlerAddr) {
InterpreterRuntime::SignatureHandler *handler =
- InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
+ InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
handler->finalize();
}
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp
--- 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 @@ class SignatureHandler {
int argument_count() const {
return cif()->nargs;
}
-
+
ffi_type** argument_types() const {
return (ffi_type**) (cif() + 1);
}
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp
--- 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 AbstractInterpreter::size_activation
int callee_param_count,
int callee_locals,
bool is_top_frame) {
- return layout_activation(method,
+ return layout_activation(method,
tempcount,
popframe_extra_args,
moncount,
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
--- 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 @@ void NativeJump::patch_verified_entry(ad
(address) CppInterpreter::normal_entry);
#else
Unimplemented();
-#endif // CC_INTERP
+#endif // CC_INTERP
}
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/stack_zero.hpp
--- 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 @@ class ZeroStack {
}
static ByteSize sp_offset() {
return byte_offset_of(ZeroStack, _sp);
- }
+ }
};
@@ -99,7 +99,7 @@ class SharkFrame;
class SharkFrame;
class DeoptimizerFrame;
-//
+//
// | ... |
// +--------------------+ ------------------
// | ... | low addresses
@@ -137,7 +137,7 @@ class ZeroFrame {
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);
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp
--- 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();
}
diff -r ea0d2d9445ce -r e3b3dd42d933 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
--- 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 @@ static inline int m68k_compare_and_swap(
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 @@ static inline int m68k_add_and_fetch(vol
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 @@ static inline int m68k_lock_test_and_set
int prev = *ptr;
if (__m68k_cmpxchg (prev, newval, ptr) == prev)
- return prev;
+ return prev;
}
}
#endif // M68K
@@ -119,11 +119,11 @@ static inline int arm_compare_and_swap(v
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 @@ static inline int arm_add_and_fetch(vola
int prev = *ptr;
if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
- return prev + add_value;
+ return prev + add_value;
}
}
@@ -149,7 +149,7 @@ static inline int arm_lock_test_and_set(
int prev = *ptr;
if (__kernel_cmpxchg (prev, newval, ptr) == 0)
- return prev;
+ return prev;
More information about the distro-pkg-dev
mailing list