Merge pull request #598 from YosysHQ/gatecat/compiler-flags

Tighten up compiler flags

3 files changed, 27 insertions, 27 deletions

diff --git a/gowin/arch.cc b/gowin/arch.cc
index 7e947341..72051b3f 100644
--- a/gowin/arch.cc
+++ b/gowin/arch.cc
@@ -613,20 +613,20 @@ Arch::Arch(ArchArgs args) : args(args)
             // fall through the ++
             case ID_LUT7:
                 z++;
-                dff = false;
+                dff = false; /* fall-through*/
             case ID_LUT6:
                 z++;
-                dff = false;
+                dff = false; /* fall-through*/
             case ID_LUT5:
-                z++;
+                z++; /* fall-through*/
             case ID_LUT4:
-                z++;
+                z++; /* fall-through*/
             case ID_LUT3:
-                z++;
+                z++; /* fall-through*/
             case ID_LUT2:
-                z++;
+                z++; /* fall-through*/
             case ID_LUT1:
-                z++;
+                z++; /* fall-through*/
             case ID_LUT0:
                 // common LUT+DFF code
                 snprintf(buf, 32, "R%dC%d_SLICE%d", row + 1, col + 1, z);
@@ -654,23 +654,23 @@ Arch::Arch(ArchArgs args) : args(args)
                 }
                 break;
             case ID_IOBJ:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBI:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBH:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBG:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBF:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBE:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBD:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBC:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBB:
-                z++;
+                z++; /* fall-through*/
             case ID_IOBA:
                 snprintf(buf, 32, "R%dC%d_IOB%c", row + 1, col + 1, 'A' + z);
                 belname = id(buf);
diff --git a/gowin/arch.h b/gowin/arch.h
index 052c1545..e0686d1c 100644
--- a/gowin/arch.h
+++ b/gowin/arch.h
@@ -348,9 +348,9 @@ struct Arch : BaseArch<ArchRanges>
 
     int getGridDimX() const override { return gridDimX; }
     int getGridDimY() const override { return gridDimY; }
-    int getTileBelDimZ(int x, int y) const { return tileBelDimZ[x][y]; }
-    int getTilePipDimZ(int x, int y) const { return tilePipDimZ[x][y]; }
-    char getNameDelimiter() const
+    int getTileBelDimZ(int x, int y) const override { return tileBelDimZ[x][y]; }
+    int getTilePipDimZ(int x, int y) const override { return tilePipDimZ[x][y]; }
+    char getNameDelimiter() const override
     {
         return ' '; /* use a non-existent delimiter as we aren't using IdStringLists yet */
     }
@@ -431,13 +431,13 @@ struct Arch : BaseArch<ArchRanges>
     bool place() override;
     bool route() override;
 
-    bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayQuad &delay) const;
+    bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayQuad &delay) const override;
     // Get the port class, also setting clockInfoCount to the number of TimingClockingInfos associated with a port
-    TimingPortClass getPortTimingClass(const CellInfo *cell, IdString port, int &clockInfoCount) const;
+    TimingPortClass getPortTimingClass(const CellInfo *cell, IdString port, int &clockInfoCount) const override;
     // Get the TimingClockingInfo of a port
-    TimingClockingInfo getPortClockingInfo(const CellInfo *cell, IdString port, int index) const;
+    TimingClockingInfo getPortClockingInfo(const CellInfo *cell, IdString port, int index) const override;
 
-    bool isBelLocationValid(BelId bel) const;
+    bool isBelLocationValid(BelId bel) const override;
 
     static const std::string defaultPlacer;
     static const std::vector<std::string> availablePlacers;
@@ -446,7 +446,7 @@ struct Arch : BaseArch<ArchRanges>
 
     // ---------------------------------------------------------------
     // Internal usage
-    void assignArchInfo();
+    void assignArchInfo() override;
     bool cellsCompatible(const CellInfo **cells, int count) const;
 
     std::vector<IdString> cell_types;
diff --git a/gowin/main.cc b/gowin/main.cc
index 308be4d3..674eac03 100644
--- a/gowin/main.cc
+++ b/gowin/main.cc
@@ -61,10 +61,10 @@ std::unique_ptr<Context> GowinCommandHandler::createContext(std::unordered_map<s
         log_error("Invalid device %s\n", device.c_str());
     }
     ArchArgs chipArgs;
-    char buf[32];
-    snprintf(buf, 32, "GW1N%s-%s", match[1].str().c_str(), match[3].str().c_str());
+    char buf[36];
+    snprintf(buf, 36, "GW1N%s-%s", match[1].str().c_str(), match[3].str().c_str());
     chipArgs.device = buf;
-    snprintf(buf, 32, "GW1N-%s", match[3].str().c_str());
+    snprintf(buf, 36, "GW1N-%s", match[3].str().c_str());
     chipArgs.family = buf;
     chipArgs.package = match[4];
     chipArgs.speed = match[5];