--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp	Tue Dec 18 08:19:53 2012 -0800
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp	Tue Dec 18 10:47:23 2012 -0800
@@ -1229,7 +1229,7 @@
   emit_byte(0x66);
   emit_byte(0x81);
   emit_operand(rdi, dst, 2);
-  emit_word(imm16);
+  emit_int16(imm16);
 }
 
 // The 32-bit cmpxchg compares the value at adr with the contents of rax,
@@ -1879,7 +1879,7 @@
   prefix(dst);
   emit_byte(0xC7);
   emit_operand(rax, dst, 2);
-  emit_word(imm16);
+  emit_int16(imm16);
 }
 
 void Assembler::movw(Register dst, Address src) {
@@ -2571,7 +2571,7 @@
     emit_byte(0xC3);
   } else {
     emit_byte(0xC2);
-    emit_word(imm16);
+    emit_int16(imm16);
   }
 }
 

--- a/hotspot/src/share/vm/asm/assembler.hpp	Tue Dec 18 08:19:53 2012 -0800
+++ b/hotspot/src/share/vm/asm/assembler.hpp	Tue Dec 18 10:47:23 2012 -0800
@@ -226,7 +226,6 @@
   void emit_address(address x) { code_section()->emit_address(x); }
 
   void emit_byte(int x)  { emit_int8 (x); }  // deprecated
-  void emit_word(int x)  { emit_int16(x); }  // deprecated
   void emit_long(jint x) { emit_int32(x); }  // deprecated
 
   // Instruction boundaries (required when emitting relocatable values).