Quick and dirty compile fix for Amiga 68k. Some files moved from port…

…able/clients to amiga/code/clients do allow for more sane main-library-size. Some files duplicated to same directory to make everything compile.

Readme.md

@@ -0,0 +1,19 @@
+Firstly, I'm not the right person to maintain this. The mathematics of compression is way over my head.
+This version exists only because I of my personal need.
+And my only criteria for success is that it compiles/runs, and does not fill my serial-log with muForce/PatchWork hits.
+
+Except making most clients external, to avoid the main library getting un-practically big(in my opinion) for m68k,
+the only changes I've don are the absolute minimum required to get it compiling/working on m68k Amiga again.
+
+The relevant files for compiling are:
+libxad/portable/amiga/SMakeFile
+libxad/amiga/source/clients/SMakeFile
+
+See also "libxad/needed_assigns"
+
+All copyrights belongs to the authors, see respective files for info.
+
+The binary release contains only the xadmaster.library for 68000-68060 and the clients that goes Libs:xad.
+Anything else that might be needed can be collected from the official xadmaster v12.1a release on Aminet.
+
+-Hagbard Celine

libxad/amiga/include/ASM/libraries/xadmaster.i

@@ -55,13 +55,11 @@ TAG_SIZ			EQU	TAG_USER
 *************************************************************************
 
 	STRUCTURE xadMasterBase,LIB_SIZE
-	IFD	XAD_OBSOLETE
 	APTR	xmb_SysBase
 	APTR	xmb_DOSBase
 	APTR	xmb_UtilityBase
 	ULONG	xmb_RecogSize		* read only
 	APTR	xmb_DefaultName 	* name for XADFIF_NOFILENAME (V6)
-	ENDC
 
 *************************************************************************
 *									*

libxad/amiga/include/C/libraries/xadmaster.h

@@ -95,13 +95,11 @@ typedef struct TagItem * xadTAGPTR;
 
 struct xadMasterBase {
   struct Library       xmb_LibNode;
-#ifdef XAD_OBSOLETE
   struct ExecBase *    xmb_SysBase;
   struct DosLibrary *  xmb_DOSBase;
   struct UtilityBase * xmb_UtilityBase;
   xadSize              xmb_RecogSize;   /* read only */
   xadSTRPTR            xmb_DefaultName; /* name for XADFIF_NOFILENAME (V6) */
-#endif
 };
 
 /************************************************************************

libxad/amiga/source/clients/ConvertE.c

@@ -0,0 +1,92 @@
+#ifndef XADMASTER_CONVERTE_C
+#define XADMASTER_CONVERTE_C
+
+/*  $Id: ConvertE.c,v 1.5 2005/06/23 14:54:41 stoecker Exp $
+    endian conversion macros
+
+    XAD library system for archive handling
+    Copyright (C) 1998 and later by Dirk Stöcker <[email protected]>
+
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/* EndGetXXX(a)  - returns value read direct from memory in fixed size and
+ *                 endianness, returned to native order.
+ *
+ * Keep in mind, that the macros require calculation time, so avoid to use
+ * them double time. Call them once and reuse results.
+ *
+ * XXX can be:
+ * M64 - big-endian Motorola format, 64 bit value
+ * M32 - big-endian Motorola format, 32 bit value
+ * M24 - big-endian Motorola format, 24 bit value
+ * M16 - big-endian Motorola format, 16 bit value
+ *
+ * I64 - little-endian Intel format, 64 bit value
+ * I32 - little-endian Intel format, 32 bit value
+ * I24 - little-endian Intel format, 24 bit value
+ * I16 - little-endian Intel format, 16 bit value
+ */
+
+#define EndGetM32(a)  (((((unsigned char *) a)[0]) << 24) |             \
+                       ((((unsigned char *) a)[1]) << 16) |             \
+                       ((((unsigned char *) a)[2]) <<  8) |             \
+                       ((((unsigned char *) a)[3])))
+#define EndGetM24(a)  (((((unsigned char *) a)[0]) << 16) |             \
+                       ((((unsigned char *) a)[1]) <<  8) |             \
+                       ((((unsigned char *) a)[2])))
+#define EndGetM16(a)  (((((unsigned char *) a)[0]) <<  8) |             \
+                       ((((unsigned char *) a)[1])))
+
+#define EndGetI32(a)  (((((unsigned char *) a)[3]) << 24) |             \
+                       ((((unsigned char *) a)[2]) << 16) |             \
+                       ((((unsigned char *) a)[1]) <<  8) |             \
+                       ((((unsigned char *) a)[0])))
+#define EndGetI24(a)  (((((unsigned char *) a)[2]) << 16) |             \
+                       ((((unsigned char *) a)[1]) <<  8) |             \
+                       ((((unsigned char *) a)[0])))
+#define EndGetI16(a)  (((((unsigned char *) a)[1]) <<  8) |             \
+                       ((((unsigned char *) a)[0])))
+
+/* 64-bit support */
+#define _convM32(a,n)(((((unsigned char *) a)[n+0]) << 24) |            \
+                      ((((unsigned char *) a)[n+1]) << 16) |            \
+                      ((((unsigned char *) a)[n+2]) <<  8) |            \
+                      ((((unsigned char *) a)[n+3])))
+#define _convI32(a,n)(((((unsigned char *) a)[n+3]) << 24) |            \
+                      ((((unsigned char *) a)[n+2]) << 16) |            \
+                      ((((unsigned char *) a)[n+1]) <<  8) |            \
+                      ((((unsigned char *) a)[n+0])))
+
+#if defined(AMIGA) /* AMIGA XAD has not 64 bit types yet */
+#  define EndGetI64(a) ((unsigned int) _convi32(a,0))
+#  define EndGetM64(a) ((unsigned int) _convm32(a,4))
+#elif defined(HAVE_STDINT_H)
+#  include <stdint.h>
+  /* C99 -- use "uint64_t" as 64-bit type */
+#  define EndGetI64(a) ((((uint64_t)    _convi32(a,4)) << 32) | \
+                        ((unsigned int) _convi32(a,0)))
+#  define EndGetM64(a) ((((uint64_t)    _convm32(a,0)) << 32) | \
+                        ((unsigned int) _convm32(a,4)))
+#else
+/* GCC -- use "unsigned long long int" as 64-bit type */
+#  define EndGetI64(a) ((((unsigned long long int) _convi32(a,4)) << 32) | \
+                        ((unsigned int)            _convi32(a,0)))
+#  define EndGetM64(a) ((((unsigned long long int) _convm32(a,0)) << 32) | \
+                        ((unsigned int)            _convm32(a,4)))
+#endif
+
+#endif /* XADMASTER_CONVERTE_C */

