提交 b7331121 编写于 作者: K kvn

8006799: Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() (jdk part of 6896617)

Summary: Move hot loop in ISO_8859_1$Encode.encodeArrayLoop() into separate method encodeISOArray() to be replaced by JVM JIT compiler with optimized intrinsic code.
Reviewed-by: alanb, sherman
上级 2fcd3325
/* /*
* Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -147,37 +147,53 @@ class ISO_8859_1 ...@@ -147,37 +147,53 @@ class ISO_8859_1
private final Surrogate.Parser sgp = new Surrogate.Parser(); private final Surrogate.Parser sgp = new Surrogate.Parser();
// JVM may replace this method with intrinsic code.
private static int encodeISOArray(char[] sa, int sp,
byte[] da, int dp, int len)
{
int i = 0;
for (; i < len; i++) {
char c = sa[sp++];
if (c > '\u00FF')
break;
da[dp++] = (byte)c;
}
return i;
}
private CoderResult encodeArrayLoop(CharBuffer src, private CoderResult encodeArrayLoop(CharBuffer src,
ByteBuffer dst) ByteBuffer dst)
{ {
char[] sa = src.array(); char[] sa = src.array();
int sp = src.arrayOffset() + src.position(); int soff = src.arrayOffset();
int sl = src.arrayOffset() + src.limit(); int sp = soff + src.position();
int sl = soff + src.limit();
assert (sp <= sl); assert (sp <= sl);
sp = (sp <= sl ? sp : sl); sp = (sp <= sl ? sp : sl);
byte[] da = dst.array(); byte[] da = dst.array();
int dp = dst.arrayOffset() + dst.position(); int doff = dst.arrayOffset();
int dl = dst.arrayOffset() + dst.limit(); int dp = doff + dst.position();
int dl = doff + dst.limit();
assert (dp <= dl); assert (dp <= dl);
dp = (dp <= dl ? dp : dl); dp = (dp <= dl ? dp : dl);
int dlen = dl - dp;
int slen = sl - sp;
int len = (dlen < slen) ? dlen : slen;
try { try {
while (sp < sl) { int ret = encodeISOArray(sa, sp, da, dp, len);
char c = sa[sp]; sp = sp + ret;
if (c <= '\u00FF') { dp = dp + ret;
if (dp >= dl) if (ret != len) {
return CoderResult.OVERFLOW; if (sgp.parse(sa[sp], sa, sp, sl) < 0)
da[dp++] = (byte)c;
sp++;
continue;
}
if (sgp.parse(c, sa, sp, sl) < 0)
return sgp.error(); return sgp.error();
return sgp.unmappableResult(); return sgp.unmappableResult();
} }
if (len < slen)
return CoderResult.OVERFLOW;
return CoderResult.UNDERFLOW; return CoderResult.UNDERFLOW;
} finally { } finally {
src.position(sp - src.arrayOffset()); src.position(sp - soff);
dst.position(dp - dst.arrayOffset()); dst.position(dp - doff);
} }
} }
...@@ -221,22 +237,25 @@ class ISO_8859_1 ...@@ -221,22 +237,25 @@ class ISO_8859_1
public int encode(char[] src, int sp, int len, byte[] dst) { public int encode(char[] src, int sp, int len, byte[] dst) {
int dp = 0; int dp = 0;
int sl = sp + Math.min(len, dst.length); int slen = Math.min(len, dst.length);
int sl = sp + slen;
while (sp < sl) { while (sp < sl) {
char c = src[sp++]; int ret = encodeISOArray(src, sp, dst, dp, slen);
if (c <= '\u00FF') { sp = sp + ret;
dst[dp++] = (byte)c; dp = dp + ret;
continue; if (ret != slen) {
} char c = src[sp++];
if (Character.isHighSurrogate(c) && sp < sl && if (Character.isHighSurrogate(c) && sp < sl &&
Character.isLowSurrogate(src[sp])) { Character.isLowSurrogate(src[sp])) {
if (len > dst.length) { if (len > dst.length) {
sl++; sl++;
len--; len--;
}
sp++;
} }
sp++; dst[dp++] = repl;
slen = Math.min((sl - sp), (dst.length - dp));
} }
dst[dp++] = repl;
} }
return dp; return dp;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册