Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Issue 1916433002: Revert of Fix interpreter unittest for embedded constant pools. (Closed)

Created:
4 years, 8 months ago by MTBrandyberry
Modified:
4 years, 8 months ago
CC:
v8-reviews_googlegroups.com, rmcilroy, JaideepBajwa
Base URL:
https://chromium.googlesource.com/v8/v8.git@master
Target Ref:
refs/pending/heads/master
Project:
v8
Visibility:
Public.

Description

Revert of Fix interpreter unittest for embedded constant pools. (patchset #3 id:40001 of https://codereview.chromium.org/1906963002/ ) Reason for revert: Need to reland with proper #undef logic. Original issue's description: > Fix interpreter unittest for embedded constant pools. > > The offset from fp to the register file is based on the frame size > -- which is one slot larger when embedded constant pools are enabled. > > TEST=unittests/DecodeBytecodeAndOperands > R=rmcilroy@chromium.org, bmeurer@chromium.org, oth@chromium.org, mstarzinger@chromium.org > BUG= TBR=bmeurer@chromium.org,mstarzinger@chromium.org,oth@chromium.org,rmcilroy@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+6 lines, -23 lines) Patch
M test/unittests/interpreter/bytecodes-unittest.cc View 4 chunks +6 lines, -23 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
MTBrandyberry
Created Revert of Fix interpreter unittest for embedded constant pools.
4 years, 8 months ago (2016-04-22 14:54:23 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1916433002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1916433002/1
4 years, 8 months ago (2016-04-22 14:54:28 UTC) #2
commit-bot: I haz the power
4 years, 8 months ago (2016-04-22 14:54:34 UTC) #4
Failed to apply patch for test/unittests/interpreter/bytecodes-unittest.cc:
While running git apply --index -3 -p1;
  error: patch failed: test/unittests/interpreter/bytecodes-unittest.cc:261
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: test/unittests/interpreter/bytecodes-unittest.cc: patch does not apply

Patch:       test/unittests/interpreter/bytecodes-unittest.cc
Index: test/unittests/interpreter/bytecodes-unittest.cc
diff --git a/test/unittests/interpreter/bytecodes-unittest.cc
b/test/unittests/interpreter/bytecodes-unittest.cc
index
3e425a1df48f968acd366bf287519d0cdcf5c231..fabd2bed9cf57367ae01e0b16ba67abc3b4708bd
100644
--- a/test/unittests/interpreter/bytecodes-unittest.cc
+++ b/test/unittests/interpreter/bytecodes-unittest.cc
@@ -177,20 +177,6 @@
   };
 
 #define B(Name) static_cast<uint8_t>(Bytecode::k##Name)
-#define REG_OPERAND(i) \
-  (InterpreterFrameConstants::kRegisterFileFromFp / kPointerSize - (i))
-#define REG8(i) static_cast<uint8_t>(REG_OPERAND(i))
-#if V8_TARGET_LITTLE_ENDIAN
-#define REG16(i)                        \
-  static_cast<uint8_t>(REG_OPERAND(i)), \
-      static_cast<uint8_t>(REG_OPERAND(i) >> 8)
-#elif V8_TARGET_BIG_ENDIAN
-#define REG16(i)                             \
-  static_cast<uint8_t>(REG_OPERAND(i) >> 8), \
-      static_cast<uint8_t>(REG_OPERAND(i))
-#else
-#error "Unknown Architecture"
-#endif
   const BytecodesAndResult cases[] = {
 #if V8_TARGET_LITTLE_ENDIAN
     {{B(LdaSmi), 0x01}, 2, 0, "            LdaSmi [1]"},
@@ -205,9 +191,9 @@
      6,
      0,
      "LdaSmi.ExtraWide [-100000]"},
-    {{B(Star), REG8(5)}, 2, 0, "            Star r5"},
-    {{B(Wide), B(Star), REG16(136)}, 4, 0, "      Star.Wide r136"},
-    {{B(Wide), B(Call), REG16(134), REG16(135), 0x02, 0x00, 0xb1, 0x00},
+    {{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},
      10,
      0,
      "Call.Wide r134, r135, #2, [177]"},
@@ -237,9 +223,9 @@
      6,
      0,
      "LdaSmi.ExtraWide [-100000]"},
-    {{B(Star), REG8(5)}, 2, 0, "            Star r5"},
-    {{B(Wide), B(Star), REG16(136)}, 4, 0, "      Star.Wide r136"},
-    {{B(Wide), B(Call), REG16(134), REG16(135), 0x00, 0x02, 0x00, 0xb1},
+    {{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},
      10,
      0,
      "Call.Wide r134, r135, #2, [177]"},
@@ -261,9 +247,6 @@
 #endif
   };
 #undef B
-#undef REG_OPERAND
-#undef REG8
-#undef REG16
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     // Generate reference string by prepending formatted bytes.

Powered by Google App Engine
This is Rietveld 408576698