libxad/amiga/source/clients/SDI_ASM_STD_protos.h

@@ -0,0 +1,165 @@
+#ifndef SDI_ASM_STD_PROTOS_H
+#define SDI_ASM_STD_PROTOS_H
+
+/* Includeheader
+
+        Name:           SDI_ASM_STD_protos
+        Versionstring:  $VER: SDI_ASM_STD_protos.h 1.22 (03.07.2004)
+        Author:         SDI
+        Distribution:   PD
+        Description:    my replacement for standard ANSI functions
+
+ 1.9   18.11.96 : converted text into english language, changed C++ comments
+        to C ones
+ 1.10  29.11.96 : added printf
+ 1.11  06.02.97 : added exit prototype
+ 1.12  28.03.97 : added some additionally defines (AMIGA_TO_ANSI), added
+        vsprintf
+ 1.13  31.05.97 : fixed SDI_isprintf
+ 1.14  20.07.97 : changed UBYTE ** to STRPTR *
+ 1.15  27.07.97 : fixed SDI_printf
+ 1.16  20.02.98 : made code more compiler independent
+ 1.17  25.02.98 : added vprintf
+ 1.18  25.06.98 : now uses SDI_compiler.h
+ 1.19  29.07.98 : isupper define was missing
+ 1.20  29.09.01 : added isalpha
+ 1.21  04.04.04 : added strcat and strncat
+ 1.22  03.07.04 : changed types to ANSI C types, added const (Ronald van Dijk)
+*/
+
+/* These are mainly the normal ANSI C functions, but with an ASM interface.
+You can replace them by their normal functions supplied with your compiler,
+but do not mix them up (one object file standard, the other one SDI).
+
+differences:
+ toupper and tolower: chars (0x41 to 0x5A) and (0xC0 to 0xDE) are upper
+  chars (0x61 to 0x79) and (0xE0 to 0xFE) are lower (some more than in ANSI)
+ isprint: chars (0x20 to 0x7E) and (0xA0 to 0xFF) are printable
+ sprintf and printf: only support exec/RawDoFmt format strings
+  and some I do not remember.
+ strtoul and strtol: return NULL in errpos, when '\0'-Byte was last scanned
+  character. I do not know, if this is really correct for ANSI.
+
+ all: return values may not match ANSI-C ones
+
+printf: Use this function only for programs need to work under OS1.3. For
+OS2.0 (and up) programs should use dos.library/amiga.lib Printf function.
+*/
+
+#if defined(SDI_TO_ANSI) && defined(__GNUC__)
+  #include <string.h>
+  #include <stdlib.h>
+  #include <stdio.h>
+  #include <ctype.h>
+#else
+
+#include "SDI_compiler.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ASM(signed char) SDI_strnicmp( REG(a0,const char *),   /* string 1                    */
+                               REG(a1,const char *),   /* string 2                    */
+                               REG(d1,unsigned long)); /* highest testlength          */
+ASM(signed char) SDI_strncmp(  REG(a0,const char *),   /* string 1                    */
+                               REG(a1,const char *),   /* string 2                    */
+                               REG(d1,unsigned long)); /* highest testlength          */
+ASM(char) SDI_tolower(         REG(d0,char));          /* character to convert        */
+ASM(char) SDI_toupper(         REG(d0,char));          /* character to convert        */
+ASM(unsigned long) SDI_strlen( REG(a0,const char *));  /* string                      */
+ASM(long) SDI_isprint(         REG(d0,unsigned char)); /* character to test           */
+ASM(long) SDI_isdigit(         REG(d0,unsigned char)); /* character to test           */
+ASM(long) SDI_isxdigit(        REG(d0,unsigned char)); /* character to test           */
+ASM(long) SDI_isalnum(         REG(d0,unsigned char)); /* character to test           */
+ASM(long) SDI_isalpha(         REG(d0,unsigned char)); /* character to test           */
+ASM(long) SDI_isupper(         REG(d0,unsigned char)); /* character to test           */
+ASM(unsigned long) SDI_strtoul(REG(a1,const char *),   /* buffer                      */
+                               REG(a0,char **),        /* char var for error position */
+                               REG(d2,unsigned char)); /* base                        */
+ASM(long) SDI_strtol(          REG(a1,const char *),   /* buffer                      */
+                               REG(a0,char **),        /* char var for error position */
+                               REG(d2,unsigned char)); /* base                        */
+ASM(char *) SDI_strncpy(       REG(a1,char *),         /* string 1                    */
+                               REG(a0,const char *),   /* string 2                    */
+                               REG(d1,unsigned long)); /* highest copy number         */
+ASM(void) SDI_memset(          REG(a1,void *),         /* buffer                      */
+                               REG(d0,unsigned char),  /* fill character              */
+                               REG(d1,unsigned long)); /* number of bytes             */
+ASM(char *) SDI_strchr(        REG(a1,const char *),   /* buffer                      */
+                               REG(d0,char));          /* character to scan for       */
+ASM(void) SDI_vsprintf(        REG(a3,char *),         /* buffer                      */
+                               REG(a0,const char *),   /* formatstring                */
+                               REG(a1,void *));        /* data                        */
+ASM(void) SDI_vprintf(         REG(a0,const char *),   /* formatstring                */
+                               REG(a1,void *));        /* data                        */
+void SDI_sprintf(char *, const char *, ...);           /* buffer, formatstring, data  */
+void SDI_printf(const char *, ...);                    /* formatstring, data          */
+
+#ifdef __cplusplus
+}
+#endif
+
+#define SDI_stricmp(a,b)        SDI_strnicmp(a,b,~0)
+#define SDI_strcmp(a,b)         SDI_strncmp(a,b,~0)
+#define SDI_strcpy(a,b)         SDI_strncpy(a,b,~0)
+#define SDI_strcat(a,b)         SDI_strncpy(a+SDI_strlen(a),b,~0)
+#define SDI_strncat(a,b,c)      SDI_strncpy((a)+SDI_strlen(a),b,c)
+
+/* Set SDI_TO_ANSI if you want to use normal ANSI names. Do not include
+the ANSI files stdio.h / stdlib.h ... , because this may result in an error */
+
+#ifdef SDI_TO_ANSI
+  #define strnicmp      SDI_strnicmp
+  #define strncmp       SDI_strncmp
+  #define stricmp       SDI_stricmp
+  #define strcmp        SDI_strcmp
+  #define tolower       SDI_tolower
+  #define toupper       SDI_toupper
+  #define strlen        SDI_strlen
+  #define isprint       SDI_isprint
+  #define isdigit       SDI_isdigit
+  #define isxdigit      SDI_isxdigit
+  #define isalnum       SDI_isalnum
+  #define isalpha       SDI_isalpha
+  #define isupper       SDI_isupper
+  #define strtoul       SDI_strtoul
+  #define strtol        SDI_strtol
+  #define strncat       SDI_strncat
+  #define strncpy       SDI_strncpy
+  #define strcat        SDI_strcat
+  #define strcpy        SDI_strcpy
+  #define strchr        SDI_strchr
+  #define memset        SDI_memset
+  #define sprintf       SDI_sprintf
+  #define printf        SDI_printf
+  #define vsprintf      SDI_vsprintf
+  #define vprintf       SDI_vprintf
+
+  extern void exit(int);
+  typedef unsigned long size_t;
+#endif
+
+/* Use the following with care, as they may collide with ANSI-C Standard
+   a lot more, than the above ones. The FILE * parameter of the functions
+   is converted into a filehandle of dos.library. Do not mix normal ANSI-C
+   and these functions! */
+
+/* These defines are in experimental state !!! */
+
+#ifdef AMIGA_TO_ANSI
+  #define memcpy(a,b,c)         CopyMem(b,a,c)
+  #define remove(a)             !DeleteFile(a)
+  #define rename(a,b)           !Rename(a,b)
+  #define putchar(a)            FPutC(Output(),a)
+  #define putc(a, b)            FPutC((BPTR) b, a)
+  #define getchar()             FGetC(Input())
+  #define getc(a)               FGetC((BPTR) a)
+  #define ungetc(a,b)           UnGetC((BPTR) b,a)
+  #define vprintf(a,b)          VPrintf(a,b)
+  #define vfprintf(a,b,c)       VFPrintf((BPTR) a, b, c)
+  #define fclose(a)             Close(a)
+#endif
+
+#endif /* SDI_TO_ANSI && __GNUC__ */
+#endif /* SDI_ASM_STD_PROTOS_H */