This is an archive of the discontinued LLVM Phabricator instance.

[Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test
ClosedPublic

Authored by mohit.bhakkad on Mar 9 2016, 3:43 AM.

Download Raw Diff

Details

Reviewers

kcc
samsonov
eugenis

Commits

rG7c682e05ba84: Merging r263199: --------------------------------------------------------------…
rGac4bd45f021c: [Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test
rCRT263199: [Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test
rL263199: [Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test

Diff Detail

Repository: rL LLVM

Event Timeline

mohit.bhakkad updated this revision to Diff 50118.Mar 9 2016, 3:43 AM

mohit.bhakkad retitled this revision from to [Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test.

mohit.bhakkad updated this object.

mohit.bhakkad added reviewers: eugenis, samsonov, kcc.

mohit.bhakkad set the repository for this revision to rL LLVM.

mohit.bhakkad added subscribers: jaydeep, slthakur, llvm-commits.

samsonov added inline comments.Mar 9 2016, 3:48 PM

lib/sanitizer_common/tests/sanitizer_ioctl_test.cc
81	Try to avoid #if where possible. E.g. can you make it unsigned int desc_value = SANITIZER_MIPS ? 0x4004ae98U : 0x8004ae98U; bool res = ioctl_decode(write_desc, &desc); ?

changed as suggested.

LGTM

This revision is now accepted and ready to land.Mar 10 2016, 10:35 AM

Closed by commit rL263199: [Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test (authored by mohit.bhakkad). · Explain WhyMar 10 2016, 10:02 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

lib/

sanitizer_common/

tests/

sanitizer_ioctl_test.cc

6 lines

Diff 50236

lib/sanitizer_common/tests/sanitizer_ioctl_test.cc

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines	TEST(SanitizerIoctl, Fixup) {
const ioctl_desc *desc = ioctl_lookup(EVIOCGKEY(16));		const ioctl_desc *desc = ioctl_lookup(EVIOCGKEY(16));
EXPECT_NE((void *)0, desc);		EXPECT_NE((void *)0, desc);
EXPECT_EQ(EVIOCGKEY(0), desc->req);		EXPECT_EQ(EVIOCGKEY(0), desc->req);
}		}

// Test decoding KVM ioctl numbers.		// Test decoding KVM ioctl numbers.
TEST(SanitizerIoctl, KVM_GET_MP_STATE) {		TEST(SanitizerIoctl, KVM_GET_MP_STATE) {
ioctl_desc desc;		ioctl_desc desc;
bool res = ioctl_decode(0x8004ae98U, &desc);		unsigned int desc_value = SANITIZER_MIPS ? 0x4004ae98U : 0x8004ae98U;
		samsonovUnsubmitted Not Done Reply Inline Actions Try to avoid #if where possible. E.g. can you make it unsigned int desc_value = SANITIZER_MIPS ? 0x4004ae98U : 0x8004ae98U; bool res = ioctl_decode(write_desc, &desc); ? samsonov: Try to avoid #if where possible. E.g. can you make it unsigned int desc_value =…
		bool res = ioctl_decode(desc_value, &desc);
EXPECT_TRUE(res);		EXPECT_TRUE(res);
EXPECT_EQ(ioctl_desc::WRITE, desc.type);		EXPECT_EQ(ioctl_desc::WRITE, desc.type);
EXPECT_EQ(4U, desc.size);		EXPECT_EQ(4U, desc.size);
}		}

TEST(SanitizerIoctl, KVM_GET_LAPIC) {		TEST(SanitizerIoctl, KVM_GET_LAPIC) {
ioctl_desc desc;		ioctl_desc desc;
bool res = ioctl_decode(0x8400ae8eU, &desc);		unsigned int desc_value = SANITIZER_MIPS ? 0x4400ae8eU : 0x8400ae8eU;
		bool res = ioctl_decode(desc_value, &desc);
EXPECT_TRUE(res);		EXPECT_TRUE(res);
EXPECT_EQ(ioctl_desc::WRITE, desc.type);		EXPECT_EQ(ioctl_desc::WRITE, desc.type);
EXPECT_EQ(1024U, desc.size);		EXPECT_EQ(1024U, desc.size);
}		}

TEST(SanitizerIoctl, KVM_GET_MSR_INDEX_LIST) {		TEST(SanitizerIoctl, KVM_GET_MSR_INDEX_LIST) {
ioctl_desc desc;		ioctl_desc desc;
bool res = ioctl_decode(0xc004ae02U, &desc);		bool res = ioctl_decode(0xc004ae02U, &desc);
EXPECT_TRUE(res);		EXPECT_TRUE(res);
EXPECT_EQ(ioctl_desc::READWRITE, desc.type);		EXPECT_EQ(ioctl_desc::READWRITE, desc.type);
EXPECT_EQ(4U, desc.size);		EXPECT_EQ(4U, desc.size);
}		}

#endif // SANITIZER_LINUX		#endif // SANITIZER_LINUX