# HG changeset patch
# User acorn
# Date 1383150404 25200
# Node ID 4fe7815b04f594acc6ef35a70542c8ac7adbb893
# Parent  fdd464c8d62ee3a48c697e061164fe57aa2f2cb7# Parent  ea79ab313e985747510439fdc1eb9cf147e7084c
Merge

diff -r fdd464c8d62e -r 4fe7815b04f5 src/cpu/x86/vm/interp_masm_x86_32.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed Oct 30 09:11:04 2013 -0700
+++ b/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed Oct 30 09:26:44 2013 -0700
@@ -196,7 +196,7 @@
 
 void InterpreterMacroAssembler::get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset) {
   assert(bcp_offset >= 0, "bcp is still pointing to start of bytecode");
-  movl(reg, Address(rsi, bcp_offset));
+  load_unsigned_short(reg, Address(rsi, bcp_offset));
   bswapl(reg);
   shrl(reg, 16);
 }
diff -r fdd464c8d62e -r 4fe7815b04f5 src/cpu/x86/vm/interp_masm_x86_64.cpp
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed Oct 30 09:11:04 2013 -0700
+++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed Oct 30 09:26:44 2013 -0700
@@ -192,7 +192,7 @@
   Register reg,
   int bcp_offset) {
   assert(bcp_offset >= 0, "bcp is still pointing to start of bytecode");
-  movl(reg, Address(r13, bcp_offset));
+  load_unsigned_short(reg, Address(r13, bcp_offset));
   bswapl(reg);
   shrl(reg, 16);
 }
diff -r fdd464c8d62e -r 4fe7815b04f5 src/cpu/x86/vm/templateTable_x86_32.cpp
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed Oct 30 09:11:04 2013 -0700
+++ b/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed Oct 30 09:26:44 2013 -0700
@@ -558,7 +558,7 @@
 
 
 void TemplateTable::locals_index_wide(Register reg) {
-  __ movl(reg, at_bcp(2));
+  __ load_unsigned_short(reg, at_bcp(2));
   __ bswapl(reg);
   __ shrl(reg, 16);
   __ negptr(reg);
@@ -1552,7 +1552,11 @@
                               InvocationCounter::counter_offset();
 
   // Load up EDX with the branch displacement
-  __ movl(rdx, at_bcp(1));
+  if (is_wide) {
+    __ movl(rdx, at_bcp(1));
+  } else {
+    __ load_signed_short(rdx, at_bcp(1));
+  }
   __ bswapl(rdx);
   if (!is_wide) __ sarl(rdx, 16);
   LP64_ONLY(__ movslq(rdx, rdx));
diff -r fdd464c8d62e -r 4fe7815b04f5 src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Oct 30 09:11:04 2013 -0700
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Oct 30 09:26:44 2013 -0700
@@ -568,7 +568,7 @@
 }
 
 void TemplateTable::locals_index_wide(Register reg) {
-  __ movl(reg, at_bcp(2));
+  __ load_unsigned_short(reg, at_bcp(2));
   __ bswapl(reg);
   __ shrl(reg, 16);
   __ negptr(reg);
@@ -1575,7 +1575,11 @@
                               InvocationCounter::counter_offset();
 
   // Load up edx with the branch displacement
-  __ movl(rdx, at_bcp(1));
+  if (is_wide) {
+    __ movl(rdx, at_bcp(1));
+  } else {
+    __ load_signed_short(rdx, at_bcp(1));
+  }
   __ bswapl(rdx);
 
   if (!is_wide) {