procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2003-08-02 Michael Koch <konqueror@gmx.de>

Browse source 
* java/nio/ByteBufferImpl.java
	(getChar): Check remaining bytes, fixed comment about endianess.
	(putChar): Likewise.
	(getShort): Likewise.
	(putShort): Likewise.
	(getInt): Check remaining bytes, fixed conversion, fixed comment about
	endianess.
	(putInt): Likewise.
	(getLong): Likewise.
	(putLong): Likewise.
	(getFloat): Likewise.
	(putFloat): Likewise.
	(getDouble): Likewise.
	(putDouble): Likewise.
	* java/nio/DirectByteBufferImpl.java
	(getChar): Wrapped code, fixed comment about endianess.
	(putchar): Likewise.
	(getShort): Likewise.
	(putShort): Likewise.
	(getInt): Fixed conversion, fixed comment about endianess.
	(putInt): Likewise.
	(getLong): Likewise.
	(putLong): Likewise.
	(getFloat): Likewise.
	(putFloat): Likewise.
	(getDouble): Likewise.
	(putDouble): Likewise.
	* java/nio/MappedByteBufferImpl.java
	(compact): Implemented.
	(getChar): Implemented.
	(putChar): Implemented.
	(getDouble): Implemented.
	(putdouble): Implemented.
	(getFloat): Implemented.
	(putFloat): Implemented.
	(getInt): Implemented.
	(putInt): Implemented.
	(getLong): Implemented.
	(putLong): Implemented.
	(getShort): Implemented.
	(putShort): Implemented.
	* java/nio/channels/FileChannelImpl.java
	(read): Set position where to access file.
	(write): Likewise.
	(transferTo): Flip buffer after read and before write.
	(transferFrom): Likewise.

From-SVN: r70102
This commit is contained in:
Michael Koch 2003-08-02 11:17:40 +00:00 • committed by Michael Koch
parent 2937079664
commit 7318eb21d1
5 changed files with 300 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

124
libjava/java/nio/DirectByteBufferImpl.java
View file

