From 4efdd2a59aa76703a74a8099369fe3c456dc7f86 Mon Sep 17 00:00:00 2001
From: Andre Fachat <afachat@gmx.de>
Date: Thu, 2 Nov 2023 21:57:40 +0100
Subject: [PATCH] beta4

---
 xa/misc/ldo65.c             |  12 ++++++------
 xa/src/xal.c                |   4 ++--
 xa/src/xat.c                |  10 +++++-----
 xa/tests/csapiec/testseg.ok | Bin 220 -> 220 bytes
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/xa/misc/ldo65.c b/xa/misc/ldo65.c
index 6c82cd9..907097b 100644
--- a/xa/misc/ldo65.c
+++ b/xa/misc/ldo65.c
@@ -304,16 +304,16 @@ printf("tbase=%04x+len=%04x->%04x, file->tbase=%04x, f.tlen=%04x -> tdiff=%04x\n
 printf("zbase=%04x+len=%04x->%04x, file->zbase=%04x, f.zlen=%04x -> zdiff=%04x\n",
 		zbase, tzlen, (zbase + tzlen), file->zbase, file->zlen, file->zdiff);
 */
-	 
+
 	  if (verbose > 0) {
 		  printf("Relocating file: %s\n", file->fname);
-		  printf("    text: from %04x to %04x (diff is %04x, length is %04x)\n", 
+		  printf("    text: from %04x to %04x (diff is %04x, length is %04x)\n",
 				  file->tbase, file->tbase + file->tdiff, file->tdiff, file->tlen);
-		  printf("    data: from %04x to %04x (diff is %04x, length is %04x)\n", 
+		  printf("    data: from %04x to %04x (diff is %04x, length is %04x)\n",
 				  file->dbase, file->dbase + file->ddiff, file->ddiff, file->dlen);
-		  printf("    bss:  from %04x to %04x (diff is %04x, length is %04x)\n", 
+		  printf("    bss:  from %04x to %04x (diff is %04x, length is %04x)\n",
 				  file->bbase, file->bbase + file->bdiff, file->bdiff, file->blen);
-		  printf("    zero: from %02x to %02x (diff is %02x, length is %02x)\n", 
+		  printf("    zero: from %02x to %02x (diff is %02x, length is %02x)\n",
 				  file->zbase, file->zbase + file->zdiff, file->zdiff, file->zlen);
 	  }
 
@@ -711,7 +711,7 @@ unsigned char *reloc_globals(unsigned char *buf, file65 *fp) {
 	  old = buf[1] + 256*buf[2];
 	  new = old + reldiff(seg);
 	  if (verbose > 1) {
-		printf("%s:%s: old=%04x, seg=%d, rel=%04x, new=%04x\n", 
+		printf("%s:%s: old=%04x, seg=%d, rel=%04x, new=%04x\n",
 				fp->fname, name, old, seg, reldiff(seg), new);
 	  }
 	  buf[1] = new & 255;
diff --git a/xa/src/xal.c b/xa/src/xal.c
index b5612f7..1781112 100644
--- a/xa/src/xal.c
+++ b/xa/src/xal.c
@@ -707,7 +707,7 @@ int ll_pdef(char *t)
 	return(E_NODEF);
 }
 
-/* 
+/*
  * Write out the list of global labels in an o65 file
  */
 int l_write(FILE *fp)
@@ -740,7 +740,7 @@ int l_write(FILE *fp)
 
 	    // segment byte
 	    afl = ltp->afl;
-            // hack to switch undef and abs flag from internal to file format 
+            // hack to switch undef and abs flag from internal to file format
 	    // if asolute of undefined (< SEG_TEXT, i.e. 0 or 1)
 	    // then invert bit 0 (0 = absolute)
             if( (afl & (A_FMASK>>8)) < SEG_TEXT) {
diff --git a/xa/src/xat.c b/xa/src/xat.c
index 8abf5d5..4a71e11 100644
--- a/xa/src/xat.c
+++ b/xa/src/xat.c
@@ -105,13 +105,13 @@ char *kt[] ={
 
 /* arithmetic operators (purely for listing, parsing is done programmatically */
 char *arith_ops[] = {
-	"", "+", "-", 			// 0,1,2
-	"*", "/", 			// 3,4
-	">>", "<<", 			// 5,6
+	"", "+", "-",			// 0,1,2
+	"*", "/",			// 3,4
+	">>", "<<",			// 5,6
 	"<", ">", "=",			// 7,8,9
-	"<=", ">=", "<>", 		// 10,11,12
+	"<=", ">=", "<>",		// 10,11,12
 	"&", "^", "|",			// 13,14,15
-	"&&", "||", "==", "!=", "!"	// 16,17,18,19,20
+	"&&", "||", "==", "!=", "!"	// 16,17,18 (9),19 (12),20 (NYI)
 };
 
 /* length of arithmetic operators indexed by operator number */
diff --git a/xa/tests/csapiec/testseg.ok b/xa/tests/csapiec/testseg.ok
index 254ccb13ae20170b77d91c7b474881f83c3a95b9..6a377b340e264f204409f9b260754dd221183f03 100644
GIT binary patch
delta 11
Scmcb^c!zO9H6zo+ngjqFHv~2S

delta 11
Scmcb^c!zO9HDlAnngjqHHw3l-