Merge from master

This commit is contained in:
Wilson Snyder 2018-04-30 20:36:26 -04:00
commit f02b99c709
4 changed files with 15 additions and 10 deletions

View File

@ -87,6 +87,9 @@ if ($opt_gdb) {
# Generic GDB interactive
run (("gdb"||$ENV{VERILATOR_GDB})
." ".verilator_bin()
# Note, uncomment to set breakpoints before running:
# ." -ex 'break main'"
# Note, we must use double-quotes ("run <switches>")
# and not single ('run <switches>') below. Bash swallows
# escapes as you would expect in a double-quoted string.

View File

@ -186,14 +186,16 @@ endif
debug-make::
@echo
@echo CPPFLAGS: $(CPPFLAGS)
@echo VM_PREFIX: $(VM_PREFIX)
@echo VM_PARALLEL_BUILDS: $(VM_PARALLEL_BUILDS)
@echo VM_CLASSES_FAST: $(VM_CLASSES_FAST)
@echo VM_CLASSES_SLOW: $(VM_CLASSES_SLOW)
@echo VM_SUPPORT_FAST: $(VM_SUPPORT_FAST)
@echo VM_SUPPORT_SLOW: $(VM_SUPPORT_SLOW)
@echo VM_GLOBAL_FAST: $(VM_GLOBAL_FAST)
@echo VM_GLOBAL_SLOW: $(VM_GLOBAL_SLOW)
@echo CPPFLAGS: $(CPPFLAGS)
@echo VK_OBJS: $(VK_OBJS)
@echo
######################################################################

View File

@ -2562,19 +2562,19 @@ void V3EmitC::emitc() {
UINFO(2,__FUNCTION__<<": "<<endl);
// Process each module in turn
for (AstNodeModule* nodep = v3Global.rootp()->modulesp(); nodep; nodep=VN_CAST(nodep->nextp(), NodeModule)) {
if (v3Global.opt.outputSplit()) {
{ EmitCImp imp; imp.main(nodep, false, true); }
{ EmitCImp imp; imp.main(nodep, true, false); }
} else {
{ EmitCImp imp; imp.main(nodep, true, true); }
}
if (v3Global.opt.outputSplit()) {
{ EmitCImp fast; fast.main(nodep, false, true); }
{ EmitCImp slow; slow.main(nodep, true, false); }
} else {
{ EmitCImp both; both.main(nodep, true, true); }
}
}
}
void V3EmitC::emitcTrace() {
UINFO(2,__FUNCTION__<<": "<<endl);
if (v3Global.opt.trace()) {
{ EmitCTrace imp (true); imp.main(); }
{ EmitCTrace imp (false); imp.main(); }
{ EmitCTrace slow(true); slow.main(); }
{ EmitCTrace fast(false); fast.main(); }
}
}

View File

@ -487,6 +487,6 @@ void V3Unroll::unrollAll(AstNetlist* nodep) {
}
void V3Unroll::unrollGen(AstNodeFor* nodep, const string& beginName) {
UINFO(2,__FUNCTION__<<": "<<endl);
UINFO(5,__FUNCTION__<<": "<<endl);
UnrollVisitor visitor (nodep, true, beginName);
}