comparison src/share/vm/code/stubs.cpp @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents 3e8fbc61cee8
children f95d63e2154a
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 /* 1 /*
2 * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright (c) 1997, 2010, 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.
14 * 14 *
15 * You should have received a copy of the GNU General Public License version 15 * You should have received a copy of the GNU General Public License version
16 * 2 along with this work; if not, write to the Free Software Foundation, 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 * 18 *
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * CA 95054 USA or visit www.sun.com if you need additional information or 20 * or visit www.oracle.com if you need additional information or have any
21 * have any questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "incls/_precompiled.incl" 25 #include "incls/_precompiled.incl"
26 #include "incls/_stubs.cpp.incl" 26 #include "incls/_stubs.cpp.incl"
60 60
61 StubQueue::StubQueue(StubInterface* stub_interface, int buffer_size, 61 StubQueue::StubQueue(StubInterface* stub_interface, int buffer_size,
62 Mutex* lock, const char* name) : _mutex(lock) { 62 Mutex* lock, const char* name) : _mutex(lock) {
63 intptr_t size = round_to(buffer_size, 2*BytesPerWord); 63 intptr_t size = round_to(buffer_size, 2*BytesPerWord);
64 BufferBlob* blob = BufferBlob::create(name, size); 64 BufferBlob* blob = BufferBlob::create(name, size);
65 if( blob == NULL ) vm_exit_out_of_memory1(size, "CodeCache: no room for %s", name); 65 if( blob == NULL) {
66 vm_exit_out_of_memory(size, err_msg("CodeCache: no room for %s", name));
67 }
66 _stub_interface = stub_interface; 68 _stub_interface = stub_interface;
67 _buffer_size = blob->instructions_size(); 69 _buffer_size = blob->content_size();
68 _buffer_limit = blob->instructions_size(); 70 _buffer_limit = blob->content_size();
69 _stub_buffer = blob->instructions_begin(); 71 _stub_buffer = blob->content_begin();
70 _queue_begin = 0; 72 _queue_begin = 0;
71 _queue_end = 0; 73 _queue_end = 0;
72 _number_of_stubs = 0; 74 _number_of_stubs = 0;
73 register_queue(this); 75 register_queue(this);
74 } 76 }