--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java	Mon Aug 02 15:44:38 2010 -0700
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java	Mon Aug 16 18:59:36 2010 -0700
@@ -1,49 +1,67 @@
+/*
+ * Copyright (c) 2010 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is
+ * described in this document. In particular, and without limitation, these intellectual property rights may include one
+ * or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent
+ * applications in the U.S. and in other countries.
+ *
+ * U.S. Government Rights - Commercial software. Government users are subject to the Sun Microsystems, Inc. standard
+ * license agreement and applicable provisions of the FAR and its supplements.
+ *
+ * Use is subject to license terms. Sun, Sun Microsystems, the Sun logo, Java and Solaris are trademarks or registered
+ * trademarks of Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are used under license and
+ * are trademarks or registered trademarks of SPARC International, Inc. in the U.S. and other countries.
+ *
+ * UNIX is a registered trademark in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.
+ */
 package com.sun.hotspot.c1x;
 
-import com.sun.cri.ci.CiConstant;
-import com.sun.cri.ri.RiConstantPool;
-import com.sun.cri.ri.RiField;
-import com.sun.cri.ri.RiMethod;
-import com.sun.cri.ri.RiSignature;
-import com.sun.cri.ri.RiType;
+import com.sun.cri.ci.*;
+import com.sun.cri.ri.*;
 
-public class HotSpotConstantPool implements RiConstantPool {
+/**
+ * Implementation of RiConstantPool for HotSpot.
+ *
+ * @author Thomas Wuerthinger, Lukas Stadler
+ */
+public class HotSpotConstantPool implements RiConstantPool, CompilerObject {
 
-    private final Class<?> constantPoolHolder;
+    long vmId;
 
-    public HotSpotConstantPool(Class<?> o) {
-        this.constantPoolHolder = o;
+    public HotSpotConstantPool(long vmId) {
+        this.vmId = vmId;
     }
 
     @Override
     public CiConstant encoding() {
         // TODO: Check if this is correct.
-        return CiConstant.forObject(constantPoolHolder);
+        return CiConstant.forObject(vmId);
     }
 
     @Override
     public Object lookupConstant(int cpi) {
-        return Compiler.getVMEntries().RiConstantPool_lookupConstant(constantPoolHolder, cpi);
+        return Compiler.getVMEntries().RiConstantPool_lookupConstant(vmId, cpi);
     }
 
     @Override
     public RiMethod lookupMethod(int cpi, int byteCode) {
-        return Compiler.getVMEntries().RiConstantPool_lookupMethod(constantPoolHolder, cpi, (byte) byteCode);
+        return Compiler.getVMEntries().RiConstantPool_lookupMethod(vmId, cpi, (byte) byteCode);
     }
 
     @Override
     public RiSignature lookupSignature(int cpi) {
-        return Compiler.getVMEntries().RiConstantPool_lookupSignature(constantPoolHolder, cpi);
+        return Compiler.getVMEntries().RiConstantPool_lookupSignature(vmId, cpi);
     }
 
     @Override
     public RiType lookupType(int cpi, int opcode) {
-        return Compiler.getVMEntries().RiConstantPool_lookupType(constantPoolHolder, cpi);
+        return Compiler.getVMEntries().RiConstantPool_lookupType(vmId, cpi);
     }
 
     @Override
     public RiField lookupField(int cpi, int opcode) {
-        return Compiler.getVMEntries().RiConstantPool_lookupField(constantPoolHolder, cpi);
+        return Compiler.getVMEntries().RiConstantPool_lookupField(vmId, cpi);
     }
 
 }