Ticket #8415: patch5.diff

scummvm/README

@@ -1247 +1247 @@
           etc. via Fink and into /sw. If you have installed SDL
           in another way, you'll have to edit the Makefile).
 
-
+    AmigaOS 4 (Cross-compiling with Cygwin):
+        * Make sure that you have SDL installed, you may also need 
+          libogg, libvorbis, libvorbisfile, zlib, libmad.
+        * Type ./configure --host=ppc-amigaos
+        * If you got an error about sdl-config, use --with-sdl-prefix
+          parameter to set the path.
+        * Check 'config.mak' file and if everything seems to fine:
+        * Run 'make'.
+        * Cross-compiling with Linux may be as easy.
 
 ------------------------------------------------------------------------
 Good Luck and Happy Adventuring!

scummvm/configure

@@ -434 +434 @@
         _host_os=riscos
         _host_cpu=arm
         ;;
+ppc-amigaos)
+        _host_os=amigaos
+        _host_cpu=ppc
+        ;;
 *)
         guessed_host=`$_srcdir/config.guess`
         _host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -613 +617 @@
                         type_2_byte='short'
                         type_4_byte='int'
                         ;;
+                ppc-amigaos)
+                        echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
+                        _def_endianness='#define SCUMM_BIG_ENDIAN'
+                        _def_align='#define     SCUMM_NEED_ALIGNMENT'
+                        type_1_byte='char'
+                        type_2_byte='short'
+                        type_4_byte='long'
+                        CXXFLAGS="$CFLAGS -newlib -mstrict-align -mcpu=750 -mtune=7400"
+                        LDFLAGS="$LDFLAGS -newlib"
+                        ;;
                 *)
                         echo "Cross-compiling to unknown target, please add your target to configure."
                         exit 1

scummvm/backends/module.mk

@@ -5 +5 @@
         backends/fs/posix/posix-fs.o \
         backends/fs/morphos/abox-fs.o \
         backends/fs/windows/windows-fs.o \
+        backends/fs/amigaos4/amigaos4-fs.o \
         backends/midi/alsa.o \
         backends/midi/coreaudio.o \
         backends/midi/morphos.o \
@@ -19 +20 @@
         backends/fs/posix \
         backends/fs/morphos \
         backends/fs/windows \
+        backends/fs/amigaos4 \
         backends/midi
 
 # Include common rules 

scummvm/base/gameDetector.cpp

@@ -617 +617 @@
                 warning("No path was provided. Assuming the data files are in the current directory");
                 gameDataPath = "./";
         } else if (gameDataPath.lastChar() != '/'
-#ifdef __MORPHOS__
+#if defined(__MORPHOS__) || defined(__amigaos4__)
                                         && gameDataPath.lastChar() != ':'
 #endif
                                         && gameDataPath.lastChar() != '\\') {

scummvm/base/main.cpp

@@ -122 +122 @@
 #endif
         ;
 
+#if defined(__amigaos4__)
+// Set the stack cookie, 640 KB should be enough for everyone
+const char* stackCookie = "$STACK: 655360\0";
+#endif
+
 #if defined(WIN32) && defined(NO_CONSOLE)
 #include <cstdio>
 #define STDOUT_FILE     TEXT("stdout.txt")

scummvm/common/file.cpp

@@ -85 +85 @@
                 file = fopen(buf, mode);
         }
 
+#ifdef __amigaos4__
+        //
+        // Work around for possibility that someone uses AmigaOS "newlib" build with SmartFileSystem (blocksize 512 bytes), leading
+        // to buffer size being only 512 bytes. "Clib2" sets the buffer size to 8KB, resulting smooth movie playback. This forces the buffer
+        // to be enough also when using "newlib" compile on SFS.
+        //
+        if (file) {
+                setvbuf(file, NULL, _IOFBF, 8192);
+        }
+#endif
+
         return file;
 }
 

scummvm/common/savefile.cpp

