Mercurial > hg > truffle

comparison src/cpu/x86/vm/frame_x86.inline.hpp @ 6948:e522a00b91aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
173 } 173 }
174 174
175 175
176 // Constant pool cache 176 // Constant pool cache
177 177
178 inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const { 178 inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
179 assert(is_interpreted_frame(), "must be interpreted"); 179 assert(is_interpreted_frame(), "must be interpreted");
180 return &(get_interpreterState()->_constants); 180 return &(get_interpreterState()->_constants);
181 } 181 }
182 182
183 // Method 183 // Method
184 184
185 inline methodOop* frame::interpreter_frame_method_addr() const { 185 inline Method** frame::interpreter_frame_method_addr() const {
186 assert(is_interpreted_frame(), "must be interpreted"); 186 assert(is_interpreted_frame(), "must be interpreted");
187 return &(get_interpreterState()->_method); 187 return &(get_interpreterState()->_method);
188 } 188 }
189 189
190 inline intptr_t* frame::interpreter_frame_mdx_addr() const { 190 inline intptr_t* frame::interpreter_frame_mdx_addr() const {
224 224
225 225
226 226
227 // Constant pool cache 227 // Constant pool cache
228 228
229 inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const { 229 inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
230 return (constantPoolCacheOop*)addr_at(interpreter_frame_cache_offset); 230 return (ConstantPoolCache**)addr_at(interpreter_frame_cache_offset);
231 } 231 }
232 232
233 // Method 233 // Method
234 234
235 inline methodOop* frame::interpreter_frame_method_addr() const { 235 inline Method** frame::interpreter_frame_method_addr() const {
236 return (methodOop*)addr_at(interpreter_frame_method_offset); 236 return (Method**)addr_at(interpreter_frame_method_offset);
237 } 237 }
238 238
239 // top of expression stack 239 // top of expression stack
240 inline intptr_t* frame::interpreter_frame_tos_address() const { 240 inline intptr_t* frame::interpreter_frame_tos_address() const {
241 intptr_t* last_sp = interpreter_frame_last_sp(); 241 intptr_t* last_sp = interpreter_frame_last_sp();