Skip to content

Commit fbd1710

Browse files
committed
PathEnd::copy use copy constructors
Signed-off-by: James Cherry <cherry@parallaxsw.com>
1 parent 464d404 commit fbd1710

2 files changed

Lines changed: 7 additions & 181 deletions

File tree

include/sta/PathEnd.hh

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,6 @@ public:
270270
protected:
271271
PathEndClkConstrained(Path *path,
272272
Path *clk_path);
273-
PathEndClkConstrained(Path *path,
274-
Path *clk_path,
275-
Crpr crpr,
276-
bool crpr_valid);
277-
278273
float sourceClkOffset(const ClockEdge *src_clk_edge,
279274
const ClockEdge *tgt_clk_edge,
280275
const TimingRole *check_role,
@@ -300,11 +295,6 @@ protected:
300295
PathEndClkConstrainedMcp(Path *path,
301296
Path *clk_path,
302297
MultiCyclePath *mcp);
303-
PathEndClkConstrainedMcp(Path *path,
304-
Path *clk_path,
305-
MultiCyclePath *mcp,
306-
Crpr crpr,
307-
bool crpr_valid);
308298
float checkMcpAdjustment(const Path *path,
309299
const ClockEdge *tgt_clk_edge,
310300
const StaState *sta) const;
@@ -341,13 +331,6 @@ public:
341331
virtual Delay clkSkew(const StaState *sta);
342332

343333
protected:
344-
PathEndCheck(Path *path,
345-
TimingArc *check_arc,
346-
Edge *check_edge,
347-
Path *clk_path,
348-
MultiCyclePath *mcp,
349-
Crpr crpr,
350-
bool crpr_valid);
351334
Delay sourceClkDelay(const StaState *sta) const;
352335
virtual Required requiredTimeNoCrpr(const StaState *sta) const;
353336

@@ -404,18 +387,6 @@ public:
404387
virtual bool ignoreClkLatency(const StaState *sta) const;
405388

406389
protected:
407-
PathEndLatchCheck(Path *path,
408-
TimingArc *check_arc,
409-
Edge *check_edge,
410-
Path *clk_path,
411-
Path *disable,
412-
MultiCyclePath *mcp,
413-
PathDelay *path_delay,
414-
Delay src_clk_arrival,
415-
Crpr crpr,
416-
bool crpr_valid);
417-
418-
private:
419390
Path *disable_path_;
420391
PathDelay *path_delay_;
421392
// Source clk arrival for set_max_delay -ignore_clk_latency.
@@ -450,12 +421,6 @@ public:
450421
const StaState *sta) const;
451422

452423
protected:
453-
PathEndOutputDelay(OutputDelay *output_delay,
454-
Path *path,
455-
Path *clk_path,
456-
MultiCyclePath *mcp,
457-
Crpr crpr,
458-
bool crpr_valid);
459424
Arrival tgtClkDelay(const ClockEdge *tgt_clk_edge,
460425
const TimingRole *check_role,
461426
const StaState *sta) const;
@@ -491,14 +456,6 @@ public:
491456
const StaState *sta) const;
492457

493458
protected:
494-
PathEndGatedClock(Path *gating_ref,
495-
Path *clk_path,
496-
const TimingRole *check_role,
497-
MultiCyclePath *mcp,
498-
ArcDelay margin,
499-
Crpr crpr,
500-
bool crpr_valid);
501-
502459
const TimingRole *check_role_;
503460
ArcDelay margin_;
504461
};
@@ -525,20 +482,12 @@ public:
525482
virtual const Path *dataClkPath() const { return data_clk_path_; }
526483

527484
protected:
528-
PathEndDataCheck(DataCheck *check,
529-
Path *data_path,
530-
Path *data_clk_path,
531-
Path *clk_path,
532-
MultiCyclePath *mcp,
533-
Crpr crpr,
534-
bool crpr_valid);
535485
Path *clkPath(Path *path,
536486
const StaState *sta);
537487
Arrival requiredTimeNoCrpr(const StaState *sta) const;
538488
// setup uses zero cycle default
539489
virtual int setupDefaultCycles() const { return 0; }
540490

541-
private:
542491
Path *data_clk_path_;
543492
DataCheck *check_;
544493
};
@@ -588,15 +537,6 @@ public:
588537
virtual bool ignoreClkLatency(const StaState *sta) const;
589538

