darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sim: glue: allow bitwise devices to only glue ints

Browse source 
Some Blackfin parts tie a bunch of interrupt lines into a single OR
gate before feeding the result into the SIC.  The glue-or device in
the sim provides a nice way of modeling this exact behavior.  At the
moment though, it requires the device to be mapped into the address
space so that things could write to it directly.  This is not needed
for the Blackfin usage, so make it optional.  Now the glue devices
can be used to simply tie interrupt lines together.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-05-23 23:00:35 +00:00
parent 0e31da218e
commit dd931b2ff2
2 changed files with 57 additions and 43 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 @@
2011-05-23 Mike Frysinger <vapier@gentoo.org>
* dv-glue.c (hw_glue_finish): Move "name" to function scope and
remove now-unnecessary sub-scope for glue->type setting.
Check to see if the "reg" property exists before we use it, and
if it doesn't exist, error out for "glue" devices.
2011-05-23 Mike Frysinger <vapier@gentoo.org>
* dv-glue.c (hw_glue_finish): Set type to glue_or when name is

93
sim/common/dv-glue.c
View file

@ -195,6 +195,7 @@ static void
hw_glue_finish (struct hw *me)
{
struct hw_glue *glue = HW_ZALLOC (me, struct hw_glue);
const char *name = hw_name (me);
/* establish our own methods */
set_hw_data (me, glue);
@ -207,39 +208,49 @@ hw_glue_finish (struct hw *me)
do_hw_attach_regs (me);
/* establish the output registers */
{
reg_property_spec unit;
int reg_nr;
if (hw_find_property (me, "reg"))
{
reg_property_spec unit;
int reg_nr;
/* find a relevant reg entry */
reg_nr = 0;
while (hw_find_reg_array_property (me, "reg", reg_nr, &unit)
&& !hw_unit_size_to_attach_size (hw_parent (me),
&unit.size,
&glue->sizeof_output,
me))
reg_nr++;
/* Find a relevant reg entry. */
reg_nr = 0;
while (hw_find_reg_array_property (me, "reg", reg_nr, &unit)
&& !hw_unit_size_to_attach_size (hw_parent (me),
&unit.size,
&glue->sizeof_output,
me))
reg_nr++;
/* check out the size */
if (glue->sizeof_output == 0)
hw_abort (me, "at least one reg property size must be nonzero");
if (glue->sizeof_output % sizeof (unsigned_word) != 0)
hw_abort (me, "reg property size must be %ld aligned",
(long) sizeof (unsigned_word));
/* Check out the size ... */
if (glue->sizeof_output == 0)
hw_abort (me, "at least one reg property size must be nonzero");
if (glue->sizeof_output % sizeof (unsigned_word) != 0)
hw_abort (me, "reg property size must be %ld aligned",
(long) sizeof (unsigned_word));
/* and the address */
hw_unit_address_to_attach_address (hw_parent (me),
&unit.address,
&glue->space,
&glue->address,
me);
if (glue->address % (sizeof (unsigned_word) * max_nr_ports) != 0)
hw_abort (me, "reg property address must be %ld aligned",
(long) (sizeof (unsigned_word) * max_nr_ports));
/* ... and the address. */
hw_unit_address_to_attach_address (hw_parent (me),
&unit.address,
&glue->space,
&glue->address,
me);
if (glue->address % (sizeof (unsigned_word) * max_nr_ports) != 0)
hw_abort (me, "reg property address must be %ld aligned",
(long) (sizeof (unsigned_word) * max_nr_ports));
glue->nr_outputs = glue->sizeof_output / sizeof (unsigned_word);
glue->output = hw_zalloc (me, glue->sizeof_output);
}
glue->nr_outputs = glue->sizeof_output / sizeof (unsigned_word);
}
else
{
/* Allow bitwise glue devices to declare only ports. */
if (!strcmp (name, "glue"))
hw_abort (me, "Missing \"reg\" property");
glue->nr_outputs = 1;
glue->sizeof_output = sizeof (unsigned_word);
}
glue->output = hw_zalloc (me, glue->sizeof_output);
/* establish the input ports */
{
@ -267,20 +278,16 @@ hw_glue_finish (struct hw *me)
}
/* determine our type */
{
const char *name = hw_name(me);
if (strcmp (name, "glue") == 0)
glue->type = glue_io;
else if (strcmp (name, "glue-and") == 0)
glue->type = glue_and;
else if (strcmp (name, "glue-or") == 0)
glue->type = glue_or;
else if (strcmp (name, "glue-xor") == 0)
glue->type = glue_xor;
else
hw_abort (me, "unimplemented glue type");
}
if (strcmp (name, "glue") == 0)
glue->type = glue_io;
else if (strcmp (name, "glue-and") == 0)
glue->type = glue_and;
else if (strcmp (name, "glue-or") == 0)
glue->type = glue_or;
else if (strcmp (name, "glue-xor") == 0)
glue->type = glue_xor;
else
hw_abort (me, "unimplemented glue type");
HW_TRACE ((me, "int-number %d, nr_inputs %d, nr_outputs %d",
glue->int_number, glue->nr_inputs, glue->nr_outputs));