archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8315970: Big-endian issues after JDK-8310929

Browse source 
Reviewed-by: mdoerr
This commit is contained in:
shaojin.wensj 2023-09-11 13:39:26 +00:00 • committed by Martin Doerr
parent ae08143d3d
commit 4cb4637b79
1 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/java.base/share/classes/java/lang/StringUTF16.java
View file

@ -33,7 +33,6 @@ import java.util.function.IntConsumer;
import java.util.stream.Stream; import java.util.stream.Stream;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
import jdk.internal.util.ArraysSupport; import jdk.internal.util.ArraysSupport;
import jdk.internal.util.ByteArrayLittleEndian;
import jdk.internal.vm.annotation.DontInline; import jdk.internal.vm.annotation.DontInline;
import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.annotation.ForceInline;
import jdk.internal.vm.annotation.IntrinsicCandidate; import jdk.internal.vm.annotation.IntrinsicCandidate;
@ -1543,21 +1542,14 @@ final class StringUTF16 {
q = i / 100; q = i / 100;
r = (q * 100) - i; r = (q * 100) - i;
i = q; i = q;
int packed = (int) StringLatin1.PACKED_DIGITS[r];
int inflated = ((packed & 0xFF00) << 8) | (packed & 0xFF);
charPos -= 2; charPos -= 2;
ByteArrayLittleEndian.setInt(buf, charPos << 1, inflated); putPair(buf, charPos, r);
} }
// We know there are at most two digits left at this point. // We know there are at most two digits left at this point.
if (i < -9) { if (i < -9) {
int packed = (int) StringLatin1.PACKED_DIGITS[-i];
int inflated = ((packed & 0xFF00) << 8) | (packed & 0xFF);
charPos -= 2; charPos -= 2;
ByteArrayLittleEndian.setInt(buf, charPos << 1, inflated); putPair(buf, charPos, -i);
} else { } else {
putChar(buf, --charPos, '0' - i); putChar(buf, --charPos, '0' - i);
} }
@ -1590,12 +1582,8 @@ final class StringUTF16 {
// Get 2 digits/iteration using longs until quotient fits into an int // Get 2 digits/iteration using longs until quotient fits into an int
while (i <= Integer.MIN_VALUE) { while (i <= Integer.MIN_VALUE) {
q = i / 100; q = i / 100;
int packed = (int) StringLatin1.PACKED_DIGITS[(int)((q * 100) - i)];
int inflated = ((packed & 0xFF00) << 8) | (packed & 0xFF);
charPos -= 2; charPos -= 2;
ByteArrayLittleEndian.setInt(buf, charPos << 1, inflated); putPair(buf, charPos, (int)((q * 100) - i));
i = q; i = q;
} }
@ -1604,23 +1592,15 @@ final class StringUTF16 {
int i2 = (int)i; int i2 = (int)i;
while (i2 <= -100) { while (i2 <= -100) {
q2 = i2 / 100; q2 = i2 / 100;
int packed = (int) StringLatin1.PACKED_DIGITS[(q2 * 100) - i2];
int inflated = ((packed & 0xFF00) << 8) | (packed & 0xFF);
charPos -= 2; charPos -= 2;
ByteArrayLittleEndian.setInt(buf, charPos << 1, inflated); putPair(buf, charPos, (q2 * 100) - i2);
i2 = q2; i2 = q2;
} }
// We know there are at most two digits left at this point. // We know there are at most two digits left at this point.
if (i2 < -9) { if (i2 < -9) {
charPos -= 2; charPos -= 2;
putPair(buf, charPos, -i2);
int packed = (int) StringLatin1.PACKED_DIGITS[-i2];
int inflated = ((packed & 0xFF00) << 8) | (packed & 0xFF);
ByteArrayLittleEndian.setInt(buf, charPos << 1, inflated);
} else { } else {
putChar(buf, --charPos, '0' - i2); putChar(buf, --charPos, '0' - i2);
} }
@ -1630,6 +1610,12 @@ final class StringUTF16 {
} }
return charPos; return charPos;
} }
private static void putPair(byte[] buf, int charPos, int v) {
int packed = (int) StringLatin1.PACKED_DIGITS[v];
putChar(buf, charPos, packed & 0xFF);
putChar(buf, charPos + 1, packed >> 8);
}
// End of trusted methods. // End of trusted methods.
public static void checkIndex(int off, byte[] val) { public static void checkIndex(int off, byte[] val) {