1.1 --- a/src/share/vm/adlc/formssel.cpp Tue Oct 21 11:23:52 2008 -0700
1.2 +++ b/src/share/vm/adlc/formssel.cpp Tue Oct 28 09:31:30 2008 -0700
1.3 @@ -1574,10 +1574,10 @@
1.4 return Opcode::NOT_AN_OPCODE;
1.5 }
1.6
1.7 -void Opcode::print_opcode(FILE *fp, Opcode::opcode_type desired_opcode) {
1.8 +bool Opcode::print_opcode(FILE *fp, Opcode::opcode_type desired_opcode) {
1.9 // Default values previously provided by MachNode::primary()...
1.10 - const char *description = "default_opcode()";
1.11 - const char *value = "-1";
1.12 + const char *description = NULL;
1.13 + const char *value = NULL;
1.14 // Check if user provided any opcode definitions
1.15 if( this != NULL ) {
1.16 // Update 'value' if user provided a definition in the instruction
1.17 @@ -1599,7 +1599,10 @@
1.18 break;
1.19 }
1.20 }
1.21 - fprintf(fp, "(%s /*%s*/)", value, description);
1.22 + if (value != NULL) {
1.23 + fprintf(fp, "(%s /*%s*/)", value, description);
1.24 + }
1.25 + return value != NULL;
1.26 }
1.27
1.28 void Opcode::dump() {
1.29 @@ -2610,14 +2613,19 @@
1.30 }
1.31
1.32 //------------------------------CondInterface----------------------------------
1.33 -CondInterface::CondInterface(char *equal, char *not_equal,
1.34 - char *less, char *greater_equal,
1.35 - char *less_equal, char *greater)
1.36 +CondInterface::CondInterface(const char* equal, const char* equal_format,
1.37 + const char* not_equal, const char* not_equal_format,
1.38 + const char* less, const char* less_format,
1.39 + const char* greater_equal, const char* greater_equal_format,
1.40 + const char* less_equal, const char* less_equal_format,
1.41 + const char* greater, const char* greater_format)
1.42 : Interface("COND_INTER"),
1.43 - _equal(equal), _not_equal(not_equal),
1.44 - _less(less), _greater_equal(greater_equal),
1.45 - _less_equal(less_equal), _greater(greater) {
1.46 - //
1.47 + _equal(equal), _equal_format(equal_format),
1.48 + _not_equal(not_equal), _not_equal_format(not_equal_format),
1.49 + _less(less), _less_format(less_format),
1.50 + _greater_equal(greater_equal), _greater_equal_format(greater_equal_format),
1.51 + _less_equal(less_equal), _less_equal_format(less_equal_format),
1.52 + _greater(greater), _greater_format(greater_format) {
1.53 }
1.54 CondInterface::~CondInterface() {
1.55 // not owner of any character arrays
