--- old/src/cpu/x86/vm/assembler_x86.cpp	2012-12-12 10:37:53.628731000 -0800
+++ new/src/cpu/x86/vm/assembler_x86.cpp	2012-12-12 10:37:53.475452000 -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);
   }
 }