Start removing clib dependencies on Amiga, so we can easily try out newer GCC.

Various cleanups and improvements to malloc() debugging.

Author: watsonmw

.gitignore

@@ -4,4 +4,3 @@ build/
 src/sourcediffs.h
 game
 frontier
-SDL2.dll

CMakeLists.txt

@@ -47,8 +47,8 @@ add_executable(
 )
 
 # Define DEBUG c/c++ macro when compiling in debug mode
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG -DM_MEM_DEBUG")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -DM_MEM_DEBUG")
 
 IF(MINGW)
     include_directories(C:/msys64/mingw32/include)
@@ -57,12 +57,12 @@ IF(MINGW)
     target_compile_options(fintro PRIVATE -mconsole)
 ENDIF()
 
-target_compile_definitions(fintro PRIVATE -DUSE_SDL -DFINTRO_SCREEN_RES=3)
+target_compile_definitions(fintro PRIVATE -DUSE_SDL -DFINTRO_SCREEN_RES=3 -DM_CLIB_USE_ALIGNED)
 target_compile_options(fintro PRIVATE -ggdb)
 
 # Point to your actual AmigaOS NDK
 target_compile_definitions(fintro-amiga PRIVATE -DAMIGA -DFINTRO_SCREEN_RES=2)
-target_include_directories(fintro-amiga PRIVATE ../../m68k-amigaos/ndk-include ../../m68k-amigaos/include)
+target_include_directories(fintro-amiga PRIVATE C:/Amiga/m68k-amigaos/ndk-include C:/Amiga/m68k-amigaos/include)
 
 IF(APPLE)
     find_library(SDL2_LIBRARY SDL2 REQUIRED)

amiga/build-ami-gcc.sh

@@ -43,9 +43,12 @@ set -x # echo on
 # -fomit-frame-pointer? - gives a 2% speedup and reduces exe size (less moves)
 # -fno-strict-aliasing ?
 
+#DEBUG_FLAGS="-g -DM_MEM_DEBUG"
+OPT_FLAGS="-m68040 -O3 -mregparm=4 -fomit-frame-pointer -fweb -frename-registers"
+
 GCC="/opt/amiga/bin/m68k-amigaos-gcc"
 VASM="/opt/amiga/bin/vasmm68k_mot"
-CCFLAGS="-m68040 -O3 -DFINTRO_SCREEN_RES=2 -DSURFACE_HEIGHT=360 $PROFILE_OPTS -mregparm=4 -fomit-frame-pointer -fweb -frename-registers"
+CCFLAGS="-DFINTRO_SCREEN_RES=2 -DSURFACE_HEIGHT=360 -DM_CLIB_DISABLE ${DEBUG_FLAGS} ${OPT_FLAGS} ${PROFILE_OPTS}"
 
 # Embed version info into exe for custom profiling code
 BUILD_DATE=`date +"%Y/%m/%d %H:%M:%S"`
@@ -72,3 +75,4 @@ ${GCC} src/assets.c $CCFLAGS -I src -c -o build/assets.o
 # Link with -noixemul for smaller exe size, this disables the UNIX emulation layer, this can be buggy and we don't need
 # it anyway.
 ${GCC} -lm -noixemul $CCFLAGS build/main.o build/mlib.o build/fmath.o build/fintro.o build/render.o build/assets.o build/audio.o ${POST_LDFLAGS} -o build/fintro-gcc
+/opt/amiga/bin/m68k-amigaos-objdump  -S --disassemble build/fintro-gcc > build/fintro-gcc.asm

amiga/readme.txt

@@ -1,12 +1,12 @@
-Frontier Elite II Intro Player
+Frontier: Elite II Intro Player
 ---
 
 ---
 About
 ---
 
 This is a RTG player for the Frontier intro, it's a full implementation of the
-Frontier Elite II renderer.  The 3d models and music are read from the official
+Frontier: Elite II renderer.  The 3d models and music are read from the official
 Frontier exe.  You must already own Frontier or alternatively download the
 shareware version and send 5 pounds to Frontier Developments.
 
