diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/nextpnr.h | 16 | ||||
| -rw-r--r-- | common/router1.cc | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index f7f1cebc..e9e491f4 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -155,10 +155,10 @@ struct GraphicElement enum style_t { - G_FRAME, - G_HIDDEN, - G_INACTIVE, - G_ACTIVE, + G_FRAME, // Static "frame". Contrast between G_INACTIVE and G_ACTIVE + G_HIDDEN, // Only display when object is selected or highlighted + G_INACTIVE, // Render using low-contrast color + G_ACTIVE, // Render using high-contast color } style = G_FRAME; float x1 = 0, y1 = 0, x2 = 0, y2 = 0, z = 0; @@ -276,11 +276,11 @@ struct CellInfo : ArchCellInfo // placement constraints CellInfo *constr_parent; - std::vector<CellInfo*> constr_children; + std::vector<CellInfo *> constr_children; const int UNCONSTR = INT_MIN; - int constr_x = UNCONSTR; // this.x - parent.x - int constr_y = UNCONSTR; // this.y - parent.y - int constr_z = UNCONSTR; // this.z - parent.z + int constr_x = UNCONSTR; // this.x - parent.x + int constr_y = UNCONSTR; // this.y - parent.y + int constr_z = UNCONSTR; // this.z - parent.z bool constr_abs_z = false; // parent.z := 0 // parent.[xyz] := 0 when (constr_parent == nullptr) }; diff --git a/common/router1.cc b/common/router1.cc index fbf3c467..8a05236f 100644 --- a/common/router1.cc +++ b/common/router1.cc @@ -810,14 +810,14 @@ bool router1(Context *ctx) log_info("Checksum: 0x%08x\n", ctx->checksum()); #ifndef NDEBUG ctx->check(); - ctx->unlock(); #endif + ctx->unlock(); return true; } catch (log_execution_error_exception) { #ifndef NDEBUG ctx->check(); - ctx->unlock(); #endif + ctx->unlock(); return false; } } |