Add $ivlh_attribute_event for VHDL support

The $ivlh_attribute_event system function helps the Verilog runtime
support <name>'event expressions in VHDL. The vhdlpp generates a
call to $ivlh_attribute_event, which in turn uses callbacks to handle
the support.

This is also the start of the vhdl_sys vpi module. This module should
by included whenever VHDL code is parsed.
This commit is contained in:
Stephen Williams 2011-06-24 18:42:43 -07:00
parent d14f60f28a
commit 91ffc68e95
4 changed files with 158 additions and 1 deletions

View File

@ -68,6 +68,14 @@ int ExpUnary::emit_operand1(ostream&out, Entity*ent, Architecture*arc)
int ExpAttribute::emit(ostream&out, Entity*ent, Architecture*arc)
{
int errors = 0;
if (name_ == "event") {
out << "$ivlh_attribute_event(";
errors += base_->emit(out, ent, arc);
out << ")";
return errors;
}
out << "$ivl_attribute(";
errors += base_->emit(out, ent, arc);
out << ", \"" << name_ << "\")";
@ -166,6 +174,7 @@ int ExpCharacter::emit_primitive_bit_(ostream&out, Entity*ent, Architecture*arc,
default:
return 1;
}
return 1;
}
int ExpCharacter::emit(ostream&out, Entity*ent, Architecture*arc)

View File

