feat+fix: adding a config option so that new frameworks strictly enforce pin declaration checks (error instead of warning), fixed projects accordingly

Author: sylefeb

frameworks/boards/icebreaker/icebreaker.v

@@ -39,6 +39,7 @@ $$config['dualport_bram_wenable0_width'] = '1'
 $$config['dualport_bram_wenable1_width'] = '1'
 $$config['simple_dualport_bram_wenable0_width'] = '1'
 $$config['simple_dualport_bram_wenable1_width'] = '1'
+$$config['allow_deprecated_framework'] = 'no'
 // declare package pins (has to match the hardware pin definition)
 // pin.NAME = <WIDTH>
 $$pin.LED1=1 pin.LED2=1 pin.LED3=1 pin.LED4=1 pin.LED5=1

frameworks/boards/icestick/icestick.v

@@ -39,6 +39,7 @@ $$config['dualport_bram_wenable0_width'] = '1'
 $$config['dualport_bram_wenable1_width'] = '1'
 $$config['simple_dualport_bram_wenable0_width'] = '1'
 $$config['simple_dualport_bram_wenable1_width'] = '1'
+$$config['allow_deprecated_framework'] = 'no'
 // declare package pins (has to match the hardware pin definition)
 // pin.NAME = <WIDTH>
 $$pin.D1 = 1 pin.D2 = 1 pin.D3 = 1 pin.D4 = 1 pin.D5 = 1
@@ -58,6 +59,11 @@ $$pin.vga_g     = {pin.TR10,pin.TR9,pin.TR8,pin.TR7,pin.TR6,pin.TR5}
 $$pin.vga_b     = {pin.BR10,pin.BR9,pin.BR8,pin.BR7,pin.BR6,pin.BR5}
 $$pin.vga_hs    = {pin.PMOD7}
 $$pin.vga_vs    = {pin.PMOD10}
+$$pin.video_r   = {pin.PMOD1,pin.PMOD2,pin.PMOD3,pin.PMOD4,pin.PMOD8,pin.PMOD9}
+$$pin.video_g   = {pin.TR10,pin.TR9,pin.TR8,pin.TR7,pin.TR6,pin.TR5}
+$$pin.video_b   = {pin.BR10,pin.BR9,pin.BR8,pin.BR7,pin.BR6,pin.BR5}
+$$pin.video_hs  = {pin.PMOD7}
+$$pin.video_vs  = {pin.PMOD10}
 $$pin.pmod      = {pin.PMOD10,pin.PMOD9,pin.PMOD8,pin.PMOD7,pin.PMOD4,pin.PMOD3,pin.PMOD2,pin.PMOD1}
 $$pin.uart_tx   = {pin.TX}
 $$pin.uart_rx   = {pin.RX}

frameworks/boards/ulx3s/ulx3s.v

@@ -40,6 +40,7 @@ $$NUM_BTNS = 7
 $$color_depth = 6
 $$color_max   = 63
 $$config['dualport_bram_supported'] = 'yes'
+$$config['allow_deprecated_framework'] = 'no'
 // declare package pins (has to match the hardware pin definition)
 // pin.NAME = <WIDTH>
 $$pin.gp         = 28
@@ -78,6 +79,8 @@ $$pin.usb_fpga_bd_dp = 1
 $$pin.usb_fpga_bd_dn = 1
 $$pin.usb_fpga_pu_dp = 1
 $$pin.usb_fpga_pu_dn = 1
+$$pin.us2_bd_dp  = pin.usb_fpga_bd_dp
+$$pin.us2_bd_dn  = pin.usb_fpga_bd_dn
 $$pin.ftdi_rxd   = 1
 $$pin.ftdi_txd   = 1
 $$pin.uart_rx    = 1

projects/oled_sdcard_test/oled_sdcard_imgview.si

@@ -21,7 +21,7 @@ $$dofile('pre_sdcard_image.lua')
 
 algorithm main(
   output uint8 leds,
-  input  uint7 btn,
+  input  uint7 btns,
   output uint1 oled_clk,
   output uint1 oled_mosi,
   output uint1 oled_dc,
@@ -58,7 +58,7 @@ algorithm main(
 
   uint7  btn_latch = 0;
 
-  btn_latch     := btn;
+  btn_latch     := btns;
 
   // maintain low (pulses high when needed)
   io.start_rect := 0;

projects/oled_text/oled_text.si

@@ -75,7 +75,7 @@ $$end
 algorithm main(
 $$if ULX3S then
   output  uint8 leds,
-  input   uint7 btn,
+  input   uint7 btns,
   output  uint1 oled_clk,
   output  uint1 oled_mosi,
   output  uint1 oled_dc,

src/SiliceCompiler.cpp

@@ -49,7 +49,7 @@ using namespace Silice::Utils;
 
 // -------------------------------------------------
 
-bool g_Disable_CL0006 = false; // allows to force the use of outdates frameworks
+bool g_Disable_CL0006 = false; // turn the check for missing pins into a warning
 
 extern bool g_SplitInouts;
 
@@ -379,6 +379,7 @@ void SiliceCompiler::beginParsing(
   CONFIG.keyValues()["frameworks_dir"] = frameworks_dir;
   CONFIG.keyValues()["templates_path"] = frameworks_dir + "/templates";
   CONFIG.keyValues()["libraries_path"] = frameworks_dir + "/libraries";
+  CONFIG.keyValues()["allow_deprecated_framework"] = "yes"; /// TODO: enforce this next major version
   // create the preprocessor
   AutoPtr<LuaPreProcessor> lpp(new LuaPreProcessor());
   lpp->enableFilesReport(fresult + ".files.log");
@@ -555,7 +556,7 @@ bool SiliceCompiler::addTopModulePort(
 ) {
   if (!m_BodyContext->lpp->isIOPortDefined(port)) {
     CHANGELOG.addPointOfInterest("CL0006", srcloc);
-    if (g_Disable_CL0006) {
+    if (g_Disable_CL0006 || CONFIG.keyValues()["allow_deprecated_framework"] == "yes") {
       warn(Deprecation, srcloc, "pin '%s' is not declared in framework\n             This may result in incorrect Verilog code.\n", port.c_str());
     } else {
       reportError(srcloc, "pin '%s' is not declared in framework\n         This may result in incorrect Verilog code.\n         Use --no-pin-check on command line to force.", port.c_str());

src/silice.cpp

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
     cmd.add(exportParam);
     TCLAP::SwitchArg             forceResetInit("", "force-reset-init", "forces initialization at reset of initialized registers", false);
     cmd.add(forceResetInit);
-    TCLAP::SwitchArg             disableCL0006("", "no-pin-check", "disable check for pin declaration in frameworks (see CL0006)", true); /// ////////// TODO set to false once no longer wip
+    TCLAP::SwitchArg             disableCL0006("", "no-pin-check", "force disable check for pin declaration in frameworks (see CL0006)", false);
     cmd.add(disableCL0006);
     TCLAP::SwitchArg             splitInouts("", "split-inouts", "splits all inouts into enable, in, out pins", false);
     cmd.add(splitInouts);