Mercurial > hg > graal-compiler
changeset 14015:0354f629431a
Bug fixes in StampTool.(zero|sign)Extend.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Tue, 25 Feb 2014 13:36:18 +0100 |
parents | ac599fff18dc |
children | 555867401850 ff5aca1b2878 |
files | graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java |
diffstat | 2 files changed, 83 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java Tue Feb 25 11:24:17 2014 +0100 +++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/IntegerStampTest.java Tue Feb 25 13:36:18 2014 +0100 @@ -260,4 +260,68 @@ public void testAnd() { assertEquals(new IntegerStamp(32, false, Integer.MIN_VALUE, 0x40000000L, 0, 0xc0000000L), StampTool.and(StampFactory.forKind(Kind.Int), StampFactory.forConstant(Constant.forInt(0xc0000000)))); } + + private static void testSignExtendShort(long lower, long upper) { + Stamp shortStamp = StampFactory.forInteger(16, false, lower, upper); + Stamp intStamp = StampTool.signExtend(shortStamp, 32); + assertEquals(StampFactory.forInteger(32, false, lower, upper), intStamp); + } + + @Test + public void testSignExtend() { + testSignExtendShort(5, 7); + testSignExtendShort(0, 42); + testSignExtendShort(-42, -1); + testSignExtendShort(-42, 0); + testSignExtendShort(-1, 1); + testSignExtendShort(Short.MIN_VALUE, Short.MAX_VALUE); + } + + private static void testZeroExtendShort(long lower, long upper, long newLower, long newUpper) { + Stamp shortStamp = StampFactory.forInteger(16, false, lower, upper); + Stamp intStamp = StampTool.zeroExtend(shortStamp, 32); + assertEquals(StampFactory.forInteger(32, false, newLower, newUpper), intStamp); + } + + @Test + public void testZeroExtend() { + testZeroExtendShort(5, 7, 5, 7); + testZeroExtendShort(0, 42, 0, 42); + testZeroExtendShort(-42, -1, 0xFFFF - 41, 0xFFFF); + testZeroExtendShort(-42, 0, 0, 0xFFFF); + testZeroExtendShort(-1, 1, 0, 0xFFFF); + testZeroExtendShort(Short.MIN_VALUE, Short.MAX_VALUE, 0, 0xFFFF); + } + + private static void testSignExtendChar(long lower, long upper, long newLower, long newUpper) { + Stamp charStamp = StampFactory.forInteger(16, true, lower, upper); + Stamp uintStamp = StampTool.signExtend(charStamp, 32); + assertEquals(StampFactory.forInteger(32, true, newLower, newUpper), uintStamp); + } + + @Test + public void testSignExtendUnsigned() { + testSignExtendChar(5, 7, 5, 7); + testSignExtendChar(0, 42, 0, 42); + testSignExtendChar(5, 0xF000, 5, 0xFFFFF000L); + testSignExtendChar(0, 0xF000, 0, 0xFFFFF000L); + testSignExtendChar(0xF000, Character.MAX_VALUE, 0xFFFFF000L, 0xFFFFFFFFL); + testSignExtendChar(Character.MIN_VALUE, Character.MAX_VALUE, 0, 0xFFFFFFFFL); + } + + private static void testZeroExtendChar(long lower, long upper) { + Stamp charStamp = StampFactory.forInteger(16, true, lower, upper); + Stamp uintStamp = StampTool.zeroExtend(charStamp, 32); + assertEquals(StampFactory.forInteger(32, true, lower, upper), uintStamp); + } + + @Test + public void testZeroExtendUnsigned() { + testZeroExtendChar(5, 7); + testZeroExtendChar(0, 42); + testZeroExtendChar(5, 0xF000); + testZeroExtendChar(0, 0xF000); + testZeroExtendChar(0xF000, Character.MAX_VALUE); + testZeroExtendChar(Character.MIN_VALUE, Character.MAX_VALUE); + } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Tue Feb 25 11:24:17 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampTool.java Tue Feb 25 13:36:18 2014 +0100 @@ -329,7 +329,17 @@ long downMask = SignExtendNode.signExtend(inputStamp.downMask(), inputBits) & defaultMask; long upMask = SignExtendNode.signExtend(inputStamp.upMask(), inputBits) & defaultMask; - return new IntegerStamp(resultBits, inputStamp.isUnsigned(), inputStamp.lowerBound(), inputStamp.upperBound(), downMask, upMask); + long lowerBound; + long upperBound; + if (inputStamp.isUnsigned()) { + lowerBound = SignExtendNode.signExtend(inputStamp.lowerBound(), inputBits) & defaultMask; + upperBound = SignExtendNode.signExtend(inputStamp.upperBound(), inputBits) & defaultMask; + } else { + lowerBound = inputStamp.lowerBound(); + upperBound = inputStamp.upperBound(); + } + + return new IntegerStamp(resultBits, inputStamp.isUnsigned(), lowerBound, upperBound, downMask, upMask); } else { return input.illegal(); } @@ -343,24 +353,16 @@ long downMask = ZeroExtendNode.zeroExtend(inputStamp.downMask(), inputBits); long upMask = ZeroExtendNode.zeroExtend(inputStamp.upMask(), inputBits); - long lowerBound; - long upperBound; - if (inputStamp.lowerBound() < 0) { - if (inputStamp.upperBound() >= 0) { - // signed range including 0 and -1 - // after sign extension, the whole range from 0 to MAX_INT is possible - return stampForMask(resultBits, downMask, upMask); - } else { - // negative range - upperBound = ZeroExtendNode.zeroExtend(inputStamp.lowerBound(), inputBits); - lowerBound = ZeroExtendNode.zeroExtend(inputStamp.upperBound(), inputBits); - } - } else { - // positive range - lowerBound = ZeroExtendNode.zeroExtend(inputStamp.lowerBound(), inputBits); - upperBound = ZeroExtendNode.zeroExtend(inputStamp.upperBound(), inputBits); + + if (inputStamp.lowerBound() < 0 && inputStamp.upperBound() >= 0) { + // signed range including 0 and -1 + // after sign extension, the whole range from 0 to MAX_INT is possible + return stampForMask(resultBits, downMask, upMask); } + long lowerBound = ZeroExtendNode.zeroExtend(inputStamp.lowerBound(), inputBits); + long upperBound = ZeroExtendNode.zeroExtend(inputStamp.upperBound(), inputBits); + return new IntegerStamp(resultBits, inputStamp.isUnsigned(), lowerBound, upperBound, downMask, upMask); } else { return input.illegal();