1.1 --- a/src/share/classes/com/sun/tools/javap/AttributeWriter.java Tue Feb 11 23:30:36 2014 +0400
1.2 +++ b/src/share/classes/com/sun/tools/javap/AttributeWriter.java Wed Feb 12 23:52:58 2014 +0400
1.3 @@ -547,7 +547,6 @@
1.4 for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
1.5 w.write(entry);
1.6 }
1.7 - println();
1.8 indent(-1);
1.9 return null;
1.10 }
1.11 @@ -559,7 +558,6 @@
1.12 for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
1.13 w.write(entry);
1.14 }
1.15 - println();
1.16 indent(-1);
1.17 return null;
1.18 }
1.19 @@ -571,14 +569,12 @@
1.20 }
1.21
1.22 public Void visit_same_frame(StackMapTable_attribute.same_frame frame, Void p) {
1.23 - printHeader(frame);
1.24 - println(" /* same */");
1.25 + printHeader(frame, "/* same */");
1.26 return null;
1.27 }
1.28
1.29 public Void visit_same_locals_1_stack_item_frame(StackMapTable_attribute.same_locals_1_stack_item_frame frame, Void p) {
1.30 - printHeader(frame);
1.31 - println(" /* same_locals_1_stack_item */");
1.32 + printHeader(frame, "/* same_locals_1_stack_item */");
1.33 indent(+1);
1.34 printMap("stack", frame.stack);
1.35 indent(-1);
1.36 @@ -586,8 +582,7 @@
1.37 }
1.38
1.39 public Void visit_same_locals_1_stack_item_frame_extended(StackMapTable_attribute.same_locals_1_stack_item_frame_extended frame, Void p) {
1.40 - printHeader(frame);
1.41 - println(" /* same_locals_1_stack_item_frame_extended */");
1.42 + printHeader(frame, "/* same_locals_1_stack_item_frame_extended */");
1.43 indent(+1);
1.44 println("offset_delta = " + frame.offset_delta);
1.45 printMap("stack", frame.stack);
1.46 @@ -596,8 +591,7 @@
1.47 }
1.48
1.49 public Void visit_chop_frame(StackMapTable_attribute.chop_frame frame, Void p) {
1.50 - printHeader(frame);
1.51 - println(" /* chop */");
1.52 + printHeader(frame, "/* chop */");
1.53 indent(+1);
1.54 println("offset_delta = " + frame.offset_delta);
1.55 indent(-1);
1.56 @@ -605,8 +599,7 @@
1.57 }
1.58
1.59 public Void visit_same_frame_extended(StackMapTable_attribute.same_frame_extended frame, Void p) {
1.60 - printHeader(frame);
1.61 - println(" /* same_frame_extended */");
1.62 + printHeader(frame, "/* same_frame_extended */");
1.63 indent(+1);
1.64 println("offset_delta = " + frame.offset_delta);
1.65 indent(-1);
1.66 @@ -614,8 +607,7 @@
1.67 }
1.68
1.69 public Void visit_append_frame(StackMapTable_attribute.append_frame frame, Void p) {
1.70 - printHeader(frame);
1.71 - println(" /* append */");
1.72 + printHeader(frame, "/* append */");
1.73 indent(+1);
1.74 println("offset_delta = " + frame.offset_delta);
1.75 printMap("locals", frame.locals);
1.76 @@ -624,12 +616,11 @@
1.77 }
1.78
1.79 public Void visit_full_frame(StackMapTable_attribute.full_frame frame, Void p) {
1.80 - printHeader(frame);
1.81 if (frame instanceof StackMap_attribute.stack_map_frame) {
1.82 + printHeader(frame, "offset = " + frame.offset_delta);
1.83 indent(+1);
1.84 - println(" offset = " + frame.offset_delta);
1.85 } else {
1.86 - println(" /* full_frame */");
1.87 + printHeader(frame, "/* full_frame */");
1.88 indent(+1);
1.89 println("offset_delta = " + frame.offset_delta);
1.90 }
1.91 @@ -639,8 +630,9 @@
1.92 return null;
1.93 }
1.94
1.95 - void printHeader(StackMapTable_attribute.stack_map_frame frame) {
1.96 - print(" frame_type = " + frame.frame_type);
1.97 + void printHeader(StackMapTable_attribute.stack_map_frame frame, String extra) {
1.98 + print("frame_type = " + frame.frame_type + " ");
1.99 + println(extra);
1.100 }
1.101
1.102 void printMap(String name, StackMapTable_attribute.verification_type_info[] map) {
