Mercurial > hg > truffle
diff src/share/vm/trace/tracetypes.xml @ 17805:bbfbe9b06038
Merge
author | kvn |
---|---|
date | Thu, 13 Mar 2014 14:57:01 -0700 |
parents | d6c97434b745 |
children | 4ca6dc0799b6 daef39043d2c |
line wrap: on
line diff
--- a/src/share/vm/trace/tracetypes.xml Mon Mar 10 12:58:02 2014 +0100 +++ b/src/share/vm/trace/tracetypes.xml Thu Mar 13 14:57:01 2014 -0700 @@ -85,12 +85,6 @@ <value type="UTF8" field="name" label="Name"/> </content_type> - <content_type id="StackTrace" hr_name="Stacktrace" - type="U8" builtin_type="STACKTRACE"> - <value type="BOOLEAN" field="truncated" label="Truncated"/> - <structarray type="StackFrame" field="frames" label="Stack frames"/> - </content_type> - <content_type id="Class" hr_name="Java class" type="U8" builtin_type="CLASS"> <value type="CLASS" field="loaderClass" label="ClassLoader"/> @@ -116,17 +110,6 @@ <value type="UTF8" field="name" label="Name"/> </content_type> - <content_type id="FrameType" hr_name="Frame type" - type="U1" jvm_type="FRAMETYPE"> - <value type="UTF8" field="desc" label="Description"/> - </content_type> - - <struct_type id="StackFrame"> - <value type="METHOD" field="method" label="Java Method"/> - <value type="INTEGER" field="line" label="Line number"/> - <value type="FRAMETYPE" field="type" label="Frame type"/> - </struct_type> - <content_type id="GCName" hr_name="GC Name" type="U1" jvm_type="GCNAME"> <value type="UTF8" field="name" label="name" /> @@ -167,6 +150,11 @@ <value type="UTF8" field="phase" label="phase" /> </content_type> + <content_type id="FlagValueOrigin" hr_name="Flag Value Origin" + type="U1" jvm_type="FLAGVALUEORIGIN"> + <value type="UTF8" field="origin" label="origin" /> + </content_type> + </content_types> @@ -351,6 +339,10 @@ <!-- VMOPERATIONTYPE --> <primary_type symbol="VMOPERATIONTYPE" datatype="U2" contenttype="VMOPERATIONTYPE" type="u2" sizeop="sizeof(u2)" /> + + <!-- FLAGVALUEORIGIN --> + <primary_type symbol="FLAGVALUEORIGIN" datatype="U1" + contenttype="FLAGVALUEORIGIN" type="u1" sizeop="sizeof(u1)" /> </primary_types> </types>