tests/endianesss: Make test independent of global_qtest

Pass around the test state explicitly, to be able to use the qtest_in*()
and qtest_out*() function in this test.

Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-01-03 12:09:50 +01:00
parent e15357801c
commit fdba0d0919
1 changed files with 145 additions and 142 deletions

View File

@ -48,65 +48,68 @@ static const TestCase test_cases[] = {
{} {}
}; };
static uint8_t isa_inb(const TestCase *test, uint16_t addr) static uint8_t isa_inb(QTestState *qts, const TestCase *test, uint16_t addr)
{ {
uint8_t value; uint8_t value;
if (test->isa_base == -1) { if (test->isa_base == -1) {
value = inb(addr); value = qtest_inb(qts, addr);
} else { } else {
value = readb(test->isa_base + addr); value = qtest_readb(qts, test->isa_base + addr);
} }
return value; return value;
} }
static uint16_t isa_inw(const TestCase *test, uint16_t addr) static uint16_t isa_inw(QTestState *qts, const TestCase *test, uint16_t addr)
{ {
uint16_t value; uint16_t value;
if (test->isa_base == -1) { if (test->isa_base == -1) {
value = inw(addr); value = qtest_inw(qts, addr);
} else { } else {
value = readw(test->isa_base + addr); value = qtest_readw(qts, test->isa_base + addr);
} }
return test->bswap ? bswap16(value) : value; return test->bswap ? bswap16(value) : value;
} }
static uint32_t isa_inl(const TestCase *test, uint16_t addr) static uint32_t isa_inl(QTestState *qts, const TestCase *test, uint16_t addr)
{ {
uint32_t value; uint32_t value;
if (test->isa_base == -1) { if (test->isa_base == -1) {
value = inl(addr); value = qtest_inl(qts, addr);
} else { } else {
value = readl(test->isa_base + addr); value = qtest_readl(qts, test->isa_base + addr);
} }
return test->bswap ? bswap32(value) : value; return test->bswap ? bswap32(value) : value;
} }
static void isa_outb(const TestCase *test, uint16_t addr, uint8_t value) static void isa_outb(QTestState *qts, const TestCase *test, uint16_t addr,
uint8_t value)
{ {
if (test->isa_base == -1) { if (test->isa_base == -1) {
outb(addr, value); qtest_outb(qts, addr, value);
} else { } else {
writeb(test->isa_base + addr, value); qtest_writeb(qts, test->isa_base + addr, value);
} }
} }
static void isa_outw(const TestCase *test, uint16_t addr, uint16_t value) static void isa_outw(QTestState *qts, const TestCase *test, uint16_t addr,
uint16_t value)
{ {
value = test->bswap ? bswap16(value) : value; value = test->bswap ? bswap16(value) : value;
if (test->isa_base == -1) { if (test->isa_base == -1) {
outw(addr, value); qtest_outw(qts, addr, value);
} else { } else {
writew(test->isa_base + addr, value); qtest_writew(qts, test->isa_base + addr, value);
} }
} }
static void isa_outl(const TestCase *test, uint16_t addr, uint32_t value) static void isa_outl(QTestState *qts, const TestCase *test, uint16_t addr,
uint32_t value)
{ {
value = test->bswap ? bswap32(value) : value; value = test->bswap ? bswap32(value) : value;
if (test->isa_base == -1) { if (test->isa_base == -1) {
outl(addr, value); qtest_outl(qts, addr, value);
} else { } else {
writel(test->isa_base + addr, value); qtest_writel(qts, test->isa_base + addr, value);
} }
} }
@ -114,161 +117,161 @@ static void isa_outl(const TestCase *test, uint16_t addr, uint32_t value)
static void test_endianness(gconstpointer data) static void test_endianness(gconstpointer data)
{ {
const TestCase *test = data; const TestCase *test = data;
QTestState *qts;
global_qtest = qtest_initf("-M %s%s%s -device pc-testdev", qts = qtest_initf("-M %s%s%s -device pc-testdev", test->machine,
test->machine, test->superio ? " -device " : "",
test->superio ? " -device " : "", test->superio ?: "");
test->superio ?: ""); isa_outl(qts, test, 0xe0, 0x87654321);
isa_outl(test, 0xe0, 0x87654321); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x21);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x21);
isa_outw(test, 0xe2, 0x8866); isa_outw(qts, test, 0xe2, 0x8866);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664321); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664321);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x88); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x88);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x66); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x66);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x21); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x21);
isa_outw(test, 0xe0, 0x4422); isa_outw(qts, test, 0xe0, 0x4422);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664422); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664422);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x88); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x88);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x66); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x66);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x44); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x44);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22);
isa_outb(test, 0xe3, 0x87); isa_outb(qts, test, 0xe3, 0x87);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87664422); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87664422);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8766); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8766);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x66); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x66);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x44); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x44);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22);
isa_outb(test, 0xe2, 0x65); isa_outb(qts, test, 0xe2, 0x65);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654422); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654422);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x44); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x44);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22);
isa_outb(test, 0xe1, 0x43); isa_outb(qts, test, 0xe1, 0x43);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654322); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654322);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4322); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4322);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22);
isa_outb(test, 0xe0, 0x21); isa_outb(qts, test, 0xe0, 0x21);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321);
g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87);
g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65);
g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43);
g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x21); g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x21);
qtest_quit(global_qtest); qtest_quit(qts);
} }
static void test_endianness_split(gconstpointer data) static void test_endianness_split(gconstpointer data)
{ {
const TestCase *test = data; const TestCase *test = data;
QTestState *qts;
global_qtest = qtest_initf("-M %s%s%s -device pc-testdev", qts = qtest_initf("-M %s%s%s -device pc-testdev", test->machine,
test->machine, test->superio ? " -device " : "",
test->superio ? " -device " : "", test->superio ?: "");
test->superio ?: ""); isa_outl(qts, test, 0xe8, 0x87654321);
isa_outl(test, 0xe8, 0x87654321); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321);
isa_outw(test, 0xea, 0x8866); isa_outw(qts, test, 0xea, 0x8866);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664321); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664321);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321);
isa_outw(test, 0xe8, 0x4422); isa_outw(qts, test, 0xe8, 0x4422);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664422); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664422);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422);
isa_outb(test, 0xeb, 0x87); isa_outb(qts, test, 0xeb, 0x87);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87664422); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87664422);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8766); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8766);
isa_outb(test, 0xea, 0x65); isa_outb(qts, test, 0xea, 0x65);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654422); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654422);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422);
isa_outb(test, 0xe9, 0x43); isa_outb(qts, test, 0xe9, 0x43);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654322); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654322);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4322); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4322);
isa_outb(test, 0xe8, 0x21); isa_outb(qts, test, 0xe8, 0x21);
g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321);
g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321);
qtest_quit(global_qtest); qtest_quit(qts);
} }
static void test_endianness_combine(gconstpointer data) static void test_endianness_combine(gconstpointer data)
{ {
const TestCase *test = data; const TestCase *test = data;
QTestState *qts;
global_qtest = qtest_initf("-M %s%s%s -device pc-testdev", qts = qtest_initf("-M %s%s%s -device pc-testdev", test->machine,
test->machine, test->superio ? " -device " : "",
test->superio ? " -device " : "", test->superio ?: "");
test->superio ?: ""); isa_outl(qts, test, 0xe0, 0x87654321);
isa_outl(test, 0xe0, 0x87654321); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654321);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654321); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4321);
g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4321);
isa_outw(test, 0xe2, 0x8866); isa_outw(qts, test, 0xe2, 0x8866);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x88664321); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x88664321);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8866); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8866);
g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4321); g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4321);
isa_outw(test, 0xe0, 0x4422); isa_outw(qts, test, 0xe0, 0x4422);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x88664422); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x88664422);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8866); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8866);
g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4422); g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4422);
isa_outb(test, 0xe3, 0x87); isa_outb(qts, test, 0xe3, 0x87);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87664422); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87664422);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8766); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8766);
isa_outb(test, 0xe2, 0x65); isa_outb(qts, test, 0xe2, 0x65);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654422); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654422);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4422); g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4422);
isa_outb(test, 0xe1, 0x43); isa_outb(qts, test, 0xe1, 0x43);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654322); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654322);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4322); g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4322);
isa_outb(test, 0xe0, 0x21); isa_outb(qts, test, 0xe0, 0x21);
g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654321); g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654321);
g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765);
g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4321); g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4321);
qtest_quit(global_qtest); qtest_quit(qts);
} }
int main(int argc, char **argv) int main(int argc, char **argv)