Mercurial > hg > graal-compiler
diff src/share/vm/asm/assembler.cpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 21 Aug 2012 10:39:19 +0200 |
parents | 1d7922586cf6 |
children | b9a9ed0f8eeb |
line wrap: on
line diff
--- a/src/share/vm/asm/assembler.cpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/asm/assembler.cpp Tue Aug 21 10:39:19 2012 +0200 @@ -318,6 +318,16 @@ } } +RegisterOrConstant AbstractAssembler::delayed_value(int(*value_fn)(), Register tmp, int offset) { + intptr_t val = (intptr_t) (*value_fn)(); + if (val != 0) return val + offset; + return delayed_value_impl(delayed_value_addr(value_fn), tmp, offset); +} +RegisterOrConstant AbstractAssembler::delayed_value(address(*value_fn)(), Register tmp, int offset) { + intptr_t val = (intptr_t) (*value_fn)(); + if (val != 0) return val + offset; + return delayed_value_impl(delayed_value_addr(value_fn), tmp, offset); +} intptr_t* AbstractAssembler::delayed_value_addr(int(*value_fn)()) { DelayedConstant* dcon = DelayedConstant::add(T_INT, (DelayedConstant::value_fn_t) value_fn); return &dcon->value;