1.1 --- a/src/share/vm/prims/jvmti.xml Thu May 05 09:33:14 2011 -0400
1.2 +++ b/src/share/vm/prims/jvmti.xml Thu May 05 12:50:42 2011 -0400
1.3 @@ -280,10 +280,8 @@
1.4 <!ELEMENT externallink (#PCDATA|jvmti|code|i|b|tm)*>
1.5 <!ATTLIST externallink id CDATA #REQUIRED>
1.6
1.7 - <!ELEMENT vmspeclink EMPTY>
1.8 - <!ATTLIST vmspeclink id CDATA #IMPLIED>
1.9 - <!ATTLIST vmspeclink name CDATA #IMPLIED>
1.10 - <!ATTLIST vmspeclink preposition CDATA #IMPLIED>
1.11 + <!ELEMENT vmspec EMPTY>
1.12 + <!ATTLIST vmspec chapter CDATA #IMPLIED>
1.13
1.14 <!ELEMENT internallink (#PCDATA|jvmti|code|i|b)*>
1.15 <!ATTLIST internallink id CDATA #REQUIRED>
1.16 @@ -2285,9 +2283,8 @@
1.17 Stack frames are referenced by depth.
1.18 The frame at depth zero is the current frame.
1.19 <p/>
1.20 - Stack frames are as described in the
1.21 - <vmspeclink id="Overview.doc.html#17257"
1.22 - name="Frames section"/>.
1.23 + Stack frames are as described in
1.24 + <vmspec chapter="3.6"/>,
1.25 That is, they correspond to method
1.26 invocations (including native methods) but do not correspond to platform native or
1.27 VM internal frames.
1.28 @@ -2627,7 +2624,7 @@
1.29 <param id="use_java_stack">
1.30 <jboolean/>
1.31 <description>
1.32 - Return the stack showing the <vmspeclink/>
1.33 + Return the stack showing <vmspec/>
1.34 model of the stack;
1.35 otherwise, show the internal representation of the stack with
1.36 inlined and optimized methods missing. If the virtual machine
1.37 @@ -2707,7 +2704,7 @@
1.38 When the thread is resumed, the execution
1.39 state of the thread is reset to the state
1.40 immediately before the called method was invoked.
1.41 - That is (using the <vmspeclink/> terminology):
1.42 + That is (using <vmspec/> terminology):
1.43 <ul>
1.44 <li>the current frame is discarded as the previous frame becomes the current one</li>
1.45 <li>the operand stack is restored--the argument values are added back
1.46 @@ -2868,9 +2865,8 @@
1.47 to return at any point during its execution.
1.48 The method which will return early is referred to as the <i>called method</i>.
1.49 The called method is the current method
1.50 - (as defined by the
1.51 - <vmspeclink id="Overview.doc.html#17257"
1.52 - name="Frames section"/>)
1.53 + (as defined by
1.54 + <vmspec chapter="3.6"/>)
1.55 for the specified thread at
1.56 the time the function is called.
1.57 <p/>
1.58 @@ -3576,10 +3572,8 @@
1.59 <field id="index">
1.60 <jint/>
1.61 <description>
1.62 - The index into the constant pool of the class. See the
1.63 - <vmspeclink id="ClassFile.doc.html#20080"
1.64 - name="Constant Pool section"/>
1.65 - description.
1.66 + The index into the constant pool of the class. See the description in
1.67 + <vmspec chapter="4.4"/>.
1.68 </description>
1.69 </field>
1.70 </typedef>
1.71 @@ -5006,9 +5000,8 @@
1.72 For references of this kind the <code>referrer_index</code>
1.73 parameter to the <internallink id="jvmtiObjectReferenceCallback">
1.74 jvmtiObjectReferenceCallback</internallink> is the index into
1.75 - constant pool table of the class, starting at 1. See the
1.76 - <vmspeclink id="ClassFile.doc.html#20080"
1.77 - name="Constant Pool section"/>
1.78 + constant pool table of the class, starting at 1. See
1.79 + <vmspec chapter="4.4"/>.
1.80 </constant>
1.81 </constants>
1.82
1.83 @@ -6441,9 +6434,7 @@
1.84 been recorded as an initiating loader. Each
1.85 class in the returned array was created by this class loader,
1.86 either by defining it directly or by delegation to another class loader.
1.87 - See the
1.88 - <vmspeclink id="ConstantPool.doc.html#72007"
1.89 - name="Creation and Loading section"/>.
1.90 + See <vmspec chapter="5.3"/>.
1.91 <p/>
1.92 For JDK version 1.1 implementations that don't
1.93 recognize the distinction between initiating and defining class loaders,
1.94 @@ -6626,9 +6617,7 @@
1.95 For the class indicated by <code>klass</code>, return the access
1.96 flags
1.97 via <code>modifiers_ptr</code>.
1.98 - Access flags are defined in the
1.99 - <vmspeclink id="ClassFile.doc.html"
1.100 - name="Class File Format chapter"/>.
1.101 + Access flags are defined in <vmspec chapter="4"/>.
1.102 <p/>
1.103 If the class is an array class, then its public, private, and protected
1.104 modifiers are the same as those of its component type. For arrays of
1.105 @@ -6794,9 +6783,8 @@
1.106 <description>
1.107 For the class indicated by <code>klass</code>,
1.108 return the minor and major version numbers,
1.109 - as defined in the
1.110 - <vmspeclink id="ClassFile.doc.html"
1.111 - name="Class File Format chapter"/>.
1.112 + as defined in
1.113 + <vmspec chapter="4"/>.
1.114 </description>
1.115 <origin>new</origin>
1.116 <capabilities>
1.117 @@ -6839,10 +6827,8 @@
1.118 <description>
1.119 For the class indicated by <code>klass</code>,
1.120 return the raw bytes of the constant pool in the format of the
1.121 - <code>constant_pool</code> item of the
1.122 - <vmspeclink id="ClassFile.doc.html"
1.123 - name="Class File Format"
1.124 - preposition="in"/>.
1.125 + <code>constant_pool</code> item of
1.126 + <vmspec chapter="4"/>.
1.127 The format of the constant pool may differ between versions
1.128 of the Class File Format, so, the
1.129 <functionlink id="GetClassVersionNumbers">minor and major
1.130 @@ -7286,9 +7272,7 @@
1.131 <field id="class_bytes">
1.132 <inbuf incount="class_byte_count"><uchar/></inbuf>
1.133 <description>
1.134 - Bytes defining class (in the
1.135 - <vmspeclink id="ClassFile.doc.html"
1.136 - name="Class File Format"/>)
1.137 + Bytes defining class (in <vmspec chapter="4"/>)
1.138 </description>
1.139 </field>
1.140 </typedef>
1.141 @@ -7611,10 +7595,8 @@
1.142 <paramlink id="signature_ptr"/>.
1.143 <p/>
1.144 Field signatures are defined in the JNI Specification and
1.145 - are referred to as
1.146 - <vmspeclink id="ClassFile.doc.html#14152"
1.147 - name="field descriptors"
1.148 - preposition="in"/>.
1.149 + are referred to as <code>field descriptors</code> in
1.150 + <vmspec chapter="4.3.2"/>.
1.151 </description>
1.152 <origin>jvmdiClone</origin>
1.153 <capabilities>
1.154 @@ -7709,9 +7691,7 @@
1.155 <description>
1.156 For the field indicated by <code>klass</code> and <code>field</code>
1.157 return the access flags via <code>modifiers_ptr</code>.
1.158 - Access flags are defined in the
1.159 - <vmspeclink id="ClassFile.doc.html"
1.160 - name="Class File Format chapter"/>.
1.161 + Access flags are defined in <vmspec chapter="4"/>.
1.162 </description>
1.163 <origin>jvmdi</origin>
1.164 <capabilities>
1.165 @@ -7810,10 +7790,9 @@
1.166 return the method name via <code>name_ptr</code> and method signature via
1.167 <code>signature_ptr</code>.
1.168 <p/>
1.169 - Method signatures are defined in the JNI Specification and are referred to as
1.170 - <vmspeclink id="ClassFile.doc.html#7035"
1.171 - name="method descriptors"
1.172 - preposition="in"/>.
1.173 + Method signatures are defined in the JNI Specification and are
1.174 + referred to as <code>method descriptors</code> in
1.175 + <vmspec chapter="4.3.3"/>.
1.176 Note this is different
1.177 than method signatures as defined in the <i>Java Language Specification</i>.
1.178 </description>
1.179 @@ -7902,9 +7881,7 @@
1.180 <description>
1.181 For the method indicated by <code>method</code>,
1.182 return the access flags via <code>modifiers_ptr</code>.
1.183 - Access flags are defined in the
1.184 - <vmspeclink id="ClassFile.doc.html"
1.185 - name="Class File Format chapter"/>.
1.186 + Access flags are defined in <vmspec chapter="4"/>.
1.187 </description>
1.188 <origin>jvmdi</origin>
1.189 <capabilities>
1.190 @@ -7941,9 +7918,7 @@
1.191 including the local variables used to pass parameters to the
1.192 method on its invocation.
1.193 <p/>
1.194 - See <code>max_locals</code> in the
1.195 - <vmspeclink id="ClassFile.doc.html#1546"
1.196 - name="Code Attribute section"/>.
1.197 + See <code>max_locals</code> in <vmspec chapter="4.7.3"/>.
1.198 </description>
1.199 <origin>jvmdi</origin>
1.200 <capabilities>
1.201 @@ -8150,8 +8125,7 @@
1.202 The local variable's type signature, encoded as a
1.203 <internallink id="mUTF">modified UTF-8</internallink> string.
1.204 The signature format is the same as that defined in
1.205 - <vmspeclink id="ClassFile.doc.html#14152"
1.206 - name="Field Descriptors section"/>
1.207 + <vmspec chapter="4.3.2"/>.
1.208 </description>
1.209 </field>
1.210 <field id="generic_signature">
1.211 @@ -10460,10 +10434,7 @@
1.212 <synopsis>Add To Bootstrap Class Loader Search</synopsis>
1.213 <description>
1.214 This function can be used to cause instrumentation classes to be defined by the
1.215 - bootstrap class loader. See
1.216 - <vmspeclink id="ConstantPool.doc.html#79383"
1.217 - name="Loading Using the Bootstrap Class Loader"
1.218 - preposition="in"/>.
1.219 + bootstrap class loader. See <vmspec chapter="5.3.1"/>.
1.220 After the bootstrap
1.221 class loader unsuccessfully searches for a class, the specified platform-dependent
1.222 search path <paramlink id="segment"/> will be searched as well. Only one segment may be specified in
1.223 @@ -10480,7 +10451,7 @@
1.224 contain any classes or resources other than those to be defined by the bootstrap
1.225 class loader for the purposes of instrumentation.
1.226 <p/>
1.227 - The <vmspeclink/> specifies that a subsequent attempt to resolve a symbolic
1.228 + <vmspec/> specifies that a subsequent attempt to resolve a symbolic
1.229 reference that the Java virtual machine has previously unsuccessfully attempted
1.230 to resolve always fails with the same error that was thrown as a result of the
1.231 initial resolution attempt. Consequently, if the JAR file contains an entry
1.232 @@ -10512,10 +10483,7 @@
1.233 <synopsis>Add To System Class Loader Search</synopsis>
1.234 <description>
1.235 This function can be used to cause instrumentation classes to be
1.236 - defined by the system class loader. See
1.237 - <vmspeclink id="ConstantPool.doc.html#79441"
1.238 - name="Loading Using a User-defined Class Loader"
1.239 - preposition="in"/>.
1.240 + defined by the system class loader. See <vmspec chapter="5.3.2"/>.
1.241 After the class loader unsuccessfully searches for a class, the specified platform-dependent search
1.242 path <paramlink id="segment"/> will be searched as well. Only one segment may be specified in the
1.243 <paramlink id="segment"/>. This function may be called multiple times to add multiple segments, the
1.244 @@ -10536,7 +10504,7 @@
1.245 which takes a single parameter of type <code>java.lang.String</code>. The method is not required
1.246 to have <code>public</code> access.
1.247 <p/>
1.248 - The <vmspeclink/> specifies that a subsequent attempt to resolve a symbolic
1.249 + <vmspec/> specifies that a subsequent attempt to resolve a symbolic
1.250 reference that the Java virtual machine has previously unsuccessfully attempted
1.251 to resolve always fails with the same error that was thrown as a result of the
1.252 initial resolution attempt. Consequently, if the JAR file contains an entry
1.253 @@ -11438,7 +11406,7 @@
1.254 at the finest granularity allowed by the VM. A single step event is
1.255 generated whenever a thread reaches a new location.
1.256 Typically, single step events represent the completion of one VM
1.257 - instruction as defined in the <vmspeclink/>. However, some implementations
1.258 + instruction as defined in <vmspec/>. However, some implementations
1.259 may define locations differently. In any case the
1.260 <code>method</code> and <code>location</code>
1.261 parameters uniquely identify the current location and allow
1.262 @@ -13841,7 +13809,7 @@
1.263 and can_get_source_debug_extension.
1.264 PopFrame cannot have a native calling method.
1.265 Removed incorrect statement in GetClassloaderClasses
1.266 - (see http://java.sun.com/docs/books/vmspec/2nd-edition/html/ConstantPool.doc.html#79383).
1.267 + (see <vmspec chapter="4.4"/>).
1.268 </change>
1.269 <change date="24 July 2003" version="v79">
1.270 XML and text fixes.
