truffle: src/share/vm/adlc/adlparse.cpp comparison

comparison src/share/vm/adlc/adlparse.cpp @ 628:7bb995fbd3c0

Merge

author	trims
date	Thu, 12 Mar 2009 18:16:36 -0700
parents	0fbdb4381b99 98cb887364d3
children	c18cbe5936b8

comparison

equal deleted inserted replaced

-:ce2272390558
+:7bb995fbd3c0
 // Check for commutative operations with tree operands.
 int count = 0;
 rule->count_commutative_op(count);
 if (count > 0) {
 // Clone match rule and swap commutative operation's operands.
-rule->swap_commutative_op(instr_ident, count, match_rules_cnt);
+rule->matchrule_swap_commutative_op(instr_ident, count, match_rules_cnt);
 }
 }
 //------------------------------adjust_set_rule--------------------------------
 // Check for "Set" form of chain rule
 // Check for a constraint
 skipws();
 while( _curchar != ')' ) {
 // Get information on the left instruction and its operand
 // left-instructions's number
-intptr_t   left_inst = get_int();
+int left_inst = get_int();
 // Left-instruction's operand
 skipws();
 if( _curchar != '.' ) {
 parse_err(SYNERR, "missing '.' in peepconstraint after instruction number.\n");
 return;
 // Collect relational operator
 char *relation = get_relation_dup();
 skipws();
 // Get information on the right instruction and its operand
-intptr_t right_inst;        // Right-instructions's number
+int right_inst;        // Right-instructions's number
 if( isdigit(_curchar) ) {
 right_inst = get_int();
 // Right-instruction's operand
 skipws();
 if( _curchar != '.' ) {
 skipws();
 while ( (_curchar != '%') && (*(_ptr+1) != '}') ) {
 // (1)
 // Check if there is a string to pass through to output
-char *start = _ptr;       // Record start of the next string
+{
-while ((_curchar != '$') && ((_curchar != '%') || (*(_ptr+1) != '}')) ) {
+char *start = _ptr;       // Record start of the next string
-// If at the start of a comment, skip past it
+while ((_curchar != '$') && ((_curchar != '%') || (*(_ptr+1) != '}')) ) {
-if( (_curchar == '/') && ((*(_ptr+1) == '/') || (*(_ptr+1) == '*')) ) {
+// If at the start of a comment, skip past it
-skipws_no_preproc();
+if( (_curchar == '/') && ((*(_ptr+1) == '/') || (*(_ptr+1) == '*')) ) {
-} else {
+skipws_no_preproc();
-// ELSE advance to the next character, or start of the next line
+} else {
-next_char_or_line();
+// ELSE advance to the next character, or start of the next line
-}
+next_char_or_line();
 }
-// If a string was found, terminate it and record in EncClass
+}
-if ( start != _ptr ) {
+// If a string was found, terminate it and record in EncClass
-*_ptr  = '\0';          // Terminate the string
+if ( start != _ptr ) {
-// Add flag to _strings list indicating we should check _rep_vars
+*_ptr  = '\0';          // Terminate the string
-format->_strings.addName(NameList::_signal2);
+// Add flag to _strings list indicating we should check _rep_vars
-format->_strings.addName(start);
+format->_strings.addName(NameList::_signal2);
+format->_strings.addName(start);
+}
 }
 // (2)
 // If we are at a replacement variable,
 // copy it and record in EncClass
 // (2)
 // If we are at a replacement variable,
 // copy it and record in FormatRule
 if ( _curchar == '$' ) {
 next_char();          // Move past the '$'
-char* rep_var = get_ident(); // Nil terminate the variable name
+char* next_rep_var = get_ident(); // Nil terminate the variable name
-rep_var = strdup(rep_var);// Copy the string
+next_rep_var = strdup(next_rep_var);// Copy the string
 *_ptr   = _curchar;     // and replace Nil with original character
-format->_rep_vars.addName(rep_var);
+format->_rep_vars.addName(next_rep_var);
 // Add flag to _strings list indicating we should check _rep_vars
 format->_strings.addName(NameList::_signal);
 }
 // (3)
 skipws();
 if (ident2 == NULL) {
 parse_err(SYNERR, "identifier expected at %c\n", _curchar);
 continue;
 }                            // Check that you have a valid operand
-const Form *form = instr->_localNames[ident2];
+const Form *form2 = instr->_localNames[ident2];
-if (!form) {
+if (!form2) {
 parse_err(SYNERR, "operand name expected at %s\n", ident2);
 continue;
 }
-oper = form->is_operand();
+oper = form2->is_operand();
-if (oper == NULL && !form->is_opclass()) {
+if (oper == NULL && !form2->is_opclass()) {
 parse_err(SYNERR, "operand name expected at %s\n", ident2);
 continue;
 }                            // Add operand to list
 instr_and_operands->add_entry(ident2);
 } while(_curchar == ',');
 char         *start;            // Pointer to start of token
 char         *end;              // Pointer to end of token
 int           result;           // Storage for integer result
 if( _curline == NULL )          // Return NULL at EOF.
-return NULL;
+return 0;
 skipws();                       // Skip whitespace before identifier
 start = end = _ptr;             // Start points at first character
 c = *end;                       // Grab character to test
 while ((c >= '0') && (c <= '9')
 }
 }
 //---------------------------ensure_start_of_line------------------------------
 // A preprocessor directive has been encountered.  Be sure it has fallen at
-// the begining of a line, or else report an error.
+// the beginning of a line, or else report an error.
 void ADLParser::ensure_start_of_line(void) {
 if (_curchar == '\n') { next_line(); return; }
 assert( _ptr >= _curline && _ptr < _curline+strlen(_curline),
 "Must be able to find which line we are in" );

Mercurial > hg > truffle

comparison src/share/vm/adlc/adlparse.cpp @ 628:7bb995fbd3c0