PSP port #1918

stefanmielke · 2021-05-09T17:06:33Z

Draft PR for PSP support.

Got so far as to build and create the EBOOT. But it generates a corrupted file that can't be executed (crashes on real PSP, works fine on PPSSPP).

Also tested Linux build to see if any changes would affect it. Would be nice to review those, as I had to remove "std::to_string" support for it to build.

Fix crash on real PSP (see PSP port #1918 (comment))
Fix audio support (halts when loading into town)
Missing ::truncate and friends pspdev/newlib#1, Missing snprintf and vsnprintf pspdev/newlib#2, and psp-g++ error: ‘to_string’ is not a member of ‘std’ pspdev/psptoolchain#108 solved ?
Changes to PSP.cmake merged (Fix need for setting library paths manually on cmake pspdev/psplibraries#78)
Needs a fix for If "bpp" is 8, repeated SDL_SetVideoMode calling will cause Display error. pspdev/psplibraries#37 if we want video support

… that was already added by the psp.cmake

glebm · 2021-05-09T23:08:13Z

Source/utils/file_util.cpp

@@ -111,6 +111,8 @@ bool ResizeFile(const char *path, std::uintmax_t size)
 	}
 	::CloseHandle(file);
 	return true;
+#elif defined(__PSP__)
+	return false;


Some form of ResizeFile is unfortunately required for save games to work

While it would obviously require more code, the PSP has its own save data utility accessible to all games. It is fairly trivial to implement, you can either call the SceUtility functions when saving the game or implement the save data dialog and let players choose files so they can scroll through the fancy icons ;)

https://github.com/pspdev/pspsdk/blob/master/src/samples/savedata/utility/main.c

PSP libc is supposed to already support ftruncate, not sure what's up with it missing

pspdev/newlib#1
pspdev/newlib#2

It's the problem on pspdev/psptoolchain#108. C++ for some reason doesn't have the functions C does.

…skipping

glebm · 2021-05-10T02:22:53Z

CMake/psp_defs.cmake

+# keeping the 3DS defaults for now
+# Streaming audio is broken on the 3DS as of 25 Mar 2021:
+# https://github.com/devkitPro/SDL/issues/72
+set(DISABLE_STREAMING_MUSIC ON)


This is no longer needed, it was due to a bug that has since been resolved.
PSP does not have enough RAM to run non-streaming audio

glebm · 2021-05-10T02:23:12Z

3rdParty/StormLib/src/StormPort.h

+//-----------------------------------------------------------------------------
+// Defines for PSP platform
+
+#if !defined(STORMLIB_PLATFORM_DEFINED) && defined(__PSP__)


Is this needed? These look like the defaults for an unknown platform

glebm · 2021-05-10T02:23:39Z

3rdParty/StormLib/src/SFileOpenArchive.cpp

@@ -201,7 +201,6 @@ LCID WINAPI SFileSetLocale(LCID lcNewLocale)
 //   dwPriority - When SFileOpenFileEx called, this contains the search priority for searched archives


The changes in this file look like formatting-only changes

Some of those were leftovers from when I was debugging. I'll remove them.

glebm · 2021-05-10T02:25:41Z

Source/init.cpp

 	HANDLE fh = nullptr;
-	if (!SFileOpenFile("ui_art\\title.pcx", &fh))
+	if (!SFileOpenFile("ui_art\\title.pcx", &fh)) {


Please revert the formatting-only changes

glebm · 2021-05-10T02:27:12Z

Source/miniwin/misc_msg.cpp

@@ -723,4 +723,26 @@ bool PostMessage(uint32_t type, int32_t wParam, int32_t lParam)
 	return true;
 }

+#ifdef __PSP__
+int snprintf(char *s, size_t n, const char *format, ...)


It'd be best to fix this in the PSP libc instead

glebm · 2021-05-10T02:27:30Z

Source/utils/sdl2_to_1_2_backports.h

@@ -22,6 +22,11 @@

 #define SDL_MAX_UINT32 ((Uint32)0xFFFFFFFFu)

+#ifdef __PSP__
+// PSP has the wrong definition on SDL_config.h, so we use ours
+#define SDL_snprintf devilution::snprintf


It'd be best to fix this in the PSP SDL instead

its in draft mode so i think some hacks are expected for now :)

…sabling them), setting surfaces to 8 bits, and setting controls.

…; Setting to use larger memory block (PSP2000+); Fix A/B buttons being swapped; Force skip intro;

… adding more common compilation flags to psp build

stefanmielke · 2021-05-13T18:23:58Z

@AJenbo @glebm still haven't gotten any more progress than being able to run on PPSSPP.

