Mercurial > hg > truffle
comparison src/cpu/sparc/vm/frame_sparc.hpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | da91efe96a93 |
children | cd3d6a6b95d9 |
comparison
equal
deleted
inserted
replaced
7065:cfacf5d5bade | 7066:7d815d842ee0 |
---|---|
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. |
262 enum compiler_frame_fixed_locals { | 262 enum compiler_frame_fixed_locals { |
263 compiler_frame_vm_locals_fp_offset = -2 | 263 compiler_frame_vm_locals_fp_offset = -2 |
264 }; | 264 }; |
265 | 265 |
266 private: | 266 private: |
267 constantPoolCacheOop* interpreter_frame_cpoolcache_addr() const; | 267 ConstantPoolCache** interpreter_frame_cpoolcache_addr() const; |
268 | 268 |
269 #ifndef CC_INTERP | 269 #ifndef CC_INTERP |
270 | 270 |
271 // where Lmonitors is saved: | 271 // where Lmonitors is saved: |
272 BasicObjectLock** interpreter_frame_monitors_addr() const { | 272 BasicObjectLock** interpreter_frame_monitors_addr() const { |