Fix last commit

This commit is contained in:
UnknownShadow200 2024-06-01 20:19:55 +10:00
parent e13917ec44
commit 1587dd7f65
3 changed files with 26 additions and 9 deletions

View File

@ -13,13 +13,12 @@ jobs:
image: ghcr.io/classicube/minimal-psn00b:latest image: ghcr.io/classicube/minimal-psn00b:latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Compile PS3 build - name: Compile PS1 build
id: compile id: compile
run: | run: |
apt-get update apt-get update
apt-get install -y curl apt-get install -y curl
export PSNOOB=/usr/local/psnoob export PSNOOB=/usr/local/psnoob
export PSL1GHT=/usr/local/ps3dev
export PATH=$PATH:$PSNOOB/bin export PATH=$PATH:$PSNOOB/bin
export PSN00BSDK_LIBS=$PSNOOB/lib/libpsn00b export PSN00BSDK_LIBS=$PSNOOB/lib/libpsn00b
make ps1 make ps1

View File

@ -33,22 +33,26 @@ cc_result GZipHeader_Read(struct Stream* s, struct GZipHeader* header) {
Header_ReadU8(tmp); Header_ReadU8(tmp);
if (tmp != 0x1F) return GZIP_ERR_HEADER1; if (tmp != 0x1F) return GZIP_ERR_HEADER1;
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_HEADER2: case GZIP_STATE_HEADER2:
Header_ReadU8(tmp); Header_ReadU8(tmp);
if (tmp != 0x8B) return GZIP_ERR_HEADER2; if (tmp != 0x8B) return GZIP_ERR_HEADER2;
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_COMPRESSIONMETHOD: case GZIP_STATE_COMPRESSIONMETHOD:
Header_ReadU8(tmp); Header_ReadU8(tmp);
if (tmp != 0x08) return GZIP_ERR_METHOD; if (tmp != 0x08) return GZIP_ERR_METHOD;
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_FLAGS: case GZIP_STATE_FLAGS:
Header_ReadU8(tmp); Header_ReadU8(tmp);
header->flags = tmp; header->flags = tmp;
if (header->flags & 0x04) return GZIP_ERR_FLAGS; if (header->flags & 0x04) return GZIP_ERR_FLAGS;
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_LASTMODIFIED: case GZIP_STATE_LASTMODIFIED:
for (; header->partsRead < 4; header->partsRead++) { for (; header->partsRead < 4; header->partsRead++) {
@ -56,14 +60,17 @@ cc_result GZipHeader_Read(struct Stream* s, struct GZipHeader* header) {
} }
header->state++; header->state++;
header->partsRead = 0; header->partsRead = 0;
/* FALLTHRU */
case GZIP_STATE_COMPRESSIONFLAGS: case GZIP_STATE_COMPRESSIONFLAGS:
Header_ReadU8(tmp); Header_ReadU8(tmp);
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_OPERATINGSYSTEM: case GZIP_STATE_OPERATINGSYSTEM:
Header_ReadU8(tmp); Header_ReadU8(tmp);
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_FILENAME: case GZIP_STATE_FILENAME:
if (header->flags & 0x08) { if (header->flags & 0x08) {
@ -73,6 +80,7 @@ cc_result GZipHeader_Read(struct Stream* s, struct GZipHeader* header) {
} }
} }
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_COMMENT: case GZIP_STATE_COMMENT:
if (header->flags & 0x10) { if (header->flags & 0x10) {
@ -82,6 +90,7 @@ cc_result GZipHeader_Read(struct Stream* s, struct GZipHeader* header) {
} }
} }
header->state++; header->state++;
/* FALLTHRU */
case GZIP_STATE_HEADERCHECKSUM: case GZIP_STATE_HEADERCHECKSUM:
if (header->flags & 0x02) { if (header->flags & 0x02) {
@ -117,6 +126,7 @@ cc_result ZLibHeader_Read(struct Stream* s, struct ZLibHeader* header) {
if ((tmp & 0x0F) != 0x08) return ZLIB_ERR_METHOD; if ((tmp & 0x0F) != 0x08) return ZLIB_ERR_METHOD;
/* Upper 4 bits are window size (ignored) */ /* Upper 4 bits are window size (ignored) */
header->state++; header->state++;
/* FALLTHRU */
case ZLIB_STATE_FLAGS: case ZLIB_STATE_FLAGS:
Header_ReadU8(tmp); Header_ReadU8(tmp);
@ -523,6 +533,7 @@ void Inflate_Process(struct InflateState* s) {
s->Index = len; /* Reuse for 'uncompressed length' */ s->Index = len; /* Reuse for 'uncompressed length' */
s->State = INFLATE_STATE_UNCOMPRESSED_DATA; s->State = INFLATE_STATE_UNCOMPRESSED_DATA;
} }
/* FALLTHRU */
case INFLATE_STATE_UNCOMPRESSED_DATA: { case INFLATE_STATE_UNCOMPRESSED_DATA: {
/* read bits left in bit buffer (slow way) */ /* read bits left in bit buffer (slow way) */
@ -565,6 +576,7 @@ void Inflate_Process(struct InflateState* s) {
s->Index = 0; s->Index = 0;
s->State = INFLATE_STATE_DYNAMIC_CODELENS; s->State = INFLATE_STATE_DYNAMIC_CODELENS;
} }
/* FALLTHRU */
case INFLATE_STATE_DYNAMIC_CODELENS: { case INFLATE_STATE_DYNAMIC_CODELENS: {
while (s->Index < s->NumCodeLens) { while (s->Index < s->NumCodeLens) {
@ -582,6 +594,7 @@ void Inflate_Process(struct InflateState* s) {
res = Huffman_Build(&s->Table.CodeLens, s->Buffer, INFLATE_MAX_CODELENS); res = Huffman_Build(&s->Table.CodeLens, s->Buffer, INFLATE_MAX_CODELENS);
if (res) { Inflate_Fail(s, res); return; } if (res) { Inflate_Fail(s, res); return; }
} }
/* FALLTHRU */
case INFLATE_STATE_DYNAMIC_LITSDISTS: { case INFLATE_STATE_DYNAMIC_LITSDISTS: {
count = s->NumLits + s->NumDists; count = s->NumLits + s->NumDists;
@ -670,12 +683,14 @@ void Inflate_Process(struct InflateState* s) {
s->TmpLit = len_base[lenIdx] + Inflate_ReadBits(s, bits); s->TmpLit = len_base[lenIdx] + Inflate_ReadBits(s, bits);
s->State = INFLATE_STATE_COMPRESSED_DIST; s->State = INFLATE_STATE_COMPRESSED_DIST;
} }
/* FALLTHRU */
case INFLATE_STATE_COMPRESSED_DIST: { case INFLATE_STATE_COMPRESSED_DIST: {
s->TmpDist = Huffman_Decode(s, &s->TableDists); s->TmpDist = Huffman_Decode(s, &s->TableDists);
if (s->TmpDist == -1) return; if (s->TmpDist == -1) return;
s->State = INFLATE_STATE_COMPRESSED_DISTEXTRA; s->State = INFLATE_STATE_COMPRESSED_DISTEXTRA;
} }
/* FALLTHRU */
case INFLATE_STATE_COMPRESSED_DISTEXTRA: { case INFLATE_STATE_COMPRESSED_DISTEXTRA: {
distIdx = s->TmpDist; distIdx = s->TmpDist;
@ -684,6 +699,7 @@ void Inflate_Process(struct InflateState* s) {
s->TmpDist = dist_base[distIdx] + Inflate_ReadBits(s, bits); s->TmpDist = dist_base[distIdx] + Inflate_ReadBits(s, bits);
s->State = INFLATE_STATE_COMPRESSED_DATA; s->State = INFLATE_STATE_COMPRESSED_DATA;
} }
/* FALLTHRU */
case INFLATE_STATE_COMPRESSED_DATA: { case INFLATE_STATE_COMPRESSED_DATA: {
if (!s->AvailOut) return; if (!s->AvailOut) return;

View File

@ -94,6 +94,8 @@ CC_VAR extern struct _WindowData WindowInfo; /* Named WindowInfo for backwards c
/* Data for alternate game window (e.g. 3DS) */ /* Data for alternate game window (e.g. 3DS) */
extern struct _WindowData Window_Alt; extern struct _WindowData Window_Alt;
/* Initialises necessary state before initing platform and loading options */
void Window_PreInit(void);
/* Initialises state for window, input, and display. */ /* Initialises state for window, input, and display. */
void Window_Init(void); void Window_Init(void);
/* Potentially frees/resets state for window, input, and display. */ /* Potentially frees/resets state for window, input, and display. */