1.1 --- a/src/share/vm/adlc/adlparse.hpp Tue Oct 21 11:23:52 2008 -0700
1.2 +++ b/src/share/vm/adlc/adlparse.hpp Tue Oct 28 09:31:30 2008 -0700
1.3 @@ -70,7 +70,6 @@
1.4 protected:
1.5 char *_curline; // Start of current line
1.6 char *_ptr; // Pointer into current location in File Buffer
1.7 - int _linenum; // Count of line numbers seen so far
1.8 char _curchar; // Current character from buffer
1.9 FormDict &_globalNames; // Global names
1.10
1.11 @@ -160,9 +159,10 @@
1.12 Interface *interface_parse(); // Parse operand interface rule
1.13 Interface *mem_interface_parse(); // Parse memory interface rule
1.14 Interface *cond_interface_parse(); // Parse conditional interface rule
1.15 - char *interface_field_parse();// Parse field contents
1.16 + char *interface_field_parse(const char** format = NULL);// Parse field contents
1.17
1.18 FormatRule *format_parse(void); // Parse format rule
1.19 + FormatRule *template_parse(void); // Parse format rule
1.20 void effect_parse(InstructForm *instr); // Parse effect rule
1.21 ExpandRule *expand_parse(InstructForm *instr); // Parse expand rule
1.22 RewriteRule *rewrite_parse(void); // Parse rewrite rule
1.23 @@ -263,7 +263,7 @@
1.24
1.25 void parse(void); // Do the parsing & build forms lists
1.26
1.27 - int getlines( ) { return _linenum; }
1.28 + int linenum() { return _buf.linenum(); }
1.29
1.30 static bool is_literal_constant(const char *hex_string);
1.31 static bool is_hex_digit(char digit);
