Mercurial > hg > truffle
diff src/cpu/x86/vm/frame_x86.inline.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | 3dbcd1013cc8 da91efe96a93 |
| children | 291ffc492eb6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.inline.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/cpu/x86/vm/frame_x86.inline.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -175,14 +175,14 @@ // Constant pool cache -inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const { +inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const { assert(is_interpreted_frame(), "must be interpreted"); return &(get_interpreterState()->_constants); } // Method -inline methodOop* frame::interpreter_frame_method_addr() const { +inline Method** frame::interpreter_frame_method_addr() const { assert(is_interpreted_frame(), "must be interpreted"); return &(get_interpreterState()->_method); } @@ -226,14 +226,14 @@ // Constant pool cache -inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const { - return (constantPoolCacheOop*)addr_at(interpreter_frame_cache_offset); +inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const { + return (ConstantPoolCache**)addr_at(interpreter_frame_cache_offset); } // Method -inline methodOop* frame::interpreter_frame_method_addr() const { - return (methodOop*)addr_at(interpreter_frame_method_offset); +inline Method** frame::interpreter_frame_method_addr() const { + return (Method**)addr_at(interpreter_frame_method_offset); } // top of expression stack