From 07c31a327fc75fd62023d1774e900f85ce982ee7 Mon Sep 17 00:00:00 2001 From: Calder Kitagawa Date: Tue, 10 Apr 2018 20:03:08 +0000 Subject: [Zucchini] Remove Marking Logic With recent refactoring by etiennep@ marking high bits is no longer required. This removes checks for existing high bits which were previously filtered out to avoid conflicts with the marking system used. Change-Id: Iab929b19ade5c9faaf7c6be073136352170c794a Reviewed-on: https://chromium-review.googlesource.com/1002862 Commit-Queue: Calder Kitagawa Reviewed-by: Samuel Huang Cr-Commit-Position: refs/heads/master@{#549620} NOKEYCHECK=True GitOrigin-RevId: 79c5e3545912bb2ec527fbe61b2aafe66c6e5bc2 --- image_utils_unittest.cc | 60 ------------------------------------------------- 1 file changed, 60 deletions(-) (limited to 'image_utils_unittest.cc') diff --git a/image_utils_unittest.cc b/image_utils_unittest.cc index 7cae9d2..cd71a2f 100644 --- a/image_utils_unittest.cc +++ b/image_utils_unittest.cc @@ -14,64 +14,4 @@ TEST(ImageUtilsTest, Bitness) { EXPECT_EQ(8U, WidthOf(kBit64)); } -TEST(ImageUtilsTest, IsMarked) { - EXPECT_FALSE(IsMarked(0x00000000)); - EXPECT_TRUE(IsMarked(0x80000000)); - - EXPECT_FALSE(IsMarked(0x00000001)); - EXPECT_TRUE(IsMarked(0x80000001)); - - EXPECT_FALSE(IsMarked(0x70000000)); - EXPECT_TRUE(IsMarked(0xF0000000)); - - EXPECT_FALSE(IsMarked(0x7FFFFFFF)); - EXPECT_TRUE(IsMarked(0xFFFFFFFF)); - - EXPECT_FALSE(IsMarked(0x70000000)); - EXPECT_TRUE(IsMarked(0xC0000000)); - - EXPECT_FALSE(IsMarked(0x0000BEEF)); - EXPECT_TRUE(IsMarked(0x8000BEEF)); -} - -TEST(ImageUtilsTest, MarkIndex) { - EXPECT_EQ(offset_t(0x80000000), MarkIndex(0x00000000)); - EXPECT_EQ(offset_t(0x80000000), MarkIndex(0x80000000)); - - EXPECT_EQ(offset_t(0x80000001), MarkIndex(0x00000001)); - EXPECT_EQ(offset_t(0x80000001), MarkIndex(0x80000001)); - - EXPECT_EQ(offset_t(0xF0000000), MarkIndex(0x70000000)); - EXPECT_EQ(offset_t(0xF0000000), MarkIndex(0xF0000000)); - - EXPECT_EQ(offset_t(0xFFFFFFFF), MarkIndex(0x7FFFFFFF)); - EXPECT_EQ(offset_t(0xFFFFFFFF), MarkIndex(0xFFFFFFFF)); - - EXPECT_EQ(offset_t(0xC0000000), MarkIndex(0x40000000)); - EXPECT_EQ(offset_t(0xC0000000), MarkIndex(0xC0000000)); - - EXPECT_EQ(offset_t(0x8000BEEF), MarkIndex(0x0000BEEF)); - EXPECT_EQ(offset_t(0x8000BEEF), MarkIndex(0x8000BEEF)); -} - -TEST(ImageUtilsTest, UnmarkIndex) { - EXPECT_EQ(offset_t(0x00000000), UnmarkIndex(0x00000000)); - EXPECT_EQ(offset_t(0x00000000), UnmarkIndex(0x80000000)); - - EXPECT_EQ(offset_t(0x00000001), UnmarkIndex(0x00000001)); - EXPECT_EQ(offset_t(0x00000001), UnmarkIndex(0x80000001)); - - EXPECT_EQ(offset_t(0x70000000), UnmarkIndex(0x70000000)); - EXPECT_EQ(offset_t(0x70000000), UnmarkIndex(0xF0000000)); - - EXPECT_EQ(offset_t(0x7FFFFFFF), UnmarkIndex(0x7FFFFFFF)); - EXPECT_EQ(offset_t(0x7FFFFFFF), UnmarkIndex(0xFFFFFFFF)); - - EXPECT_EQ(offset_t(0x40000000), UnmarkIndex(0x40000000)); - EXPECT_EQ(offset_t(0x40000000), UnmarkIndex(0xC0000000)); - - EXPECT_EQ(offset_t(0x0000BEEF), UnmarkIndex(0x0000BEEF)); - EXPECT_EQ(offset_t(0x0000BEEF), UnmarkIndex(0x8000BEEF)); -} - } // namespace zucchini -- cgit v1.2.3