1.1 --- a/src/share/vm/adlc/main.cpp Tue Oct 09 12:40:05 2012 -0700 1.2 +++ b/src/share/vm/adlc/main.cpp Tue Oct 09 16:09:31 2012 -0700 1.3 @@ -341,14 +341,20 @@ 1.4 static void usage(ArchDesc& AD) 1.5 { 1.6 printf("Architecture Description Language Compiler\n\n"); 1.7 - printf("Usage: adl [-doqw] [-Dflag[=def]] [-Uflag] [-cFILENAME] [-hFILENAME] [-aDFAFILE] ADLFILE\n"); 1.8 + printf("Usage: adlc [-doqwTs] [-#]* [-D<FLAG>[=<DEF>]] [-U<FLAG>] [-c<CPP_FILE_NAME>] [-h<HPP_FILE_NAME>] [-a<DFA_FILE_NAME>] [-v<GLOBALS_FILE_NAME>] <ADL_FILE_NAME>\n"); 1.9 printf(" d produce DFA debugging info\n"); 1.10 printf(" o no output produced, syntax and semantic checking only\n"); 1.11 printf(" q quiet mode, supresses all non-essential messages\n"); 1.12 printf(" w suppress warning messages\n"); 1.13 + printf(" T make DFA as many subroutine calls\n"); 1.14 + printf(" s output which instructions are cisc-spillable\n"); 1.15 + printf(" D define preprocessor symbol\n"); 1.16 + printf(" U undefine preprocessor symbol\n"); 1.17 printf(" c specify CPP file name (default: %s)\n", AD._CPP_file._name); 1.18 printf(" h specify HPP file name (default: %s)\n", AD._HPP_file._name); 1.19 printf(" a specify DFA output file name\n"); 1.20 + printf(" v specify adGlobals output file name\n"); 1.21 + printf(" # increment ADL debug level\n"); 1.22 printf("\n"); 1.23 } 1.24 1.25 @@ -450,22 +456,6 @@ 1.26 return fname; 1.27 } 1.28 1.29 -//------------------------------strip_path_and_ext------------------------------ 1.30 -static char *strip_path_and_ext(char *fname) 1.31 -{ 1.32 - char *ep; 1.33 - char *sp; 1.34 - 1.35 - if (fname) { 1.36 - for (sp = fname; *sp; sp++) 1.37 - if (*sp == '/') fname = sp+1; 1.38 - ep = fname; // start at first character and look for '.' 1.39 - while (ep <= (fname + strlen(fname) - 1) && *ep != '.') ep++; 1.40 - if (*ep == '.') *ep = '\0'; // truncate string at '.' 1.41 - } 1.42 - return fname; 1.43 -} 1.44 - 1.45 //------------------------------base_plus_suffix------------------------------- 1.46 // New concatenated string 1.47 static char *base_plus_suffix(const char* base, const char *suffix) 1.48 @@ -477,18 +467,6 @@ 1.49 return fname; 1.50 } 1.51 1.52 - 1.53 -//------------------------------prefix_plus_base_plus_suffix------------------- 1.54 -// New concatenated string 1.55 -static char *prefix_plus_base_plus_suffix(const char* prefix, const char* base, const char *suffix) 1.56 -{ 1.57 - int len = (int)strlen(prefix) + (int)strlen(base) + (int)strlen(suffix) + 1; 1.58 - 1.59 - char* fname = new char[len]; 1.60 - sprintf(fname,"%s%s%s",prefix,base,suffix); 1.61 - return fname; 1.62 -} 1.63 - 1.64 //------------------------------get_legal_text--------------------------------- 1.65 // Get pointer to legal text at the beginning of AD file. 1.66 // This code assumes that a legal text starts at the beginning of .ad files,