diff src/cpu/x86/vm/assembler_x86.hpp @ 7955:cf8470eaf7e5

Merge
author acorn
date Sun, 27 Jan 2013 21:58:34 -0500
parents b30b3c2a0cf2 8b46b0196eb0
children b800986664f4
line wrap: on
line diff
--- a/src/cpu/x86/vm/assembler_x86.hpp	Fri Jan 25 03:03:23 2013 -0800
+++ b/src/cpu/x86/vm/assembler_x86.hpp	Sun Jan 27 21:58:34 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -543,7 +543,7 @@
   // of instructions are freely declared without the need for wrapping them an ifdef.
   // (Some dangerous instructions are ifdef's out of inappropriate jvm's.)
   // In the .cpp file the implementations are wrapped so that they are dropped out
-  // of the resulting jvm. This is done mostly to keep the footprint of KERNEL
+  // of the resulting jvm. This is done mostly to keep the footprint of MINIMAL
   // to the size it was prior to merging up the 32bit and 64bit assemblers.
   //
   // This does mean you'll get a linker/runtime error if you use a 64bit only instruction