From 8b969202c05fa2a1c3668ecf5e9e2dff5375f8a7 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Thu, 21 Aug 2014 20:21:23 -0700 Subject: [PATCH] Clean up some bugs introduced by recent patches. --- elab_sig.cc | 4 ---- vvp/compile.cc | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/elab_sig.cc b/elab_sig.cc index 6c0318439..cf37911c8 100644 --- a/elab_sig.cc +++ b/elab_sig.cc @@ -1119,10 +1119,6 @@ NetNet* PWire::elaborate_sig(Design*des, NetScope*scope) const continue; } - cerr << get_fileline() << ": XXXX: " - << "use_lidx=" << use_lidx - << ", use_ridx=" << use_ridx << endl; - // Cannot handle dynamic arrays of arrays yet. ivl_assert(*this, netdarray==0); ivl_assert(*this, use_lidx && use_ridx); diff --git a/vvp/compile.cc b/vvp/compile.cc index 4838a4b10..4dac7f1de 100644 --- a/vvp/compile.cc +++ b/vvp/compile.cc @@ -245,15 +245,15 @@ static const struct opcode_table_s opcode_table[] = { { "%shiftr/s/i0", of_SHIFTR_S_I0,2,{OA_BIT1,OA_NUMBER, OA_NONE} }, { "%store/dar/r", of_STORE_DAR_R, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, { "%store/dar/str",of_STORE_DAR_STR, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, - { "%store/qb/r", of_STORE_QB_R, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, - { "%store/qb/str", of_STORE_QB_STR, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, - { "%store/qf/r", of_STORE_QF_R, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, - { "%store/qf/str", of_STORE_QF_STR, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, { "%store/obj", of_STORE_OBJ, 1, {OA_FUNC_PTR,OA_NONE, OA_NONE} }, { "%store/prop/obj",of_STORE_PROP_OBJ,1, {OA_NUMBER, OA_NONE, OA_NONE} }, { "%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, 3, {OA_BIT1, OA_BIT2, OA_NUMBER} }, + { "%store/qb/r", of_STORE_QB_R, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, + { "%store/qb/str", of_STORE_QB_STR, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, + { "%store/qf/r", of_STORE_QF_R, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, + { "%store/qf/str", of_STORE_QF_STR, 1, {OA_FUNC_PTR, OA_NONE, OA_NONE} }, { "%store/real", of_STORE_REAL, 1, {OA_FUNC_PTR,OA_NONE, OA_NONE} }, { "%store/reala", of_STORE_REALA, 2, {OA_ARR_PTR, OA_BIT1, OA_NONE} }, { "%store/str", of_STORE_STR, 1, {OA_FUNC_PTR,OA_NONE, OA_NONE} },