Mercurial > hg > truffle

comparison src/share/vm/shark/sharkCompiler.cpp @ 2447:e863062e521d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7032458: Zero and Shark fixes Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>
author twisti
date Mon, 04 Apr 2011 03:02:00 -0700
parents f95d63e2154a
children 5d0bb7d52783 2cd5e15048e6
comparison
equal deleted inserted replaced
2446:13bc79b5c9c8 2447:e863062e521d
1 /* 1 /*
2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
3 * Copyright 2008, 2009, 2010 Red Hat, Inc. 3 * Copyright 2008, 2009, 2010, 2011 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
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
216 false); 216 false);
217 } 217 }
218 218
219 nmethod* SharkCompiler::generate_native_wrapper(MacroAssembler* masm, 219 nmethod* SharkCompiler::generate_native_wrapper(MacroAssembler* masm,
220 methodHandle target, 220 methodHandle target,
221 int compile_id,
221 BasicType* arg_types, 222 BasicType* arg_types,
222 BasicType return_type) { 223 BasicType return_type) {
223 assert(is_initialized(), "should be"); 224 assert(is_initialized(), "should be");
224 ResourceMark rm; 225 ResourceMark rm;
225 const char *name = methodname( 226 const char *name = methodname(
239 // Generate native code 240 // Generate native code
240 generate_native_code(entry, wrapper->function(), name); 241 generate_native_code(entry, wrapper->function(), name);
241 242
242 // Return the nmethod for installation in the VM 243 // Return the nmethod for installation in the VM
243 return nmethod::new_native_nmethod(target, 244 return nmethod::new_native_nmethod(target,
245 compile_id,
244 masm->code(), 246 masm->code(),
245 0, 247 0,
246 0, 248 0,
247 wrapper->frame_size(), 249 wrapper->frame_size(),
248 wrapper->receiver_offset(), 250 wrapper->receiver_offset(),