diff -r a49a647afe9a -r ba764ed4b6f2 src/share/vm/opto/classes.hpp
--- a/src/share/vm/opto/classes.hpp	Fri Apr 11 09:56:35 2008 -0400
+++ b/src/share/vm/opto/classes.hpp	Sun Apr 13 17:43:42 2008 -0400
@@ -64,6 +64,7 @@
 macro(CMoveI)
 macro(CMoveL)
 macro(CMoveP)
+macro(CmpN)
 macro(CmpD)
 macro(CmpD3)
 macro(CmpF)
@@ -77,7 +78,9 @@
 macro(CompareAndSwapI)
 macro(CompareAndSwapL)
 macro(CompareAndSwapP)
+macro(CompareAndSwapN)
 macro(Con)
+macro(ConN)
 macro(ConD)
 macro(ConF)
 macro(ConI)
@@ -100,6 +103,7 @@
 macro(CountedLoop)
 macro(CountedLoopEnd)
 macro(CreateEx)
+macro(DecodeN)
 macro(DivD)
 macro(DivF)
 macro(DivI)
@@ -107,6 +111,7 @@
 macro(DivMod)
 macro(DivModI)
 macro(DivModL)
+macro(EncodeP)
 macro(ExpD)
 macro(FastLock)
 macro(FastUnlock)
@@ -133,6 +138,7 @@
 macro(LoadPLocked)
 macro(LoadLLocked)
 macro(LoadP)
+macro(LoadN)
 macro(LoadRange)
 macro(LoadS)
 macro(Lock)
@@ -201,6 +207,7 @@
 macro(StoreI)
 macro(StoreL)
 macro(StoreP)
+macro(StoreN)
 macro(StrComp)
 macro(SubD)
 macro(SubF)