On real hardware it crashes on StormLib/SBaseCommon.h:459 on method DecryptMpqBlock when it tries to access DataBlock[i] after the first time it goes in the method (when pvDataBlock has been 'added' with the first move on the method that calls this one). Everything seems to work if I force fail this method (the menu loads without any assets, but I'm able to go ingame and it generates the save file as expected, or exit the game).

We still have the issues @glebm linked on PSPSDK end (pspdev/newlib#1 and pspdev/newlib#2). For now I redirected snprintf to sprintf and vsnprintf to vsprintf without major issues, but even copying the whole code for those 2 methods didn't change anything.

Also tried to use the PSPSDK sceIo* methods on Stormlib, but unfortunately sceIoRead is not returning the correct bytes read (and probably reading more than it should).

I'm adding a list of things missing from this port as a checklist on the original PR comment to keep track.

AJenbo

321

glebm · 2021-05-15T01:10:56Z

Source/utils/sdl2_to_1_2_backports.cpp

+#ifdef __PSP__
+#include "miniwin/miniwin.h"
+#endif


Is this still needed?

It's needed for the SDL_snprintf redirect to work. SDL_snprintf calls snprintf, and we redirect snprintf to sprintf for now.

glebm · 2021-05-15T01:12:08Z

Source/utils/sdl2_to_1_2_backports.cpp


 #if defined(__3DS__)
 	retval = SDL_strdup("sdmc:/3ds/devilutionx/");
 	return retval;
 #endif
+#if defined(__PSP__)
+	{
+		// replacement for strdup


Hopefully the newlib 3 branch has strdup and other missing functions

AJenbo · 2022-07-02T02:10:42Z

@stefanmielke both StormLib, snprintf, and vsnprintf have been removed as dependencies so this should probably workout much better if rebased :)

AJenbo · 2023-03-10T01:15:47Z

Things are now in a much better state so I did a fresh draft for this :)
#5869

I have tested the game in the PPSSPP emulator but it still need to be test it on hardware.

stefanmielke added 9 commits May 9, 2021 14:01

Initial PSP port. Includes the pipeline to build

61aebc1

Using SDL_Main instead; removed custom definition from psp_defs.cmake…

bffa425

… that was already added by the psp.cmake

fix need to alter psptoolchain's SDL_config.h to compile

949afbf

adding psp to circleci config

cd4c65c

forcing only PSP for now

aa76765

setting build.sh to be run from root folder

5c445ae

fixing circleci build for psp

24ad192

adding back other circleci jobs

f49b551

fix config.yml indentation

5f5321a

glebm reviewed May 9, 2021

View reviewed changes

changes made to boot the game, up until showing the intro or menu if …

58e5b18

…skipping

glebm reviewed May 10, 2021

View reviewed changes

stefanmielke added 9 commits May 10, 2021 16:30

Reducing resolution, adding back streaming music and sounds (still di…

392d8da

…sabling them), setting surfaces to 8 bits, and setting controls.

Using sprintf to replace snprintf (and removed custom implementation)…

703d7c1

…; Setting to use larger memory block (PSP2000+); Fix A/B buttons being swapped; Force skip intro;

Rollback of changes in SFileOpenArchive.cpp

87a6641

Rollback of changes in init.cpp

751197e

Rollback of changes in FileStream.cpp

79ddbff

Rollback of more changes in SFileOpenArchive.cpp

c04de03

Rollback of more style changes

d762a2b

Putting back SetApplicationVersions()

3cef15a

fix icon and background; set base path as ms0:/PSP/GAME/DevilutionX/;…

0192517

… adding more common compilation flags to psp build

stefanmielke added 3 commits May 13, 2021 15:30

Merge branch 'master' into psp

94e3168

Merge branch 'master' into psp

633e459

adding back miniwin.h to fix SDL_snprintf redirect for PSP

0794731

stefanmielke added 2 commits May 14, 2021 17:14

Removed workarounds on CMakeLists.txt

76437aa

Merge branch 'master' into psp

ce11c9e

stefanmielke mentioned this pull request May 14, 2021

psp-g++ error: ‘to_string’ is not a member of ‘std’ pspdev/psptoolchain#108

Closed

AJenbo approved these changes May 15, 2021

View reviewed changes

AJenbo reviewed May 15, 2021

View reviewed changes

glebm reviewed May 15, 2021

View reviewed changes

AJenbo added the platform support label Aug 14, 2022

AJenbo closed this Mar 10, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PSP port #1918

PSP port #1918

stefanmielke commented May 9, 2021 •

edited by glebm

Loading

glebm May 9, 2021

galaxyhaxz May 9, 2021

glebm May 10, 2021 •

edited

Loading

stefanmielke May 15, 2021

glebm May 10, 2021

glebm May 10, 2021 •

edited

Loading

glebm May 10, 2021

stefanmielke May 10, 2021

glebm May 10, 2021

glebm May 10, 2021

glebm May 10, 2021

AJenbo May 10, 2021

stefanmielke commented May 13, 2021

AJenbo left a comment

glebm May 15, 2021

stefanmielke May 15, 2021 •

edited

Loading

glebm May 15, 2021

AJenbo commented Jul 2, 2022

AJenbo commented Mar 10, 2023

		@@ -201,7 +201,6 @@ LCID WINAPI SFileSetLocale(LCID lcNewLocale)
		// dwPriority - When SFileOpenFileEx called, this contains the search priority for searched archives

PSP port #1918

PSP port #1918

Conversation

stefanmielke commented May 9, 2021 • edited by glebm Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

glebm May 10, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

glebm May 10, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stefanmielke commented May 13, 2021

AJenbo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stefanmielke May 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AJenbo commented Jul 2, 2022

AJenbo commented Mar 10, 2023

stefanmielke commented May 9, 2021 •

edited by glebm

Loading

glebm May 10, 2021 •

edited

Loading

glebm May 10, 2021 •

edited

Loading

stefanmielke May 15, 2021 •

edited

Loading