Mercurial > hg > graal-compiler
comparison src/share/vm/shark/sharkCacheDecache.cpp @ 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 | e1a03c81cef0 da91efe96a93 |
children | 291ffc492eb6 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * Copyright 2008, 2009 Red Hat, Inc. | 3 * Copyright 2008, 2009 Red Hat, Inc. |
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5 * | 5 * |
6 * This code is free software; you can redistribute it and/or modify it | 6 * This code is free software; you can redistribute it and/or modify it |
7 * under the terms of the GNU General Public License version 2 only, as | 7 * under the terms of the GNU General Public License version 2 only, as |
105 } | 105 } |
106 | 106 |
107 void SharkDecacher::process_method_slot(Value** value, int offset) { | 107 void SharkDecacher::process_method_slot(Value** value, int offset) { |
108 // Decache the method pointer | 108 // Decache the method pointer |
109 write_value_to_frame( | 109 write_value_to_frame( |
110 SharkType::methodOop_type(), | 110 SharkType::Method*_type(), |
111 *value, | 111 *value, |
112 offset); | 112 offset); |
113 | 113 |
114 oopmap()->set_oop(slot2reg(offset)); | 114 oopmap()->set_oop(slot2reg(offset)); |
115 } | 115 } |
205 *value = read_value_from_frame(SharkType::oop_type(), offset); | 205 *value = read_value_from_frame(SharkType::oop_type(), offset); |
206 } | 206 } |
207 | 207 |
208 void SharkCacher::process_method_slot(Value** value, int offset) { | 208 void SharkCacher::process_method_slot(Value** value, int offset) { |
209 // Cache the method pointer | 209 // Cache the method pointer |
210 *value = read_value_from_frame(SharkType::methodOop_type(), offset); | 210 *value = read_value_from_frame(SharkType::Method*_type(), offset); |
211 } | 211 } |
212 | 212 |
213 void SharkFunctionEntryCacher::process_method_slot(Value** value, int offset) { | 213 void SharkFunctionEntryCacher::process_method_slot(Value** value, int offset) { |
214 // "Cache" the method pointer | 214 // "Cache" the method pointer |
215 *value = method(); | 215 *value = method(); |