@@ -23,7 +23,7 @@ Requirements
 Tested on FS-UAE / WinUAE and on Vampire V4, reported to work well on a V1200
 by Dr Procton!
 
-Frontier Elite II exe must exist in same directory as 'fintro'.  Use the exe
+'Frontier: Elite II' exe must exist in same directory as 'fintro'.  Use the exe
 from the CD32 version or the final Elite Club shareware version.  This can be
 downloaded from here:
 
@@ -44,7 +44,7 @@ Controls
   Escape     - Exit
   Left Mouse - Exit
 
-Somewhat OS friendly, multitasking is still enabled.  But stop any music players
+Somewhat OS friendly, multi-tasking is still enabled.  But stop any music players
 before starting as it trounces audio registers.
 
 
@@ -70,6 +70,17 @@ Q. Could this be patched into original Amiga exe so we can play FE2 in RTG?
 A. Yes it could be, it would be work, but the original exe had jump tables for
    the renderer that this code mostly re-implements.
 
+Q. It crashes on ApolloOS / AROS!
+A. For me too.  There's at least two issues:
+     - The software interrupt that generates the sound can get corrupted.  This
+       only happens if you run the startup sequence.
+     - PC or status register gets corrupted during rendering, likely also an
+       interrupt issue.
+   Of course, it could be a bug on my side - but it's not for lack of looking -
+   let me just say that!
+   A solution would be to turn off the OS while running, and use HW interrrupts
+   for the sound.
+
 
 ---
 Feedback

data/model-overrides-be.dat

