hotspot/src/share/vm/opto/classes.hpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)classes.hpp  1.178 07/07/19 19:08:27 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_HDR
  #pragma ident "@(#)classes.hpp  1.178 07/07/19 19:08:27 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.
*** 38,47 ****
--- 38,48 ----
  macro(AddP)
  macro(Allocate)
  macro(AllocateArray)
  macro(AndI)
  macro(AndL)
+ macro(AryEq)
  macro(AtanD)
  macro(Binary)
  macro(Bool)
  macro(BoxLock)
  macro(ReverseBytesI)
*** 65,74 ****
--- 66,77 ----
  macro(CMoveD)
  macro(CMoveF)
  macro(CMoveI)
  macro(CMoveL)
  macro(CMoveP)
+ macro(CMoveN)
+ macro(CmpN)
  macro(CmpD)
  macro(CmpD3)
  macro(CmpF)
  macro(CmpF3)
  macro(CmpI)
*** 78,88 ****
--- 81,93 ----
  macro(CmpP)
  macro(CmpU)
  macro(CompareAndSwapI)
  macro(CompareAndSwapL)
  macro(CompareAndSwapP)
+ macro(CompareAndSwapN)
  macro(Con)
+ macro(ConN)
  macro(ConD)
  macro(ConF)
  macro(ConI)
  macro(ConL)
  macro(ConP)
*** 101,117 ****
--- 106,124 ----
  macro(ConvL2I)
  macro(CosD)
  macro(CountedLoop)
  macro(CountedLoopEnd)
  macro(CreateEx)
+ macro(DecodeN)
  macro(DivD)
  macro(DivF)
  macro(DivI)
  macro(DivL)
  macro(DivMod)
  macro(DivModI)
  macro(DivModL)
+ macro(EncodeP)
  macro(ExpD)
  macro(FastLock)
  macro(FastUnlock)
  macro(Goto)
  macro(Halt)
*** 129,143 ****
--- 136,152 ----
  macro(LoadD)
  macro(LoadD_unaligned)
  macro(LoadF)
  macro(LoadI)
  macro(LoadKlass)
+ macro(LoadNKlass)
  macro(LoadL)
  macro(LoadL_unaligned)
  macro(LoadPLocked)
  macro(LoadLLocked)
  macro(LoadP)
+ macro(LoadN)
  macro(LoadRange)
  macro(LoadS)
  macro(Lock)
  macro(LogD)
  macro(Log10D)
*** 159,168 ****
--- 168,178 ----
  macro(MoveF2I)
  macro(MoveL2D)
  macro(MoveD2L)
  macro(MulD)
  macro(MulF)
+ macro(MulHiL)
  macro(MulI)
  macro(MulL)
  macro(Multi)
  macro(NegD)
  macro(NegF)
*** 186,210 ****
--- 196,223 ----
  macro(Return)
  macro(Root)
  macro(RoundDouble)
  macro(RoundFloat)
  macro(SafePoint)
+ macro(SafePointScalarObject)
  macro(SCMemProj)
  macro(SinD)
  macro(SqrtD)
  macro(Start)
  macro(StartOSR)
  macro(StoreB)
  macro(StoreC)
  macro(StoreCM)
  macro(StorePConditional)
+ macro(StoreIConditional)
  macro(StoreLConditional)
  macro(StoreD)
  macro(StoreF)
  macro(StoreI)
  macro(StoreL)
  macro(StoreP)
+ macro(StoreN)
  macro(StrComp)
  macro(SubD)
  macro(SubF)
  macro(SubI)
  macro(SubL)