From ada3067899a73a26ea1e7f39b8f94f2fc2949a71 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Wed, 21 Apr 2021 09:08:26 +0100 Subject: [PATCH] Fix waveform dumpers to use vpiInstance when dumping all variables. (cherry picked from commit a7cb93842eabf2e820887785702defb4e1ebf66a) --- vpi/sys_fst.c | 6 +++--- vpi/sys_lxt.c | 6 +++--- vpi/sys_lxt2.c | 6 +++--- vpi/sys_vcd.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vpi/sys_fst.c b/vpi/sys_fst.c index 769a008b9..30d9d5278 100644 --- a/vpi/sys_fst.c +++ b/vpi/sys_fst.c @@ -824,10 +824,10 @@ static PLI_INT32 sys_dumpvars_calltf(ICARUS_VPI_CONST PLI_BYTE8*name) } if (!depth) depth = 10000; - /* This dumps all the modules in the design if none are given. */ + /* This dumps all the instances in the design if none are given. */ if (!argv || !(item = vpi_scan(argv))) { - argv = vpi_iterate(vpiModule, 0x0); - assert(argv); /* There must be at least one top level module. */ + argv = vpi_iterate(vpiInstance, 0x0); + assert(argv); /* There must be at least one top level instance. */ item = vpi_scan(argv); } diff --git a/vpi/sys_lxt.c b/vpi/sys_lxt.c index a92c583cb..761051a0d 100644 --- a/vpi/sys_lxt.c +++ b/vpi/sys_lxt.c @@ -768,10 +768,10 @@ static PLI_INT32 sys_dumpvars_calltf(ICARUS_VPI_CONST PLI_BYTE8*name) } if (!depth) depth = 10000; - /* This dumps all the modules in the design if none are given. */ + /* This dumps all the instances in the design if none are given. */ if (!argv || !(item = vpi_scan(argv))) { - argv = vpi_iterate(vpiModule, 0x0); - assert(argv); /* There must be at least one top level module. */ + argv = vpi_iterate(vpiInstance, 0x0); + assert(argv); /* There must be at least one top level instance. */ item = vpi_scan(argv); } diff --git a/vpi/sys_lxt2.c b/vpi/sys_lxt2.c index 545b48943..5d7379c2c 100644 --- a/vpi/sys_lxt2.c +++ b/vpi/sys_lxt2.c @@ -820,10 +820,10 @@ static PLI_INT32 sys_dumpvars_calltf(ICARUS_VPI_CONST PLI_BYTE8*name) } if (!depth) depth = 10000; - /* This dumps all the modules in the design if none are given. */ + /* This dumps all the instances in the design if none are given. */ if (!argv || !(item = vpi_scan(argv))) { - argv = vpi_iterate(vpiModule, 0x0); - assert(argv); /* There must be at least one top level module. */ + argv = vpi_iterate(vpiInstance, 0x0); + assert(argv); /* There must be at least one top level instance. */ item = vpi_scan(argv); } diff --git a/vpi/sys_vcd.c b/vpi/sys_vcd.c index 55cdb14aa..9a8c3e646 100644 --- a/vpi/sys_vcd.c +++ b/vpi/sys_vcd.c @@ -804,10 +804,10 @@ static PLI_INT32 sys_dumpvars_calltf(ICARUS_VPI_CONST PLI_BYTE8*name) } if (!depth) depth = 10000; - /* This dumps all the modules in the design if none are given. */ + /* This dumps all the instances in the design if none are given. */ if (!argv || !(item = vpi_scan(argv))) { - argv = vpi_iterate(vpiModule, 0x0); - assert(argv); /* There must be at least one top level module. */ + argv = vpi_iterate(vpiInstance, 0x0); + assert(argv); /* There must be at least one top level instance. */ item = vpi_scan(argv); }