From bb9d7ba17f29c6b009536f5ff8bb8d4432327c3b Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 3 Nov 2011 19:07:20 +0100
Subject: [PATCH] Eliminate `sal_num_segments'.

---
 src/tabytecode.h |  3 +--
 src/tafpgm.c     | 22 +++++++---------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/tabytecode.h b/src/tabytecode.h
index ca4eb1e..2d2dac1 100644
--- a/src/tabytecode.h
+++ b/src/tabytecode.h
@@ -304,8 +304,7 @@
 #define sal_temp3 sal_temp2 + 1
 #define sal_limit sal_temp3 + 1
 #define sal_func sal_limit +1
-#define sal_num_segments sal_func + 1
-#define sal_anchor sal_num_segments + 1
+#define sal_anchor sal_func + 1
 #define sal_point_min sal_anchor + 1
 #define sal_point_max sal_point_min + 1
 #define sal_segment_offset sal_point_max + 1 /* must be last */
diff --git a/src/tafpgm.c b/src/tafpgm.c
index 83fe662..b1514d9 100644
--- a/src/tafpgm.c
+++ b/src/tafpgm.c
@@ -781,7 +781,6 @@ unsigned char FPGM(bci_create_segment) [] = {
  *
  * sal: sal_i (start of current segment)
  *      sal_j (current twilight point)
- *      sal_num_segments
  */
 
 unsigned char FPGM(bci_create_segments) [] = {
@@ -793,27 +792,22 @@ unsigned char FPGM(bci_create_segments) [] = {
   /* all our measurements are taken along the y axis */
   SVTCA_y,
 
+  DUP,
+  ADD,
   PUSHB_1,
-    sal_num_segments,
-  SWAP,
-  WS, /* sal_num_segments = num_segments */
+    1,
+  SUB, /* delta = (2*num_segments - 1) */
 
-  PUSHB_5,
+  PUSHB_4,
     sal_segment_offset,
     sal_segment_offset,
-    sal_num_segments,
 
     sal_j,
     0,
   WS, /* sal_j = 0 (point offset) */
 
-  RS,
-  DUP,
-  ADD,
-  ADD,
-  PUSHB_1,
-    1,
-  SUB, /* s: sal_segment_offset (sal_segment_offset + 2*num_segments - 1) */
+  ROLL,
+  ADD, /* s: ... sal_segment_offset (sal_segment_offset + delta) */
 
   /* `bci_create_segment_point' also increases the loop counter by 1; */
   /* this effectively means we have a loop step of 2 */
@@ -1698,7 +1692,6 @@ unsigned char FPGM(bci_action_adjust_bound) [] = {
  *      sal_temp1
  *      sal_temp2
  *      sal_temp3
- *      sal_num_segments
  */
 
 #undef sal_u_off
@@ -2415,7 +2408,6 @@ unsigned char FPGM(bci_action_adjust) [] = {
  *      sal_temp1
  *      sal_temp2
  *      sal_temp3
- *      sal_num_segments
  */
 
 #undef sal_u_off
-- 
2.11.4.GIT