OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: sim-core: pass down cpu to hw accesses when available 

The bfin port has been using the device callback largely so it could be
passed the cpu when available.  Add this logic to the common core code
so all ports get access to the active cpu.

The semantics of these buffer functions are changed slightly in that
errors halt the engine synchronously rather than returning the length
to the caller.  We'll probably adjust this in a follow up commit.

The bfin code isn't updated just yet as it has a bit more logic in the
device layer that needs to be unwound at which point we can delete it
entirely.
This commit is contained in:
Mike Frysinger 2015-12-26 14:16:51 -05:00
parent 26f8bf63bf
commit dea10706e9
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/common/ChangeLog
View File

@ -1,3 +1,10 @@
2015-12-26 Mike Frysinger <vapier@gentoo.org>
* sim-core.c (sim_core_read_buffer): Move cia decl to top of func.
Call sim_cpu_hw_io_read_buffer if cpu is valid.
(sim_core_write_buffer): Move cia decl to top of func. Call
sim_cpu_hw_io_write_buffer if cpu is valid.
2015-12-25 Mike Frysinger <vapier@gentoo.org>
* hw-properties.c (hw_find_ihandle_runtime_property): Delete

44
sim/common/sim-core.c
View File

@ -511,11 +511,23 @@ sim_core_read_buffer (SIM_DESC sd,
int nr_bytes = len - count;
if (raddr + nr_bytes - 1> mapping->bound)
nr_bytes = mapping->bound - raddr + 1;
if (sim_hw_io_read_buffer (sd, mapping->device,
(unsigned_1*)buffer + count,
mapping->space,
raddr,
nr_bytes) != nr_bytes)
/* If the access was initiated by a cpu, pass it down so errors can
be propagated properly. For other sources (e.g. GDB or DMA), we
can only signal errors via the return value. */
if (cpu)
{
sim_cia cia = cpu ? CPU_PC_GET (cpu) : NULL_CIA;
sim_cpu_hw_io_read_buffer (cpu, cia, mapping->device,
(unsigned_1*)buffer + count,
mapping->space,
raddr,
nr_bytes);
}
else if (sim_hw_io_read_buffer (sd, mapping->device,
(unsigned_1*)buffer + count,
mapping->space,
raddr,
nr_bytes) != nr_bytes)
break;
count += nr_bytes;
continue;
@ -577,11 +589,23 @@ sim_core_write_buffer (SIM_DESC sd,
int nr_bytes = len - count;
if (raddr + nr_bytes - 1 > mapping->bound)
nr_bytes = mapping->bound - raddr + 1;
if (sim_hw_io_write_buffer (sd, mapping->device,
(unsigned_1*)buffer + count,
mapping->space,
raddr,
nr_bytes) != nr_bytes)
/* If the access was initiated by a cpu, pass it down so errors can
be propagated properly. For other sources (e.g. GDB or DMA), we
can only signal errors via the return value. */
if (cpu)
{
sim_cia cia = cpu ? CPU_PC_GET (cpu) : NULL_CIA;
sim_cpu_hw_io_write_buffer (cpu, cia, mapping->device,
(unsigned_1*)buffer + count,
mapping->space,
raddr,
nr_bytes);
}
else if (sim_hw_io_write_buffer (sd, mapping->device,
(unsigned_1*)buffer + count,
mapping->space,
raddr,
nr_bytes) != nr_bytes)
break;
count += nr_bytes;
continue;