@ -181,13 +181,14 @@ class DirectByteBufferImpl extends ByteBuffer
final public char getChar ()
{
// FIXME: this handles big endian only
return (char) (((get () & 0xff) << 8) + (get () & 0xff));
// FIXME: this handles little endian only
return (char) (((get () & 0xff) << 8)
+ (get () & 0xff));
}
final public ByteBuffer putChar (char value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put ((byte) ((((int) value) & 0xff00) >> 8));
put ((byte) (((int) value) & 0x00ff));
return this;
@ -195,13 +196,14 @@ class DirectByteBufferImpl extends ByteBuffer
final public char getChar (int index)
{
// FIXME: this handles big endian only
return (char) (((get (index) & 0xff) << 8) + (get (index + 1) & 0xff));
// FIXME: this handles little endian only
return (char) (((get (index) & 0xff) << 8)
+ (get (index + 1) & 0xff));
}
final public ByteBuffer putChar (int index, char value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put (index, (byte) ((((int) value) & 0xff00) >> 8));
put (index + 1, (byte) (((int) value) & 0x00ff));
return this;
@ -209,13 +211,14 @@ class DirectByteBufferImpl extends ByteBuffer
final public short getShort ()
{
// FIXME: this handles big endian only
return (short) (((get () & 0xff) << 8) + (get () & 0xff));
// FIXME: this handles little endian only
return (short) (((get () & 0xff) << 8)
+ (get () & 0xff));
}
final public ByteBuffer putShort (short value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put ((byte) ((((int) value) & 0xff00) >> 8));
put ((byte) (((int) value) & 0x00ff));
return this;
@ -223,13 +226,14 @@ class DirectByteBufferImpl extends ByteBuffer
final public short getShort (int index)
{
// FIXME: this handles big endian only
return (short) (((get (index) & 0xff) << 8) + (get (index + 1) & 0xff));
// FIXME: this handles little endian only
return (short) (((get (index) & 0xff) << 8)
+ (get (index + 1) & 0xff));
}
final public ByteBuffer putShort (int index, short value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put (index, (byte) ((((int) value) & 0xff00) >> 8));
put (index + 1, (byte) (((int) value) & 0x00ff));
return this;
@ -237,16 +241,16 @@ class DirectByteBufferImpl extends ByteBuffer
final public int getInt ()
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (int) (((get () & 0xff) << 24)
+ (get () & 0xff) << 16
+ (get () & 0xff) << 8
+ ((get () & 0xff) << 16)
+ ((get () & 0xff) << 8)
+ (get () & 0xff));
}
final public ByteBuffer putInt (int value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put ((byte) ((((int) value) & 0xff000000) >> 24));
put ((byte) ((((int) value) & 0x00ff0000) >> 16));
put ((byte) ((((int) value) & 0x0000ff00) >> 8));
@ -256,16 +260,16 @@ class DirectByteBufferImpl extends ByteBuffer
final public int getInt (int index)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (int) (((get (index) & 0xff) << 24)
+ (get (index + 1) & 0xff) << 16
+ (get (index + 2) & 0xff) << 8
+ ((get (index + 1) & 0xff) << 16)
+ ((get (index + 2) & 0xff) << 8)
+ (get (index + 3) & 0xff));
}
final public ByteBuffer putInt (int index, int value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put (index, (byte) ((((int) value) & 0xff000000) >> 24));
put (index + 1, (byte) ((((int) value) & 0x00ff0000) >> 16));
put (index + 2, (byte) ((((int) value) & 0x0000ff00) >> 8));
@ -275,20 +279,20 @@ class DirectByteBufferImpl extends ByteBuffer
final public long getLong ()
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (long) (((get () & 0xff) << 56)
+ (get () & 0xff) << 48
+ (get () & 0xff) << 40
+ (get () & 0xff) << 32
+ (get () & 0xff) << 24
+ (get () & 0xff) << 16
+ (get () & 0xff) << 8
+ ((get () & 0xff) << 48)
+ ((get () & 0xff) << 40)
+ ((get () & 0xff) << 32)
+ ((get () & 0xff) << 24)
+ ((get () & 0xff) << 16)
+ ((get () & 0xff) << 8)
+ (get () & 0xff));
}
final public ByteBuffer putLong (long value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put ((byte) ((value & 0xff00000000000000L) >> 56));
put ((byte) ((value & 0x00ff000000000000L) >> 48));
put ((byte) ((value & 0x0000ff0000000000L) >> 40));
@ -302,20 +306,20 @@ class DirectByteBufferImpl extends ByteBuffer
final public long getLong (int index)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (long) (((get (index) & 0xff) << 56)
+ (get (index + 1) & 0xff) << 48
+ (get (index + 2) & 0xff) << 40
+ (get (index + 3) & 0xff) << 32
+ (get (index + 4) & 0xff) << 24
+ (get (index + 5) & 0xff) << 16
+ (get (index + 6) & 0xff) << 8
+ ((get (index + 1) & 0xff) << 48)
+ ((get (index + 2) & 0xff) << 40)
+ ((get (index + 3) & 0xff) << 32)
+ ((get (index + 4) & 0xff) << 24)
+ ((get (index + 5) & 0xff) << 16)
+ ((get (index + 6) & 0xff) << 8)
+ (get (index + 7) & 0xff));
}
final public ByteBuffer putLong (int index, long value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put (index, (byte) ((value & 0xff00000000000000L) >> 56));
put (index + 1, (byte) ((value & 0x00ff000000000000L) >> 48));
put (index + 2, (byte) ((value & 0x0000ff0000000000L) >> 40));
@ -329,16 +333,16 @@ class DirectByteBufferImpl extends ByteBuffer
final public float getFloat ()
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (float) (((get () & 0xff) << 24)
+ (get () & 0xff) << 16
+ (get () & 0xff) << 8
+ ((get () & 0xff) << 16)
+ ((get () & 0xff) << 8)
+ (get () & 0xff));
}
final public ByteBuffer putFloat (float value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put ((byte) ((((int) value) & 0xff000000) >> 24));
put ((byte) ((((int) value) & 0x00ff0000) >> 16));
put ((byte) ((((int) value) & 0x0000ff00) >> 8));
@ -348,16 +352,16 @@ class DirectByteBufferImpl extends ByteBuffer
final public float getFloat (int index)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (float) (((get (index) & 0xff) << 24)
+ (get (index + 1) & 0xff) << 16
+ (get (index + 2) & 0xff) << 8
+ ((get (index + 1) & 0xff) << 16)
+ ((get (index + 2) & 0xff) << 8)
+ (get (index + 3) & 0xff));
}
final public ByteBuffer putFloat (int index, float value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put (index, (byte) ((((int) value) & 0xff000000) >> 24));
put (index + 1, (byte) ((((int) value) & 0x00ff0000) >> 16));
put (index + 2, (byte) ((((int) value) & 0x0000ff00) >> 8));
@ -367,20 +371,20 @@ class DirectByteBufferImpl extends ByteBuffer
final public double getDouble ()
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (double) (((get () & 0xff) << 56)
+ (get () & 0xff) << 48
+ (get () & 0xff) << 40
+ (get () & 0xff) << 32
+ (get () & 0xff) << 24
+ (get () & 0xff) << 16
+ (get () & 0xff) << 8
+ ((get () & 0xff) << 48)
+ ((get () & 0xff) << 40)
+ ((get () & 0xff) << 32)
+ ((get () & 0xff) << 24)
+ ((get () & 0xff) << 16)
+ ((get () & 0xff) << 8)
+ (get () & 0xff));
}
final public ByteBuffer putDouble (double value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put ((byte) ((((long) value) & 0xff00000000000000L) >> 56));
put ((byte) ((((long) value) & 0x00ff000000000000L) >> 48));
put ((byte) ((((long) value) & 0x0000ff0000000000L) >> 40));
@ -394,20 +398,20 @@ class DirectByteBufferImpl extends ByteBuffer
final public double getDouble (int index)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
return (double) (((get (index) & 0xff) << 56)
+ (get (index + 1) & 0xff) << 48
+ (get (index + 2) & 0xff) << 40
+ (get (index + 3) & 0xff) << 32
+ (get (index + 4) & 0xff) << 24
+ (get (index + 5) & 0xff) << 16
+ (get (index + 6) & 0xff) << 8
+ ((get (index + 1) & 0xff) << 48)
+ ((get (index + 2) & 0xff) << 40)
+ ((get (index + 3) & 0xff) << 32)
+ ((get (index + 4) & 0xff) << 24)
+ ((get (index + 5) & 0xff) << 16)
+ ((get (index + 6) & 0xff) << 8)
+ (get (index + 7) & 0xff));
}
final public ByteBuffer putDouble (int index, double value)
{
// FIXME: this handles big endian only
// FIXME: this handles little endian only
put (index, (byte) ((((long) value) & 0xff00000000000000L) >> 56));
put (index + 1, (byte) ((((long) value) & 0x00ff000000000000L) >> 48));
put (index + 2, (byte) ((((long) value) & 0x0000ff0000000000L) >> 40));