You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
298 lines
7.6 KiB
298 lines
7.6 KiB
--- sexypsf/driver.h
|
|
+++ sexypsf/driver.h
|
|
@@ -23,4 +23,4 @@
|
|
PSFINFO *sexy_getpsfinfo(char *path);
|
|
void sexy_freepsfinfo(PSFINFO *info);
|
|
|
|
-void sexyd_update(char*,long);
|
|
+void sexyd_update(unsigned char*,long);
|
|
--- sexypsf/Linux/LnxMain.c
|
|
+++ sexypsf/Linux/LnxMain.c
|
|
@@ -26,6 +26,7 @@
|
|
#include <time.h>
|
|
|
|
#include "driver.h"
|
|
+#include "oss.h"
|
|
#include "Linux.h"
|
|
|
|
int main(int argc, char *argv[]) {
|
|
--- sexypsf/Linux/Makefile
|
|
+++ sexypsf/Linux/Makefile
|
|
@@ -4,12 +4,10 @@
|
|
|
|
all: sexypsf
|
|
|
|
-CC = gcc
|
|
RM = rm -f
|
|
STRIP = strip
|
|
|
|
-OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
|
|
-FLAGS = -g -D__LINUX__ -DPSS_STYLE=1
|
|
+FLAGS = -D__LINUX__ -DPSS_STYLE=1
|
|
#-DTIMEO
|
|
LIBS = -lz
|
|
|
|
@@ -20,11 +18,11 @@
|
|
|
|
OBJS+= LnxMain.o
|
|
|
|
-CFLAGS = -Wall -Winline ${OPTIMIZE} -I. -I.. ${FLAGS}
|
|
+CFLAGS += -Wall -Winline -Wno-nonnull -I. -I.. ${FLAGS}
|
|
#CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags)
|
|
|
|
sexypsf: ${OBJS}
|
|
- ${CC} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
|
|
+ ${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
|
|
|
|
.PHONY: clean sexypsf
|
|
|
|
--- sexypsf/Linux/oss.c
|
|
+++ sexypsf/Linux/oss.c
|
|
@@ -54,6 +54,9 @@
|
|
|
|
#define OSS_MEM_DEF
|
|
#include "oss.h"
|
|
+
|
|
+#include "driver.h"
|
|
+
|
|
static int oss_audio_fd = -1;
|
|
extern int errno;
|
|
|
|
@@ -66,8 +69,6 @@
|
|
int pspeed=44100;
|
|
int pstereo;
|
|
int format;
|
|
- int fragsize = 0;
|
|
- int myfrag;
|
|
int oss_speed, oss_stereo;
|
|
|
|
pstereo=OSS_MODE_STEREO;
|
|
--- sexypsf/Linux/oss.h
|
|
+++ sexypsf/Linux/oss.h
|
|
@@ -32,4 +32,6 @@
|
|
|
|
#define OSS_SPEED_44100 44100
|
|
|
|
+void SetupSound(void);
|
|
+
|
|
#endif // _OSS_SOUND_H
|
|
--- sexypsf/Makefile
|
|
+++ sexypsf/Makefile
|
|
@@ -12,18 +12,13 @@
|
|
RM = rm -f
|
|
|
|
LIBS = -shared -lz
|
|
-OPTIMIZE = -O2 -finline-functions -ffast-math
|
|
-FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\""
|
|
+FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\"" -fPIC
|
|
|
|
OBJS = PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o \
|
|
R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o
|
|
|
|
OBJS+= xmms/xmms.o
|
|
-FLAGS+= `gtk-config --cflags`
|
|
+FLAGS+= `xmms-config --cflags`
|
|
-
|
|
-ifeq (${CPU}, ix86)
|
|
- OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
|
|
-endif
|
|
|
|
ifeq (${CPU}, ppc)
|
|
FLAGS+=-DMSB_FIRST
|
|
@@ -33,10 +28,10 @@
|
|
FLAGS+=-DMSB_FIRST
|
|
endif
|
|
|
|
-CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS}
|
|
+CFLAGS += -Wall -Wno-nonnull -I. ${FLAGS}
|
|
|
|
sexypsf: ${OBJS}
|
|
- ${CC} ${CFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
|
|
+ ${CC} ${LDFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
|
|
|
|
install: sexypsf
|
|
mv libsexypsf.so ${HOME}/.xmms/Plugins
|
|
--- sexypsf/Misc.c
|
|
+++ sexypsf/Misc.c
|
|
@@ -226,7 +226,7 @@
|
|
{
|
|
FILE *fp;
|
|
EXE_HEADER tmpHead;
|
|
- char *in,*out=0;
|
|
+ unsigned char *in,*out=0;
|
|
u8 head[4];
|
|
u32 reserved;
|
|
u32 complen;
|
|
--- sexypsf/PsxInterpreter.c
|
|
+++ sexypsf/PsxInterpreter.c
|
|
@@ -417,7 +417,7 @@
|
|
* Load higher 16 bits of the first word in GPR with imm *
|
|
* Format: OP rt, immediate *
|
|
*********************************************************/
|
|
-static void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im
|
|
+static void psxLUI() { if (!_Rt_) return; _rRt_ = psxRegs.code << 16; } // Upper halfword of Rt = Im
|
|
|
|
/*********************************************************
|
|
* Move from HI/LO to GPR *
|
|
@@ -491,7 +491,7 @@
|
|
|
|
static void psxLBU() {
|
|
if (_Rt_) {
|
|
- _u32(_rRt_) = psxMemRead8(_oB_);
|
|
+ _rRt_ = psxMemRead8(_oB_);
|
|
} else {
|
|
psxMemRead8(_oB_);
|
|
}
|
|
@@ -507,7 +507,7 @@
|
|
|
|
static void psxLHU() {
|
|
if (_Rt_) {
|
|
- _u32(_rRt_) = psxMemRead16(_oB_);
|
|
+ _rRt_ = psxMemRead16(_oB_);
|
|
} else {
|
|
psxMemRead16(_oB_);
|
|
}
|
|
@@ -515,7 +515,7 @@
|
|
|
|
static void psxLW() {
|
|
if (_Rt_) {
|
|
- _u32(_rRt_) = psxMemRead32(_oB_);
|
|
+ _rRt_ = psxMemRead32(_oB_);
|
|
} else {
|
|
psxMemRead32(_oB_);
|
|
}
|
|
@@ -530,7 +530,7 @@
|
|
u32 mem = psxMemRead32(addr & ~3);
|
|
|
|
if (!_Rt_) return;
|
|
- _u32(_rRt_) = ( _u32(_rRt_) & LWL_MASK[shift]) |
|
|
+ _rRt_ = ( _u32(_rRt_) & LWL_MASK[shift]) |
|
|
( mem << LWL_SHIFT[shift]);
|
|
|
|
/*
|
|
@@ -552,7 +552,7 @@
|
|
u32 mem = psxMemRead32(addr & ~3);
|
|
|
|
if (!_Rt_) return;
|
|
- _u32(_rRt_) = ( _u32(_rRt_) & LWR_MASK[shift]) |
|
|
+ _rRt_ = ( _u32(_rRt_) & LWR_MASK[shift]) |
|
|
( mem >> LWR_SHIFT[shift]);
|
|
|
|
/*
|
|
--- sexypsf/PsxMem.c
|
|
+++ sexypsf/PsxMem.c
|
|
@@ -21,7 +21,7 @@
|
|
|
|
#include "PsxCommon.h"
|
|
|
|
-void LoadPSXMem(u32 address, s32 length, char *data)
|
|
+void LoadPSXMem(u32 address, s32 length, unsigned char *data)
|
|
{
|
|
//printf("%08x %08x\n",address,length);
|
|
while(length>0)
|
|
@@ -56,8 +56,8 @@
|
|
|
|
writeok=1;
|
|
|
|
- psxMemLUT = (u32*)malloc(0x10000 * 4);
|
|
+ psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT);
|
|
- memset(psxMemLUT, 0, 0x10000 * 4);
|
|
+ memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT);
|
|
|
|
psxM = (char*)malloc(0x00200000);
|
|
psxP = (char*)malloc(0x00010000);
|
|
@@ -67,16 +67,16 @@
|
|
printf("Error allocating memory"); return -1;
|
|
}
|
|
|
|
- for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
|
|
+ for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
|
|
|
|
- memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
|
|
+ memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
|
|
- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
|
|
+ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
|
|
|
|
- for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16];
|
|
+ for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = &psxP[i << 16];
|
|
|
|
- for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = (u32)&psxH[i << 16];
|
|
+ for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = &psxH[i << 16];
|
|
|
|
- for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = (u32)&psxR[i << 16];
|
|
+ for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = &psxR[i << 16];
|
|
|
|
return 0;
|
|
}
|
|
@@ -215,16 +215,16 @@
|
|
case 0x800: case 0x804:
|
|
if (writeok == 0) break;
|
|
writeok = 0;
|
|
- memset(psxMemLUT + 0x0000, 0, 0x80 * 4);
|
|
+ memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT);
|
|
- memset(psxMemLUT + 0x8000, 0, 0x80 * 4);
|
|
+ memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT);
|
|
- memset(psxMemLUT + 0xa000, 0, 0x80 * 4);
|
|
+ memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT);
|
|
break;
|
|
case 0x1e988:
|
|
if (writeok == 1) break;
|
|
writeok = 1;
|
|
- for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
|
|
+ for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
|
|
- memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
|
|
+ memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
|
|
- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
|
|
+ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
|
|
break;
|
|
default:
|
|
break;
|
|
--- sexypsf/PsxMem.h
|
|
+++ sexypsf/PsxMem.h
|
|
@@ -41,21 +41,21 @@
|
|
}
|
|
#endif
|
|
|
|
-s8 *psxM;
|
|
+char *psxM;
|
|
#define psxMu32(mem) (*(u32*)&psxM[(mem) & 0x1fffff])
|
|
|
|
-s8 *psxP;
|
|
+char *psxP;
|
|
-s8 *psxR;
|
|
+char *psxR;
|
|
#define psxRu32(mem) (*(u32*)&psxR[(mem) & 0x7ffff])
|
|
|
|
-s8 *psxH;
|
|
+char *psxH;
|
|
|
|
#define psxHu8(mem) (*(u8*) &psxH[(mem) & 0xffff])
|
|
|
|
#define psxHu16(mem) (*(u16*)&psxH[(mem) & 0xffff])
|
|
#define psxHu32(mem) (*(u32*)&psxH[(mem) & 0xffff])
|
|
|
|
-u32 *psxMemLUT;
|
|
+char **psxMemLUT;
|
|
|
|
#define PSXM(mem) (psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
|
|
|
|
@@ -76,6 +76,6 @@
|
|
void psxMemWrite16(u32 mem, u16 value);
|
|
void psxMemWrite32(u32 mem, u32 value);
|
|
|
|
-void LoadPSXMem(u32 address, s32 length, char *data);
|
|
+void LoadPSXMem(u32 address, s32 length, unsigned char *data);
|
|
|
|
#endif /* __PSXMEMORY_H__ */
|
|
--- sexypsf/xmms/xmms.c
|
|
+++ sexypsf/xmms/xmms.c
|
|
@@ -101,7 +101,7 @@
|
|
}
|
|
|
|
static pthread_t dethread;
|
|
-void sexyd_update(char *Buffer, long count)
|
|
+void sexyd_update(unsigned char *Buffer, long count)
|
|
{
|
|
int mask = ~((((16 / 8) * 2)) - 1);
|
|
if(count)
|