S390: Fixed LBR, LGBR, LHR, LGHR instructions in simulator.

src/s390/simulator-s390.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdarg.h>
 #include <stdlib.h>
 #include <cmath>
 
 #if V8_TARGET_ARCH_S390
 
@@ skipping 3706 matching lines @@
       int32_t mem_val = ReadW(b2_val + x2_val + d2_val, instr);
       int32_t r1_val = get_low_register<int32_t>(r1);
       set_low_register(r1, r1_val * mem_val);
       break;
     }
     case LGBR:
     case LBR: {
       RREInstruction* rrinst = reinterpret_cast<RREInstruction*>(instr);
       int r1 = rrinst->R1Value();
       int r2 = rrinst->R2Value();
-#ifdef V8_TARGET_ARCH_S390X
+      if (op == LGBR) {
       int64_t r2_val = get_low_register<int64_t>(r2);
       r2_val <<= 56;
       r2_val >>= 56;
       set_register(r1, r2_val);
-#else
+      } else if (op == LBR) {
       int32_t r2_val = get_low_register<int32_t>(r2);
       r2_val <<= 24;
       r2_val >>= 24;
       set_low_register(r1, r2_val);
-#endif
+      } else {
+        UNREACHABLE();
+      }
       break;
     }
     case LGHR:
     case LHR: {
       RREInstruction* rrinst = reinterpret_cast<RREInstruction*>(instr);
       int r1 = rrinst->R1Value();
       int r2 = rrinst->R2Value();
-#ifdef V8_TARGET_ARCH_S390X
+      if (op == LGHR) {
       int64_t r2_val = get_low_register<int64_t>(r2);
       r2_val <<= 48;
       r2_val >>= 48;
       set_register(r1, r2_val);
-#else
+      } else if (op == LHR) {
       int32_t r2_val = get_low_register<int32_t>(r2);
       r2_val <<= 16;
       r2_val >>= 16;
       set_low_register(r1, r2_val);
-#endif
+      } else {
+        UNREACHABLE();
+      }
       break;
     }
     case ALCR: {
       RREInstruction* rrinst = reinterpret_cast<RREInstruction*>(instr);
       int r1 = rrinst->R1Value();
       int r2 = rrinst->R2Value();
       uint32_t r1_val = get_low_register<uint32_t>(r1);
       uint32_t r2_val = get_low_register<uint32_t>(r2);
       uint32_t alu_out = 0;
       bool isOF = false;
@@ skipping 2322 matching lines @@
 EVALUATE(LBR) {
   DCHECK_OPCODE(LBR);
   DECODE_RRE_INSTRUCTION(r1, r2);
   int32_t r2_val = get_low_register<int32_t>(r2);
   r2_val <<= 24;
   r2_val >>= 24;
   set_low_register(r1, r2_val);
   return length;
 }
 
+EVALUATE(LGBR) {
+  DCHECK_OPCODE(LGBR);
+  DECODE_RRE_INSTRUCTION(r1, r2);
+  int64_t r2_val = get_low_register<int64_t>(r2);
+  r2_val <<= 56;
+  r2_val >>= 56;
+  set_register(r1, r2_val);
+  return length;
+}
+
+EVALUATE(LHR) {
+  DCHECK_OPCODE(LHR);
+  DECODE_RRE_INSTRUCTION(r1, r2);
+  int32_t r2_val = get_low_register<int32_t>(r2);
+  r2_val <<= 16;
+  r2_val >>= 16;
+  set_low_register(r1, r2_val);
+  return length;
+}
+
+EVALUATE(LGHR) {
+  DCHECK_OPCODE(LGHR);
+  DECODE_RRE_INSTRUCTION(r1, r2);
+  int64_t r2_val = get_low_register<int64_t>(r2);
+  r2_val <<= 48;
+  r2_val >>= 48;
+  set_register(r1, r2_val);
+  return length;
+}
+
 EVALUATE(LGF) {
   DCHECK_OPCODE(LGF);
   DECODE_RXY_A_INSTRUCTION(r1, x2, b2, d2);
   intptr_t addr = GET_ADDRESS(x2, b2, d2);
   int64_t mem_val = static_cast<int64_t>(ReadW(addr, instr));
   set_register(r1, mem_val);
   return length;
 }
 
 EVALUATE(ST) {
@@ skipping 892 matching lines @@
 EVALUATE(RRXTR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(LPGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(LNGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(LTGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(LCGR) { return DecodeInstructionOriginal(instr); }
 
-EVALUATE(LGBR) { return DecodeInstructionOriginal(instr); }
-
-EVALUATE(LGHR) { return DecodeInstructionOriginal(instr); }
-
 EVALUATE(SGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(ALGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(SLGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(MSGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(DSGR) { return DecodeInstructionOriginal(instr); }
 
@@ skipping 24 matching lines @@
 EVALUATE(DSGFR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(KMAC) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(LRVR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(CGR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(CLGR) { return DecodeInstructionOriginal(instr); }
 
-EVALUATE(LHR) { return DecodeInstructionOriginal(instr); }
-
 EVALUATE(KMF) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(KMO) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(PCC) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(KMCTR) { return DecodeInstructionOriginal(instr); }
 
 EVALUATE(KM) { return DecodeInstructionOriginal(instr); }
 
@@ skipping 567 matching lines @@
 
 EVALUATE(CXZT) { return DecodeInstructionOriginal(instr); }
 
 #undef EVALUATE
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // USE_SIMULATOR
 #endif  // V8_TARGET_ARCH_S390