From b4da7a60bd081754b56ce670cfc4bc88af5a8373 Mon Sep 17 00:00:00 2001
From: twisti <unknown>
Date: Tue, 18 Dec 2012 10:47:23 -0800
Subject: [PATCH] 8004536: replace AbstractAssembler emit_word with emit_int16
 Reviewed-by: jrose, kvn, twisti Contributed-by: Morris Meyer
 <morris.meyer@oracle.com>

---
 src/cpu/x86/vm/assembler_x86.cpp | 6 +++---
 src/share/vm/asm/assembler.hpp   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cpu/x86/vm/assembler_x86.cpp b/src/cpu/x86/vm/assembler_x86.cpp
index 0a51534ed..092fdf71d 100644
--- a/src/cpu/x86/vm/assembler_x86.cpp
+++ b/src/cpu/x86/vm/assembler_x86.cpp
@@ -1229,7 +1229,7 @@ void Assembler::cmpw(Address dst, int imm16) {
   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 @@ void Assembler::movw(Address dst, int imm16) {
   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 @@ void Assembler::ret(int imm16) {
     emit_byte(0xC3);
   } else {
     emit_byte(0xC2);
-    emit_word(imm16);
+    emit_int16(imm16);
   }
 }
 
diff --git a/src/share/vm/asm/assembler.hpp b/src/share/vm/asm/assembler.hpp
index 893ed13e9..2ff8e57d5 100644
--- a/src/share/vm/asm/assembler.hpp
+++ b/src/share/vm/asm/assembler.hpp
@@ -226,7 +226,6 @@ class AbstractAssembler : public ResourceObj  {
   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).
-- 
GitLab