comparison src/share/vm/prims/jvmtiEnter.xsl @ 4137:04b9a2566eec

Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents a6eef545f1a2
children da91efe96a93
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
424 <xsl:if test="count(@impl)=0 or not(contains(@impl,'innative'))"> 424 <xsl:if test="count(@impl)=0 or not(contains(@impl,'innative'))">
425 <xsl:text>JavaThread* current_thread = (JavaThread*)this_thread;</xsl:text> 425 <xsl:text>JavaThread* current_thread = (JavaThread*)this_thread;</xsl:text>
426 <xsl:value-of select="$space"/> 426 <xsl:value-of select="$space"/>
427 <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> 427 <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
428 <xsl:value-of select="$space"/> 428 <xsl:value-of select="$space"/>
429 <xsl:text>__ENTRY(jvmtiError, </xsl:text> 429 <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
430 <xsl:apply-templates select="." mode="functionid"/> 430 <xsl:apply-templates select="." mode="functionid"/>
431 <xsl:text> , current_thread)</xsl:text> 431 <xsl:text> , current_thread)</xsl:text>
432 <xsl:value-of select="$space"/> 432 <xsl:value-of select="$space"/>
433 <xsl:text>debug_only(VMNativeEntryWrapper __vew;)</xsl:text> 433 <xsl:text>debug_only(VMNativeEntryWrapper __vew;)</xsl:text>
434 <xsl:if test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))"> 434 <xsl:if test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))">