nexus: Switch from RelPtr to RelSlice

This replaces RelPtrs and a separate length field with a Rust-style
slice containing both a pointer and a length; with bounds checking
always enforced.

Thus iterating over these structures is both cleaner and safer.

Signed-off-by: D. Shah <dave@ds0.me>

1 files changed, 4 insertions, 4 deletions

diff --git a/nexus/fasm.cc b/nexus/fasm.cc
index b041bf43..f320405d 100644
--- a/nexus/fasm.cc
+++ b/nexus/fasm.cc
@@ -150,9 +150,9 @@ struct NexusFasmWriter
     const PhysicalTileInfoPOD &tile_by_type_and_loc(int loc, IdString type)
     {
         auto &ploc = ctx->chip_info->grid[loc];
-        for (int i = 0; i < ploc.num_phys_tiles; i++) {
-            if (ploc.phys_tiles[i].tiletype == type.index)
-                return ploc.phys_tiles[i];
+        for (auto &pt : ploc.phys_tiles) {
+            if (pt.tiletype == type.index)
+                return pt;
         }
         log_error("No tile of type %s found at location R%dC%d", ctx->nameOf(type), loc / ctx->chip_info->width,
                   loc % ctx->chip_info->width);
@@ -161,7 +161,7 @@ struct NexusFasmWriter
     const PhysicalTileInfoPOD &tile_at_loc(int loc)
     {
         auto &ploc = ctx->chip_info->grid[loc];
-        NPNR_ASSERT(ploc.num_phys_tiles == 1);
+        NPNR_ASSERT(ploc.phys_tiles.size() == 1);
         return ploc.phys_tiles[0];
     }
     // Escape an internal prjoxide name for FASM by replacing : with __