From c7477d2f1b1d34b6fd9deab308c0296422f048c7 Mon Sep 17 00:00:00 2001
From: "A. Fachat" <fachat@web.de>
Date: Sun, 6 Oct 2013 16:37:28 +0200
Subject: [PATCH] fix a bug in operand size optimization

---
 xa/src/xat.c                     | 13 +++++++++----
 xa/tests/README                  |  1 +
 xa/tests/relmode/Makefile        | 24 ++++++++++++++++++++++++
 xa/tests/relmode/mixabsolute.a65 | 18 ++++++++++++++++++
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 xa/tests/relmode/Makefile
 create mode 100644 xa/tests/relmode/mixabsolute.a65

diff --git a/xa/src/xat.c b/xa/src/xat.c
index 3750e1b..4633564 100644
--- a/xa/src/xat.c
+++ b/xa/src/xat.c
@@ -1691,9 +1691,12 @@ fprintf(stderr,
 /* terrible KLUDGE!!!! OH NOES!!!1!
    due to the way this is constructed, you must absolutely always specify @ to
    get an absolute long or it will absolutely always be optimized down */
-
-                    if(bl && am>16 &&
-			!er && !(vv[0]&0xff0000) && opt[am]>=0)
+/* now also checks for negative overflow, resp. not-overflow */
+                    if(bl 
+			&& am>16 
+			&& !er 
+			&& (((vv[0]&0xff8000)==0xff8000) || !(vv[0]&0xff0000)) 
+			&& opt[am]>=0)
                          if(ct[n][opt[am]]>=0)
                               am=opt[am];
 #ifdef DEBUG_AM
@@ -1746,8 +1749,10 @@ fprintf(stderr, "byte length is now %d\n", bl);
                                   er=E_CMOS;
                          } else {
                               n65816++;
-                              if(!w65816)
+                              if(!w65816) {
+fprintf(stderr,"n=%d, am=%d\n", n, am);
                                   er=E_65816;
+			      }
                          }
                     }
                     if(am!=0)
diff --git a/xa/tests/README b/xa/tests/README
index 8ecb6df..a7d08c2 100644
--- a/xa/tests/README
+++ b/xa/tests/README
@@ -20,6 +20,7 @@ binclude/	Binary include code with some weird casing
 chppch/		Changing preprocessor characters (-p)
 charset/	Tests of when charsets should be honoured and when not
 cc65/		Compatibility tests for ca65 compatibility
+relmode/	tests concerning switches between segments and absolute mode
 
 Cameron Kaiser, André Fachat
 
diff --git a/xa/tests/relmode/Makefile b/xa/tests/relmode/Makefile
new file mode 100644
index 0000000..1b37495
--- /dev/null
+++ b/xa/tests/relmode/Makefile
@@ -0,0 +1,24 @@
+#
+# Makefile for tests
+#
+
+XA=../../xa
+
+tests: mixabs1 mixabs2 clean
+
+
+mixabs1: mixabsolute.a65
+	${XA} $<
+	hexdump -C a.o65 > a.hex
+	cmp mixabs1.out a.hex
+
+mixabs2: mixabsolute.a65
+	${XA} -R $<
+	file65 -V a.o65
+	reloc65 -bt 40960 -o b.o65 a.o65
+	hexdump -C b.o65 > b.hex
+	cmp mixabs2.out b.hex
+
+clean:
+#	rm -f a.err a.o65 a.hex b.o65 b.hex
+
diff --git a/xa/tests/relmode/mixabsolute.a65 b/xa/tests/relmode/mixabsolute.a65
new file mode 100644
index 0000000..5f01d06
--- /dev/null
+++ b/xa/tests/relmode/mixabsolute.a65
@@ -0,0 +1,18 @@
+
+	.text
+
+l1	lda l1
+
+	*=$2000
+
+l2	lda l2
+
+	.data
+
+l3	.word l3
+
+	.text
+
+l4 	lda l4
+
+