diff --git a/PExpr.h b/PExpr.h index 78c3055bb..f7d2e10d5 100644 --- a/PExpr.h +++ b/PExpr.h @@ -37,6 +37,7 @@ class NetExpr; class NetScope; class PPackage; struct symbol_search_results; +class netclass_t; /* * The PExpr class hierarchy supports the description of @@ -981,7 +982,16 @@ class PECallFunction : public PExpr { unsigned elaborate_arguments_(Design*des, NetScope*scope, const NetFuncDef*def, bool need_const, std::vector&parms, - unsigned parm_off) const; + unsigned parm_off, + const std::vector*src_parms = nullptr) const; + + NetExpr* elaborate_class_method_net_(Design*des, NetScope*scope, + NetNet*net, const netclass_t*class_type, + perm_string method_name, + const std::vector*src_parms) const; + + NetExpr* elaborate_expr_method_chained_(Design*des, NetScope*scope, + symbol_search_results&search_results) const; }; /* diff --git a/Statement.h b/Statement.h index d410caaef..4229dfa0d 100644 --- a/Statement.h +++ b/Statement.h @@ -257,17 +257,17 @@ class PCallTask : public Statement { NetProc*elaborate_build_call_(Design*des, NetScope*scope, NetScope*task, NetExpr*use_this) const; NetProc*elaborate_sys_task_method_(Design*des, NetScope*scope, - NetNet*net, + NetExpr*base_expr, perm_string method_name, const char *sys_task_name, const std::vector &parm_names = {}) const; NetProc*elaborate_queue_method_(Design*des, NetScope*scope, - NetNet*net, + NetExpr*queue_base, perm_string method_name, const char *sys_task_name, const std::vector &parm_names) const; NetProc*elaborate_method_func_(NetScope*scope, - NetNet*net, + NetExpr*queue_base, ivl_type_t type, perm_string method_name, const char*sys_task_name) const; diff --git a/elab_expr.cc b/elab_expr.cc index 671381e62..88dfcfc94 100644 --- a/elab_expr.cc +++ b/elab_expr.cc @@ -1537,12 +1537,39 @@ unsigned PECallFunction::test_width_method_(Design*, NetScope*, << "search_results.net->net_type: " << *search_results.net->net_type() << endl; } - // Don't support multiple chained methods yet. + // Chained class methods: obj.m1().m2() — width is that of the last call. if (search_results.path_tail.size() > 1) { + if (search_results.net && search_results.net->data_type()==IVL_VT_CLASS) { + const netclass_t* cur_class = dynamic_cast(search_results.type); + if (cur_class) { + size_t ntail = search_results.path_tail.size(); + size_t idx = 0; + for (auto it = search_results.path_tail.begin() + ; it != search_results.path_tail.end() ; ++it, ++idx) { + perm_string mname = it->name; + NetScope*meth = cur_class->method_from_name(mname); + if (meth == 0) + return 0; + const NetNet*res = meth->find_signal(meth->basename()); + if (res == 0) + return 0; + if (idx + 1 == ntail) { + expr_type_ = res->data_type(); + expr_width_ = res->vector_width(); + min_width_ = expr_width_; + signed_flag_ = res->get_signed(); + return expr_width_; + } + cur_class = dynamic_cast(res->net_type()); + if (cur_class == 0) + return 0; + } + } + } if (debug_elaborate) { cerr << get_fileline() << ": PECallFunction::test_width_method_: " << "Chained path tail (" << search_results.path_tail - << ") not supported." << endl; + << ") not supported for this expression type." << endl; } return 0; } @@ -2729,7 +2756,6 @@ NetExpr* PEIdent::elaborate_expr_class_field_(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - const netclass_t *class_type = dynamic_cast(sr.type); const name_component_t comp = sr.path_tail.front(); @@ -2807,6 +2833,26 @@ NetExpr* PEIdent::elaborate_expr_class_field_(Design*des, NetScope*scope, canon_index = make_canonical_index(des, scope, this, comp.index, tmp_ua, false); } + } else if (dynamic_cast(tmp_type)) { + /* Queue or dynamic-array property: optional index, e.g. c.q[i] + * or whole-container reference c.q. */ + const std::list*idx_list = &comp.index; + if (idx_list->empty() && !path_.back().index.empty()) + idx_list = &path_.back().index; + if (idx_list->size() == 0) { + canon_index = nullptr; + } else if (idx_list->size() != 1) { + cerr << get_fileline() << ": error: " + << "Got " << idx_list->size() << " indices, " + << "expecting 0 or 1 for the queue/dynamic-array property " + << class_type->get_prop_name(pidx) << "." << endl; + des->errors++; + } else { + const index_component_t&use_index = idx_list->back(); + ivl_assert(*this, use_index.msb != 0); + ivl_assert(*this, use_index.lsb == 0); + canon_index = elab_and_eval(des, scope, use_index.msb, -1, false); + } } if (debug_elaborate && canon_index) { @@ -3125,13 +3171,16 @@ NetExpr* PECallFunction::elaborate_base_(Design*des, NetScope*scope, NetScope*ds unsigned PECallFunction::elaborate_arguments_(Design*des, NetScope*scope, const NetFuncDef*def, bool need_const, vector&parms, - unsigned parm_off) const + unsigned parm_off, + const vector*src_parms) const { unsigned parm_errors = 0; unsigned missing_parms = 0; + const vector&use_parms = src_parms ? *src_parms : parms_; + const unsigned parm_count = parms.size() - parm_off; - const unsigned actual_count = parms_.size(); + const unsigned actual_count = use_parms.size(); if (parm_count == 0 && actual_count == 0) return 0; @@ -3144,7 +3193,7 @@ unsigned PECallFunction::elaborate_arguments_(Design*des, NetScope*scope, des->errors += 1; } - auto args = map_named_args(des, def, parms_, parm_off); + auto args = map_named_args(des, def, use_parms, parm_off); for (unsigned idx = 0 ; idx < parm_count ; idx += 1) { unsigned pidx = idx + parm_off; @@ -3199,6 +3248,159 @@ unsigned PECallFunction::elaborate_arguments_(Design*des, NetScope*scope, return parm_errors; } +/* + * Elaborate a call to a single class method, optionally using an alternate + * argument vector (for chained calls where inner methods use no user args). + */ +NetExpr* PECallFunction::elaborate_class_method_net_(Design*des, NetScope*scope, + NetNet*net, const netclass_t*class_type, + perm_string method_name, + const vector*src_parms) const +{ + NetScope*method = class_type->method_from_name(method_name); + + if (method == 0) { + cerr << get_fileline() << ": Error: " << method_name + << " is not a method of class " << class_type->get_name() + << "." << endl; + des->errors += 1; + return 0; + } + + const NetFuncDef*def = method->func_def(); + ivl_assert(*this, def); + + NetNet*res = method->find_signal(method->basename()); + ivl_assert(*this, res); + + vector parms(def->port_count()); + ivl_assert(*this, def->port_count() >= 1); + + NetESignal*ethis = new NetESignal(net); + ethis->set_line(*this); + parms[0] = ethis; + + elaborate_arguments_(des, scope, def, false, parms, 1, src_parms); + + NetESignal*eres = new NetESignal(res); + NetEUFunc*call = new NetEUFunc(scope, method, eres, parms, false); + call->set_line(*this); + return call; +} + +/* + * Handle obj.m1().m2(args): arguments apply only to the last call; intermediate + * methods must be class methods returning class handles. + */ +NetExpr* PECallFunction::elaborate_expr_method_chained_(Design*des, NetScope*scope, + symbol_search_results&search_results) const +{ + static const vector no_parms; + + if (search_results.par_val && search_results.type) { + cerr << get_fileline() << ": sorry: " + << "Method name nesting is not supported for parameter methods yet." << endl; + des->errors += 1; + return 0; + } + + NetExpr* sub_expr = 0; + if (search_results.net) { + NetESignal*tmp = new NetESignal(search_results.net); + tmp->set_line(*this); + sub_expr = tmp; + } + + if (search_results.net && search_results.net->data_type()==IVL_VT_QUEUE + && search_results.path_head.back().index.size()==1) { + + const NetNet*net = search_results.net; + const netdarray_t*darray = net->darray_type(); + const index_component_t&use_index = search_results.path_head.back().index.back(); + ivl_assert(*this, use_index.msb != 0); + ivl_assert(*this, use_index.lsb == 0); + + NetExpr*mux = elab_and_eval(des, scope, use_index.msb, -1, false); + if (!mux) + return 0; + + NetESelect*tmp = new NetESelect(sub_expr, mux, darray->element_width(), darray->element_type()); + tmp->set_line(*this); + sub_expr = tmp; + } + + if (!sub_expr) { + cerr << get_fileline() << ": internal error: " + << "Method chain elaborate lost base sub-expression." << endl; + des->errors += 1; + return 0; + } + + if (sub_expr->expr_type() != IVL_VT_CLASS) { + cerr << get_fileline() << ": sorry: " + << "Method name nesting for this expression type is not supported yet " + << "(only class handle chains)." << endl; + cerr << get_fileline() << ": : " + << "method path: " << search_results.path_tail << endl; + des->errors += 1; + return 0; + } + + NetNet* cur_net = search_results.net; + const netclass_t* cur_class = dynamic_cast(search_results.type); + if (cur_class == 0) + cur_class = dynamic_cast(cur_net->net_type()); + if (cur_class == 0) { + cerr << get_fileline() << ": internal error: " + << "IVL_VT_CLASS net without netclass_t type." << endl; + des->errors += 1; + return 0; + } + + size_t chain_len = search_results.path_tail.size() - 1; + size_t step_idx = 0; + for (auto it = search_results.path_tail.begin() + ; step_idx < chain_len ; ++it, ++step_idx) { + perm_string method_name = it->name; + + NetExpr* step = elaborate_class_method_net_(des, scope, cur_net, cur_class, + method_name, &no_parms); + if (step == 0) + return 0; + + NetEUFunc*uf = dynamic_cast (step); + if (uf == 0) { + cerr << get_fileline() << ": internal error: " + << "expected class method call to be NetEUFunc." << endl; + des->errors += 1; + return 0; + } + + const NetESignal*rs = uf->result_sig(); + ivl_assert(*this, rs); + cur_net = const_cast(rs->sig()); + ivl_assert(*this, cur_net); + cur_class = dynamic_cast(cur_net->net_type()); + if (cur_class == 0) { + cerr << get_fileline() << ": sorry: " + << "Method chaining requires intermediate results to be class handles; " + << "after `" << method_name << "` the type is not a class." << endl; + des->errors += 1; + return 0; + } + } + + symbol_search_results tail_sr; + tail_sr.scope = search_results.scope; + tail_sr.path_head = search_results.path_head; + tail_sr.path_tail.clear(); + tail_sr.path_tail.push_back(search_results.path_tail.back()); + tail_sr.net = cur_net; + tail_sr.type = cur_class; + + return elaborate_expr_method_(des, scope, tail_sr); +} + /* * Look for a method of a given object. The search_results gives us the * information we need to look into this case: The net is the object that will @@ -3222,12 +3424,81 @@ NetExpr* PECallFunction::elaborate_expr_method_(Design*des, NetScope*scope, return 0; } + // e.g. c.q.size() — path_tail is {q, size}; q is a queue-typed property + if (search_results.path_tail.size() == 2) { + const netclass_t*cls = dynamic_cast(search_results.type); + if (!cls && search_results.net && search_results.net->net_type()) + cls = dynamic_cast(search_results.net->net_type()); + if (cls && search_results.net) { + perm_string prop_name = search_results.path_tail.front().name; + int pidx = cls->property_idx_from_name(prop_name); + if (pidx >= 0) { + ivl_type_t ptype = cls->get_prop_type(pidx); + if (ptype && dynamic_cast(ptype)) { + NetEProperty*prop = new NetEProperty(search_results.net, pidx, nullptr); + prop->set_line(*this); + perm_string method_name = search_results.path_tail.back().name; + const netqueue_t*queue = dynamic_cast(ptype); + ivl_assert(*this, queue); + ivl_type_t element_type = queue->element_type(); + if (method_name == "size") { + if (parms_.size() != 0) { + cerr << get_fileline() << ": error: size() method " + << "takes no arguments" << endl; + des->errors += 1; + } + NetESFunc*sys_expr = new NetESFunc("$size", &netvector_t::atom2u32, 1); + sys_expr->set_line(*this); + sys_expr->parm(0, prop); + return sys_expr; + } + if (method_name == "pop_back") { + if (parms_.size() != 0) { + cerr << get_fileline() << ": error: pop_back() method " + << "takes no arguments" << endl; + des->errors += 1; + } + NetESFunc*sys_expr = new NetESFunc("$ivl_queue_method$pop_back", + element_type, 1); + sys_expr->set_line(*this); + sys_expr->parm(0, prop); + return sys_expr; + } + if (method_name == "pop_front") { + if (parms_.size() != 0) { + cerr << get_fileline() << ": error: pop_front() method " + << "takes no arguments" << endl; + des->errors += 1; + } + NetESFunc*sys_expr = new NetESFunc("$ivl_queue_method$pop_front", + element_type, 1); + sys_expr->set_line(*this); + sys_expr->parm(0, prop); + return sys_expr; + } + } + if (ptype && ptype->base_type() == IVL_VT_DARRAY) { + NetEProperty*prop = new NetEProperty(search_results.net, pidx, nullptr); + prop->set_line(*this); + perm_string method_name = search_results.path_tail.back().name; + if (method_name == "size") { + if (parms_.size() != 0) { + cerr << get_fileline() << ": error: size() method " + << "takes no arguments" << endl; + des->errors += 1; + } + NetESFunc*sys_expr = new NetESFunc("$size", &netvector_t::atom2u32, 1); + sys_expr->set_line(*this); + sys_expr->parm(0, prop); + return sys_expr; + } + } + } + } + } + if (search_results.path_tail.size() > 1) { - cerr << get_fileline() << ": sorry: " - << "Method name nesting is not supported yet." << endl; - cerr << get_fileline() << ": : " - << "method path: " << search_results.path_tail << endl; - return 0; + return elaborate_expr_method_chained_(des, scope, search_results); } if (debug_elaborate) { @@ -3391,41 +3662,13 @@ NetExpr* PECallFunction::elaborate_expr_method_(Design*des, NetScope*scope, // Class methods. Generate function call to the class method. if (sub_expr->expr_type()==IVL_VT_CLASS) { - // Get the method name that we are looking for. perm_string method_name = search_results.path_tail.back().name; NetNet*net = search_results.net; const netclass_t*class_type = dynamic_cast(search_results.type); ivl_assert(*this, class_type); - NetScope*method = class_type->method_from_name(method_name); - - if (method == 0) { - cerr << get_fileline() << ": Error: " << method_name - << " is not a method of class " << class_type->get_name() - << "." << endl; - des->errors += 1; - return 0; - } - - const NetFuncDef*def = method->func_def(); - ivl_assert(*this, def); - - NetNet*res = method->find_signal(method->basename()); - ivl_assert(*this, res); - - vector parms(def->port_count()); - ivl_assert(*this, def->port_count() >= 1); - - NetESignal*ethis = new NetESignal(net); - ethis->set_line(*this); - parms[0] = ethis; - - elaborate_arguments_(des, scope, def, false, parms, 1); - - NetESignal*eres = new NetESignal(res); - NetEUFunc*call = new NetEUFunc(scope, method, eres, parms, false); - call->set_line(*this); - return call; + return elaborate_class_method_net_(des, scope, net, class_type, + method_name, nullptr); } // String methods. diff --git a/elab_sig.cc b/elab_sig.cc index 5b8ed476b..19fa97a42 100644 --- a/elab_sig.cc +++ b/elab_sig.cc @@ -397,11 +397,6 @@ void netclass_t::elaborate_sig(Design*des, PClass*pclass) << " type=" << *use_type << endl; } - if (dynamic_cast (use_type)) { - cerr << cur->second.get_fileline() << ": sorry: " - << "Queues inside classes are not yet supported." << endl; - des->errors++; - } set_property(cur->first, cur->second.qual, use_type); if (! cur->second.qual.test_static()) diff --git a/elaborate.cc b/elaborate.cc index 6839156da..cdbbbeb0d 100644 --- a/elaborate.cc +++ b/elaborate.cc @@ -47,6 +47,7 @@ # include "netenum.h" # include "netvector.h" # include "netdarray.h" +# include "netqueue.h" # include "netparray.h" # include "netscalar.h" # include "netclass.h" @@ -3683,22 +3684,30 @@ NetProc* PCallTask::elaborate_usr(Design*des, NetScope*scope) const * sys_task_name is the internal system-task name to use. */ NetProc* PCallTask::elaborate_sys_task_method_(Design*des, NetScope*scope, - NetNet*net, + NetExpr*base_expr, perm_string method_name, const char *sys_task_name, const std::vector &parm_names) const { - NetESignal*sig = new NetESignal(net); - sig->set_line(*this); + base_expr->set_line(*this); unsigned nparms = parms_.size(); vectorargv (1 + nparms); - argv[0] = sig; + argv[0] = base_expr; if (method_name == "delete") { // The queue delete method takes an optional element. - if (net->queue_type()) { + bool is_queue = false; + if (const NetESignal*ns = dynamic_cast(base_expr)) { + is_queue = ns->sig()->queue_type() != 0; + } else if (const NetEProperty*np = dynamic_cast(base_expr)) { + const netclass_t*ct = dynamic_cast(np->get_sig()->net_type()); + ivl_assert(*this, ct); + ivl_type_t pt = ct->get_prop_type(np->property_idx()); + is_queue = pt && pt->base_type() == IVL_VT_QUEUE; + } + if (is_queue) { if (nparms > 1) { cerr << get_fileline() << ": error: queue delete() " << "method takes zero or one argument." << endl; @@ -3732,13 +3741,25 @@ NetProc* PCallTask::elaborate_sys_task_method_(Design*des, NetScope*scope, * sys_task_name is the internal system-task name to use. */ NetProc* PCallTask::elaborate_queue_method_(Design*des, NetScope*scope, - NetNet*net, + NetExpr*queue_base, perm_string method_name, const char *sys_task_name, const std::vector &parm_names) const { - NetESignal*sig = new NetESignal(net); - sig->set_line(*this); + queue_base->set_line(*this); + + const netdarray_t*use_darray = 0; + if (const NetESignal*ns = dynamic_cast(queue_base)) { + use_darray = ns->sig()->darray_type(); + } else if (const NetEProperty*np = dynamic_cast(queue_base)) { + const netclass_t*ct = dynamic_cast(np->get_sig()->net_type()); + ivl_assert(*this, ct); + ivl_type_t pt = ct->get_prop_type(np->property_idx()); + use_darray = dynamic_cast(pt); + ivl_assert(*this, use_darray); + } else { + ivl_assert(*this, 0); + } unsigned nparms = parms_.size(); // insert() requires two arguments. @@ -3755,19 +3776,19 @@ NetProc* PCallTask::elaborate_queue_method_(Design*des, NetScope*scope, } // Get the context width if this is a logic type. - ivl_variable_type_t base_type = net->darray_type()->element_base_type(); + ivl_variable_type_t base_type = use_darray->element_base_type(); int context_width = -1; switch (base_type) { case IVL_VT_BOOL: case IVL_VT_LOGIC: - context_width = net->darray_type()->element_width(); + context_width = use_darray->element_width(); break; default: break; } vectorargv (nparms+1); - argv[0] = sig; + argv[0] = queue_base; auto args = map_named_args(des, parm_names, parms_); if (method_name != "insert") { @@ -3811,7 +3832,7 @@ NetProc* PCallTask::elaborate_queue_method_(Design*des, NetScope*scope, * This is used for array/queue function methods called as tasks. */ NetProc* PCallTask::elaborate_method_func_(NetScope*scope, - NetNet*net, + NetExpr*queue_base, ivl_type_t type, perm_string method_name, const char*sys_task_name) const @@ -3824,9 +3845,8 @@ NetProc* PCallTask::elaborate_method_func_(NetScope*scope, // Generate the function. NetESFunc*sys_expr = new NetESFunc(sys_task_name, type, 1); sys_expr->set_line(*this); - NetESignal*arg = new NetESignal(net); - arg->set_line(*net); - sys_expr->parm(0, arg); + queue_base->set_line(*this); + sys_expr->parm(0, queue_base); // Create a L-value that matches the function return type. NetNet*tmp; tmp = new NetNet(scope, scope->local_symbol(), NetNet::REG, type); @@ -3886,46 +3906,131 @@ NetProc* PCallTask::elaborate_method_(Design*des, NetScope*scope, << net->name() << ".data_type() --> " << net->data_type() << endl; } + // Class handle with one path_tail component: queue/darray property method + // e.g. c.q.push_back(x) => sr.path_tail = {q}, method_name = push_back + if (sr.path_tail.size() == 1) { + const netclass_t*cls = dynamic_cast(sr.type); + if (!cls && net->net_type()) + cls = dynamic_cast(net->net_type()); + if (cls) { + perm_string prop_name = sr.path_tail.front().name; + int pidx = cls->property_idx_from_name(prop_name); + if (pidx >= 0) { + ivl_type_t ptype = cls->get_prop_type(pidx); + if (ptype && dynamic_cast(ptype)) { + NetEProperty*prop = new NetEProperty(net, pidx, 0); + prop->set_line(*this); + const netdarray_t*use_darray = dynamic_cast(ptype); + ivl_assert(*this, use_darray); + + if (method_name == "push_back") { + static const std::vector parm_names = { + perm_string::literal("item") + }; + return elaborate_queue_method_(des, scope, prop, method_name, + "$ivl_queue_method$push_back", + parm_names); + } + if (method_name == "push_front") { + static const std::vector parm_names = { + perm_string::literal("item") + }; + return elaborate_queue_method_(des, scope, prop, method_name, + "$ivl_queue_method$push_front", + parm_names); + } + if (method_name == "insert") { + static const std::vector parm_names = { + perm_string::literal("index"), + perm_string::literal("item") + }; + return elaborate_queue_method_(des, scope, prop, method_name, + "$ivl_queue_method$insert", + parm_names); + } + if (method_name == "pop_front") { + return elaborate_method_func_(scope, prop, + use_darray->element_type(), + method_name, + "$ivl_queue_method$pop_front"); + } + if (method_name == "pop_back") { + return elaborate_method_func_(scope, prop, + use_darray->element_type(), + method_name, + "$ivl_queue_method$pop_back"); + } + if (method_name == "size") { + return elaborate_method_func_(scope, prop, + &netvector_t::atom2s32, + method_name, "$size"); + } + } else if (ptype && ptype->base_type() == IVL_VT_DARRAY) { + NetEProperty*prop = new NetEProperty(net, pidx, 0); + prop->set_line(*this); + if (method_name == "delete") { + static const std::vector parm_names = { + perm_string::literal("index") + }; + return elaborate_sys_task_method_(des, scope, prop, method_name, + "$ivl_darray_method$delete", + parm_names); + } + if (method_name == "size") { + return elaborate_method_func_(scope, prop, + &netvector_t::atom2s32, + method_name, "$size"); + } + } + } + } + } + // Is this a method of a "string" type? if (dynamic_cast(net->net_type())) { if (method_name == "itoa") { static const std::vector parm_names = { perm_string::literal("i") }; - - return elaborate_sys_task_method_(des, scope, net, method_name, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_sys_task_method_(des, scope, sig, method_name, "$ivl_string_method$itoa", parm_names); } else if (method_name == "hextoa") { static const std::vector parm_names = { perm_string::literal("i") }; - - return elaborate_sys_task_method_(des, scope, net, method_name, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_sys_task_method_(des, scope, sig, method_name, "$ivl_string_method$hextoa", parm_names); } else if (method_name == "octtoa") { static const std::vector parm_names = { perm_string::literal("i") }; - - return elaborate_sys_task_method_(des, scope, net, method_name, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_sys_task_method_(des, scope, sig, method_name, "$ivl_string_method$octtoa", parm_names); } else if (method_name == "bintoa") { static const std::vector parm_names = { perm_string::literal("i") }; - - return elaborate_sys_task_method_(des, scope, net, method_name, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_sys_task_method_(des, scope, sig, method_name, "$ivl_string_method$bintoa", parm_names); } else if (method_name == "realtoa") { static const std::vector parm_names = { perm_string::literal("r") }; - - return elaborate_sys_task_method_(des, scope, net, method_name, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_sys_task_method_(des, scope, sig, method_name, "$ivl_string_method$realtoa", parm_names); } @@ -3937,13 +4042,16 @@ NetProc* PCallTask::elaborate_method_(Design*des, NetScope*scope, static const std::vector parm_names = { perm_string::literal("index") }; - - return elaborate_sys_task_method_(des, scope, net, method_name, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_sys_task_method_(des, scope, sig, method_name, "$ivl_darray_method$delete", parm_names); } else if (method_name == "size") { // This returns an int. It could be removed, but keep for now. - return elaborate_method_func_(scope, net, + NetESignal*sig = new NetESignal(net); + sig->set_line(*this); + return elaborate_method_func_(scope, sig, &netvector_t::atom2s32, method_name, "$size"); } else if (method_name == "reverse") { @@ -3975,12 +4083,14 @@ NetProc* PCallTask::elaborate_method_(Design*des, NetScope*scope, if (net->queue_type()) { const netdarray_t*use_darray = net->darray_type(); + NetESignal*qs = new NetESignal(net); + qs->set_line(*this); if (method_name == "push_back") { static const std::vector parm_names = { perm_string::literal("item") }; - return elaborate_queue_method_(des, scope, net, method_name, + return elaborate_queue_method_(des, scope, qs, method_name, "$ivl_queue_method$push_back", parm_names); } else if (method_name == "push_front") { @@ -3988,7 +4098,7 @@ NetProc* PCallTask::elaborate_method_(Design*des, NetScope*scope, perm_string::literal("item") }; - return elaborate_queue_method_(des, scope, net, method_name, + return elaborate_queue_method_(des, scope, qs, method_name, "$ivl_queue_method$push_front", parm_names); } else if (method_name == "insert") { @@ -3997,16 +4107,16 @@ NetProc* PCallTask::elaborate_method_(Design*des, NetScope*scope, perm_string::literal("item") }; - return elaborate_queue_method_(des, scope, net, method_name, + return elaborate_queue_method_(des, scope, qs, method_name, "$ivl_queue_method$insert", parm_names); } else if (method_name == "pop_front") { - return elaborate_method_func_(scope, net, + return elaborate_method_func_(scope, qs, use_darray->element_type(), method_name, "$ivl_queue_method$pop_front"); } else if (method_name == "pop_back") { - return elaborate_method_func_(scope, net, + return elaborate_method_func_(scope, qs, use_darray->element_type(), method_name, "$ivl_queue_method$pop_back"); diff --git a/eval_tree.cc b/eval_tree.cc index 7cbb49321..6c465daf1 100644 --- a/eval_tree.cc +++ b/eval_tree.cc @@ -26,6 +26,7 @@ # include # include "netlist.h" +# include "netclass.h" # include "ivl_assert.h" # include "netmisc.h" @@ -2182,6 +2183,27 @@ static bool get_array_info(const NetExpr*arg, long dim, left = range.get_msb(); right = range.get_lsb(); return false; + } + /* Class property (e.g. queue field): size is dynamic; defer to runtime + * instead of folding to all-X in evaluate_array_funcs_. */ + if (const NetEProperty*prop = dynamic_cast(arg)) { + const NetNet*obj = prop->get_sig(); + const netclass_t*cls = dynamic_cast(obj->net_type()); + if (cls == 0) + return true; + ivl_type_t ptype = cls->get_prop_type(prop->property_idx()); + if (ptype == 0) + return true; + switch (ptype->base_type()) { + case IVL_VT_DARRAY: + case IVL_VT_QUEUE: + case IVL_VT_STRING: + defer = true; + return true; + default: + break; + } + return true; } /* The argument must be a signal that has enough dimensions. */ const NetESignal*esig = dynamic_cast(arg); diff --git a/ivl_target.h b/ivl_target.h index b33ea9aa4..b4eec2c3b 100644 --- a/ivl_target.h +++ b/ivl_target.h @@ -2400,6 +2400,10 @@ extern int ivl_type_properties(ivl_type_t net); extern const char* ivl_type_prop_name(ivl_type_t net, int idx); extern ivl_type_t ivl_type_prop_type(ivl_type_t net, int idx); +/* Maximum element count for a queue type (0 = unbounded). Only valid + * when ivl_type_base(net) == IVL_VT_QUEUE. */ +extern unsigned ivl_type_queue_max(ivl_type_t net); + #if defined(__MINGW32__) || defined (__CYGWIN__) # define DLLEXPORT __declspec(dllexport) diff --git a/t-dll-api.cc b/t-dll-api.cc index 7a33018f8..9aa69b4be 100644 --- a/t-dll-api.cc +++ b/t-dll-api.cc @@ -25,6 +25,7 @@ # include "discipline.h" # include "netclass.h" # include "netdarray.h" +# include "netqueue.h" # include "netenum.h" # include "netvector.h" # include @@ -3308,6 +3309,19 @@ extern "C" ivl_type_t ivl_type_prop_type(ivl_type_t net, int idx) return class_type->get_prop_type(idx); } +extern "C" unsigned ivl_type_queue_max(ivl_type_t net) +{ + if (net == 0) + return 0; + if (const netqueue_t*que = dynamic_cast(net)) { + long max_idx = que->max_idx(); + if (max_idx < 0) + return 0; + return (unsigned)(max_idx + 1); + } + return 0; +} + extern "C" int ivl_type_signed(ivl_type_t net) { assert(net); diff --git a/tgt-vvp/draw_class.c b/tgt-vvp/draw_class.c index afbc26d5c..012dedbfc 100644 --- a/tgt-vvp/draw_class.c +++ b/tgt-vvp/draw_class.c @@ -63,6 +63,7 @@ static void show_prop_type(ivl_type_t ptype) show_prop_type_vector(ptype); break; case IVL_VT_DARRAY: + case IVL_VT_QUEUE: case IVL_VT_CLASS: fprintf(vvp_out, "\"o\""); if (packed_dimensions > 0) { diff --git a/tgt-vvp/draw_vpi.c b/tgt-vvp/draw_vpi.c index a49ffb308..16e56a018 100644 --- a/tgt-vvp/draw_vpi.c +++ b/tgt-vvp/draw_vpi.c @@ -375,6 +375,20 @@ static void draw_vpi_taskfunc_args(const char*call_string, } break; + case IVL_EX_PROPERTY: + if (ivl_expr_oper1(expr) == 0 && + (ivl_expr_value(expr) == IVL_VT_QUEUE || + ivl_expr_value(expr) == IVL_VT_DARRAY)) { + ivl_signal_t clas = ivl_expr_signal(expr); + unsigned pidx = ivl_expr_property_idx(expr); + unsigned isq = ivl_expr_value(expr) == IVL_VT_QUEUE ? 1U : 0U; + snprintf(buffer, sizeof buffer, "&PQ", + clas, pidx, isq); + args[idx].text = strdup(buffer); + continue; + } + break; + case IVL_EX_SIGNAL: case IVL_EX_SELECT: args[idx].stack = vec4_stack_need; @@ -402,6 +416,10 @@ static void draw_vpi_taskfunc_args(const char*call_string, switch (ivl_expr_value(expr)) { case IVL_VT_LOGIC: case IVL_VT_BOOL: + case IVL_VT_QUEUE: + case IVL_VT_DARRAY: + /* Queue/darray element selects may still carry the + * container ivl_expr_value; evaluate as vec4 like logic. */ draw_eval_vec4(expr); args[idx].vec_flag = ivl_expr_signed(expr)? 's' : 'u'; args[idx].str_flag = 0; @@ -433,6 +451,20 @@ static void draw_vpi_taskfunc_args(const char*call_string, buffer[0] = 0; break; default: + /* See eval_vec4.c:draw_eval_vec4 — indexed selects sometimes + * carry an unexpected ivl_expr_value (e.g. NO_TYPE). */ + if (ivl_expr_type(expr) == IVL_EX_SELECT && + ivl_expr_oper2(expr) != 0) { + draw_eval_vec4(expr); + args[idx].vec_flag = ivl_expr_signed(expr)? 's' : 'u'; + args[idx].str_flag = 0; + args[idx].real_flag = 0; + args[idx].stack = vec4_stack_need; + args[idx].vec_wid = ivl_expr_width(expr); + vec4_stack_need += 1; + buffer[0] = 0; + break; + } fprintf(stderr, "%s:%u: Sorry, cannot generate code for argument %u.\n", ivl_expr_file(expr), ivl_expr_lineno(expr), idx+1); fprintf(vvp_out, "\nXXXX Unexpected argument: call_string=<%s>, arg=%u, type=%d\n", diff --git a/tgt-vvp/eval_real.c b/tgt-vvp/eval_real.c index a61ab0f39..bb662033f 100644 --- a/tgt-vvp/eval_real.c +++ b/tgt-vvp/eval_real.c @@ -277,6 +277,15 @@ static void real_ex_pop(ivl_expr_t expr) fb = "f"; arg = ivl_expr_parm(expr, 0); + if (ivl_expr_type(arg) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(arg); + unsigned pidx = ivl_expr_property_idx(arg); + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + fprintf(vvp_out, " %%qpop/prop/%s/r %u;\n", fb, pidx); + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + return; + } + assert(ivl_expr_type(arg) == IVL_EX_SIGNAL); fprintf(vvp_out, " %%qpop/%s/real v%p_0;\n", fb, ivl_expr_signal(arg)); diff --git a/tgt-vvp/eval_string.c b/tgt-vvp/eval_string.c index 2624c43f4..303df6ecd 100644 --- a/tgt-vvp/eval_string.c +++ b/tgt-vvp/eval_string.c @@ -167,6 +167,15 @@ static void string_ex_pop(ivl_expr_t expr) fb = "f"; arg = ivl_expr_parm(expr, 0); + if (ivl_expr_type(arg) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(arg); + unsigned pidx = ivl_expr_property_idx(arg); + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + fprintf(vvp_out, " %%qpop/prop/%s/str %u;\n", fb, pidx); + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + return; + } + assert(ivl_expr_type(arg) == IVL_EX_SIGNAL); fprintf(vvp_out, " %%qpop/%s/str v%p_0;\n", fb, ivl_expr_signal(arg)); diff --git a/tgt-vvp/eval_vec4.c b/tgt-vvp/eval_vec4.c index 6bbbb0c0a..73e8977b4 100644 --- a/tgt-vvp/eval_vec4.c +++ b/tgt-vvp/eval_vec4.c @@ -917,6 +917,28 @@ static void draw_property_vec4(ivl_expr_t expr) { ivl_signal_t sig = ivl_expr_signal(expr); unsigned pidx = ivl_expr_property_idx(expr); + /* Queue/dynamic-array property with index: index is oper1 (see + * dll_target::expr_property). */ + ivl_expr_t index_ex = ivl_expr_oper1(expr); + + if (index_ex) { + ivl_type_t cls_type = ivl_signal_net_type(sig); + ivl_type_t ptype = ivl_type_prop_type(cls_type, pidx); + if (ptype) { + ivl_variable_type_t pbase = ivl_type_base(ptype); + if (pbase == IVL_VT_QUEUE || pbase == IVL_VT_DARRAY) { + unsigned wid = ivl_expr_width(expr); + draw_eval_expr_into_integer(index_ex, 3); + fprintf(vvp_out, " %%load/obj v%p_0;\n", sig); + fprintf(vvp_out, " %%load/prop/dar/vec4 %u, %u;\n", + pidx, wid); + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + if (ivl_expr_value(expr) == IVL_VT_BOOL) + fprintf(vvp_out, " %%cast2;\n"); + return; + } + } + } fprintf(vvp_out, " %%load/obj v%p_0;\n", sig); fprintf(vvp_out, " %%prop/v %u;\n", pidx); @@ -948,7 +970,30 @@ static void draw_select_vec4(ivl_expr_t expr) return; } - if (ivl_expr_value(subexpr)==IVL_VT_DARRAY) { + /* Class property that is a queue or dynamic array: c.q[idx] */ + if (ivl_expr_type(subexpr) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(subexpr); + unsigned pidx = ivl_expr_property_idx(subexpr); + ivl_type_t cls_type = ivl_signal_net_type(clas); + ivl_type_t ptype = ivl_type_prop_type(cls_type, pidx); + if (ptype) { + ivl_variable_type_t pbase = ivl_type_base(ptype); + if (pbase == IVL_VT_QUEUE || pbase == IVL_VT_DARRAY) { + assert(base); + draw_eval_expr_into_integer(base, 3); + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + fprintf(vvp_out, " %%load/prop/dar/vec4 %u, %u;\n", + pidx, wid); + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + if (ivl_expr_value(expr) == IVL_VT_BOOL) + fprintf(vvp_out, " %%cast2;\n"); + return; + } + } + } + + if (ivl_expr_value(subexpr)==IVL_VT_DARRAY || + ivl_expr_value(subexpr)==IVL_VT_QUEUE) { ivl_signal_t sig = ivl_expr_signal(subexpr); assert(sig); assert( (ivl_signal_data_type(sig)==IVL_VT_DARRAY) @@ -1017,6 +1062,16 @@ static void draw_darray_pop(ivl_expr_t expr) fb = "f"; ivl_expr_t arg = ivl_expr_parm(expr, 0); + if (ivl_expr_type(arg) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(arg); + unsigned pidx = ivl_expr_property_idx(arg); + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + fprintf(vvp_out, " %%qpop/prop/%s/v %u, %u;\n", fb, pidx, + ivl_expr_width(expr)); + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + return; + } + assert(ivl_expr_type(arg) == IVL_EX_SIGNAL); fprintf(vvp_out, " %%qpop/%s/v v%p_0, %u;\n", fb, ivl_expr_signal(arg), @@ -1049,6 +1104,18 @@ static void draw_sfunc_vec4(ivl_expr_t expr) return; } + if (strcmp(ivl_expr_name(expr), "$size")==0 && parm_count==1) { + ivl_expr_t arg = ivl_expr_parm(expr, 0); + if (ivl_expr_type(arg) == IVL_EX_PROPERTY) { + ivl_signal_t sig = ivl_expr_signal(arg); + unsigned pidx = ivl_expr_property_idx(arg); + fprintf(vvp_out, " %%load/obj v%p_0;\n", sig); + fprintf(vvp_out, " %%prop/queue/size %u;\n", pidx); + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + return; + } + } + draw_vpi_func_call(expr); } @@ -1357,7 +1424,9 @@ void draw_eval_vec4(ivl_expr_t expr) } assert(ivl_expr_value(expr) == IVL_VT_BOOL || - ivl_expr_value(expr) == IVL_VT_VECTOR); + ivl_expr_value(expr) == IVL_VT_VECTOR || + (ivl_expr_type(expr) == IVL_EX_SELECT && ivl_expr_oper2(expr) != 0) || + ivl_expr_type(expr) == IVL_EX_PROPERTY); switch (ivl_expr_type(expr)) { case IVL_EX_BINARY: diff --git a/tgt-vvp/stmt_assign.c b/tgt-vvp/stmt_assign.c index ac0a92dd3..75e687441 100644 --- a/tgt-vvp/stmt_assign.c +++ b/tgt-vvp/stmt_assign.c @@ -1364,15 +1364,16 @@ static int show_stmt_assign_sig_cobject(ivl_statement_t net) fprintf(vvp_out, " %%store/prop/str %d;\n", prop_idx); fprintf(vvp_out, " %%pop/obj 1, 0;\n"); - } else if (ivl_type_base(prop_type) == IVL_VT_DARRAY) { + } else if (ivl_type_base(prop_type) == IVL_VT_DARRAY + || ivl_type_base(prop_type) == IVL_VT_QUEUE) { int idx = 0; - /* The property is a darray, and there is no mux - expression to the assignment is of an entire - array object. */ + /* The property is a darray or queue, and there is no mux + expression so the assignment is of an entire + array/queue object. */ errors += draw_eval_object(rval); - fprintf(vvp_out, " %%store/prop/obj %d, %d; IVL_VT_DARRAY\n", prop_idx, idx); + fprintf(vvp_out, " %%store/prop/obj %d, %d; IVL_VT_DARRAY or QUEUE\n", prop_idx, idx); fprintf(vvp_out, " %%pop/obj 1, 0;\n"); } else if (ivl_type_base(prop_type) == IVL_VT_CLASS) { diff --git a/tgt-vvp/vvp_process.c b/tgt-vvp/vvp_process.c index 2604ae656..e90b6f432 100644 --- a/tgt-vvp/vvp_process.c +++ b/tgt-vvp/vvp_process.c @@ -1663,6 +1663,24 @@ static int show_delete_method(ivl_statement_t net) return 1; ivl_expr_t parm = ivl_stmt_parm(net, 0); + if (ivl_expr_type(parm) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(parm); + unsigned pidx = ivl_expr_property_idx(parm); + ivl_type_t sig_type = ivl_signal_net_type(clas); + ivl_type_t queue_type = ivl_type_prop_type(sig_type, pidx); + assert(ivl_type_base(queue_type) == IVL_VT_QUEUE); + + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + if (parm_count == 2) { + draw_eval_expr_into_integer(ivl_stmt_parm(net, 1), 3); + fprintf(vvp_out, " %%delete/prop/elem %u;\n", pidx); + } else { + fprintf(vvp_out, " %%delete/prop/obj %u;\n", pidx); + } + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + return 0; + } + assert(ivl_expr_type(parm) == IVL_EX_SIGNAL); ivl_signal_t var = ivl_expr_signal(parm); @@ -1687,6 +1705,47 @@ static int show_insert_method(ivl_statement_t net) return 1; ivl_expr_t parm0 = ivl_stmt_parm(net,0); + if (ivl_expr_type(parm0) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(parm0); + unsigned pidx = ivl_expr_property_idx(parm0); + ivl_type_t sig_type = ivl_signal_net_type(clas); + ivl_type_t var_type = ivl_type_prop_type(sig_type, pidx); + assert(ivl_type_base(var_type) == IVL_VT_QUEUE); + + int idx = allocate_word(); + assert(idx >= 0); + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + fprintf(vvp_out, " %%ix/load %d, %u, 0;\n", idx, + ivl_type_queue_max(var_type)); + + ivl_type_t element_type = ivl_type_element(var_type); + + ivl_expr_t parm1 = ivl_stmt_parm(net,1); + draw_eval_expr_into_integer(parm1, 3); + ivl_expr_t parm2 = ivl_stmt_parm(net,2); + switch (ivl_type_base(element_type)) { + case IVL_VT_REAL: + draw_eval_real(parm2); + fprintf(vvp_out, " %%qinsert/prop/r %u, %d;\n", + pidx, idx); + break; + case IVL_VT_STRING: + draw_eval_string(parm2); + fprintf(vvp_out, " %%qinsert/prop/str %u, %d;\n", + pidx, idx); + break; + default: + draw_eval_vec4(parm2); + fprintf(vvp_out, " %%qinsert/prop/v %u, %d, %u;\n", + pidx, idx, + ivl_type_packed_width(element_type)); + break; + } + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + clr_word(idx); + return 0; + } + assert(ivl_expr_type(parm0) == IVL_EX_SIGNAL); ivl_signal_t var = ivl_expr_signal(parm0); ivl_type_t var_type = ivl_signal_net_type(var); @@ -1740,6 +1799,45 @@ static int show_push_frontback_method(ivl_statement_t net, bool is_front) return 1; ivl_expr_t parm0 = ivl_stmt_parm(net,0); + if (ivl_expr_type(parm0) == IVL_EX_PROPERTY) { + ivl_signal_t clas = ivl_expr_signal(parm0); + unsigned pidx = ivl_expr_property_idx(parm0); + ivl_type_t sig_type = ivl_signal_net_type(clas); + ivl_type_t var_type = ivl_type_prop_type(sig_type, pidx); + assert(ivl_type_base(var_type) == IVL_VT_QUEUE); + + int idx = allocate_word(); + assert(idx >= 0); + fprintf(vvp_out, " %%load/obj v%p_0;\n", clas); + fprintf(vvp_out, " %%ix/load %d, %u, 0;\n", idx, + ivl_type_queue_max(var_type)); + + ivl_type_t element_type = ivl_type_element(var_type); + + ivl_expr_t parm1 = ivl_stmt_parm(net,1); + switch (ivl_type_base(element_type)) { + case IVL_VT_REAL: + draw_eval_real(parm1); + fprintf(vvp_out, " %%store/prop/%s/r %u, %d;\n", + type_code, pidx, idx); + break; + case IVL_VT_STRING: + draw_eval_string(parm1); + fprintf(vvp_out, " %%store/prop/%s/str %u, %d;\n", + type_code, pidx, idx); + break; + default: + draw_eval_vec4(parm1); + fprintf(vvp_out, " %%store/prop/%s/v %u, %d, %u;\n", + type_code, pidx, idx, + ivl_type_packed_width(element_type)); + break; + } + fprintf(vvp_out, " %%pop/obj 1, 0;\n"); + clr_word(idx); + return 0; + } + assert(ivl_expr_type(parm0) == IVL_EX_SIGNAL); ivl_signal_t var = ivl_expr_signal(parm0); ivl_type_t var_type = ivl_signal_net_type(var); diff --git a/vpi/sys_display.c b/vpi/sys_display.c index dad17f127..155ec3169 100644 --- a/vpi/sys_display.c +++ b/vpi/sys_display.c @@ -867,6 +867,35 @@ static unsigned int get_format_char(char **rtn, int ljust, int plus, * be a binary string (can contain NULLs). */ break; + case 'p': + case 'P': + *idx += 1; + if (plus != 0 || prec != -1) { + vpi_printf("WARNING: %s:%d: invalid format %s%s.\n", + info->filename, info->lineno, info->name, fmtb); + } + if (*idx >= info->nitems) { + vpi_printf("WARNING: %s:%d: missing argument for %s%s.\n", + info->filename, info->lineno, info->name, fmtb); + } else { + char *pp = vpip_format_pretty(info->items[*idx]); + if (pp == 0) { + vpi_printf("WARNING: %s:%d: incompatible value for %s%s.\n", + info->filename, info->lineno, info->name, fmtb); + } else { + char *cp = pp; + if (width == -1) width = 0; + size = strlen(cp) + 1; + if ((signed)size < (width+1)) size = width+1; + if (size > ini_size) result = realloc(result, size*sizeof(char)); + if (ljust == 0) sprintf(result, "%*s", width, cp); + else sprintf(result, "%-*s", width, cp); + free(pp); + size = strlen(result) + 1; + } + } + break; + default: vpi_printf("WARNING: %s:%d: unknown format %s%s.\n", info->filename, info->lineno, info->name, fmtb); @@ -1215,6 +1244,7 @@ static int sys_check_args(vpiHandle callh, vpiHandle argv, const PLI_BYTE8*name, #endif case vpiClassVar: case vpiSysFuncCall: + case vpiRegArray: /* dynamic arrays, queues, SV array vars */ break; default: diff --git a/vpi_user.h b/vpi_user.h index c347fe15e..9ea41d6f1 100644 --- a/vpi_user.h +++ b/vpi_user.h @@ -641,6 +641,10 @@ extern DLLEXPORT void (*vlog_startup_routines[])(void); /* Format a scalar a la %v. The str points to a 4byte character buffer. The value must be a vpiStrengthVal. */ extern void vpip_format_strength(char*str, s_vpi_value*value, unsigned bit); + /* Pretty-print a dynamic array or queue (including class property queues) + * for %p. Returns a malloc'd string, or NULL if the handle is not + * supported. Caller must free the returned pointer when non-NULL. */ +extern char* vpip_format_pretty(vpiHandle ref); /* Set the return value to return from the vvp run time. This is usually 0 or 1. This is the exit code that the vvp process returns, and in distinct from the finish_number that is an diff --git a/vvp/codes.h b/vvp/codes.h index 94a4f26b5..a9d2c4844 100644 --- a/vvp/codes.h +++ b/vvp/codes.h @@ -150,6 +150,7 @@ extern bool of_LOAD_REAL(vthread_t thr, vvp_code_t code); extern bool of_LOAD_DAR_R(vthread_t thr, vvp_code_t code); extern bool of_LOAD_DAR_STR(vthread_t thr, vvp_code_t code); extern bool of_LOAD_DAR_VEC4(vthread_t thr, vvp_code_t code); +extern bool of_LOAD_PROP_DAR_VEC4(vthread_t thr, vvp_code_t code); extern bool of_LOAD_OBJ(vthread_t thr, vvp_code_t code); extern bool of_LOAD_OBJA(vthread_t thr, vvp_code_t code); extern bool of_LOAD_STR(vthread_t thr, vvp_code_t code); @@ -232,6 +233,24 @@ extern bool of_STORE_PROP_OBJ(vthread_t thr, vvp_code_t code); extern bool of_STORE_PROP_R(vthread_t thr, vvp_code_t code); extern bool of_STORE_PROP_STR(vthread_t thr, vvp_code_t code); extern bool of_STORE_PROP_V(vthread_t thr, vvp_code_t code); +extern bool of_STORE_PROP_QB_R(vthread_t thr, vvp_code_t code); +extern bool of_STORE_PROP_QB_STR(vthread_t thr, vvp_code_t code); +extern bool of_STORE_PROP_QB_V(vthread_t thr, vvp_code_t code); +extern bool of_STORE_PROP_QF_R(vthread_t thr, vvp_code_t code); +extern bool of_STORE_PROP_QF_STR(vthread_t thr, vvp_code_t code); +extern bool of_STORE_PROP_QF_V(vthread_t thr, vvp_code_t code); +extern bool of_QINSERT_PROP_R(vthread_t thr, vvp_code_t code); +extern bool of_QINSERT_PROP_STR(vthread_t thr, vvp_code_t code); +extern bool of_QINSERT_PROP_V(vthread_t thr, vvp_code_t code); +extern bool of_QPOP_PROP_B_REAL(vthread_t thr, vvp_code_t code); +extern bool of_QPOP_PROP_B_STR(vthread_t thr, vvp_code_t code); +extern bool of_QPOP_PROP_B_V(vthread_t thr, vvp_code_t code); +extern bool of_QPOP_PROP_F_REAL(vthread_t thr, vvp_code_t code); +extern bool of_QPOP_PROP_F_STR(vthread_t thr, vvp_code_t code); +extern bool of_QPOP_PROP_F_V(vthread_t thr, vvp_code_t code); +extern bool of_PROP_QUEUE_SIZE(vthread_t thr, vvp_code_t code); +extern bool of_DELETE_PROP_ELEM(vthread_t thr, vvp_code_t code); +extern bool of_DELETE_PROP_OBJ(vthread_t thr, vvp_code_t code); extern bool of_STORE_QB_R(vthread_t thr, vvp_code_t code); extern bool of_STORE_QB_STR(vthread_t thr, vvp_code_t code); extern bool of_STORE_QB_V(vthread_t thr, vvp_code_t code); diff --git a/vvp/compile.cc b/vvp/compile.cc index 5c0460086..e05de3df1 100644 --- a/vvp/compile.cc +++ b/vvp/compile.cc @@ -204,6 +204,7 @@ static const struct opcode_table_s opcode_table[] = { { "%load/dar/vec4",of_LOAD_DAR_VEC4,1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, { "%load/obj", of_LOAD_OBJ, 1,{OA_FUNC_PTR,OA_NONE, OA_NONE} }, { "%load/obja", of_LOAD_OBJA, 2,{OA_ARR_PTR, OA_BIT1, OA_NONE} }, + { "%load/prop/dar/vec4", of_LOAD_PROP_DAR_VEC4, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, { "%load/real", of_LOAD_REAL, 1,{OA_VPI_PTR, OA_NONE, OA_NONE} }, { "%load/str", of_LOAD_STR, 1,{OA_FUNC_PTR,OA_NONE, OA_NONE} }, { "%load/stra", of_LOAD_STRA, 2,{OA_ARR_PTR, OA_BIT1, OA_NONE} }, @@ -241,6 +242,7 @@ static const struct opcode_table_s opcode_table[] = { { "%pow/s", of_POW_S, 0, {OA_NONE, OA_NONE, OA_NONE} }, { "%pow/wr", of_POW_WR, 0, {OA_NONE, OA_NONE, OA_NONE} }, { "%prop/obj",of_PROP_OBJ,2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%prop/queue/size", of_PROP_QUEUE_SIZE, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%prop/r", of_PROP_R, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%prop/str",of_PROP_STR,1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%prop/v", of_PROP_V, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, @@ -249,6 +251,9 @@ static const struct opcode_table_s opcode_table[] = { { "%pushi/vec4",of_PUSHI_VEC4,3,{OA_BIT1, OA_BIT2, OA_NUMBER} }, { "%pushv/str", of_PUSHV_STR, 0,{OA_NONE, OA_NONE, OA_NONE} }, { "%putc/str/vec4",of_PUTC_STR_VEC4,2,{OA_FUNC_PTR,OA_BIT1,OA_NONE} }, + { "%qinsert/prop/r", of_QINSERT_PROP_R, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%qinsert/prop/str", of_QINSERT_PROP_STR, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%qinsert/prop/v", of_QINSERT_PROP_V, 3, {OA_NUMBER, OA_BIT1, OA_BIT2} }, { "%qinsert/real",of_QINSERT_REAL,2,{OA_FUNC_PTR,OA_BIT1,OA_NONE} }, { "%qinsert/str", of_QINSERT_STR, 2,{OA_FUNC_PTR,OA_BIT1,OA_NONE} }, { "%qinsert/v", of_QINSERT_V, 3,{OA_FUNC_PTR,OA_BIT1,OA_BIT2} }, @@ -282,9 +287,23 @@ static const struct opcode_table_s opcode_table[] = { { "%store/obj", of_STORE_OBJ, 1, {OA_FUNC_PTR,OA_NONE, OA_NONE} }, { "%store/obja", of_STORE_OBJA, 2, {OA_ARR_PTR, OA_BIT1, OA_NONE} }, { "%store/prop/obj",of_STORE_PROP_OBJ,2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%store/prop/qb/r", of_STORE_PROP_QB_R, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%store/prop/qb/str", of_STORE_PROP_QB_STR, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%store/prop/qb/v", of_STORE_PROP_QB_V, 3, {OA_NUMBER, OA_BIT1, OA_BIT2} }, + { "%store/prop/qf/r", of_STORE_PROP_QF_R, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%store/prop/qf/str", of_STORE_PROP_QF_STR, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%store/prop/qf/v", of_STORE_PROP_QF_V, 3, {OA_NUMBER, OA_BIT1, OA_BIT2} }, { "%store/prop/r", of_STORE_PROP_R, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%store/prop/str",of_STORE_PROP_STR,1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%store/prop/v", of_STORE_PROP_V, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%qpop/prop/b/r", of_QPOP_PROP_B_REAL, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, + { "%qpop/prop/b/str", of_QPOP_PROP_B_STR, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, + { "%qpop/prop/b/v", of_QPOP_PROP_B_V, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%qpop/prop/f/r", of_QPOP_PROP_F_REAL, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, + { "%qpop/prop/f/str", of_QPOP_PROP_F_STR, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, + { "%qpop/prop/f/v", of_QPOP_PROP_F_V, 2, {OA_NUMBER, OA_BIT1, OA_NONE} }, + { "%delete/prop/elem", of_DELETE_PROP_ELEM, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, + { "%delete/prop/obj", of_DELETE_PROP_OBJ, 1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%store/qb/r", of_STORE_QB_R, 2, {OA_FUNC_PTR, OA_BIT1, OA_NONE} }, { "%store/qb/str", of_STORE_QB_STR, 2, {OA_FUNC_PTR, OA_BIT1, OA_NONE} }, { "%store/qb/v", of_STORE_QB_V, 3, {OA_FUNC_PTR, OA_BIT1, OA_BIT2} }, diff --git a/vvp/compile.h b/vvp/compile.h index d19263ae5..6abc26439 100644 --- a/vvp/compile.h +++ b/vvp/compile.h @@ -344,6 +344,9 @@ class resolv_list_s { */ extern void functor_ref_lookup(vvp_net_t**ref, char*lab); +extern vpiHandle vpip_make_prop_queue_ref(char* class_label, unsigned prop_idx, + unsigned is_queue_flag); + /* * This function schedules a lookup of the labeled instruction. The * code points to a code structure that points to the instruction diff --git a/vvp/lexor.lex b/vvp/lexor.lex index 1a6ce88ef..122bcaf45 100644 --- a/vvp/lexor.lex +++ b/vvp/lexor.lex @@ -272,6 +272,7 @@ inline uint64_t strtouint64(const char*str, char**endptr, int base) "&A" { return K_A; } "&APV" { return K_APV; } +"&PQ" { return K_PQ; } "&PV" { return K_PV; } "%"[.$_/a-zA-Z0-9]+ { diff --git a/vvp/parse.y b/vvp/parse.y index bd8dba1bf..e890070d8 100644 --- a/vvp/parse.y +++ b/vvp/parse.y @@ -93,7 +93,7 @@ static struct __vpiModPath*modpath_dst = 0; %token K_NET K_NET_S K_NET_R K_NET_2S K_NET_2U %token K_NET8 K_NET8_2S K_NET8_2U K_NET8_S %token K_PARAM_STR K_PARAM_L K_PARAM_REAL K_PART K_PART_PV -%token K_PART_V K_PART_V_S K_PORT K_PORT_INFO K_PV K_REDUCE_AND K_REDUCE_OR K_REDUCE_XOR +%token K_PART_V K_PART_V_S K_PORT K_PORT_INFO K_PQ K_PV K_REDUCE_AND K_REDUCE_OR K_REDUCE_XOR %token K_REDUCE_NAND K_REDUCE_NOR K_REDUCE_XNOR K_REPEAT %token K_RESOLV K_RTRAN K_RTRANIF0 K_RTRANIF1 %token K_SCOPE K_SFUNC K_SFUNC_E K_SHIFTL K_SHIFTR K_SHIFTRS @@ -1122,6 +1122,8 @@ symbol_access { $$ = vpip_make_PV($3, $5, $7); } | K_APV '<' T_SYMBOL ',' T_NUMBER ',' T_NUMBER ',' T_NUMBER '>' { $$ = vpip_make_vthr_APV($3, $5, $7, $9); } + | K_PQ '<' T_SYMBOL ',' T_NUMBER ',' T_NUMBER '>' + { $$ = vpip_make_prop_queue_ref($3, $5, $7); } ; /* functor operands can only be a list of symbols. */ diff --git a/vvp/vpi_darray.cc b/vvp/vpi_darray.cc index db9b902c6..d6b636463 100644 --- a/vvp/vpi_darray.cc +++ b/vvp/vpi_darray.cc @@ -22,6 +22,7 @@ # include "vpi_priv.h" # include "vvp_net_sig.h" # include "vvp_darray.h" +# include "vvp_cobject.h" # include "array_common.h" # include "schedule.h" #ifdef CHECK_WITH_VALGRIND @@ -294,38 +295,23 @@ vpiHandle vpip_make_darray_var(const char*name, vvp_net_t*net) } __vpiQueueVar::__vpiQueueVar(__vpiScope*sc, const char*na, vvp_net_t*ne) -: __vpiBaseVar(sc, na, ne) +: __vpiDarrayVar(sc, na, ne) { } -int __vpiQueueVar::get_type_code(void) const -{ return vpiArrayVar; } - - int __vpiQueueVar::vpi_get(int code) { - vvp_fun_signal_object*fun = dynamic_cast (get_net()->fun); - assert(fun); - vvp_object_t val = fun->get_object(); - const vvp_queue*aval = val.peek(); - switch (code) { case vpiArrayType: return vpiQueueArray; - case vpiSize: - if (aval == 0) - return 0; - else - return aval->get_size(); - default: - return 0; + return __vpiDarrayVar::vpi_get(code); } } void __vpiQueueVar::vpi_get_value(p_vpi_value val) { - val->format = vpiSuppressVal; + __vpiDarrayVar::vpi_get_value(val); } @@ -339,9 +325,140 @@ vpiHandle vpip_make_queue_var(const char*name, vvp_net_t*net) return obj; } +__vpiPropQueueRef::__vpiPropQueueRef(__vpiScope*scope, unsigned pidx, + bool is_queue) +: class_net_(0), prop_idx_(pidx), is_queue_(is_queue), scope_(scope) +{ +} + +int __vpiPropQueueRef::get_type_code(void) const +{ return vpiArrayVar; } + +static vvp_darray* get_live_darray_from_prop(vvp_net_t* class_net, unsigned pid) +{ + if (!class_net) + return 0; + vvp_fun_signal_object* fun + = dynamic_cast(class_net->fun); + if (!fun) + return 0; + vvp_object_t obj = fun->get_object(); + vvp_cobject* cobj = obj.peek(); + if (!cobj) + return 0; + vvp_object_t qobj; + cobj->get_object(pid, qobj, 0); + return qobj.peek(); +} + +int __vpiPropQueueRef::vpi_get(int code) +{ + vvp_darray* aobj = get_live_darray_from_prop(class_net_, prop_idx_); + switch (code) { + case vpiArrayType: + return is_queue_ ? vpiQueueArray : vpiDynamicArray; + case vpiLeftRange: + return 0; + case vpiRightRange: + return aobj ? (int) (aobj->get_size() - 1) : 0; + case vpiSize: + return aobj ? (int) aobj->get_size() : 0; + default: + return 0; + } +} + +char* __vpiPropQueueRef::vpi_get_str(int code) +{ + if (code == vpiFile) { + return simple_set_rbuf_str(file_names[0]); + } + return generic_get_str(code, scope_, "prop_darray", NULL); +} + +void __vpiPropQueueRef::vpi_get_value(p_vpi_value val) +{ + val->format = vpiSuppressVal; +} + +vpiHandle vpip_make_prop_queue_ref(char* class_label, unsigned prop_idx, + unsigned is_queue_flag) +{ + __vpiPropQueueRef* obj = new __vpiPropQueueRef(vpip_peek_current_scope(), + prop_idx, + is_queue_flag != 0); + functor_ref_lookup(&obj->class_net_, class_label); + return obj; +} + +static char* format_darray_pretty(vvp_darray* aobj) +{ + if (!aobj || aobj->get_size() == 0) + return strdup("{}"); + + string out = "{"; + + for (size_t i = 0; i < aobj->get_size(); i += 1) { + if (i > 0) + out += ", "; + if (dynamic_cast(aobj)) { + double d; + aobj->get_word((unsigned) i, d); + char buf[256]; + snprintf(buf, sizeof buf, "%g", d); + out += buf; + } else if (dynamic_cast(aobj)) { + string s; + aobj->get_word((unsigned) i, s); + out += "\""; + out += s; + out += "\""; + } else { + vvp_vector4_t v; + aobj->get_word((unsigned) i, v); + s_vpi_value val; + val.format = vpiDecStrVal; + vpip_vec4_get_value(v, v.size(), false, &val); + out += val.value.str; + } + } + + out += "}"; + return strdup(out.c_str()); +} + +extern "C" char* vpip_format_pretty(vpiHandle ref) +{ + if (!ref) + return 0; + + if (__vpiPropQueueRef* pr = dynamic_cast<__vpiPropQueueRef*>(ref)) { + vvp_darray* a = get_live_darray_from_prop(pr->class_net_, + pr->prop_idx_); + return format_darray_pretty(a); + } + + if (__vpiDarrayVar* dv = dynamic_cast<__vpiDarrayVar*>(ref)) { + vvp_fun_signal_object* fun + = dynamic_cast(dv->get_net()->fun); + if (!fun) + return 0; + vvp_object_t obj = fun->get_object(); + vvp_darray* aobj = obj.peek(); + return format_darray_pretty(aobj); + } + + return 0; +} + #ifdef CHECK_WITH_VALGRIND void array_delete(vpiHandle item) { + if (__vpiPropQueueRef* pq = dynamic_cast<__vpiPropQueueRef*>(item)) { + delete pq; + return; + } + __vpiDarrayVar*dobj = dynamic_cast<__vpiDarrayVar*>(item); if (dobj) { if (dobj->vals_words) delete [] (dobj->vals_words-1); @@ -349,12 +466,6 @@ void array_delete(vpiHandle item) return; } - __vpiQueueVar*qobj = dynamic_cast<__vpiQueueVar*>(item); - if (qobj) { - delete qobj; - return; - } - fprintf(stderr, "Need support for deleting array type: %d\n", item->vpi_get(vpiArrayType)); assert(0); } diff --git a/vvp/vpi_priv.h b/vvp/vpi_priv.h index 3b253c999..4486454cb 100644 --- a/vvp/vpi_priv.h +++ b/vvp/vpi_priv.h @@ -870,18 +870,38 @@ class __vpiDarrayVar : public __vpiBaseVar, public __vpiArrayBase { extern vpiHandle vpip_make_darray_var(const char*name, vvp_net_t*net); -class __vpiQueueVar : public __vpiBaseVar { +class __vpiQueueVar : public __vpiDarrayVar { public: __vpiQueueVar(__vpiScope*scope, const char*name, vvp_net_t*net); - int get_type_code(void) const override; int vpi_get(int code) override; void vpi_get_value(p_vpi_value val) override; }; extern vpiHandle vpip_make_queue_var(const char*name, vvp_net_t*net); +class __vpiPropQueueRef : public __vpiHandle { + + public: + explicit __vpiPropQueueRef(__vpiScope*scope, unsigned pidx, bool is_queue); + + int get_type_code(void) const override; + int vpi_get(int code) override; + char* vpi_get_str(int code) override; + void vpi_get_value(p_vpi_value val) override; + + vvp_net_t* class_net_; + unsigned prop_idx_; + bool is_queue_; + + private: + __vpiScope* scope_; +}; + +extern vpiHandle vpip_make_prop_queue_ref(char* class_label, unsigned prop_idx, + unsigned is_queue_flag); + class __vpiCobjectVar : public __vpiBaseVar { public: diff --git a/vvp/vthread.cc b/vvp/vthread.cc index de7578b00..3bbe9d42f 100644 --- a/vvp/vthread.cc +++ b/vvp/vthread.cc @@ -3873,6 +3873,35 @@ bool of_LOAD_DAR_VEC4(vthread_t thr, vvp_code_t cp) return load_dar(thr, cp); } +/* + * %load/prop/dar/vec4 , ; + * Indexed read of queue/dynamic-array class property; object on stack, + * index in words[3] (same as %load/dar/vec4). + */ +bool of_LOAD_PROP_DAR_VEC4(vthread_t thr, vvp_code_t cp) +{ + size_t pid = cp->number; + unsigned wid = cp->bit_idx[0]; + int64_t adr = thr->words[3].w_int; + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + vvp_object_t pobj; + cobj->get_object(pid, pobj, 0); + vvp_darray*darray = pobj.peek(); + + vvp_vector4_t word; + if (darray && (adr >= 0) && (thr->flags[4] == BIT4_0)) + darray->get_word(adr, word); + else + dq_default(word, wid); + + thr->push_vec4(word); + return true; +} + /* * %load/obj */ @@ -5981,6 +6010,291 @@ bool of_STORE_PROP_V(vthread_t thr, vvp_code_t cp) return store_prop(thr, cp, cp->bit_idx[0]); } +template +static QTYPE* get_queue_prop(vvp_cobject*cobj, size_t pid) +{ + vvp_object_t qobj; + cobj->get_object(pid, qobj, 0); + QTYPE* queue = qobj.peek(); + if (queue == 0) { + queue = new QTYPE; + vvp_object_t val(queue); + cobj->set_object(pid, val, 0); + } + return queue; +} + +template +static bool store_prop_qb(vthread_t thr, vvp_code_t cp, unsigned wid) +{ + size_t pid = cp->number; + ELEM value; + unsigned max_size = thr->words[cp->bit_idx[0]].w_uint; + pop_value(thr, value, wid); + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + QTYPE* queue = get_queue_prop(cobj, pid); + assert(queue); + queue->push_back(value, max_size); + return true; +} + +template +static bool store_prop_qf(vthread_t thr, vvp_code_t cp, unsigned wid) +{ + size_t pid = cp->number; + ELEM value; + unsigned max_size = thr->words[cp->bit_idx[0]].w_uint; + pop_value(thr, value, wid); + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + QTYPE* queue = get_queue_prop(cobj, pid); + assert(queue); + queue->push_front(value, max_size); + return true; +} + +bool of_STORE_PROP_QB_R(vthread_t thr, vvp_code_t cp) +{ + return store_prop_qb(thr, cp, 0); +} + +bool of_STORE_PROP_QB_STR(vthread_t thr, vvp_code_t cp) +{ + return store_prop_qb(thr, cp, 0); +} + +bool of_STORE_PROP_QB_V(vthread_t thr, vvp_code_t cp) +{ + return store_prop_qb(thr, cp, cp->bit_idx[1]); +} + +bool of_STORE_PROP_QF_R(vthread_t thr, vvp_code_t cp) +{ + return store_prop_qf(thr, cp, 0); +} + +bool of_STORE_PROP_QF_STR(vthread_t thr, vvp_code_t cp) +{ + return store_prop_qf(thr, cp, 0); +} + +bool of_STORE_PROP_QF_V(vthread_t thr, vvp_code_t cp) +{ + return store_prop_qf(thr, cp, cp->bit_idx[1]); +} + +template +static bool qinsert_prop(vthread_t thr, vvp_code_t cp, unsigned wid) +{ + int64_t idx = thr->words[3].w_int; + ELEM value; + size_t pid = cp->number; + pop_value(thr, value, wid); + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + QTYPE* queue = get_queue_prop(cobj, pid); + assert(queue); + if (idx < 0) { + cerr << thr->get_fileline() + << "Warning: cannot insert at a negative " + << get_queue_type(value) + << " index (" << idx << "). "; + print_queue_value(value); + cerr << " was not added." << endl; + } else if (thr->flags[4] != BIT4_0) { + cerr << thr->get_fileline() + << "Warning: cannot insert at an undefined " + << get_queue_type(value) << " index. "; + print_queue_value(value); + cerr << " was not added." << endl; + } else { + unsigned max_size = thr->words[cp->bit_idx[0]].w_int; + queue->insert(idx, value, max_size); + } + return true; +} + +bool of_QINSERT_PROP_R(vthread_t thr, vvp_code_t cp) +{ + return qinsert_prop(thr, cp, 0); +} + +bool of_QINSERT_PROP_STR(vthread_t thr, vvp_code_t cp) +{ + return qinsert_prop(thr, cp, 0); +} + +bool of_QINSERT_PROP_V(vthread_t thr, vvp_code_t cp) +{ + return qinsert_prop(thr, cp, cp->bit_idx[1]); +} + +template +static bool q_pop_prop(vthread_t thr, vvp_code_t cp, + void (*get_val_func)(vvp_queue*, ELEM&), + const char*loc, unsigned wid) +{ + size_t pid = cp->number; + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + QTYPE* queue = get_queue_prop(cobj, pid); + assert(queue); + + size_t size = queue->get_size(); + + ELEM value; + if (size) { + get_val_func(queue, value); + } else { + dq_default(value, wid); + cerr << thr->get_fileline() + << "Warning: pop_" << loc << "() on empty " + << get_queue_type(value) << "." << endl; + } + + push_value(thr, value, wid); + return true; +} + +template +static bool qpop_b_prop(vthread_t thr, vvp_code_t cp, unsigned wid) +{ + return q_pop_prop(thr, cp, get_back_value, "back", wid); +} + +template +static bool qpop_f_prop(vthread_t thr, vvp_code_t cp, unsigned wid) +{ + return q_pop_prop(thr, cp, get_front_value, "front", wid); +} + +bool of_QPOP_PROP_B_REAL(vthread_t thr, vvp_code_t cp) +{ + return qpop_b_prop(thr, cp, 0); +} + +bool of_QPOP_PROP_B_STR(vthread_t thr, vvp_code_t cp) +{ + return qpop_b_prop(thr, cp, 0); +} + +bool of_QPOP_PROP_B_V(vthread_t thr, vvp_code_t cp) +{ + return qpop_b_prop(thr, cp, cp->bit_idx[0]); +} + +bool of_QPOP_PROP_F_REAL(vthread_t thr, vvp_code_t cp) +{ + return qpop_f_prop(thr, cp, 0); +} + +bool of_QPOP_PROP_F_STR(vthread_t thr, vvp_code_t cp) +{ + return qpop_f_prop(thr, cp, 0); +} + +bool of_QPOP_PROP_F_V(vthread_t thr, vvp_code_t cp) +{ + return qpop_f_prop(thr, cp, cp->bit_idx[0]); +} + +bool of_PROP_QUEUE_SIZE(vthread_t thr, vvp_code_t cp) +{ + size_t pid = cp->number; + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + vvp_object_t qobj; + cobj->get_object(pid, qobj, 0); + vvp_queue* queue = qobj.peek(); + + size_t sz = queue ? queue->get_size() : 0; + + vvp_vector4_t val(32, BIT4_0); + unsigned long ul = sz; + for (unsigned idx = 0; idx < 32; idx++) { + if (ul & 1UL) + val.set_bit(idx, BIT4_1); + else + val.set_bit(idx, BIT4_0); + ul >>= 1; + } + thr->push_vec4(val); + return true; +} + +bool of_DELETE_PROP_ELEM(vthread_t thr, vvp_code_t cp) +{ + size_t pid = cp->number; + + int64_t idx_val = thr->words[3].w_int; + if (thr->flags[4] == BIT4_1) { + cerr << thr->get_fileline() + << "Warning: skipping queue delete() with undefined index." + << endl; + return true; + } + if (idx_val < 0) { + cerr << thr->get_fileline() + << "Warning: skipping queue delete() with negative index." + << endl; + return true; + } + size_t idx = idx_val; + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + vvp_object_t qobj; + cobj->get_object(pid, qobj, 0); + vvp_queue* queue = qobj.peek(); + if (queue == 0) { + cerr << thr->get_fileline() + << "Warning: skipping delete(" << idx + << ") on empty queue." << endl; + } else { + size_t size = queue->get_size(); + if (idx >= size) { + cerr << thr->get_fileline() + << "Warning: skipping out of range delete(" << idx + << ") on queue of size " << size << "." << endl; + } else { + queue->erase(idx); + } + } + + return true; +} + +bool of_DELETE_PROP_OBJ(vthread_t thr, vvp_code_t cp) +{ + size_t pid = cp->number; + + vvp_object_t& top = thr->peek_object(); + vvp_cobject*cobj = top.peek(); + assert(cobj); + + cobj->set_object(pid, vvp_object_t(), 0); + + return true; +} + template static bool store_qb(vthread_t thr, vvp_code_t cp, unsigned wid=0) { diff --git a/vvp/vvp.def b/vvp/vvp.def index 1d1737c77..702103d60 100644 --- a/vvp/vvp.def +++ b/vvp/vvp.def @@ -43,6 +43,7 @@ vpi_vprintf vpip_calc_clog2 vpip_count_drivers vpip_format_strength +vpip_format_pretty vpip_make_systf_system_defined vpip_mcd_rawwrite vpip_set_return_value