OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qtest: Use cpu address space instead of system memory

Browse Source 
Some devices (like nvic in armv7m) are not accessable through
address_space_memory, therefore can not be tested with qtest.

Signed-off-by: Julia Suvorova <jusual@mail.ru>
Message-Id: <20180702065237.27899-1-jusual@mail.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Julia Suvorova 2018-07-02 09:52:37 +03:00 committed by Paolo Bonzini
parent 2729d79d49
commit 70da30483e
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
qtest.c
View File

@ -387,19 +387,23 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
if (words[0][5] == 'b') { if (words[0][5] == 'b') {
uint8_t data = value; uint8_t data = value;
cpu_physical_memory_write(addr, &data, 1); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
&data, 1, true);
} else if (words[0][5] == 'w') { } else if (words[0][5] == 'w') {
uint16_t data = value; uint16_t data = value;
tswap16s(&data); tswap16s(&data);
cpu_physical_memory_write(addr, &data, 2); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
(uint8_t *) &data, 2, true);
} else if (words[0][5] == 'l') { } else if (words[0][5] == 'l') {
uint32_t data = value; uint32_t data = value;
tswap32s(&data); tswap32s(&data);
cpu_physical_memory_write(addr, &data, 4); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
(uint8_t *) &data, 4, true);
} else if (words[0][5] == 'q') { } else if (words[0][5] == 'q') {
uint64_t data = value; uint64_t data = value;
tswap64s(&data); tswap64s(&data);
cpu_physical_memory_write(addr, &data, 8); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
(uint8_t *) &data, 8, true);
} }
qtest_send_prefix(chr); qtest_send_prefix(chr);
qtest_send(chr, "OK\n"); qtest_send(chr, "OK\n");
@ -417,18 +421,22 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
if (words[0][4] == 'b') { if (words[0][4] == 'b') {
uint8_t data; uint8_t data;
cpu_physical_memory_read(addr, &data, 1); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
&data, 1, false);
value = data; value = data;
} else if (words[0][4] == 'w') { } else if (words[0][4] == 'w') {
uint16_t data; uint16_t data;
cpu_physical_memory_read(addr, &data, 2); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
(uint8_t *) &data, 2, false);
value = tswap16(data); value = tswap16(data);
} else if (words[0][4] == 'l') { } else if (words[0][4] == 'l') {
uint32_t data; uint32_t data;
cpu_physical_memory_read(addr, &data, 4); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
(uint8_t *) &data, 4, false);
value = tswap32(data); value = tswap32(data);
} else if (words[0][4] == 'q') { } else if (words[0][4] == 'q') {
cpu_physical_memory_read(addr, &value, 8); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
(uint8_t *) &value, 8, false);
tswap64s(&value); tswap64s(&value);
} }
qtest_send_prefix(chr); qtest_send_prefix(chr);
@ -448,7 +456,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
g_assert(len); g_assert(len);
data = g_malloc(len); data = g_malloc(len);
cpu_physical_memory_read(addr, data, len); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
data, len, false);
enc = g_malloc(2 * len + 1); enc = g_malloc(2 * len + 1);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -473,7 +482,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
g_assert(ret == 0); g_assert(ret == 0);
data = g_malloc(len); data = g_malloc(len);
cpu_physical_memory_read(addr, data, len); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
data, len, false);
b64_data = g_base64_encode(data, len); b64_data = g_base64_encode(data, len);
qtest_send_prefix(chr); qtest_send_prefix(chr);
qtest_sendf(chr, "OK %s\n", b64_data); qtest_sendf(chr, "OK %s\n", b64_data);
@ -507,7 +517,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
data[i] = 0; data[i] = 0;
} }
} }
cpu_physical_memory_write(addr, data, len); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
data, len, true);
g_free(data); g_free(data);
qtest_send_prefix(chr); qtest_send_prefix(chr);
@ -529,7 +540,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
if (len) { if (len) {
data = g_malloc(len); data = g_malloc(len);
memset(data, pattern, len); memset(data, pattern, len);
cpu_physical_memory_write(addr, data, len); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
data, len, true);
g_free(data); g_free(data);
} }
@ -562,7 +574,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
out_len = MIN(out_len, len); out_len = MIN(out_len, len);
} }
cpu_physical_memory_write(addr, data, out_len); address_space_rw(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED,
data, len, true);
qtest_send_prefix(chr); qtest_send_prefix(chr);
qtest_send(chr, "OK\n"); qtest_send(chr, "OK\n");