@@ -156 +156 @@
         const int dirLen = strlen(buf);
 
         if (dirLen > 0) {
-#ifdef __MORPHOS__
+#if defined(__MORPHOS__) || defined(__amigaos4__)
                 if (buf[dirLen-1] != ':' && buf[dirLen-1] != '/')
 #endif
 

scummvm/common/scummsys.h

@@ -323 +323 @@
         #define fsize(a)                        ps2_fsize(a)
 
         extern void ps2_disableHandleCaching(void);
+
+#elif defined (__amigaos4__)
+        #include <exec/types.h>
+
+        #define scumm_stricmp strcasecmp
+        #define scumm_strnicmp strncasecmp
+
+        #define CHECK_HEAP
+
+        #define SCUMM_BIG_ENDIAN
+
+        // You need to set this manually if necessary
+        #define SCUMM_NEED_ALIGNMENT
+
+        #define FORCEINLINE     inline
+        #define CDECL
+
+        #ifndef HAVE_CONFIG_H
+        typedef unsigned char byte;
+        typedef unsigned int uint;
+        #endif
+
+        #define START_PACK_STRUCTS
+        #define END_PACK_STRUCTS
+        #define GCC_PACK __attribute__((packed))
+        #define NORETURN __attribute__((__noreturn__))
 #else
         #error No system type defined
 #endif

scummvm/common/stdafx.h

@@ -111 +111 @@
 #endif
 #if !defined(macintosh)
 #include <sys/types.h>
-#if !defined(__PLAYSTATION2__)
+#if !defined(__PLAYSTATION2__) && !defined(__amigaos4__)
 #include <sys/uio.h>
 #endif
+#if !defined(__amigaos4__)
 #include <sys/param.h>
 #endif
+#endif
 #if !defined (__BEOS__)
 #include <unistd.h>
 #endif

scummvm/common/scaler/hq2x.cpp

@@ -42 +42 @@
 #else
 
 #ifdef HAS_ALTIVEC
+
+#ifdef __amigaos4__
+#include <proto/exec.h>
+#include <altivec.h>
+static bool isAltiVecAvailable() {
+        uint32 vecUnit;
+        IExec->GetCPUInfo(GCIT_VectorUnit, &vecUnit, TAG_DONE);
+        if (vecUnit == VECTORTYPE_NONE)
+                return false;
+        else
+                return true;
+}
+#else
+
 #include <sys/sysctl.h> 
 
 static bool isAltiVecAvailable()  {
@@ -54 +68 @@
         return false; 
 }
 #endif
+#endif
 
 #define PIXEL00_0       *(q) = w5;
 #define PIXEL00_10      *(q) = interpolate16_2<bitFormat,3,1>(w5, w1);

scummvm/common/scaler/hq3x.cpp

@@ -42 +42 @@
 #else
 
 #ifdef HAS_ALTIVEC
+
+#ifdef __amigaos4__
+#include <proto/exec.h>
+static bool isAltiVecAvailable() {
+        uint32 vecUnit;
+        IExec->GetCPUInfo(GCIT_VectorUnit, &vecUnit, TAG_DONE);
+        if (vecUnit == VECTORTYPE_NONE)
+                return false;
+        else
+                return true;
+}
+#else
+
 #include <sys/sysctl.h> 
 
 static bool isAltiVecAvailable()  {
@@ -54 +67 @@
         return false; 
 }
 #endif
+#endif
 
 #define PIXEL00_1M  *(q) = interpolate16_2<bitFormat,3,1>(w5, w1);
 #define PIXEL00_1U  *(q) = interpolate16_2<bitFormat,3,1>(w5, w2);

scummvm/gui/options.cpp

@@ -33 +33 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
-#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__)) && !defined(_MSC_VER))
+#if (!( defined(__PALM_OS__) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
 #include <sys/param.h>
 #include <unistd.h>
 #endif

scummvm/scumm/script_v90he.cpp

@@ -2547 +2547 @@
         case 2001:
                 // Used in football
                 debug(0, "o90_kernelGetFunctions: U32 code %d (args %d) %d", args[1], num - 2, args[2]);
-                push(_logicHE->dispatch(args[1], num - 2, &args[2]));
+                push(_logicHE->dispatch( args[1], num - 2, (int32*)&args[2]));
                 break;
         default:
                 error("o90_kernelGetFunctions: default case %d", args[0]);
@@ -2613 +2613 @@
         case 2001:
                 // Used in SoccerMLS/Soccer2004
                 debug(0, "o90_kernelSetFunctions: U32 code %d (args %d) %d", args[1], num - 2, args[2]);
-                _logicHE->dispatch(args[1], num - 2, &args[2]);
+                _logicHE->dispatch(args[1], num - 2, (int32*)&args[2]);
                 break;
         default:
                 error("o90_kernelSetFunctions: default case %d (param count %d)", args[0], num);

scummvm/sound/softsynth/mt32/partialManager.cpp

@@ -19 +19 @@
  * IN THE SOFTWARE.
  */
 
+#ifdef __amigaos4__
+#include <strings.h>
+#else
 #include <memory.h>
+#endif
 
 #include "mt32emu.h"
 

scummvm/tools/credits.pl

@@ -329 +329 @@
         add_person("Jamieson Christian", "jamieson630", "iMUSE, MIDI, all things musical");
         add_person("Jerome Fisher", "KingGuppy", "MT-32 emulator");
         add_person("Jochen Hoenicke", "hoenicke", "Speaker & PCjr sound support, Adlib work");
+        add_person("Hans-Jörg Frieden", "", "Port: AmigaOS 4");
   end_section();
 
 
@@ -362 +363 @@
         add_person("Daniel Schepler", "", "Final MI1 CD music support, initial Ogg Vorbis support");
         add_person("André Souza", "", "SDL-based OpenGL renderer");
         add_person("Tim ???", "realmz", "Initial MI1 CD music support");
+        add_person("Juha Niemimäki", "", "AmigaOS 4 port maintaining");
   end_section();