/hg/icedtea6: 2009-09-03 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Thu Sep 3 08:29:31 PDT 2009
changeset cc4f8460a676 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc4f8460a676
author: Gary Benson <gbenson at redhat.com>
date: Thu Sep 03 11:23:31 2009 -0400
2009-09-03 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
Reformatted with trailing opening braces.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/copy_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/icache_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/register_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline
.hpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hp
p: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
Likewise.
diffstat:
58 files changed, 624 insertions(+), 892 deletions(-)
ChangeLog | 70 ++++
ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 36 --
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 3
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 3
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 51 +--
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 43 ++
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 3
ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 145 ++++------
ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 38 +-
ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 80 ++---
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 3
ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp | 3
ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 5
ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 18 -
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 51 +--
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 25 -
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 63 +---
ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 9
ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 2
ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 24 -
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 51 +--
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 15 -
ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 24 -
ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 20 -
ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 24 -
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | 3
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 105 ++-----
ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 18 -
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 35 +-
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 3
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 28 -
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 12
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 75 +----
ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 27 -
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 12
ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 3
ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 15 -
ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 8
ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 12
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 78 +----
ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 9
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 27 -
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 138 ++++-----
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 3
ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 6
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 9
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 6
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 42 --
diffs (truncated from 3573 to 500 lines):
diff -r ad90da0ee95f -r cc4f8460a676 ChangeLog
--- a/ChangeLog Thu Sep 03 09:03:41 2009 -0400
+++ b/ChangeLog Thu Sep 03 11:23:31 2009 -0400
@@ -1,3 +1,73 @@ 2009-09-03 Gary Benson <gbenson at redhat
+2009-09-03 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: Reformatted
+ with trailing opening braces.
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
+ Likewise.
+
2009-09-03 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Thu Sep 03 11:23:31 2009 -0400
@@ -26,67 +26,55 @@
#include "incls/_precompiled.incl"
#include "incls/_assembler_zero.cpp.incl"
-int AbstractAssembler::code_fill_byte()
-{
+int AbstractAssembler::code_fill_byte() {
return 0;
}
-void Assembler::pd_patch_instruction(address branch, address target)
-{
+void Assembler::pd_patch_instruction(address branch, address target) {
Unimplemented();
}
#ifndef PRODUCT
-void Assembler::pd_print_patched_instruction(address branch)
-{
+void Assembler::pd_print_patched_instruction(address branch) {
Unimplemented();
}
#endif // PRODUCT
-void MacroAssembler::align(int modulus)
-{
+void MacroAssembler::align(int modulus) {
while (offset() % modulus != 0)
emit_byte(AbstractAssembler::code_fill_byte());
}
-void MacroAssembler::bang_stack_with_offset(int offset)
-{
+void MacroAssembler::bang_stack_with_offset(int offset) {
Unimplemented();
}
-void MacroAssembler::advance(int bytes)
-{
+void MacroAssembler::advance(int bytes) {
_code_pos += bytes;
sync();
}
-void MacroAssembler::store_oop(jobject obj)
-{
+void MacroAssembler::store_oop(jobject obj) {
code_section()->relocate(pc(), oop_Relocation::spec_for_immediate());
emit_address((address) obj);
}
-static void _UnimplementedStub()
-{
+static void _UnimplementedStub() {
report_unimplemented(__FILE__, __LINE__);
}
-address UnimplementedStub()
-{
+address UnimplementedStub() {
return (address) _UnimplementedStub;
}
-address UnimplementedEntry()
-{
+address UnimplementedEntry() {
return (address) _UnimplementedStub;
}
-static void _ShouldNotReachHereStub()
-{
+static void _ShouldNotReachHereStub() {
report_should_not_reach_here(__FILE__, __LINE__);
}
-address ShouldNotReachHereStub()
-{
+address ShouldNotReachHereStub() {
return (address) _ShouldNotReachHereStub;
}
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Thu Sep 03 11:23:31 2009 -0400
@@ -52,8 +52,7 @@ class MacroAssembler : public Assembler
};
#ifdef ASSERT
-inline bool AbstractAssembler::pd_check_instruction_mark()
-{
+inline bool AbstractAssembler::pd_check_instruction_mark() {
Unimplemented();
}
#endif
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp Thu Sep 03 11:23:31 2009 -0400
@@ -28,8 +28,7 @@
#ifdef CC_INTERP
-const char *BytecodeInterpreter::name_of_field_at_address(address addr)
-{
+const char *BytecodeInterpreter::name_of_field_at_address(address addr) {
#define DO(member) {if (addr == (address) &(member)) return XSTR(member);}
DO(_thread);
DO(_bcp);
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Thu Sep 03 11:23:31 2009 -0400
@@ -35,72 +35,55 @@
interpreterState _self_link;
public:
- inline void set_locals(intptr_t* new_locals)
- {
+ inline void set_locals(intptr_t* new_locals) {
_locals = new_locals;
}
- inline void set_method(methodOop new_method)
- {
+ inline void set_method(methodOop new_method) {
_method = new_method;
}
- inline interpreterState self_link()
- {
+ inline interpreterState self_link() {
return _self_link;
}
- inline void set_self_link(interpreterState new_self_link)
- {
+ inline void set_self_link(interpreterState new_self_link) {
_self_link = new_self_link;
}
- inline interpreterState prev_link()
- {
+ inline interpreterState prev_link() {
return _prev_link;
}
- inline void set_prev_link(interpreterState new_prev_link)
- {
+ inline void set_prev_link(interpreterState new_prev_link) {
_prev_link = new_prev_link;
}
- inline void set_stack_limit(intptr_t* new_stack_limit)
- {
+ inline void set_stack_limit(intptr_t* new_stack_limit) {
_stack_limit = new_stack_limit;
}
- inline void set_stack_base(intptr_t* new_stack_base)
- {
+ inline void set_stack_base(intptr_t* new_stack_base) {
_stack_base = new_stack_base;
}
- inline void set_monitor_base(BasicObjectLock *new_monitor_base)
- {
+ inline void set_monitor_base(BasicObjectLock *new_monitor_base) {
_monitor_base = new_monitor_base;
}
- inline void set_thread(JavaThread* new_thread)
- {
+ inline void set_thread(JavaThread* new_thread) {
_thread = new_thread;
}
- inline void set_constants(constantPoolCacheOop new_constants)
- {
+ inline void set_constants(constantPoolCacheOop new_constants) {
_constants = new_constants;
}
- inline oop oop_temp()
- {
+ inline oop oop_temp() {
return _oop_temp;
}
- inline oop *oop_temp_addr()
- {
+ inline oop *oop_temp_addr() {
return &_oop_temp;
}
- inline void set_oop_temp(oop new_oop_temp)
- {
+ inline void set_oop_temp(oop new_oop_temp) {
_oop_temp = new_oop_temp;
}
- inline address callee_entry_point()
- {
+ inline address callee_entry_point() {
return _result._to_call._callee_entry_point;
}
- inline address osr_buf()
- {
+ inline address osr_buf() {
return _result._osr._osr_buf;
}
- inline address osr_entry()
- {
+ inline address osr_entry() {
return _result._osr._osr_entry;
}
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp Thu Sep 03 11:23:31 2009 -0400
@@ -25,15 +25,33 @@
// Inline interpreter functions for zero
-inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) { return op1 + op2; }
-inline jfloat BytecodeInterpreter::VMfloatSub(jfloat op1, jfloat op2) { return op1 - op2; }
-inline jfloat BytecodeInterpreter::VMfloatMul(jfloat op1, jfloat op2) { return op1 * op2; }
-inline jfloat BytecodeInterpreter::VMfloatDiv(jfloat op1, jfloat op2) { return op1 / op2; }
-inline jfloat BytecodeInterpreter::VMfloatRem(jfloat op1, jfloat op2) { return fmod(op1, op2); }
-
-inline jfloat BytecodeInterpreter::VMfloatNeg(jfloat op) { return -op; }
-
-inline int32_t BytecodeInterpreter::VMfloatCompare(jfloat op1, jfloat op2, int32_t direction) {
+inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) {
+ return op1 + op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatSub(jfloat op1, jfloat op2) {
+ return op1 - op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatMul(jfloat op1, jfloat op2) {
+ return op1 * op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatDiv(jfloat op1, jfloat op2) {
+ return op1 / op2;
+}
+
+inline jfloat BytecodeInterpreter::VMfloatRem(jfloat op1, jfloat op2) {
+ return fmod(op1, op2);
+}
+
+inline jfloat BytecodeInterpreter::VMfloatNeg(jfloat op) {
+ return -op;
+}
+
+inline int32_t BytecodeInterpreter::VMfloatCompare(jfloat op1,
+ jfloat op2,
+ int32_t direction) {
return ( op1 < op2 ? -1 :
op1 > op2 ? 1 :
op1 == op2 ? 0 :
@@ -41,7 +59,8 @@ inline int32_t BytecodeInterpreter::VMfl
}
-inline void BytecodeInterpreter::VMmemCopy64(uint32_t to[2], const uint32_t from[2]) {
+inline void BytecodeInterpreter::VMmemCopy64(uint32_t to[2],
+ const uint32_t from[2]) {
*(uint64_t *) to = *(uint64_t *) from;
}
@@ -182,7 +201,9 @@ inline jdouble BytecodeInterpreter::VMdo
return op1 - op2;
}
-inline int32_t BytecodeInterpreter::VMdoubleCompare(jdouble op1, jdouble op2, int32_t direction) {
+inline int32_t BytecodeInterpreter::VMdoubleCompare(jdouble op1,
+ jdouble op2,
+ int32_t direction) {
return ( op1 < op2 ? -1 :
op1 > op2 ? 1 :
op1 == op2 ? 0 :
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp Thu Sep 03 11:23:31 2009 -0400
@@ -26,8 +26,7 @@
#include "incls/_precompiled.incl"
#include "incls/_bytecodes_zero.cpp.incl"
-void Bytecodes::pd_initialize()
-{
+void Bytecodes::pd_initialize() {
#if defined(PRODUCT) && defined(HOTSPOT_ASM)
def(_iaccess_0, "_iaccess_0", "b_jj", NULL, T_INT, 1, true, _aload_0);
def(_iaccess_1, "_iaccess_1", "b_jj", NULL, T_INT, 1, true, _aload_1);
diff -r ad90da0ee95f -r cc4f8460a676 ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp Thu Sep 03 09:03:41 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp Thu Sep 03 11:23:31 2009 -0400
@@ -27,8 +27,7 @@ class Bytes: AllStatic {
public:
// Returns true if the byte ordering used by Java is different
// from the native byte ordering of the underlying machine.
- static inline bool is_Java_byte_ordering_different()
- {
+ static inline bool is_Java_byte_ordering_different() {
#ifdef VM_LITTLE_ENDIAN
return true;
#else
@@ -48,10 +47,10 @@ class Bytes: AllStatic {
static inline u4 get_native_u4(address p) {
switch (intptr_t(p) & 3) {
- case 0: return *(u4*)p;
-
- case 2: return ( u4( ((u2*)p)[1] ) << 16 )
- | ( u4( ((u2*)p)[0] ) );
+ case 0: return *(u4*)p;
+
+ case 2: return ( u4( ((u2*)p)[1] ) << 16 )
+ | ( u4( ((u2*)p)[0] ) );
default: return ( u4(p[3]) << 24 )
| ( u4(p[2]) << 16 )
@@ -62,29 +61,29 @@ class Bytes: AllStatic {
static inline u8 get_native_u8(address p) {
switch (intptr_t(p) & 7) {
- case 0: return *(u8*)p;
-
- case 4: return ( u8( ((u4*)p)[1] ) << 32 )
- | ( u8( ((u4*)p)[0] ) );
-
- case 2: return ( u8( ((u2*)p)[3] ) << 48 )
- | ( u8( ((u2*)p)[2] ) << 32 )
- | ( u8( ((u2*)p)[1] ) << 16 )
- | ( u8( ((u2*)p)[0] ) );
-
- default: return ( u8(p[7]) << 56 )
- | ( u8(p[6]) << 48 )
- | ( u8(p[5]) << 40 )
- | ( u8(p[4]) << 32 )
- | ( u8(p[3]) << 24 )
- | ( u8(p[2]) << 16 )
- | ( u8(p[1]) << 8 )
- | u8(p[0]);
- }
- }
-
- static inline void put_native_u2(address p, u2 x) {
- if ( (intptr_t(p) & 1) == 0 ) *(u2*)p = x;
+ case 0: return *(u8*)p;
+
+ case 4: return ( u8( ((u4*)p)[1] ) << 32 )
+ | ( u8( ((u4*)p)[0] ) );
+
+ case 2: return ( u8( ((u2*)p)[3] ) << 48 )
+ | ( u8( ((u2*)p)[2] ) << 32 )
+ | ( u8( ((u2*)p)[1] ) << 16 )
+ | ( u8( ((u2*)p)[0] ) );
+
+ default: return ( u8(p[7]) << 56 )
+ | ( u8(p[6]) << 48 )
+ | ( u8(p[5]) << 40 )
+ | ( u8(p[4]) << 32 )
+ | ( u8(p[3]) << 24 )
+ | ( u8(p[2]) << 16 )
+ | ( u8(p[1]) << 8 )
+ | u8(p[0]);
+ }
+ }
+
+ static inline void put_native_u2(address p, u2 x) {
+ if ((intptr_t(p) & 1) == 0) *(u2*) p = x;
else {
p[1] = x >> 8;
p[0] = x;
@@ -143,10 +142,10 @@ class Bytes: AllStatic {
static inline u4 get_native_u4(address p) {
switch (intptr_t(p) & 3) {
- case 0: return *(u4*)p;
-
- case 2: return ( u4( ((u2*)p)[0] ) << 16 )
- | ( u4( ((u2*)p)[1] ) );
+ case 0: return *(u4*)p;
+
+ case 2: return ( u4( ((u2*)p)[0] ) << 16 )
+ | ( u4( ((u2*)p)[1] ) );
default: return ( u4(p[0]) << 24 )
| ( u4(p[1]) << 16 )
@@ -157,28 +156,28 @@ class Bytes: AllStatic {
static inline u8 get_native_u8(address p) {
switch (intptr_t(p) & 7) {
- case 0: return *(u8*)p;
-
- case 4: return ( u8( ((u4*)p)[0] ) << 32 )
- | ( u8( ((u4*)p)[1] ) );
-
- case 2: return ( u8( ((u2*)p)[0] ) << 48 )
- | ( u8( ((u2*)p)[1] ) << 32 )
- | ( u8( ((u2*)p)[2] ) << 16 )
- | ( u8( ((u2*)p)[3] ) );
-
- default: return ( u8(p[0]) << 56 )
- | ( u8(p[1]) << 48 )
- | ( u8(p[2]) << 40 )
- | ( u8(p[3]) << 32 )
- | ( u8(p[4]) << 24 )
- | ( u8(p[5]) << 16 )
- | ( u8(p[6]) << 8 )
- | u8(p[7]);
- }
- }
-
- static inline void put_native_u2(address p, u2 x) {
+ case 0: return *(u8*)p;
+
+ case 4: return ( u8( ((u4*)p)[0] ) << 32 )
+ | ( u8( ((u4*)p)[1] ) );
+
+ case 2: return ( u8( ((u2*)p)[0] ) << 48 )
+ | ( u8( ((u2*)p)[1] ) << 32 )
+ | ( u8( ((u2*)p)[2] ) << 16 )
+ | ( u8( ((u2*)p)[3] ) );
+
+ default: return ( u8(p[0]) << 56 )
+ | ( u8(p[1]) << 48 )
+ | ( u8(p[2]) << 40 )
+ | ( u8(p[3]) << 32 )
+ | ( u8(p[4]) << 24 )
+ | ( u8(p[5]) << 16 )
+ | ( u8(p[6]) << 8 )
+ | u8(p[7]);
+ }
More information about the distro-pkg-dev
mailing list