Skip to content

Commit

Permalink
Repair handling of attributes attached to variables.
Browse files Browse the repository at this point in the history
  • Loading branch information
@steveicarus
steveicarus committed May 9, 2012
1 parent c3f25c3 commit 5d05d97
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 43 deletions.
22 changes: 15 additions & 7 deletions parse.y
View file
Expand Up @@ -66,6 +66,11 @@ static stack<PBlock*> current_block_stack;
* simulation issues. */
static unsigned args_after_notifier;

/* The rules sometimes push attributes into a global context where
sub-rules may grab them. This makes parser rules a little easier to
write in some cases. */
static list<named_pexpr_t>*attributes_in_context = 0;

/* Later version of bison (including 1.35) will not compile in stack
extension if the output is compiled with C++ and either the YYSTYPE
or YYLTYPE are provided by the source code. However, I can get the
Expand Down Expand Up @@ -1806,22 +1811,22 @@ block_item_decl
is implicit in the "integer" of the declaration. */

: K_integer signed_unsigned_opt register_variable_list ';'
{ pform_set_reg_integer($3);
{ pform_set_reg_integer($3, attributes_in_context);
}

| K_time register_variable_list ';'
{ pform_set_reg_time($2);
{ pform_set_reg_time($2, attributes_in_context);
}

/* variable declarations. Note that data_type can be 0 if we are
recovering from an error. */

| data_type register_variable_list ';'
{ if ($1) pform_set_data_type(@1, $1, $2);
{ if ($1) pform_set_data_type(@1, $1, $2, attributes_in_context);
}

| K_reg data_type register_variable_list ';'
{ if ($2) pform_set_data_type(@2, $2, $3);
{ if ($2) pform_set_data_type(@2, $2, $3, attributes_in_context);
}

| K_event list_of_identifiers ';'
Expand Down Expand Up @@ -4100,12 +4105,15 @@ module_item
will see the discipline name as an identifier. We match it to the
discipline or type name semantically. */
| DISCIPLINE_IDENTIFIER list_of_identifiers ';'
{ pform_attach_discipline(@1, $1, $2); }
{ pform_attach_discipline(@1, $1, $2); }

/* block_item_decl rule is shared with task blocks and named
begin/end. */
begin/end. Careful to pass attributes to the block_item_decl. */

| block_item_decl
| attribute_list_opt { attributes_in_context = $1; } block_item_decl
{ delete attributes_in_context;
attributes_in_context = 0;
}

/* */

Expand Down
58 changes: 34 additions & 24 deletions pform.cc
View file
Expand Up @@ -1521,7 +1521,8 @@ static void pform_set_net_range(perm_string name,
const list<pform_range_t>*range,
bool signed_flag,
ivl_variable_type_t dt,
PWSRType rt)
PWSRType rt,
std::list<named_pexpr_t>*attr)
{
PWire*cur = pform_get_wire_in_scope(name);
if (cur == 0) {
Expand All @@ -1541,17 +1542,20 @@ static void pform_set_net_range(perm_string name,

if (dt != IVL_VT_NO_TYPE)
cur->set_data_type(dt);

pform_bind_attributes(cur->attributes, attr, true);
}

void pform_set_net_range(list<perm_string>*names,
list<pform_range_t>*range,
bool signed_flag,
ivl_variable_type_t dt)
ivl_variable_type_t dt,
std::list<named_pexpr_t>*attr)
{
for (list<perm_string>::iterator cur = names->begin()
; cur != names->end() ; ++ cur ) {
perm_string txt = *cur;
pform_set_net_range(txt, range, signed_flag, dt, SR_NET);
pform_set_net_range(txt, range, signed_flag, dt, SR_NET, attr);
}

delete names;
Expand Down Expand Up @@ -2036,7 +2040,7 @@ void pform_makewire(const vlltype&li,
pform_makewire(li, txt, type, pt, dt, attr);
/* This has already been done for real variables. */
if (dt != IVL_VT_REAL) {
pform_set_net_range(txt, range, signed_flag, dt, rt);
pform_set_net_range(txt, range, signed_flag, dt, rt, 0);
}
}

Expand Down Expand Up @@ -2066,7 +2070,7 @@ void pform_makewire(const vlltype&li,
/* This has already been done for real variables. */
if (dt != IVL_VT_REAL) {
pform_set_net_range(first->name, range, signed_flag, dt,
SR_NET);
SR_NET, 0);
}

PWire*cur = pform_get_wire_in_scope(first->name);
Expand Down Expand Up @@ -2534,14 +2538,14 @@ void pform_set_port_type(const struct vlltype&li,
perm_string txt = *cur;
pform_set_port_type(txt, pt, li.text, li.first_line);
pform_set_net_range(txt, range, signed_flag, IVL_VT_NO_TYPE,
SR_PORT);
SR_PORT, 0);
}

delete names;
delete range;
}

static void pform_set_reg_integer(perm_string name)
static void pform_set_reg_integer(perm_string name, list<named_pexpr_t>*attr)
{
PWire*cur = pform_get_make_wire_in_scope(name, NetNet::INTEGER, NetNet::NOT_A_PORT, IVL_VT_LOGIC);
assert(cur);
Expand All @@ -2553,19 +2557,21 @@ static void pform_set_reg_integer(perm_string name)
rlist.push_back(rng);
cur->set_range(rlist, SR_NET);
cur->set_signed(true);

pform_bind_attributes(cur->attributes, attr, true);
}

void pform_set_reg_integer(list<perm_string>*names)
void pform_set_reg_integer(list<perm_string>*names, list<named_pexpr_t>*attr)
{
for (list<perm_string>::iterator cur = names->begin()
; cur != names->end() ; ++ cur ) {
perm_string txt = *cur;
pform_set_reg_integer(txt);
pform_set_reg_integer(txt, attr);
}
delete names;
}

static void pform_set_reg_time(perm_string name)
static void pform_set_reg_time(perm_string name, list<named_pexpr_t>*attr)
{
PWire*cur = pform_get_make_wire_in_scope(name, NetNet::REG, NetNet::NOT_A_PORT, IVL_VT_LOGIC);
assert(cur);
Expand All @@ -2576,19 +2582,21 @@ static void pform_set_reg_time(perm_string name)
list<pform_range_t>rlist;
rlist.push_back(rng);
cur->set_range(rlist, SR_NET);

pform_bind_attributes(cur->attributes, attr, true);
}

void pform_set_reg_time(list<perm_string>*names)
void pform_set_reg_time(list<perm_string>*names, list<named_pexpr_t>*attr)
{
for (list<perm_string>::iterator cur = names->begin()
; cur != names->end() ; ++ cur ) {
perm_string txt = *cur;
pform_set_reg_time(txt);
pform_set_reg_time(txt, attr);
}
delete names;
}

static void pform_set_integer_2atom(uint64_t width, bool signed_flag, perm_string name)
static void pform_set_integer_2atom(uint64_t width, bool signed_flag, perm_string name, list<named_pexpr_t>*attr)
{
PWire*cur = pform_get_make_wire_in_scope(name, NetNet::REG, NetNet::NOT_A_PORT, IVL_VT_BOOL);
assert(cur);
Expand All @@ -2601,14 +2609,15 @@ static void pform_set_integer_2atom(uint64_t width, bool signed_flag, perm_strin
list<pform_range_t>rlist;
rlist.push_back(rng);
cur->set_range(rlist, SR_NET);
pform_bind_attributes(cur->attributes, attr, true);
}

void pform_set_integer_2atom(uint64_t width, bool signed_flag, list<perm_string>*names)
static void pform_set_integer_2atom(uint64_t width, bool signed_flag, list<perm_string>*names, list<named_pexpr_t>*attr)
{
for (list<perm_string>::iterator cur = names->begin()
; cur != names->end() ; ++ cur ) {
perm_string txt = *cur;
pform_set_integer_2atom(width, signed_flag, txt);
pform_set_integer_2atom(width, signed_flag, txt, attr);
}
delete names;
}
Expand All @@ -2617,32 +2626,32 @@ void pform_set_integer_2atom(uint64_t width, bool signed_flag, list<perm_string>
* This function detects the derived class for the given type and
* dispatches the type to the proper subtype function.
*/
void pform_set_data_type(const struct vlltype&li, data_type_t*data_type, list<perm_string>*names)
void pform_set_data_type(const struct vlltype&li, data_type_t*data_type, list<perm_string>*names, list<named_pexpr_t>*attr)
{
if (atom2_type_t*atom2_type = dynamic_cast<atom2_type_t*> (data_type)) {
pform_set_integer_2atom(atom2_type->type_code, atom2_type->signed_flag, names);
pform_set_integer_2atom(atom2_type->type_code, atom2_type->signed_flag, names, attr);
return;
}

if (struct_type_t*struct_type = dynamic_cast<struct_type_t*> (data_type)) {
pform_set_struct_type(struct_type, names);
pform_set_struct_type(struct_type, names, attr);
return;
}

if (enum_type_t*enum_type = dynamic_cast<enum_type_t*> (data_type)) {
pform_set_enum(li, enum_type, names);
pform_set_enum(li, enum_type, names, attr);
return;
}

if (vector_type_t*vec_type = dynamic_cast<vector_type_t*> (data_type)) {
pform_set_net_range(names, vec_type->pdims.get(),
vec_type->signed_flag,
vec_type->base_type);
vec_type->base_type, attr);
return;
}

if (/*real_type_t*real_type =*/ dynamic_cast<real_type_t*> (data_type)) {
pform_set_net_range(names, 0, true, IVL_VT_REAL);
pform_set_net_range(names, 0, true, IVL_VT_REAL, attr);
return;
}

Expand All @@ -2655,7 +2664,7 @@ void pform_set_data_type(const struct vlltype&li, data_type_t*data_type, list<pe
}

static void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type,
perm_string name)
perm_string name, std::list<named_pexpr_t>*attr)
{
(void) li; // The line information is not currently needed.
PWire*cur = pform_get_make_wire_in_scope(name, NetNet::REG, NetNet::NOT_A_PORT, enum_type->base_type);
Expand All @@ -2667,9 +2676,10 @@ static void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type,
assert(enum_type->range->size() == 1);
cur->set_range(*enum_type->range, SR_NET);
cur->set_enumeration(enum_type);
pform_bind_attributes(cur->attributes, attr, true);
}

void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type, list<perm_string>*names)
void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type, list<perm_string>*names, std::list<named_pexpr_t>*attr)
{
// By definition, the base type can only be IVL_VT_LOGIC or
// IVL_VT_BOOL.
Expand All @@ -2689,7 +2699,7 @@ void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type, list<perm_st
for (list<perm_string>::iterator cur = names->begin()
; cur != names->end() ; ++ cur) {
perm_string txt = *cur;
pform_set_enum(li, enum_type, txt);
pform_set_enum(li, enum_type, txt, attr);
}

delete names;
Expand Down
15 changes: 8 additions & 7 deletions pform.h
View file
Expand Up @@ -292,18 +292,19 @@ extern void pform_set_port_type(const struct vlltype&li,
extern void pform_set_net_range(list<perm_string>*names,
list<pform_range_t>*,
bool signed_flag,
ivl_variable_type_t);
ivl_variable_type_t,
std::list<named_pexpr_t>*attr);
extern void pform_set_reg_idx(perm_string name, PExpr*l, PExpr*r);
extern void pform_set_reg_integer(list<perm_string>*names);
extern void pform_set_reg_time(list<perm_string>*names);
extern void pform_set_reg_integer(list<perm_string>*names, list<named_pexpr_t>*attr);
extern void pform_set_reg_time(list<perm_string>*names, list<named_pexpr_t>*attr);

extern void pform_set_integer_2atom(uint64_t width, bool signed_flag, list<perm_string>*names);
//XXXXextern void pform_set_integer_2atom(uint64_t width, bool signed_flag, list<perm_string>*names);

extern void pform_set_data_type(const struct vlltype&li, data_type_t*, list<perm_string>*names);
extern void pform_set_data_type(const struct vlltype&li, data_type_t*, list<perm_string>*names, list<named_pexpr_t>*attr);

extern void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type, list<perm_string>*names);
extern void pform_set_enum(const struct vlltype&li, enum_type_t*enum_type, list<perm_string>*names, std::list<named_pexpr_t>*attr);

extern void pform_set_struct_type(struct_type_t*struct_type, list<perm_string>*names);
extern void pform_set_struct_type(struct_type_t*struct_type, std::list<perm_string>*names, std::list<named_pexpr_t>*attr);

/* pform_set_attrib and pform_set_type_attrib exist to support the
$attribute syntax, which can only set string values to
Expand Down
11 changes: 6 additions & 5 deletions pform_struct_type.cc
View file
Expand Up @@ -48,30 +48,31 @@ static ivl_variable_type_t figure_struct_base_type(struct_type_t*struct_type)
* out the base type of the packed variable. Elaboration, later on,
* well figure out the rest.
*/
static void pform_set_packed_struct(struct_type_t*struct_type, perm_string name)
static void pform_set_packed_struct(struct_type_t*struct_type, perm_string name, list<named_pexpr_t>*attr)
{
ivl_variable_type_t base_type = figure_struct_base_type(struct_type);

PWire*net = pform_get_make_wire_in_scope(name, NetNet::REG, NetNet::NOT_A_PORT, base_type);
net->set_struct_type(struct_type);
pform_bind_attributes(net->attributes, attr, true);
}

static void pform_set_struct_type(struct_type_t*struct_type, perm_string name)
static void pform_set_struct_type(struct_type_t*struct_type, perm_string name, list<named_pexpr_t>*attr)
{
if (struct_type->packed_flag) {
pform_set_packed_struct(struct_type, name);
pform_set_packed_struct(struct_type, name, attr);
return;
}

// For now, can only handle packed structs.
ivl_assert(*struct_type, 0);
}

void pform_set_struct_type(struct_type_t*struct_type, list<perm_string>*names)
void pform_set_struct_type(struct_type_t*struct_type, list<perm_string>*names, list<named_pexpr_t>*attr)
{
for (list<perm_string>::iterator cur = names->begin()
; cur != names->end() ; ++ cur) {
pform_set_struct_type(struct_type, *cur);
pform_set_struct_type(struct_type, *cur, attr);
}
}

Expand Down

0 comments on commit 5d05d97

Please sign in to comment.