Mercurial > hg > truffle
diff src/cpu/x86/vm/x86_64.ad @ 17506:984401824c5e
8031743: C2: loadI2L_immI broken for negative memory values
Summary: Restrict loadI2L_imm optimizations to positive values of mask
Reviewed-by: kvn, dlong
| author | iveresov |
|---|---|
| date | Tue, 21 Jan 2014 20:05:28 -0800 |
| parents | 59e8ad757e19 |
| children | 45467c53f178 4d4ea046d32a |
line wrap: on
line diff
--- a/src/cpu/x86/vm/x86_64.ad Fri Jan 17 18:09:08 2014 -0800 +++ b/src/cpu/x86/vm/x86_64.ad Tue Jan 21 20:05:28 2014 -0800 @@ -3086,6 +3086,17 @@ interface(CONST_INTER); %} +// Int Immediate non-negative +operand immU31() +%{ + predicate(n->get_int() >= 0); + match(ConI); + + op_cost(0); + format %{ %} + interface(CONST_INTER); +%} + // Constant for long shifts operand immI_32() %{ @@ -5042,12 +5053,12 @@ ins_pipe(ialu_reg_mem); %} -// Load Integer with a 32-bit mask into Long Register -instruct loadI2L_immI(rRegL dst, memory mem, immI mask, rFlagsReg cr) %{ +// Load Integer with a 31-bit mask into Long Register +instruct loadI2L_immU31(rRegL dst, memory mem, immU31 mask, rFlagsReg cr) %{ match(Set dst (ConvI2L (AndI (LoadI mem) mask))); effect(KILL cr); - format %{ "movl $dst, $mem\t# int & 32-bit mask -> long\n\t" + format %{ "movl $dst, $mem\t# int & 31-bit mask -> long\n\t" "andl $dst, $mask" %} ins_encode %{ Register Rdst = $dst$$Register;