@@ -93,22 +93,24 @@ void Assets_LoadAmigaFiles(AssetsDataAmiga* assets, MReadFileRet* amigaExeData,
         assets->bitmapFontData = amigaExeData->data + 0x3b034;
 
         assets->mainStrings = Assets_LoadStringPointers16BE(amigaExeData->data + 0x4c70d, 112);
+        assets->mainStringsLen = 112;
     } else if (assetsRead == AssetsRead_Amiga_EliteClub || assetsRead == AssetsRead_Amiga_EliteClub2) {
         Assets_LoadModelPointers32BE(amigaExeData->data + 0x39ea0, 16, &assets->galmapModels);
         ARRAY_REWRITE_BE16(amigaExeData->data + 0x3a328, 0x18fc);
 
         assets->bitmapFontData = amigaExeData->data + 0x3c9a6;
 
         assets->mainStrings = Assets_LoadStringPointers16BE(amigaExeData->data + 0x4ff9e, 126);
+        assets->mainStringsLen = 126;
     }
 
     assets->assetsRead = assetsRead;
 }
 
 void Assets_FreeAmigaFiles(AssetsDataAmiga* assets) {
-    MFree(assets->mainExeData); assets->mainExeData = 0;
+    MFree(assets->mainExeData, assets->mainExeSize); assets->mainExeData = 0;
     MArrayFree(assets->galmapModels);
-    MFree(assets->mainStrings);
+    MFree(assets->mainStrings, assets->mainStringsLen * sizeof(u8*));
 }
 
 MReadFileRet Assets_LoadModelOverrides(const char* filePath, ModelsArray* modelsArray) {

src/assets.c

@@ -49,6 +49,7 @@ typedef struct sAssetsDataAmiga {
 
     ModelsArray galmapModels;
     u8** mainStrings;
+    u32 mainStringsLen;
     u8* bitmapFontData;
     AssetsReadEnum assetsRead;
 } AssetsDataAmiga;

src/assets.h

@@ -212,7 +212,7 @@ static void Audio_CopyAndFixSamples(AudioContext* audio) {
     audio->samplesDataSize = 0x20000;
 #ifdef AMIGA
     // Allocate some chip ram that will be used to store the fixed up samples
-    audio->samplesData = (u8*) AllocMem(audio->samplesDataSize, MEMF_PUBLIC | MEMF_CHIP);
+    audio->samplesData = (u8*) AllocMem(audio->samplesDataSize, MEMF_CHIP);
 #else
     audio->samplesData = (u8*) MMalloc(audio->samplesDataSize);
 #endif
@@ -385,13 +385,13 @@ void Audio_Exit(AudioContext* audio) {
     SDL_CloseAudioDevice(audio->sdlAudioID); audio->sdlAudioID = 0;
 
     if (audio->audioOutputBuffer != NULL) {
-        MFree(audio->audioOutputBuffer); audio->audioOutputBuffer = NULL;
+        MFree(audio->audioOutputBuffer, audio->audioOutputBufferSize); audio->audioOutputBuffer = NULL;
     }
 
     for (int i = 0; i < AUDIO_SAMPLE_CACHE_SIZE; ++i) {
         SampleConvert* s = audio->sampleCache + i;
         if (s->sampleConverted != NULL) {
-            MFree(s->sampleConverted); s->sampleConverted = NULL;
+            MFree(s->sampleConverted, s->sampleConvertedBufferSize); s->sampleConverted = NULL;
         }
     }
 #endif
@@ -401,7 +401,7 @@ void Audio_Exit(AudioContext* audio) {
 
     FreeMem(audio->samplesData, audio->samplesDataSize);
 #else
-    MFree(audio->samplesData);
+    MFree(audio->samplesData, audio->samplesDataSize);
 #endif
     audio->samplesData = 0;
 }
@@ -1182,7 +1182,8 @@ SampleConvert* Audio_ConvertSample(AudioContext* audio, ChannelRegisters* hw) {
     }
 
     if (sampleConvert->sampleConverted) {
-        MFree(sampleConvert->sampleConverted); sampleConvert->sampleConverted = NULL;
+        MFree(sampleConvert->sampleConverted, sampleConvert->sampleConvertedBufferSize);
+        sampleConvert->sampleConverted = NULL;
     }
 
     // period = ticks per second / samples per second
@@ -1195,14 +1196,16 @@ SampleConvert* Audio_ConvertSample(AudioContext* audio, ChannelRegisters* hw) {
                       AUDIO_S16, 1, PLAYBACK_FEQ);
 
     cvt.len = hw->len * 2;
-    cvt.buf = (Uint8 *) MMalloc(cvt.len * cvt.len_mult);
+    int buffReqSize = cvt.len * cvt.len_mult;
+    cvt.buf = (Uint8 *) MMalloc(buffReqSize);
 
     memcpy(cvt.buf, hw->pos, cvt.len);
 
     int r = SDL_ConvertAudio(&cvt);
     if (r == 0) {
         sampleConvert->sampleConverted = (i16*)cvt.buf;
         sampleConvert->sampleConvertedLen = cvt.len_cvt / 2;
+        sampleConvert->sampleConvertedBufferSize = buffReqSize;
         sampleConvert->samplePtr = hw->pos;
         sampleConvert->sampleLen = hw->len;
         sampleConvert->period = hw->period;
@@ -1213,7 +1216,9 @@ SampleConvert* Audio_ConvertSample(AudioContext* audio, ChannelRegisters* hw) {
         sampleConvert->sampleLen = 0;
         sampleConvert->period = 0;
         sampleConvert->sampleConvertedLen = 0;
+        sampleConvert->sampleConvertedBufferSize = 0;
         sampleConvert->used = 0;
+        MFree(cvt.buf, buffReqSize);
     }
 
     if (sDebugLog) {
@@ -1260,7 +1265,7 @@ void Audio_Render(AudioContext* audio, int ticks, b32 output) {
 
     if (output) {
         if (audio->audioOutputBufferSize < outputSize) {
-            audio->audioOutputBuffer = (i16*)MRealloc(audio->audioOutputBuffer, outputSize);
+            audio->audioOutputBuffer = (i16*)MRealloc(audio->audioOutputBuffer, audio->audioOutputBufferSize, outputSize);
             audio->audioOutputBufferSize = outputSize;
         }
         audio->audioOutputContentSize = outputSize;

src/audio.c

@@ -138,6 +138,7 @@ typedef struct sSampleConvert {
 
     i16* sampleConverted;
     u32 sampleConvertedLen;
+    u32 sampleConvertedBufferSize;
 
     u32 cacheClock;
     u8 used;

src/audio.h

@@ -62,6 +62,7 @@ void Intro_InitPC(Intro* intro, SceneSetup* sceneSetup, AssetsDataPC* assetsData
 #endif
 
     sceneSetup->moduleStrings = Assets_LoadStringPointers16LE(introFileData + 0x1d8, 33);
+    sceneSetup->moduleStringNum = 33;
 
     Assets_LoadModelPointers16LE(introFileData + 0x3b0, 120, &sceneSetup->assets.models);
     Assets_LoadModelPointers16LE(assetsData->vectorFontData, 15, &sceneSetup->assets.galmapModels);
@@ -151,6 +152,7 @@ void Intro_InitAmiga(Intro* intro, SceneSetup* sceneSetup, AssetsDataAmiga* asse
                            (0x6a34 - (planetByteCodeStart + planetByteCodeLen)));
 
         sceneSetup->moduleStrings = Assets_LoadStringPointers16BE(fileData + 0x76f88, 33);
+        sceneSetup->moduleStringNum = 33 ;
         intro->creditsStringData = (u16*)(fileData + 0x81e16);
     } else if (assetsData->assetsRead == AssetsRead_Amiga_EliteClub) {
         Assets_LoadModelPointers32BE(fileData + 0x7ffdc, 120, &sceneSetup->assets.models);
@@ -162,6 +164,7 @@ void Intro_InitAmiga(Intro* intro, SceneSetup* sceneSetup, AssetsDataAmiga* asse
         ARRAY_REWRITE_BE16(fileData + 0x829f8, 28);
 
         sceneSetup->moduleStrings = Assets_LoadStringPointers16BE(fileData + 0x7fe0e, 33);
+        sceneSetup->moduleStringNum = 33;
         intro->creditsStringData = (u16*)(fileData + 0x8b774);
     } else if (assetsData->assetsRead == AssetsRead_Amiga_EliteClub2) {
         Assets_LoadModelPointers32BE(fileData + 0x7ffdc, 120, &sceneSetup->assets.models);
@@ -173,6 +176,7 @@ void Intro_InitAmiga(Intro* intro, SceneSetup* sceneSetup, AssetsDataAmiga* asse
         ARRAY_REWRITE_BE16(fileData + 0x829f8, 28);
 
         sceneSetup->moduleStrings = Assets_LoadStringPointers16BE(fileData + 0x7fe0e, 33);
+        sceneSetup->moduleStringNum = 33;
         intro->creditsStringData = (u16*)(fileData + 0x8b774);
     }
 
@@ -230,19 +234,19 @@ void Intro_InitAmiga(Intro* intro, SceneSetup* sceneSetup, AssetsDataAmiga* asse
 #if FINTRO_SCREEN_RES == 3
         Image8Bit* upScaledImage = MArrayAddPtr(intro->imageStore.images);
         Render_ImageUpscale2x(&image, upScaledImage);
-        MFree(image.data);
+        MFree(image.data, image.w * image.h);
 #endif
     }
 }
 
 void Intro_Free(Intro* intro, SceneSetup* sceneSetup) {
     MArrayFree(sceneSetup->assets.models);
-    MFree(sceneSetup->moduleStrings);
+    MFree(sceneSetup->moduleStrings, sceneSetup->moduleStringNum * sizeof(u8*));
 
     Images8Bit* images = &intro->imageStore.images;
     for (int i = 0; i < MArraySize(*images); i++) {
         Image8Bit* image = MArrayGetPtr(*images, i);
-        MFree(image->data);
+        MFree(image->data, image->w * image->h);
     }
 
     MArrayFree(*images);