hotspot/src/share/vm/adlc/forms.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)forms.cpp    1.161 07/05/05 17:04:59 JVM"
  #endif
  /*
!  * Copyright 1997-2007 Sun Microsystems, Inc.  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,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)forms.cpp    1.161 07/05/05 17:04:59 JVM"
  #endif
  /*
!  * Copyright 1997-2008 Sun Microsystems, Inc.  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.
*** 36,45 ****
--- 36,47 ----
  }
  
  //------------------------------NameList---------------------------------------
  // reserved user-defined string
  const char  *NameList::_signal   = "$$SIGNAL$$";
+ const char  *NameList::_signal2  = "$$SIGNAL2$$";
+ const char  *NameList::_signal3  = "$$SIGNAL3$$";
  
  // Constructor and Destructor
  NameList::NameList() : _cur(0), _max(4), _iter(0), _justReset(true) { 
    _names = (const char**)malloc(_max*sizeof(char*));
  }
*** 212,221 ****
--- 214,224 ----
  Form::DataType Form::ideal_to_const_type(const char *name) const {
    if( name == NULL ) { return Form::none; }
  
    if (strcmp(name,"ConI")==0) return Form::idealI;
    if (strcmp(name,"ConP")==0) return Form::idealP;
+   if (strcmp(name,"ConN")==0) return Form::idealN;
    if (strcmp(name,"ConL")==0) return Form::idealL;
    if (strcmp(name,"ConF")==0) return Form::idealF;
    if (strcmp(name,"ConD")==0) return Form::idealD;
    if (strcmp(name,"Bool")==0) return Form::idealI;
  
*** 252,266 ****
--- 255,271 ----
    if( strcmp(opType,"LoadD")==0 )  return Form::idealD;
    if( strcmp(opType,"LoadD_unaligned")==0 )  return Form::idealD;
    if( strcmp(opType,"LoadF")==0 )  return Form::idealF;
    if( strcmp(opType,"LoadI")==0 )  return Form::idealI;
    if( strcmp(opType,"LoadKlass")==0 )  return Form::idealP;
+   if( strcmp(opType,"LoadNKlass")==0 ) return Form::idealN;
    if( strcmp(opType,"LoadL")==0 )  return Form::idealL;
    if( strcmp(opType,"LoadL_unaligned")==0 )  return Form::idealL;
    if( strcmp(opType,"LoadPLocked")==0 )  return Form::idealP;
    if( strcmp(opType,"LoadLLocked")==0 )  return Form::idealL;
    if( strcmp(opType,"LoadP")==0 )  return Form::idealP;
+   if( strcmp(opType,"LoadN")==0 )  return Form::idealN;
    if( strcmp(opType,"LoadRange")==0 )  return Form::idealI;
    if( strcmp(opType,"LoadS")==0 )  return Form::idealS;
    if( strcmp(opType,"Load16B")==0 )  return Form::idealB;
    if( strcmp(opType,"Load8B")==0 )  return Form::idealB;
    if( strcmp(opType,"Load4B")==0 )  return Form::idealB;
*** 287,296 ****
--- 292,302 ----
    if( strcmp(opType,"StoreD")==0)  return Form::idealD;
    if( strcmp(opType,"StoreF")==0)  return Form::idealF;
    if( strcmp(opType,"StoreI")==0)  return Form::idealI;
    if( strcmp(opType,"StoreL")==0)  return Form::idealL;
    if( strcmp(opType,"StoreP")==0)  return Form::idealP;
+   if( strcmp(opType,"StoreN")==0) return Form::idealN;
    if( strcmp(opType,"Store16B")==0)  return Form::idealB;
    if( strcmp(opType,"Store8B")==0)  return Form::idealB;
    if( strcmp(opType,"Store4B")==0)  return Form::idealB;
    if( strcmp(opType,"Store8C")==0)  return Form::idealC;
    if( strcmp(opType,"Store4C")==0)  return Form::idealC;