Mercurial > hg > truffle
comparison src/share/vm/runtime/sharedRuntime.hpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | 04b9a2566eec 0382d2b469b2 |
children | 422c979ff392 |
comparison
equal
deleted
inserted
replaced
4703:2cfb7fb2dce7 | 4970:33df1aeaebbf |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2011, 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. |
460 int total_args_passed, | 460 int total_args_passed, |
461 int max_arg, | 461 int max_arg, |
462 BasicType *sig_bt, | 462 BasicType *sig_bt, |
463 VMRegPair *regs, | 463 VMRegPair *regs, |
464 BasicType ret_type ); | 464 BasicType ret_type ); |
465 | |
466 // Block before entering a JNI critical method | |
467 static void block_for_jni_critical(JavaThread* thread); | |
465 | 468 |
466 #ifdef HAVE_DTRACE_H | 469 #ifdef HAVE_DTRACE_H |
467 // Generate a dtrace wrapper for a given method. The method takes arguments | 470 // Generate a dtrace wrapper for a given method. The method takes arguments |
468 // in the Java compiled code convention, marshals them to the native | 471 // in the Java compiled code convention, marshals them to the native |
469 // convention (handlizes oops, etc), transitions to native, makes the call, | 472 // convention (handlizes oops, etc), transitions to native, makes the call, |