src/share/vm/adlc/archDesc.cpp

*** 1,7 ****
  //
! // Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
  // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  //
  // This code is free software; you can redistribute it and/or modify it
  // under the terms of the GNU General Public License version 2 only, as
  // published by the Free Software Foundation.
--- 1,7 ----
  //
! // Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  //
  // This code is free software; you can redistribute it and/or modify it
  // under the terms of the GNU General Public License version 2 only, as
  // published by the Free Software Foundation.
*** 1036,1061 ****
    fprintf(fp,"\n");
    fprintf(fp,"// Machine Generated File.  Do Not Edit!\n");
    fprintf(fp,"\n");
  }
  
- //---------------------------machineDependentIncludes--------------------------
- // output #include declarations for machine specific files
- void ArchDesc::machineDependentIncludes(ADLFILE &adlfile) {
-   const char *basename = adlfile._name;
-   const char *cp;
-   for (cp = basename; *cp; cp++)
-     if (*cp == '/')  basename = cp+1;
  
    // Build #include lines
    fprintf(adlfile._fp, "\n");
!   fprintf(adlfile._fp, "#include \"incls/_precompiled.incl\"\n");
!   fprintf(adlfile._fp, "#include \"incls/_%s.incl\"\n",basename);
    fprintf(adlfile._fp, "\n");
  
  }
  
  
  //---------------------------addPreprocessorChecks-----------------------------
  // Output C preprocessor code to verify the backend compilation environment.
  // The idea is to force code produced by "adlc -DHS64" to be compiled by a
  // command of the form "CC ... -DHS64 ...", so that any #ifdefs in the source
--- 1036,1077 ----
    fprintf(fp,"\n");
    fprintf(fp,"// Machine Generated File.  Do Not Edit!\n");
    fprintf(fp,"\n");
  }
  
  
+ //---------------------------addIncludeGuardStart--------------------------
+ // output the start of an include guard.
+ void ArchDesc::addIncludeGuardStart(ADLFILE &adlfile, const char* guardString) {
    // Build #include lines
    fprintf(adlfile._fp, "\n");
!   fprintf(adlfile._fp, "#ifndef %s\n", guardString);
!   fprintf(adlfile._fp, "#define %s\n", guardString);
    fprintf(adlfile._fp, "\n");
  
  }
  
+ //---------------------------addIncludeGuardEnd--------------------------
+ // output the end of an include guard.
+ void ArchDesc::addIncludeGuardEnd(ADLFILE &adlfile, const char* guardString) {
+   // Build #include lines
+   fprintf(adlfile._fp, "\n");
+   fprintf(adlfile._fp, "#endif // %s\n", guardString);
+ 
+ }
+ 
+ //---------------------------addInclude--------------------------
+ // output the #include line for this file.
+ void ArchDesc::addInclude(ADLFILE &adlfile, const char* fileName) {
+   fprintf(adlfile._fp, "#include \"%s\"\n", fileName);
+ 
+ }
+ 
+ void ArchDesc::addInclude(ADLFILE &adlfile, const char* includeDir, const char* fileName) {
+   fprintf(adlfile._fp, "#include \"%s/%s\"\n", includeDir, fileName);
+ 
+ }
  
  //---------------------------addPreprocessorChecks-----------------------------
  // Output C preprocessor code to verify the backend compilation environment.
  // The idea is to force code produced by "adlc -DHS64" to be compiled by a
  // command of the form "CC ... -DHS64 ...", so that any #ifdefs in the source