comparison c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java @ 1933:2a6ce81e3101

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 21 Dec 2010 17:09:45 +0100
parents fe69dec9a1ed cb04e4217df0
children 3c0a889a176b
comparison
equal deleted inserted replaced
1932:e6500c6c5e24 1933:2a6ce81e3101
146 146
147 runtime = new HotSpotRuntime(config); 147 runtime = new HotSpotRuntime(config);
148 final int wordSize = 8; 148 final int wordSize = 8;
149 final int stackFrameAlignment = 16; 149 final int stackFrameAlignment = 16;
150 registerConfig = runtime.globalStubRegConfig; 150 registerConfig = runtime.globalStubRegConfig;
151 target = new HotSpotTarget(new AMD64(), true, wordSize, wordSize, wordSize, stackFrameAlignment, config.vmPageSize, wordSize, wordSize, config.codeEntryAlignment, true); 151 target = new HotSpotTarget(new AMD64(), true, wordSize, stackFrameAlignment, config.vmPageSize, wordSize, true);
152 152
153 if (Logger.ENABLED) { 153 if (Logger.ENABLED) {
154 generator = LoggingProxy.getProxy(RiXirGenerator.class, new HotSpotXirGenerator(config, target, registerConfig)); 154 generator = LoggingProxy.getProxy(RiXirGenerator.class, new HotSpotXirGenerator(config, target, registerConfig));
155 } else { 155 } else {
156 generator = new HotSpotXirGenerator(config, target, registerConfig); 156 generator = new HotSpotXirGenerator(config, target, registerConfig);