sim-card
/
qemu
Archived
10
0
Fork 0

Fill in unassigned mem read/write callbacks.

Implement the "functions may be omitted with NULL pointer"
interface mentioned in the function block comment by transforming
NULL entries in the read/write arrays into calls to the
unassigned_mem family of functions.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Richard Henderson 2010-05-07 09:52:51 -07:00 committed by Blue Swirl
parent 4cbd40cec0
commit 3cab721d0e
1 changed files with 10 additions and 2 deletions

12
exec.c
View File

@ -3262,6 +3262,8 @@ static int cpu_register_io_memory_fixed(int io_index,
CPUWriteMemoryFunc * const *mem_write,
void *opaque)
{
int i;
if (io_index <= 0) {
io_index = get_free_io_mem_idx();
if (io_index == -1)
@ -3272,8 +3274,14 @@ static int cpu_register_io_memory_fixed(int io_index,
return -1;
}
memcpy(io_mem_read[io_index], mem_read, 3 * sizeof(CPUReadMemoryFunc*));
memcpy(io_mem_write[io_index], mem_write, 3 * sizeof(CPUWriteMemoryFunc*));
for (i = 0; i < 3; ++i) {
io_mem_read[io_index][i]
= (mem_read[i] ? mem_read[i] : unassigned_mem_read[i]);
}
for (i = 0; i < 3; ++i) {
io_mem_write[io_index][i]
= (mem_write[i] ? mem_write[i] : unassigned_mem_write[i]);
}
io_mem_opaque[io_index] = opaque;
return (io_index << IO_MEM_SHIFT);