From d64c8abb40c279adb34b87514d73b9730f33f6d0 Mon Sep 17 00:00:00 2001
From: Stefan Frederik <stefan.schippers@gmail.com>
Date: Wed, 6 Jan 2021 00:12:04 +0100
Subject: [PATCH] add -pg also in LDFLAGS if --profile is requested; add little
 more margin in ps page exports

---
 scconfig/hooks.c                 | 5 +++++
 src/hilight.c                    | 1 -
 src/psprint.c                    | 2 +-
 xschem_library/binto7seg/top.sch | 9 +++++----
 xschem_library/devices/res.sym   | 6 +++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/scconfig/hooks.c b/scconfig/hooks.c
index f2289cbe..44d86b92 100644
--- a/scconfig/hooks.c
+++ b/scconfig/hooks.c
@@ -221,11 +221,16 @@ int hook_detect_target()
 			if (require("cc/argstd/pg",  0, 0) == 0) {
 				append("cc/cflags", " ");
 				append("cc/cflags", get("cc/argstd/pg"));
+				append("cc/ldflags", " ");
+				append("cc/ldflags", get("cc/argstd/pg"));
 			}
+                        /* no-pie no more needed it seems */
+                        /* 
 			if (require("cc/argstd/no-pie",  0, 0) == 0) {
 				append("cc/cflags", " ");
 				append("cc/cflags", get("cc/argstd/no-pie"));
 			}
+                        */
 		}
 	}
 
diff --git a/src/hilight.c b/src/hilight.c
index 535d8d2c..8b0ee575 100644
--- a/src/hilight.c
+++ b/src/hilight.c
@@ -1064,7 +1064,6 @@ void propagate_logic()
       npin = xctx->simdata.inst[i].npin;
       for(j=0; j<npin;j++) {
         if(xctx->simdata.inst && xctx->simdata.inst[i].pin && xctx->simdata.inst[i].pin[j].go_to) {
-        /* if(xctx->simdata.inst[i].pin[j].go_to) { */
           int n = 1;
           const char *propag;
           int clock_pin, clock_val, clock_oldval;
diff --git a/src/psprint.c b/src/psprint.c
index e8b5534f..20d19054 100644
--- a/src/psprint.c
+++ b/src/psprint.c
@@ -577,7 +577,7 @@ void ps_draw(void)
 {
  double dx, dy, scale, scaley;
  int landscape=1;
- double margin=0; /* in postscript points, (1/72)". No need to add margin as xschem zoom full already has margins.*/
+ double margin=10; /* in postscript points, (1/72)". No need to add margin as xschem zoom full already has margins.*/
 
  /* Legal: 612 792 */
  double pagex=842;/* a4, in postscript points, (1/72)" */
diff --git a/xschem_library/binto7seg/top.sch b/xschem_library/binto7seg/top.sch
index 984cfa25..3507d4f5 100644
--- a/xschem_library/binto7seg/top.sch
+++ b/xschem_library/binto7seg/top.sch
@@ -1,5 +1,6 @@
-v {xschem version=2.9.5 file_version=1.1}
+v {xschem version=2.9.9 file_version=1.2 }
 G {}
+K {}
 V {}
 S {}
 E {}
@@ -10,7 +11,7 @@ Distributed under the terms of the GNU General Public License,
 either verion 2 or (at your choice) any later version.} 40 -150 0 0 0.4 0.4 {}
 T {INPUTS} 50 -520 0 0 0.4 0.4 {}
 T {OUTPUTS} 280 -460 0 0 0.4 0.4 {}
-T {Binary to 7-segment chip} 660 -450 0 0 0.7 0.7 {}
+T {Binary to 7-segment chip} 660 -460 0 0 0.7 0.7 {}
 N 500 -610 590 -610 {lab=bcd2[1:0]}
 N 590 -630 590 -610 {lab=bcd2[1:0]}
 N 590 -630 650 -630 {lab=bcd2[1:0]}
@@ -109,7 +110,7 @@ C {ipin.sym} 110 -480 0 0 {name=p15 lab=ibin[7:0]}
 C {opin.sym} 280 -420 0 0 {name=p6 lab=oseg2[6:0] verilog_type=reg}
 C {opin.sym} 280 -400 0 0 {name=p7 lab=oseg1[6:0] verilog_type=reg}
 C {opin.sym} 280 -380 0 0 {name=p8 lab=oseg0[6:0] verilog_type=reg}
-C {code.sym} 700 -170 0 0 {name=TESTBENCH only_toplevel=false value="
+C {code.sym} 790 -160 0 0 {name=TESTBENCH only_toplevel=false value="
 reg [7:0] iibin;
 reg ien;
 reg inen;
@@ -119,7 +120,7 @@ reg ipolarity;
 
 initial begin
   $dumpfile(\\"dumpfile.vcd\\");
-  $dumpvars;
+  $dumpvars(0, top);
 end
 
 task binpattern;
diff --git a/xschem_library/devices/res.sym b/xschem_library/devices/res.sym
index 8fef4248..007e5db0 100644
--- a/xschem_library/devices/res.sym
+++ b/xschem_library/devices/res.sym
@@ -1,4 +1,4 @@
-v {xschem version=2.9.8 file_version=1.2}
+v {xschem version=2.9.9 file_version=1.2 }
 G {}
 K {type=resistor
 format="@name @pinlist @value m=@m"
@@ -36,10 +36,10 @@ L 4 2.5 -22.5 7.5 -22.5 {}
 L 4 5 -25 5 -20 {}
 B 5 -2.5 -32.5 2.5 -27.5 {name=P dir=inout propag=1 pinnumber=1}
 B 5 -2.5 27.5 2.5 32.5 {name=M dir=inout propag=0 pinnumber=2}
-T {@name} 15 -18.75 0 0 0.2 0.2 {}
+T {@name} -15 -13.75 0 1 0.2 0.2 {}
 T {@value} 15 -6.25 0 0 0.2 0.2 {}
 T {@#0:pinnumber} -10 -26.25 0 1 0.2 0.2 {layer=13}
 T {@#1:pinnumber} -10 16.25 0 1 0.2 0.2 {layer=13}
 T {@#0:net_name} 10 -28.75 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 10 20 0 0 0.15 0.15 {layer=15}
-T {m=@m} 15 6.25 0 0 0.2 0.2 {}
+T {m=@m} -15 1.25 0 1 0.2 0.2 {}