@ -76,7 +76,9 @@ V = va_math.o
V2009 = v2009_table.o v2009_enum.o
all: dep system.vpi va_math.vpi v2005_math.vpi v2009.vpi $(ALL32)
VHDL_SYS = vhdl_table.o
all: dep system.vpi va_math.vpi v2005_math.vpi v2009.vpi vhdl_sys.vpi $(ALL32)
check: all
@ -148,6 +150,9 @@ v2009.vpi: $(V2009) ../vvp/libvpi.a
va_math.vpi: $V ../vvp/libvpi.a
$(CC) @shared@ -o $@ $V -L../vvp $(LDFLAGS) -lvpi $(VA_MATH_VPI_LDFLAGS)
vhdl_sys.vpi: $(VHDL_SYS) ../vvp/libvpi.a
$(CXX) @shared@ -o $@ $(VHDL_SYS) -L ../vvp $(LDFLAGS) -lvpi $(SYSTEM_VPI_FLAGS)
stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status
@rm -f $@
cd ..; ./config.status --header=vpi/vpi_config.h
@ -158,6 +163,7 @@ install: all installdirs \
$(vpidir)/va_math.vpi $(vpidir)/va_math.sft \
$(vpidir)/v2005_math.vpi $(vpidir)/v2005_math.sft \
$(vpidir)/v2009.vpi $(vpidir)/v2009.sft \
$(vpidir)/vhdl_sys.vpi $(vpidir)/vhdl_sys.sft
$(vpidir)/system.vpi: ./system.vpi
$(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi"
@ -183,6 +189,12 @@ $(vpidir)/v2009.vpi: ./v2009.vpi
$(vpidir)/v2009.sft: v2009.sft
$(INSTALL_DATA) $< "$(DESTDIR)$@"
$(vpidir)/vhdl_sys.vpi: ./vhdl_sys.vpi
$(INSTALL_PROGRAM) ./vhdl_sys.vpi "$(DESTDIR)$(vpidir)/vhdl_sys.vpi"
$(vpidir)/vhdl_sys.sft: vhdl_sys.sft
$(INSTALL_DATA) $< "$(DESTDIR)$@"
installdirs: $(srcdir)/../mkinstalldirs
$(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)" "$(DESTDIR)$(vpidir)"
@ -195,6 +207,8 @@ uninstall:
rm -f "$(DESTDIR)$(vpidir)/v2005_math.sft"
rm -f "$(DESTDIR)$(vpidir)/v2009.vpi"
rm -f "$(DESTDIR)$(vpidir)/v2009.sft"
rm -f "$(DESTDIR)$(vpidir)/vhdl_sys.vpi"
rm -f "$(DESTDIR)$(vpidir)/vhdl_sys.sft"
-include $(patsubst %.o, dep/%.d, $O)
-include $(patsubst %.o, dep/%.d, $(OPP))

1
vpi/vhdl_sys.sft Normal file
View File

@ -0,0 +1 @@
$ivlh_attribute_event vpiSysFuncSized 1 unsigned

133
vpi/vhdl_table.cc Normal file
View File

@ -0,0 +1,133 @@
/*
* Copyright (c) 2011 Stephen Williams (steve@icarus.com)
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
* General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
# include "vpi_config.h"
# include "vpi_user.h"
# include <cassert>
/*
* The $ivlh_attribute_event implements the VHDL <varname>'event
* attribute. It does this by monitoring value-change events on the
* operand, and noting the time. If the $ivlh_attribute_event is
* called at the same simulation time as a value-change, then the
* function returns logic true. Otherwise it returns false.
*/
struct monitor_data {
struct t_vpi_time last_event;
};
static PLI_INT32 monitor_events(struct t_cb_data*cb)
{
struct monitor_data*mon = reinterpret_cast<monitor_data*> (cb->user_data);
assert(cb->time);
assert(cb->time->type == vpiSimTime);
mon->last_event = *(cb->time);
return 0;
}
static PLI_INT32 ivlh_attribute_event_compiletf(ICARUS_VPI_CONST PLI_BYTE8*)
{
vpiHandle sys = vpi_handle(vpiSysTfCall, 0);
vpiHandle argv = vpi_iterate(vpiArgument, sys);
vpiHandle arg;
// Check that there is at least 1 argument...
if (argv == 0) {
vpi_printf("ERROR: %s:%d: ", vpi_get_str(vpiFile, sys), vpi_get(vpiLineNo, sys));
vpi_printf("Call to %s missing its argument\n", vpi_get_str(vpiName,sys));
vpi_control(vpiFinish, 1);
return 0;
}
arg = vpi_scan(argv);
assert(arg);
struct monitor_data*monitor_handle = new struct monitor_data;
struct t_cb_data cb;
struct t_vpi_time tb;
tb.type = vpiSimTime;
cb.reason = cbValueChange;
cb.cb_rtn = monitor_events;
cb.obj = arg;
cb.time = &tb;
cb.value = 0;
cb.user_data = reinterpret_cast<char*>(monitor_handle);
vpi_register_cb(&cb);
vpi_put_userdata(sys, monitor_handle);
// check that there is no more then 1 argument
arg = vpi_scan(argv);
if (arg != 0) {
vpi_printf("ERROR: %s:%d: ", vpi_get_str(vpiFile, sys), vpi_get(vpiLineNo, sys));
vpi_printf("Too many arguments for call to %s.\n", vpi_get_str(vpiName,sys));
vpi_control(vpiFinish, 1);
}
return 0;
}
static PLI_INT32 ivlh_attribute_event_calltf(ICARUS_VPI_CONST PLI_BYTE8*)
{
vpiHandle sys = vpi_handle(vpiSysTfCall, 0);
struct t_vpi_value rval;
rval.format = vpiScalarVal;
struct monitor_data*mon = reinterpret_cast<monitor_data*>(vpi_get_userdata(sys));
if (mon->last_event.type == 0) {
rval.value.scalar = vpi0;
} else {
struct t_vpi_time tnow;
tnow.type = vpiSimTime;
vpi_get_time(0,&tnow);
rval.value.scalar = vpi1;
if (mon->last_event.high != tnow.high)
rval.value.scalar = vpi0;
if (mon->last_event.low != tnow.low)
rval.value.scalar = vpi0;
}
vpi_put_value(sys, &rval, 0, vpiNoDelay);
return 0;
}
static void vhdl_register(void)
{
s_vpi_systf_data tf_data;
tf_data.type = vpiSysFunc;
tf_data.tfname = "$ivlh_attribute_event";
tf_data.calltf = ivlh_attribute_event_calltf;
tf_data.compiletf = ivlh_attribute_event_compiletf;
tf_data.sizetf = 0;
tf_data.user_data = "$ivlh_attribute_event";
vpi_register_systf(&tf_data);
}
void (*vlog_startup_routines[])() = {
vhdl_register,
0
};