ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor variable type changes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1233 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-21 21:12:01 +00:00
parent 996440bab0
commit 7922f33f4f
16 changed files with 128 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/CDVD/CdRom.cpp
View File

@ -71,7 +71,7 @@ const char *CmdName[0x100]= {
};
cdrStruct cdr;
long LoadCdBios;
s32 LoadCdBios;
u8 Test04[] = { 0 };
u8 Test05[] = { 0 };
@ -83,12 +83,12 @@ u8 Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
// PSXCLK = 1 sec in the ps
// so (PSXCLK / 75) / BIAS = cdr read time (linuzappz)
//#define cdReadTime ((PSXCLK / 75) / BIAS)
unsigned long cdReadTime;// = ((PSXCLK / 75) / BIAS);
u32 cdReadTime;// = ((PSXCLK / 75) / BIAS);
#define CDR_INT(eCycle) PSX_INT(IopEvt_Cdrom, eCycle)
#define CDREAD_INT(eCycle) PSX_INT(IopEvt_CdromRead, eCycle)
static __forceinline void StartReading(unsigned long type) {
static __forceinline void StartReading(u32 type) {
cdr.Reading = type;
cdr.FirstSector = 1;
cdr.Readed = 0xff;
@ -149,7 +149,7 @@ static void ReadTrack() {
#define DataEnd 4
#define DiskError 5
static void AddIrqQueue(u8 irq, unsigned long ecycle) {
static void AddIrqQueue(u8 irq, u32 ecycle) {
cdr.Irq = irq;
if (cdr.Stat) {
cdr.eCycle = ecycle;
@ -649,7 +649,7 @@ void cdrWrite1(u8 rt) {
for (i=0; i<3; i++) cdr.SetSector[i] = btoi(cdr.Param[i]);
cdr.SetSector[3] = 0;
if ((cdr.SetSector[0] | cdr.SetSector[1] | cdr.SetSector[2]) == 0) {
*(unsigned long *)cdr.SetSector = *(unsigned long *)cdr.SetSectorSeek;
*(u32 *)cdr.SetSector = *(u32 *)cdr.SetSectorSeek;
}
cdr.Ctrl|= 0x80;
cdr.Stat = NoIntr;
@ -780,14 +780,14 @@ void cdrWrite1(u8 rt) {
break;
case CdlSeekL:
((unsigned long *)cdr.SetSectorSeek)[0] = ((unsigned long *)cdr.SetSector)[0];
((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0];
cdr.Ctrl|= 0x80;
cdr.Stat = NoIntr;
AddIrqQueue(cdr.Cmd, 0x800);
break;
case CdlSeekP:
((unsigned long *)cdr.SetSectorSeek)[0] = ((unsigned long *)cdr.SetSector)[0];
((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0];
cdr.Ctrl|= 0x80;
cdr.Stat = NoIntr;
AddIrqQueue(cdr.Cmd, 0x800);

6
pcsx2/CDVD/CdRom.h
View File

@ -48,7 +48,7 @@ struct cdrStruct
u8 ResultReady;
u8 Cmd;
u8 Readed;
unsigned long Reading;
u32 Reading;
cdvdTN ResultTN;
u8 ResultTD[4];
@ -67,12 +67,12 @@ struct cdrStruct
int Init;
u8 Irq;
unsigned long eCycle;
u32 eCycle;
char Unused[4087];
};
void AddIrqQueue(u8 irq, unsigned long ecycle);
void AddIrqQueue(u8 irq, u32 ecycle);
extern cdrStruct cdr;

8
pcsx2/DebugTools/DisR3000asm.cpp
View File

@ -24,7 +24,7 @@
namespace R3000A {
unsigned long IOP_opcode_addr;
u32 IOP_opcode_addr;
const char *GPR_IOP_REG[32] = {
"zero", "at", "v0", "v1", "a0", "a1", "a2", "a3",
@ -223,7 +223,7 @@ char *disR3000Fasm(u32 code, u32 pc) {
char *IOP_jump_decode(void)
{
static char buf[256];
unsigned long addr;
u32 addr;
addr = (IOP_opcode_addr & 0xf0000000)|((psxRegs.code&0x3ffffff)<<2);
sprintf(buf, "0x%08lX", addr);
return buf;
@ -231,8 +231,8 @@ char *IOP_jump_decode(void)
char *IOP_offset_decode(void)
{
static char buf[256];
unsigned long addr;
addr = ((((short)( psxRegs.code & 0xFFFF) * 4) + IOP_opcode_addr + 4));
u32 addr;
addr = ((((s16)( psxRegs.code & 0xFFFF) * 4) + IOP_opcode_addr + 4));
sprintf(buf, "0x%08lX", addr);
return buf;
}

128
pcsx2/Decode_XA.cpp
View File

@ -30,10 +30,6 @@
#pragma warning(disable:4244)
#endif
typedef unsigned char U8;
typedef unsigned short U16;
typedef unsigned long U32;
#define NOT(_X_) (!(_X_))
#define CLAMP(_X_,_MI_,_MA_) {if(_X_<_MI_)_X_=_MI_;if(_X_>_MA_)_X_=_MA_;}
@ -71,13 +67,13 @@ void ADPCM_InitDecode( ADPCM_Decode_t *decp )
#define IK0(fid) ((int)((-K0[fid]) * (1<<SHC)))
#define IK1(fid) ((int)((-K1[fid]) * (1<<SHC)))
void ADPCM_DecodeBlock16( ADPCM_Decode_t *decp, U8 filter_range, const void *vblockp, short *destp, int inc ) {
void ADPCM_DecodeBlock16( ADPCM_Decode_t *decp, u8 filter_range, const void *vblockp, short *destp, int inc ) {
int i;
int range, filterid;
long fy0, fy1;
const U16 *blockp;
const u16 *blockp;
blockp = (const unsigned short *)vblockp;
blockp = (const u16*)vblockp;
filterid = (filter_range >> 4) & 0x0f;
range = (filter_range >> 0) & 0x0f;
@ -85,14 +81,14 @@ void ADPCM_DecodeBlock16( ADPCM_Decode_t *decp, U8 filter_range, const void *vbl
fy1 = decp->y1;
for (i = BLKSIZ/4; i; --i) {
long y;
long x0, x1, x2, x3;
s32 y;
s32 x0, x1, x2, x3;
y = *blockp++;
x3 = (short)( y & 0xf000) >> range; x3 <<= SH;
x2 = (short)((y << 4) & 0xf000) >> range; x2 <<= SH;
x1 = (short)((y << 8) & 0xf000) >> range; x1 <<= SH;
x0 = (short)((y << 12) & 0xf000) >> range; x0 <<= SH;
x3 = (s16)( y & 0xf000) >> range; x3 <<= SH;
x2 = (s16)((y << 4) & 0xf000) >> range; x2 <<= SH;
x1 = (s16)((y << 8) & 0xf000) >> range; x1 <<= SH;
x0 = (s16)((y << 12) & 0xf000) >> range; x0 <<= SH;
x0 -= (IK0(filterid) * fy0 + (IK1(filterid) * fy1)) >> SHC; fy1 = fy0; fy0 = x0;
x1 -= (IK0(filterid) * fy0 + (IK1(filterid) * fy1)) >> SHC; fy1 = fy0; fy0 = x1;
@ -111,12 +107,12 @@ void ADPCM_DecodeBlock16( ADPCM_Decode_t *decp, U8 filter_range, const void *vbl
static int headtable[4] = {0,2,8,10};
//===========================================
static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
const U8 *sound_groupsp;
const U8 *sound_datap, *sound_datap2;
int i, j, k, nbits;
U16 data[4096], *datap;
short *destp;
static void xa_decode_data( xa_decode_t *xdp, u8 *srcp ) {
const u8 *sound_groupsp;
const u8 *sound_datap, *sound_datap2;
s32 i, j, k, nbits;
u16 data[4096], *datap;
s16 *destp;
destp = xdp->pcm;
nbits = xdp->nbits == 4 ? 4 : 2;
@ -131,15 +127,16 @@ static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
sound_datap2 = sound_datap + i;
if ((xdp->nbits == 8) && (xdp->freq == 37800)) { // level A
for (k=0; k < 14; k++, sound_datap2 += 8) {
*(datap++) = (U16)sound_datap2[0] |
(U16)(sound_datap2[4] << 8);
*(datap++) = (u16)sound_datap2[0] |
(u16)(sound_datap2[4] << 8);
}
} else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (U16)(sound_datap2[ 0] & 0x0f) |
((U16)(sound_datap2[ 4] & 0x0f) << 4) |
((U16)(sound_datap2[ 8] & 0x0f) << 8) |
((U16)(sound_datap2[12] & 0x0f) << 12);
}
else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (u16)(sound_datap2[ 0] & 0x0f) |
((u16)(sound_datap2[ 4] & 0x0f) << 4) |
((u16)(sound_datap2[ 8] & 0x0f) << 8) |
((u16)(sound_datap2[12] & 0x0f) << 12);
}
}
ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+0], data,
@ -149,15 +146,16 @@ static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
sound_datap2 = sound_datap + i;
if ((xdp->nbits == 8) && (xdp->freq == 37800)) { // level A
for (k=0; k < 14; k++, sound_datap2 += 8) {
*(datap++) = (U16)sound_datap2[0] |
(U16)(sound_datap2[4] << 8);
*(datap++) = (u16)sound_datap2[0] |
(u16)(sound_datap2[4] << 8);
}
} else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (U16)(sound_datap2[ 0] >> 4) |
((U16)(sound_datap2[ 4] >> 4) << 4) |
((U16)(sound_datap2[ 8] >> 4) << 8) |
((U16)(sound_datap2[12] >> 4) << 12);
}
else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (u16)(sound_datap2[ 0] >> 4) |
((u16)(sound_datap2[ 4] >> 4) << 4) |
((u16)(sound_datap2[ 8] >> 4) << 8) |
((u16)(sound_datap2[12] >> 4) << 12);
}
}
ADPCM_DecodeBlock16( &xdp->right, sound_groupsp[headtable[i]+1], data,
@ -177,15 +175,16 @@ static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
sound_datap2 = sound_datap + i;
if ((xdp->nbits == 8) && (xdp->freq == 37800)) { // level A
for (k=0; k < 14; k++, sound_datap2 += 8) {
*(datap++) = (U16)sound_datap2[0] |
(U16)(sound_datap2[4] << 8);
*(datap++) = (u16)sound_datap2[0] |
(u16)(sound_datap2[4] << 8);
}
} else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (U16)(sound_datap2[ 0] & 0x0f) |
((U16)(sound_datap2[ 4] & 0x0f) << 4) |
((U16)(sound_datap2[ 8] & 0x0f) << 8) |
((U16)(sound_datap2[12] & 0x0f) << 12);
}
else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (u16)(sound_datap2[ 0] & 0x0f) |
((u16)(sound_datap2[ 4] & 0x0f) << 4) |
((u16)(sound_datap2[ 8] & 0x0f) << 8) |
((u16)(sound_datap2[12] & 0x0f) << 12);
}
}
ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+0], data,
@ -197,15 +196,16 @@ static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
sound_datap2 = sound_datap + i;
if ((xdp->nbits == 8) && (xdp->freq == 37800)) { // level A
for (k=0; k < 14; k++, sound_datap2 += 8) {
*(datap++) = (U16)sound_datap2[0] |
(U16)(sound_datap2[4] << 8);
*(datap++) = (u16)sound_datap2[0] |
(u16)(sound_datap2[4] << 8);
}
} else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (U16)(sound_datap2[ 0] >> 4) |
((U16)(sound_datap2[ 4] >> 4) << 4) |
((U16)(sound_datap2[ 8] >> 4) << 8) |
((U16)(sound_datap2[12] >> 4) << 12);
}
else { // level B/C
for (k=0; k < 7; k++, sound_datap2 += 16) {
*(datap++) = (u16)(sound_datap2[ 0] >> 4) |
((u16)(sound_datap2[ 4] >> 4) << 4) |
((u16)(sound_datap2[ 8] >> 4) << 8) |
((u16)(sound_datap2[12] >> 4) << 12);
}
}
ADPCM_DecodeBlock16( &xdp->left, sound_groupsp[headtable[i]+1], data,
@ -221,15 +221,15 @@ static void xa_decode_data( xa_decode_t *xdp, unsigned char *srcp ) {
//=== XA SPECIFIC ROUTINES
//============================================
typedef struct {
U8 filenum;
U8 channum;
U8 submode;
U8 coding;
u8 filenum;
u8 channum;
u8 submode;
u8 coding;
U8 filenum2;
U8 channum2;
U8 submode2;
U8 coding2;
u8 filenum2;
u8 channum2;
u8 submode2;
u8 coding2;
} xa_subheader_t;
#define SUB_SUB_EOF (1<<7) // end of file
@ -251,10 +251,10 @@ U8 coding2;
#define SUB_AUDIO 2
//============================================
static int parse_xa_audio_sector( xa_decode_t *xdp,
static s32 parse_xa_audio_sector( xa_decode_t *xdp,
xa_subheader_t *subheadp,
unsigned char *sectorp,
int is_first_sector ) {
u8*sectorp,
s32 is_first_sector ) {
if ( is_first_sector ) {
switch ( AUDIO_CODING_GET_FREQ(subheadp->coding) ) {
case 0: xdp->freq = 37800; break;
@ -295,8 +295,8 @@ static int parse_xa_audio_sector( xa_decode_t *xdp,
//=== - 0 for any other successive sector
//=== return -1 if error
//================================================================
long xa_decode_sector( xa_decode_t *xdp,
unsigned char *sectorp, int is_first_sector ) {
s32 xa_decode_sector( xa_decode_t *xdp,
u8 *sectorp, s32 is_first_sector ) {
if (parse_xa_audio_sector(xdp, (xa_subheader_t *)sectorp, sectorp + sizeof(xa_subheader_t), is_first_sector))
return -1;

20
pcsx2/Decode_XA.h
View File

@ -23,21 +23,23 @@
#ifndef DECODEXA_H
#define DECODEXA_H
#include "PrecompiledHeader.h"
typedef struct {
long y0, y1;
s32 y0, y1;
} ADPCM_Decode_t;
typedef struct {
int freq;
int nbits;
int stereo;
int nsamples;
s32 freq;
s32 nbits;
s32 stereo;
s32 nsamples;
ADPCM_Decode_t left, right;
short pcm[16384];
s16 pcm[16384];
} xa_decode_t;
long xa_decode_sector( xa_decode_t *xdp,
unsigned char *sectorp,
int is_first_sector );
s32 xa_decode_sector( xa_decode_t *xdp,
u8*sectorp,
s32 is_first_sector );
#endif

6
pcsx2/IPU/coroutine.cpp
View File

@ -26,8 +26,8 @@ struct coroutine {
uptr storeebx, storeesi, storeedi, storeebp;
int restore; // if nonzero, restore the registers
int alloc;
s32 restore; // if nonzero, restore the registers
s32 alloc;
//struct s_coroutine *caller;
//struct s_coroutine *restarget;
@ -45,7 +45,7 @@ coroutine_t so_create(void (*func)(void *), void *data, void *stack, int size)
int alloc = 0; // r = CO_STK_COROSIZE;
coroutine *co;
if ((size &= ~(sizeof(long) - 1)) < CO_MIN_SIZE) return NULL;
if ((size &= ~(sizeof(s32) - 1)) < CO_MIN_SIZE) return NULL;
if (!stack) {
size = (size + sizeof(coroutine) + CO_STK_ALIGN - 1) & ~(CO_STK_ALIGN - 1);
stack = malloc(size);

4
pcsx2/Linux/DebugDlg.cpp
View File

@ -18,7 +18,7 @@
#include "DebugDlg.h"
using namespace R5900;
unsigned long DebuggerPC = 0;
u32 DebuggerPC = 0;
/*void UpdateDebugger()
{
@ -70,7 +70,7 @@ unsigned long DebuggerPC = 0;
void UpdateDebugger(void)
{
/* unsigned long t;
/* u32 t;
int cnt;
if (DebuggerPC == 0) DebuggerPC = cpuRegs.pc; //- 0x00000038;

13
pcsx2/MTGS.cpp
View File

@ -769,15 +769,16 @@ static u32 GSRingBufCopySz = 0;
int mtgsThreadObject::PrepDataPacket( GIF_PATH pathidx, const u8* srcdata, u32 size )
{
#ifdef PCSX2_GSRING_TX_STATS
ringtx_s+=size;
ringtx_s_ulg+=size&0x7F;
ringtx_s_min=min(ringtx_s_min,size);
ringtx_s_max=max(ringtx_s_max,size);
ringtx_s += size;
ringtx_s_ulg += size&0x7F;
ringtx_s_min = min(ringtx_s_min,size);
ringtx_s_max = max(ringtx_s_max,size);
ringtx_c++;
unsigned long tx_sz;
u32 tx_sz;
if (_BitScanReverse(&tx_sz,size))
{
unsigned long tx_algn;
u32 tx_algn;
_BitScanForward(&tx_algn,size);
ringtx_inf[tx_sz][tx_algn]++;
ringtx_inf_s[tx_sz]+=size;

10
pcsx2/Mdec.h
View File

@ -94,16 +94,16 @@ void psxDma0(u32 madr, u32 bcr, u32 chcr);
void psxDma1(u32 madr, u32 bcr, u32 chcr);
int mdecFreeze(gzFile f, int Mode);
unsigned short* rl2blk(int *blk,unsigned short *mdec_rl);
u16* rl2blk(int *blk,u16 *mdec_rl);
void iqtab_init(int *iqtab,unsigned char *iq_y);
void round_init(void);
void yuv2rgb24(int *blk,unsigned char *image);
void yuv2rgb15(int *blk,unsigned short *image);
void yuv2rgb15(int *blk,u16 *image);
struct {
unsigned long command;
unsigned long status;
unsigned short *rl;
u32 command;
u32 status;
u16 *rl;
int rlsize;
} mdec;

8
pcsx2/RDebug/deci2.h
View File

@ -54,13 +54,13 @@ struct DECI2_DBGP_BRK{
#define RUN 1
extern DECI2_DBGP_BRK ebrk[32], ibrk[32];
extern int ebrk_count, ibrk_count;
extern volatile long runStatus;
extern int runCode, runCount;
extern s32 ebrk_count, ibrk_count;
extern volatile s32 runStatus;
extern s32 runCode, runCount;
extern Threading::Semaphore* runEvent;
extern int connected;
extern s32 connected;
//when add linux code this might change
int writeData(const u8 *result);

8
pcsx2/x86/ix86-32/iCore-32.cpp
View File

@ -139,10 +139,10 @@ void _flushConstReg(int reg)
void _flushConstRegs()
{
int i, j;
int zero_cnt = 0, minusone_cnt = 0;
int eaxval = 1; // 0, -1
unsigned long done[4] = {0, 0, 0, 0};
s32 i, j;
s32 zero_cnt = 0, minusone_cnt = 0;
s32 eaxval = 1; // 0, -1
u32 done[4] = {0, 0, 0, 0};
u8* rewindPtr;
// flush constants

6
plugins/CDVDiso/src/CDVDiso.h
View File

@ -106,9 +106,9 @@ extern _cdIso cdIso[8];
#define MSF2SECT(m,s,f) (((m)*60+(s)-2)*75+(f))
extern const unsigned char version;
extern const unsigned char revision;
extern const unsigned char build;
extern const u8 version;
extern const u8 revision;
extern const u8 build;
extern char IsoFile[256];
extern char IsoCWD[256];

10
plugins/CDVDiso/src/CDVDisop.cpp
View File

@ -53,11 +53,11 @@ char *LibName = "Linuz Iso CDVD (Debug) ";
char *LibName = "Linuz Iso CDVD ";
#endif
const unsigned char version = PS2E_CDVD_VERSION;
const unsigned char revision = 0;
const unsigned char build = 9;
const u8 version = PS2E_CDVD_VERSION;
const u8 revision = 0;
const u8 build = 9;
unsigned char cdbuffer[CD_FRAMESIZE_RAW * 10] = {0};
u8 cdbuffer[CD_FRAMESIZE_RAW * 10] = {0};
s32 msf_to_lba(u8 m, u8 s, u8 f)
{
@ -279,7 +279,7 @@ EXPORT_C_(s32) CDVDgetTD(u8 Track, cdvdTD *Buffer)
return 0;
}
static int layer1start = -1;
static s32 layer1start = -1;
EXPORT_C_(s32) CDVDgetTOC(void* toc)
{
u8 type = CDVDgetDiskType();

4
plugins/CDVDiso/src/Linux/Config.h
View File

@ -52,8 +52,8 @@ extern void SysMessageLoc(char *fmt, ...);
extern char *LibName;
extern const unsigned char revision;
extern const unsigned char build;
extern const u8 revision;
extern const u8 build;
extern GtkWidget *AboutDlg, *ConfDlg, *MsgDlg, *FileSel;
extern GtkWidget *Edit, *CdEdit;

6
plugins/FWnull/FW.cpp
View File

@ -24,9 +24,9 @@ using namespace std;
#include "FW.h"
const unsigned char version = PS2E_FW_VERSION;
const unsigned char revision = 0;
const unsigned char build = 5; // increase that with each version
const u8 version = PS2E_FW_VERSION;
const u8 revision = 0;
const u8 build = 5; // increase that with each version
static char *libraryName = "FWnull Driver";
string s_strIniPath="inis/FWnull.ini";

2
plugins/FWnull/FW.h
View File

@ -62,7 +62,7 @@ extern "C"
typedef struct
{
int Log;
s32 Log;
} Config;
extern Config conf;