Fix interpreter unittest for embedded constant pools.

test/unittests/interpreter/bytecodes-unittest.cc

 // Copyright 2015 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 <vector>
 
 #include "src/v8.h"
 
 #include "src/interpreter/bytecodes.h"
 #include "test/unittests/test-utils.h"
@@ skipping 159 matching lines @@
 
 TEST(Bytecodes, DecodeBytecodeAndOperands) {
   struct BytecodesAndResult {
     const uint8_t bytecode[32];
     const size_t length;
     int parameter_count;
     const char* output;
   };
 
 #define B(Name) static_cast<uint8_t>(Bytecode::k##Name)
+#define REG_OFFSET \
+  (InterpreterFrameConstants::kRegisterFileFromFp / kPointerSize)
+#define REG(i) static_cast<uint8_t>(REG_OFFSET - (i))
+#define REG_HI(i) static_cast<uint8_t>((REG_OFFSET - (i)) >> 8)

[oth, 2016/04/22 09:35:30]

An alternative would be to have two macros here:

REG8(x) defining a single 8-bit operand value.
REG16(x) defining a pair of 8-bit values representing an 16-bit register
operand.

I think this'd be more readable in the tests.

   const BytecodesAndResult cases[] = {
 #if V8_TARGET_LITTLE_ENDIAN
     {{B(LdaSmi), 0x01}, 2, 0, "            LdaSmi [1]"},
     {{B(Wide), B(LdaSmi), 0xe8, 0x03}, 4, 0, "      LdaSmi.Wide [1000]"},
     {{B(ExtraWide), B(LdaSmi), 0xa0, 0x86, 0x01, 0x00},
      6,
      0,
      "LdaSmi.ExtraWide [100000]"},
     {{B(LdaSmi), 0xff}, 2, 0, "            LdaSmi [-1]"},
     {{B(Wide), B(LdaSmi), 0x18, 0xfc}, 4, 0, "      LdaSmi.Wide [-1000]"},
     {{B(ExtraWide), B(LdaSmi), 0x60, 0x79, 0xfe, 0xff},
      6,
      0,
      "LdaSmi.ExtraWide [-100000]"},
-    {{B(Star), 0xf5}, 2, 0, "            Star r5"},
-    {{B(Wide), B(Star), 0x72, 0xff}, 4, 0, "      Star.Wide r136"},
-    {{B(Wide), B(Call), 0x74, 0xff, 0x73, 0xff, 0x02, 0x00, 0xb1, 0x00},
+    {{B(Star), REG(5)}, 2, 0, "            Star r5"},
+    {{B(Wide), B(Star), REG(136), REG_HI(136)}, 4, 0, "      Star.Wide r136"},
+    {{B(Wide), B(Call), REG(134), REG_HI(134), REG(135), REG_HI(135), 0x02,
+      0x00, 0xb1, 0x00},
      10,
      0,
      "Call.Wide r134, r135, #2, [177]"},
     {{B(Ldar),
       static_cast<uint8_t>(Register::FromParameterIndex(2, 3).ToOperand())},
      2,
      3,
      "            Ldar a1"},
     {{B(Wide), B(CreateObjectLiteral), 0x01, 0x02, 0x03, 0x04, 0xa5},
      7,
      0,
      "CreateObjectLiteral.Wide [513], [1027], #165"},
     {{B(ExtraWide), B(JumpIfNull), 0x15, 0xcd, 0x5b, 0x07},
      6,
      0,
      "JumpIfNull.ExtraWide [123456789]"},
 #elif V8_TARGET_BIG_ENDIAN
     {{B(LdaSmi), 0x01}, 2, 0, "            LdaSmi [1]"},
     {{B(Wide), B(LdaSmi), 0x03, 0xe8}, 4, 0, "      LdaSmi.Wide [1000]"},
     {{B(ExtraWide), B(LdaSmi), 0x00, 0x01, 0x86, 0xa0},
      6,
      0,
      "LdaSmi.ExtraWide [100000]"},
     {{B(LdaSmi), 0xff}, 2, 0, "            LdaSmi [-1]"},
     {{B(Wide), B(LdaSmi), 0xfc, 0x18}, 4, 0, "      LdaSmi.Wide [-1000]"},
     {{B(ExtraWide), B(LdaSmi), 0xff, 0xfe, 0x79, 0x60},
      6,
      0,
      "LdaSmi.ExtraWide [-100000]"},
-    {{B(Star), 0xf5}, 2, 0, "            Star r5"},
-    {{B(Wide), B(Star), 0xff, 0x72}, 4, 0, "      Star.Wide r136"},
-    {{B(Wide), B(Call), 0xff, 0x74, 0xff, 0x73, 0x00, 0x02, 0x00, 0xb1},
+    {{B(Star), REG(5)}, 2, 0, "            Star r5"},
+    {{B(Wide), B(Star), REG_HI(136), REG(136)}, 4, 0, "      Star.Wide r136"},
+    {{B(Wide), B(Call), REG_HI(134), REG(134), REG_HI(135), REG(135), 0x00,
+      0x02, 0x00, 0xb1},
      10,
      0,
      "Call.Wide r134, r135, #2, [177]"},
     {{B(Ldar),
       static_cast<uint8_t>(Register::FromParameterIndex(2, 3).ToOperand())},
      2,
      3,
      "            Ldar a1"},
     {{B(Wide), B(CreateObjectLiteral), 0x02, 0x01, 0x04, 0x03, 0xa5},
      7,
      0,
      "CreateObjectLiteral.Wide [513], [1027], #165"},
     {{B(ExtraWide), B(JumpIfNull), 0x07, 0x5b, 0xcd, 0x15},
      6,
      0,
      "JumpIfNull.ExtraWide [123456789]"},
 #else
 #error "Unknown Architecture"
 #endif
   };
 #undef B
+#undef REG_OFFSET
+#undef REG
+#undef REG_HI
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     // Generate reference string by prepending formatted bytes.
     std::stringstream expected_ss;
     std::ios default_format(nullptr);
     default_format.copyfmt(expected_ss);
     // Match format of Bytecodes::Decode() for byte representations.
     expected_ss.fill('0');
     expected_ss.flags(std::ios::right | std::ios::hex);
     for (size_t b = 0; b < cases[i].length; b++) {
@@ skipping 78 matching lines @@
   names.insert(Bytecodes::AccumulatorUseToString(AccumulatorUse::kNone));
   names.insert(Bytecodes::AccumulatorUseToString(AccumulatorUse::kRead));
   names.insert(Bytecodes::AccumulatorUseToString(AccumulatorUse::kWrite));
   names.insert(Bytecodes::AccumulatorUseToString(AccumulatorUse::kReadWrite));
   CHECK_EQ(names.size(), 4);
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8