# HG changeset patch # User amenkov # Date 1566416077 25200 # Node ID 8c73d2a46ba92907541885df648f1f7b2f1161e6 # Parent 253c817653b6a5f82094464f5e8b71b9bbaba215 8228547: accessibility errors in jvmti.html Reviewed-by: jcbeyler, sspitsyn, dholmes diff -r 253c817653b6 -r 8c73d2a46ba9 src/hotspot/share/prims/jvmti.xml --- a/src/hotspot/share/prims/jvmti.xml Wed Aug 21 18:05:31 2019 +0200 +++ b/src/hotspot/share/prims/jvmti.xml Wed Aug 21 12:34:37 2019 -0700 @@ -341,12 +341,14 @@ + - + @@ -3523,10 +3525,15 @@ An instance of class C1 will have the following field indices:

+ + + + + - @@ -3538,9 +3545,9 @@ - @@ -3554,10 +3561,15 @@ An instance of class C2 will have the following field indices:
Field Index Description

+ a - + 2

+ b - + 3
+ + + + + - @@ -3571,9 +3583,9 @@ - @@ -3582,9 +3594,9 @@ - @@ -3593,9 +3605,9 @@ - @@ -3613,10 +3625,15 @@ The interface I1 will have the following field indices:
Field Index Description

+ a - + 3

+ b - + 4

+ q - + 5

+ r - + 6
+ + + + + - @@ -4468,20 +4485,14 @@ The table below summarizes this:

Field Index Description

+ x - + 1
- + - - + + + - - @@ -4512,7 +4523,7 @@ - - - @@ -886,74 +873,47 @@
- - Controls objects visited - - Controls objects reported - - Controls primitives reported - Controls objects visited Controls objects reported Controls primitives reported

+ the Heap Visit Control Flags returned by @@ -4497,7 +4508,7 @@

+ in set

+ @@ -4526,7 +4537,7 @@

+ @@ -4660,20 +4671,14 @@ ):
- + - - + + + - - @@ -4704,7 +4709,7 @@ - - - @@ -749,14 +743,14 @@ - - - @@ -821,28 +815,21 @@ - - - + + - - - + + +
- - Controls objects visited - - Controls objects reported - - Controls primitives reported - Controls objects visited Controls objects reported Controls primitives reported

+ the Heap Visit Control Flags returned by @@ -4689,7 +4694,7 @@

+ in set

+ @@ -4718,7 +4723,7 @@