590539
protected:
591-
PathEndPathDelay(PathDelay *path_delay,
592-
Path *path,
593-
Path *clk_path,
594-
TimingArc *check_arc,
595-
Edge *check_edge,
596-
OutputDelay *output_delay,
597-
Arrival src_clk_arrival,
598-
Crpr crpr,
599-
bool crpr_valid);
600540
void findSrcClkArrival(const StaState *sta);
601541

602542
PathDelay *path_delay_;

search/PathEnd.cc

Lines changed: 7 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ PathEndUnconstrained::PathEndUnconstrained(Path *path) :
449449
PathEnd *
450450
PathEndUnconstrained::copy() const
451451
{
452-
return new PathEndUnconstrained(path_);
452+
return new PathEndUnconstrained(*this);
453453
}
454454

455455
bool
@@ -512,17 +512,6 @@ PathEndClkConstrained::PathEndClkConstrained(Path *path,
512512
{
513513
}
514514

515-
PathEndClkConstrained::PathEndClkConstrained(Path *path,
516-
Path *clk_path,
517-
Crpr crpr,
518-
bool crpr_valid) :
519-
PathEnd(path),
520-
clk_path_(clk_path),
521-
crpr_(crpr),
522-
crpr_valid_(crpr_valid)
523-
{
524-
}
525-
526515
void
527516
PathEndClkConstrained::setPath(Path *path)
528517
{
@@ -765,16 +754,6 @@ PathEndClkConstrainedMcp::PathEndClkConstrainedMcp(Path *path,
765754
{
766755
}
767756

768-
PathEndClkConstrainedMcp::PathEndClkConstrainedMcp(Path *path,
769-
Path *clk_path,
770-
MultiCyclePath *mcp,
771-
Crpr crpr,
772-
bool crpr_valid) :
773-
PathEndClkConstrained(path, clk_path, crpr, crpr_valid),
774-
mcp_(mcp)
775-
{
776-
}
777-
778757
float
779758
PathEndClkConstrainedMcp::targetClkMcpAdjustment(const StaState *sta) const
780759
{
@@ -945,24 +924,10 @@ PathEndCheck::PathEndCheck(Path *path,
945924
{
946925
}
947926

948-
PathEndCheck::PathEndCheck(Path *path,
949-
TimingArc *check_arc,
950-
Edge *check_edge,
951-
Path *clk_path,
952-
MultiCyclePath *mcp,
953-
Crpr crpr,
954-
bool crpr_valid) :
955-
PathEndClkConstrainedMcp(path, clk_path, mcp, crpr, crpr_valid),
956-
check_arc_(check_arc),
957-
check_edge_(check_edge)
958-
{
959-
}
960-
961927
PathEnd *
962928
PathEndCheck::copy() const
963929
{
964-
return new PathEndCheck(path_, check_arc_, check_edge_,
965-
clk_path_, mcp_, crpr_, crpr_valid_);
930+
return new PathEndCheck(*this);
966931
}
967932

968933
PathEnd::Type
@@ -1129,29 +1094,10 @@ PathEndLatchCheck::PathEndLatchCheck(Path *path,
11291094
src_clk_arrival_ = search->pathClkPathArrival(path_);
11301095
}
11311096

1132-
PathEndLatchCheck::PathEndLatchCheck(Path *path,
1133-
TimingArc *check_arc,
1134-
Edge *check_edge,
1135-
Path *clk_path,
1136-
Path *disable_path,
1137-
MultiCyclePath *mcp,
1138-
PathDelay *path_delay,
1139-
Delay src_clk_arrival,
1140-
Crpr crpr,
1141-
bool crpr_valid) :
1142-
PathEndCheck(path, check_arc, check_edge, clk_path, mcp, crpr, crpr_valid),
1143-
disable_path_(disable_path),
1144-
path_delay_(path_delay),
1145-
src_clk_arrival_(src_clk_arrival)
1146-
{
1147-
}
1148-
11491097
PathEnd *
11501098
PathEndLatchCheck::copy() const
11511099
{
1152-
return new PathEndLatchCheck(path_, check_arc_, check_edge_,
1153-
clk_path_, disable_path_, mcp_, path_delay_,
1154-
src_clk_arrival_, crpr_, crpr_valid_);
1100+
return new PathEndLatchCheck(*this);
11551101
}
11561102

11571103
PathEnd::Type
@@ -1357,22 +1303,10 @@ PathEndOutputDelay::PathEndOutputDelay(OutputDelay *output_delay,
13571303
{
13581304
}
13591305

1360-
PathEndOutputDelay::PathEndOutputDelay(OutputDelay *output_delay,
1361-
Path *path,
1362-
Path *clk_path,
1363-
MultiCyclePath *mcp,
1364-
Crpr crpr,
1365-
bool crpr_valid) :
1366-
PathEndClkConstrainedMcp(path, clk_path, mcp, crpr, crpr_valid),
1367-
output_delay_(output_delay)
1368-
{
1369-
}
1370-
13711306
PathEnd *
13721307
PathEndOutputDelay::copy() const
13731308
{
1374-
return new PathEndOutputDelay(output_delay_, path_, clk_path_,
1375-
mcp_, crpr_, crpr_valid_);
1309+
return new PathEndOutputDelay(*this);
13761310
}
13771311

13781312
PathEnd::Type
@@ -1564,24 +1498,10 @@ PathEndGatedClock::PathEndGatedClock(Path *gating_ref,
15641498
{
15651499
}
15661500

1567-
PathEndGatedClock::PathEndGatedClock(Path *gating_ref,
1568-
Path *clk_path,
1569-
const TimingRole *check_role,
1570-
MultiCyclePath *mcp,
1571-
ArcDelay margin,
1572-
Crpr crpr,
1573-
bool crpr_valid) :
1574-
PathEndClkConstrainedMcp(gating_ref, clk_path, mcp, crpr, crpr_valid),
1575-
check_role_(check_role),
1576-
margin_(margin)
1577-
{
1578-
}
1579-
15801501
PathEnd *
15811502
PathEndGatedClock::copy() const
15821503
{
1583-
return new PathEndGatedClock(path_, clk_path_, check_role_,
1584-
mcp_, margin_, crpr_, crpr_valid_);
1504+
return new PathEndGatedClock(*this);
15851505
}
15861506

15871507
PathEnd::Type
@@ -1680,24 +1600,10 @@ PathEndDataCheck::clkPath(Path *path,
16801600
return nullptr;
16811601
}
16821602

1683-
PathEndDataCheck::PathEndDataCheck(DataCheck *check,
1684-
Path *data_path,
1685-
Path *data_clk_path,
1686-
Path *clk_path,
1687-
MultiCyclePath *mcp,
1688-
Crpr crpr,
1689-
bool crpr_valid) :
1690-
PathEndClkConstrainedMcp(data_path, clk_path, mcp, crpr, crpr_valid),
1691-
data_clk_path_(data_clk_path),
1692-
check_(check)
1693-
{
1694-
}
1695-
16961603
PathEnd *
16971604
PathEndDataCheck::copy() const
16981605
{
1699-
return new PathEndDataCheck(check_, path_, data_clk_path_,
1700-
clk_path_, mcp_, crpr_, crpr_valid_);
1606+
return new PathEndDataCheck(*this);
17011607
}
17021608

17031609
PathEnd::Type
@@ -1838,30 +1744,10 @@ PathEndPathDelay::PathEndPathDelay(PathDelay *path_delay,
18381744
findSrcClkArrival(sta);
18391745
}
18401746

1841-
PathEndPathDelay::PathEndPathDelay(PathDelay *path_delay,
1842-
Path *path,
1843-
Path *clk_path,
1844-
TimingArc *check_arc,
1845-
Edge *check_edge,
1846-
OutputDelay *output_delay,
1847-
Arrival src_clk_arrival,
1848-
Crpr crpr,
1849-
bool crpr_valid) :
1850-
PathEndClkConstrained(path, clk_path, crpr, crpr_valid),
1851-
path_delay_(path_delay),
1852-
check_arc_(check_arc),
1853-
check_edge_(check_edge),
1854-
output_delay_(output_delay),
1855-
src_clk_arrival_(src_clk_arrival)
1856-
{
1857-
}
1858-
18591747
PathEnd *
18601748
PathEndPathDelay::copy() const
18611749
{
1862-
return new PathEndPathDelay(path_delay_, path_, clk_path_,
1863-
check_arc_, check_edge_, output_delay_,
1864-
src_clk_arrival_, crpr_, crpr_valid_);
1750+
return new PathEndPathDelay(*this);
18651751
}
18661752

18671753
PathEnd::Type

0 commit comments

Comments
 (0)