changeset in /hg/icedtea: 2008-01-31 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Thu Jan 31 05:57:20 PST 2008
changeset 36c1000392c9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=36c1000392c9
description:
2008-01-31 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp
(get_native_u2): Implement for little endian machines.
(get_native_u4): Likewise.
(get_native_u8): Likewise.
(put_native_u2): Likewise.
(put_native_u4): Likewise.
(put_native_u8): Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
(accessor_entry): Work on little endian machines.
diffstat:
3 files changed, 115 insertions(+), 4 deletions(-)
ChangeLog | 13 ++
ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 99 ++++++++++++++++-
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 7 -
diffs (165 lines):
diff -r 4200738b14e8 -r 36c1000392c9 ChangeLog
--- a/ChangeLog Thu Jan 31 13:44:18 2008 +0000
+++ b/ChangeLog Thu Jan 31 13:56:43 2008 +0000
@@ -1,3 +1,16 @@ 2008-01-31 Gary Benson <gbenson at redhat
+2008-01-31 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp
+ (get_native_u2): Implement for little endian machines.
+ (get_native_u4): Likewise.
+ (get_native_u8): Likewise.
+ (put_native_u2): Likewise.
+ (put_native_u4): Likewise.
+ (put_native_u8): Likewise.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+ (accessor_entry): Work on little endian machines.
+
2008-01-31 Gary Benson <gbenson at redhat.com>
* Makefile.am (hotspot, hotspot-helper): New rules.
diff -r 4200738b14e8 -r 36c1000392c9 ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp Thu Jan 31 13:44:18 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp Thu Jan 31 13:56:43 2008 +0000
@@ -1,6 +1,6 @@
/*
* Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
- * Copyright 2007 Red Hat, Inc.
+ * Copyright 2007, 2008 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,102 @@ class Bytes: AllStatic {
// Efficient reading and writing of unaligned unsigned data in
// platform-specific byte ordering.
+#ifdef VM_LITTLE_ENDIAN
+ static inline u2 get_native_u2(address p){
+ return (intptr_t(p) & 1) == 0
+ ? *(u2*)p
+ : ( u2(p[1]) << 8 )
+ | ( u2(p[0]) );
+ }
+
+ 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] ) );
+
+ default: return ( u4(p[3]) << 24 )
+ | ( u4(p[2]) << 16 )
+ | ( u4(p[1]) << 8 )
+ | u4(p[0]);
+ }
+ }
+
+ 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;
+ else {
+ p[1] = x >> 8;
+ p[0] = x;
+ }
+ }
+
+ static inline void put_native_u4(address p, u4 x) {
+ switch ( intptr_t(p) & 3 ) {
+ case 0: *(u4*)p = x;
+ break;
+
+ case 2: ((u2*)p)[1] = x >> 16;
+ ((u2*)p)[0] = x;
+ break;
+
+ default: ((u1*)p)[3] = x >> 24;
+ ((u1*)p)[2] = x >> 16;
+ ((u1*)p)[1] = x >> 8;
+ ((u1*)p)[0] = x;
+ break;
+ }
+ }
+
+ static inline void put_native_u8(address p, u8 x) {
+ switch ( intptr_t(p) & 7 ) {
+ case 0: *(u8*)p = x;
+ break;
+
+ case 4: ((u4*)p)[1] = x >> 32;
+ ((u4*)p)[0] = x;
+ break;
+
+ case 2: ((u2*)p)[3] = x >> 48;
+ ((u2*)p)[2] = x >> 32;
+ ((u2*)p)[1] = x >> 16;
+ ((u2*)p)[0] = x;
+ break;
+
+ default: ((u1*)p)[7] = x >> 56;
+ ((u1*)p)[6] = x >> 48;
+ ((u1*)p)[5] = x >> 40;
+ ((u1*)p)[4] = x >> 32;
+ ((u1*)p)[3] = x >> 24;
+ ((u1*)p)[2] = x >> 16;
+ ((u1*)p)[1] = x >> 8;
+ ((u1*)p)[0] = x;
+ }
+ }
+#else
static inline u2 get_native_u2(address p){
return (intptr_t(p) & 1) == 0
? *(u2*)p
@@ -132,6 +228,7 @@ class Bytes: AllStatic {
((u1*)p)[7] = x;
}
}
+#endif // VM_LITTLE_ENDIAN
// Efficient reading and writing of unaligned unsigned data in Java
diff -r 4200738b14e8 -r 36c1000392c9 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Jan 31 13:44:18 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Jan 31 13:56:43 2008 +0000
@@ -398,15 +398,16 @@ void CppInterpreter::accessor_entry(meth
// Read the field index from the bytecode, which looks like this:
// 0: aload_0
// 1: getfield
- // 2: index (high byte)
- // 3: index (low byte)
+ // 2: index
+ // 3: index
// 4: ireturn/areturn
+ // NB this is not raw bytecode: index is in machine order
u1 *code = method->code_base();
assert(code[0] == Bytecodes::_aload_0 &&
code[1] == Bytecodes::_getfield &&
(code[4] == Bytecodes::_ireturn ||
code[4] == Bytecodes::_areturn), "should do");
- u2 index = code[2] << 8 | code[3];
+ u2 index = Bytes::get_native_u2(&code[2]);
// Get the entry from the constant pool cache, and drop into
// the slow path if it has not been resolved
More information about the distro-pkg-dev
mailing list