+ diff -r 253c817653b6 -r 8c73d2a46ba9 src/hotspot/share/prims/jvmti.xsl --- a/src/hotspot/share/prims/jvmti.xsl Wed Aug 21 18:05:31 2019 +0200 +++ b/src/hotspot/share/prims/jvmti.xsl Wed Aug 21 12:34:37 2019 -0700 @@ -46,22 +46,48 @@ .rightAligned { text-align: right; } .bgLight { background-color: #EEEEFF; } .bgDark { background-color: #CCCCFF} - th { background-color: #EEEEFF; } - td.tableHeader {font-size: larger; text-align:center; } + th { font-weight: normal; text-align: left; } div.sep { height: 10px; } div.callbackCtnr { margin: 0 5%; } hr { border-width:0; color:gray; background-color:gray; } hr.thick { height:3px; } hr.thin { height:1px; } - table.bordered { border: 1px solid gray; border-spacing: 0; border-collapse: separate; } - table.bordered td, table.bordered th { padding: 3px; border: 1px solid black; } - table.wide { width: 100%; } + table.bordered, div.bordered { border: 2px solid black; border-spacing: 0; border-collapse: collapse; } + table.bordered td, table.bordered th, div.bordered div.divTableHead, div.bordered .divTableCell { + padding: 3px; + border: 2px solid black; + } + .wide { width: 100%; } + table.bordered caption, divCaption { + border: 2px solid black; + border-bottom-width: 0; + } + .captionTitle { + background-color: #CCCCFF; + font-size: larger; + text-align:center; + padding: 3px; + } + .captionDescr { + border-top: 2px solid black; + padding: 3px; + text-align: left; + } + div.divTable { display: table; } + + div.wideDivTableCtnr { padding-right: 2px; } + div.divTableRow { display: table-row; } + div.divTableHead, div.divTableCell { display: table-cell; vertical-align: middle; } + div.divTableHead { font-weight: bold; text-align: center; } + table.bordered td.noPadding { padding: 0; } + div.withPadding { padding: 3px; } + div.topBorder { border-top: 2px solid black; } -
+
-
+

@@ -169,7 +195,7 @@

-
+

@@ -205,7 +231,7 @@
-
+
@@ -349,76 +375,62 @@ - - - - - - - - - - - - - -
- Phase - - Callback Safe - - Position - - Since -
+
+
+
+
Phase
+
Callback Safe
+
Position
+
Since
+
+
+
-
+ +
-
+ +
-
+ +
-
+
+ + + - - - - - - - - - - - - - - - -
- Phase - - Event Type - - Number - - Enabling - - Since -
+
+
+
+
Phase
+
Event Type
+
Number
+
Enabling
+
Since
+
+
+
-
+ +
-
+ +
-
- SetEventNotificationMode(JVMTI_ENABLE, - , NULL) - + +
+ SetEventNotificationMode(JVMTI_ENABLE, + , NULL) +
+
-
+ + + + @@ -674,21 +686,13 @@ - - - + - - - + + +
- - -
+ - +
- Field - - Type - - Description - Field Type Description

@@ -705,26 +709,16 @@ - - - - - - - - + + +
+
+
- - - +
+
All types are unsigned int : 1
+
- All types are unsigned int : 1 -
- Field - - Description - - Since - Field Description Since

@@ -732,7 +726,7 @@
+ # @@ -740,7 +734,7 @@ - +
+ . - + @@ -770,7 +764,7 @@
+ @@ -783,7 +777,7 @@ - + . @@ -798,7 +792,7 @@
+ # @@ -808,7 +802,7 @@ - +
- - - ( - - - - ) - -
+ + + ( + + + + ) + +
- Constant - - Value - - Description - Constant Value Description

@@ -862,14 +849,14 @@
+ - +
- - - + - - + +
- -

- Type - - Description - Type Description

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + +
+ + + + + + + + + + + + + +
+ +

- - - - +
+ + + @@ -1074,37 +1034,40 @@
- - - - - - - - - - -
- Parameters -
- Name - - Type - - Description -
+ + + + + + + + + + + +
Parameters
Name Type Description
+ + +
+
Parameters
+
None
+
+ + - + . - + @@ -1122,120 +1085,97 @@ - - - 2 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Capabilities - - Required Functionality - - Optional Functionality: might not be implemented for all - virtual machines. - - - The following capability - - - One of the following capabilities - - - (as returned by - GetCapabilities) - must be true to use this - - - function. - - - event. - - - - Capability - - Effect - - Optional Features - - Capability - - Effect - + + + + + + + + + + + + + + + + + + + + + + + + + + Capabilities + + + Required Functionality + + + + Optional Functionality: might not be implemented for all virtual machines. + + + The following capability + + + One of the following capabilities + + + (as returned by GetCapabilities) + must be true to use this + + + function. + + + event. + + + + + + Capability Effect + Optional Features + Capability Effect + + + + Capabilities + Required Functionality + + + + - - - - - - - - - + + - - - - - - @@ -1727,18 +1652,10 @@ + Capabilities + Required Functionality + - Capabilities - - Required Functionality - + Event Enabling Capabilities - + - Capability - - Events - Capability Events + #jvmtiCapabilities. @@ -1243,7 +1183,7 @@ - + @@ -1264,7 +1204,7 @@ + #jvmtiCapabilities. @@ -1272,7 +1212,7 @@ - + @@ -1297,53 +1237,38 @@ - - - 2 - 1 - - - - - - - - - - - - - - - Errors - + + + + - - + + - - - - + Errors + This function returns either a universal error or one of the following errors - - + + - Error - - Description - Error Description + + + + + Errors + This function returns a universal error - + + + + @@ -1352,13 +1277,13 @@ + JVMTI_ERROR_MUST_POSSESS_CAPABILITY - + The environment does not possess the capability @@ -1391,14 +1316,14 @@ + # - + @@ -1418,14 +1343,14 @@ + # - + @@ -1689,14 +1614,14 @@ + # - + - - - + - - + + @@ -1746,18 +1663,10 @@ - Structure Type Definitions - Structure Type Definitions - Type - - Description - Type Description - - - + - - + + @@ -1765,18 +1674,10 @@ - Function Type Definitions - Function Type Definitions - Type - - Description - Type Description - - - + - - + + @@ -1784,21 +1685,11 @@ - Enumeration Definitions - Enumeration Definitions - Type - - Description - Type Description - - - + - - - + + + @@ -1814,9 +1705,9 @@ - - @@ -2023,6 +1914,11 @@ + + + + + @@ -2045,6 +1941,11 @@ + + + + + - Function Table Layout - Function Table Layout - Position - - Function - - Declaration - Position Function Declaration + - + @@ -1920,13 +1811,13 @@ - + Version Date - - + + Changes - + @@ -1934,7 +1825,7 @@ + @@ -1942,7 +1833,7 @@ - +

- Capabilities -
- Required Functionality -
- Optional Functionality: might not be implemented for all - virtual machines. - - - The following capability - - - One of the following capabilities - - - (as returned by - `GetCapabilities`) - must be true to use this - - - function. - - - event. - - -
- Capability -	- Effect -
- Optional Features -
- Capability -	- Effect -

- Structure Type Definitions -
- Type -	- Description -	Type	Description

- Function Type Definitions -
- Type -	- Description -	Type	Description

- Enumeration Definitions -
- Type -	- Description -	Type	Description