commit 58bf0c6d756ff59d3b50d3e90bcdada92b2c933f
author Ian Rogers <irogers@google.com> Tue Nov 20 16:24:12 2012 -0800
committer Ian Rogers <irogers@google.com> Tue Nov 20 16:25:09 2012 -0800
tree d64178bcf00a41290968665941599552f524de72
parent c0a61fc79e5070f2a16e7dbb7ecf451d13405b45

Fix interpreter cmp[gl]-double.

Change-Id: I332ff181db100e2fa8b663f1de84f42baba7da2f

src/interpreter/interpreter.cc

diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc
index 0a32f8f..33d2e59 100644
--- a/src/interpreter/interpreter.cc
+++ b/src/interpreter/interpreter.cc
@@ -476,23 +476,18 @@
         break;
       case Primitive::kPrimByte:
         f->SetByte(obj, shadow_frame.GetVReg(dec_insn.vA));
-        shadow_frame.SetVReg(dec_insn.vA, f->GetByte(obj));
         break;
       case Primitive::kPrimChar:
         f->SetChar(obj, shadow_frame.GetVReg(dec_insn.vA));
-        shadow_frame.SetVReg(dec_insn.vA, f->GetChar(obj));
         break;
       case Primitive::kPrimShort:
         f->SetShort(obj, shadow_frame.GetVReg(dec_insn.vA));
-        shadow_frame.SetVReg(dec_insn.vA, f->GetShort(obj));
         break;
       case Primitive::kPrimInt:
         f->SetInt(obj, shadow_frame.GetVReg(dec_insn.vA));
-        shadow_frame.SetVReg(dec_insn.vA, f->GetInt(obj));
         break;
       case Primitive::kPrimLong:
         f->SetLong(obj, shadow_frame.GetVRegLong(dec_insn.vA));
-        shadow_frame.SetVRegLong(dec_insn.vA, f->GetLong(obj));
         break;
       case Primitive::kPrimNot:
         f->SetObj(obj, shadow_frame.GetReference(dec_insn.vA));
@@ -753,7 +748,7 @@
         int32_t result;
         if (val1 == val2) {
           result = 0;
-        } else if (val1 < val2) {
+        } else if (val1 > val2) {
           result = 1;
         } else {
           result = -1;
@@ -768,7 +763,7 @@
         int32_t result;
         if (val1 == val2) {
           result = 0;
-        } else if (val1 > val2) {
+        } else if (val1 < val2) {
           result = -1;
         } else {
           result = 1;