Mercurial > hg > truffle
diff src/share/vm/c1x/c1x_CodeInstaller.cpp @ 1439:d0c8d3a2a7e8
Modified domake script to use (and require) JRE7 environment variable for find the base of a JRE 7 installation. This script no also ensures that $JRE7/lib/amd64/jvm.cfg has the right value for '-client'.
Added c1x4hotspotsrc/hotspot/java as indirect launcher for $JRE7/bin/java that can be referenced from Eclipse launch configuration.
Copied .checkstyle_checks.xml from C1X project to c1x4hotspotsrc/HotSpotVM so that it can be used by HotSpotVM project without hard coded path to C1X in another Eclipse workspace.
Various other changes to reflect changes in CRI and C1X.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 29 Oct 2010 18:14:17 +0200 |
| parents | a7a0ef3c6858 |
| children | f8ab19e5acae |
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp Mon Oct 25 18:35:34 2010 +0200 +++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp Fri Oct 29 18:14:17 2010 +0200 @@ -50,7 +50,7 @@ arrayOop register_map = (arrayOop) CiDebugInfo::registerRefMap(debug_info); arrayOop frame_map = (arrayOop) CiDebugInfo::frameRefMap(debug_info); - assert(register_map->length() == (NUM_REGS + 7) / 8, "unexpected register_map length"); + assert(register_map->length() == (NUM_CPU_REGS + 7) / 8, "unexpected register_map length"); for (jint i = 0; i < NUM_REGS; i++) { unsigned char byte = ((unsigned char*) register_map->base(T_BYTE))[i / 8];