Skip to content

use standard type instead #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickgaiser merged 1 commit into from
Mar 16, 2025
Merged

use standard type instead #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions include/ps2s/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Core {
*/

namespace MemMappings {
static const tU32 Normal = 0x00000000,
static const uint32_t Normal = 0x00000000,
Uncached = 0x20000000,
UncachedAccl = 0x30000000,

Expand All @@ -36,19 +36,19 @@ namespace MemMappings {
template <class ptrType>
inline ptrType MakePtrNormal(ptrType ptr)
{
return reinterpret_cast<ptrType>((tU32)ptr & 0x0fffffff);
return reinterpret_cast<ptrType>((uint32_t)ptr & 0x0fffffff);
}

template <class ptrType>
inline ptrType MakePtrUncached(ptrType ptr)
{
return reinterpret_cast<ptrType>((tU32)MakePtrNormal(ptr) | MemMappings::Uncached);
return reinterpret_cast<ptrType>((uint32_t)MakePtrNormal(ptr) | MemMappings::Uncached);
}

template <class ptrType>
inline ptrType MakePtrUncachedAccl(ptrType ptr)
{
return reinterpret_cast<ptrType>((tU32)MakePtrNormal(ptr) | MemMappings::UncachedAccl);
return reinterpret_cast<ptrType>((uint32_t)MakePtrNormal(ptr) | MemMappings::UncachedAccl);
}

/********************************************
Expand All @@ -70,24 +70,24 @@ inline void Delete16(void* p)
// cop0 counter

inline void ZeroCount(void);
inline tU32 GetCount(void);
inline uint32_t GetCount(void);

// fpu

inline tU32 FToI4(float flp);
inline uint32_t FToI4(float flp);

// cop0 performance counter

static const tU32 COP0_NUM_PERF_COUNTERS = 2;
static const tU32 COP0_NUM_PERF_EVENTS = 17;
static const uint32_t COP0_NUM_PERF_COUNTERS = 2;
static const uint32_t COP0_NUM_PERF_EVENTS = 17;

void SetupPerfCounters(tU32 evt_0, tU32 evt_1); // set up,also zero + halt
void SetupPerfCounters(uint32_t evt_0, uint32_t evt_1); // set up,also zero + halt

inline void HaltPerfCounters(); // stop both counters
inline void ZeroStartPerfCounters(); // clear and start both counters

inline tU32 ReadPerfCounter0(); // read counter 0
inline tU32 ReadPerfCounter1(); // read counter 1
inline uint32_t ReadPerfCounter0(); // read counter 0
inline uint32_t ReadPerfCounter1(); // read counter 1

// names of the events for people

Expand All @@ -106,10 +106,10 @@ Core::ZeroCount(void)
"sync.p ");
}

inline tU32
inline uint32_t
Core::GetCount(void)
{
tU32 ret;
uint32_t ret;

asm __volatile__("mfc0 %0, $9 \n"
"sync.p "
Expand All @@ -118,10 +118,10 @@ Core::GetCount(void)
return ret;
}

inline tU32
inline uint32_t
Core::FToI4(float flp)
{
tU32 fip;
uint32_t fip;

asm __volatile__("qmtc2 %1, $vf1 \n"
"vftoi4 $vf1, $vf1 \n"
Expand Down Expand Up @@ -154,18 +154,18 @@ inline void Core::ZeroStartPerfCounters()
: "v0");
};

inline tU32 Core::ReadPerfCounter0()
inline uint32_t Core::ReadPerfCounter0()
{
tU32 ret;
uint32_t ret;
asm __volatile__(" mfpc %0,0 \n"
" sync.p "
: "=r"(ret));
return ret;
}

inline tU32 Core::ReadPerfCounter1()
inline uint32_t Core::ReadPerfCounter1()
{
tU32 ret;
uint32_t ret;
asm __volatile__(" mfpc %0,1 \n"
" sync.p "
: "=r"(ret));
Expand Down
4 changes: 2 additions & 2 deletions include/ps2s/displayenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ class CDisplayEnv {
inline void BlendRC1WithBG(void) { gsrPMode.SLBG = 1; }
inline void BlendRC1WithRC2(void) { gsrPMode.SLBG = 0; }
inline void BlendUsingRC1Alpha(void) { gsrPMode.MMOD = 0; }
inline void BlendUsingConstAlpha(tU8 alpha)
inline void BlendUsingConstAlpha(uint8_t alpha)
{
gsrPMode.MMOD = 1;
gsrPMode.ALP = alpha;
}
void DontBlend(void);

inline void SetBGColor(tU8 r, tU8 g, tU8 b)
inline void SetBGColor(uint8_t r, uint8_t g, uint8_t b)
{
gsrBGColor.R = r;
gsrBGColor.G = g;
Expand Down
18 changes: 9 additions & 9 deletions include/ps2s/dmac.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ typedef struct tD_CHCR_t {
} tD_CHCR;

typedef struct tSourceChainTag_t {
tU64 QWC : 16;
tU64 pad : 10;
tU64 PCE : 2;
tU64 ID : 3;
tU64 IRQ : 1;
tU64 ADDR : 31;
tU64 SPR : 1;
tU32 opt1;
tU32 opt2;
uint64_t QWC : 16;
uint64_t pad : 10;
uint64_t PCE : 2;
uint64_t ID : 3;
uint64_t IRQ : 1;
uint64_t ADDR : 31;
uint64_t SPR : 1;
uint32_t opt1;
uint32_t opt2;
} __attribute__((packed,aligned(16))) tSourceChainTag;

typedef tSourceChainTag tDmaTag;
Expand Down
104 changes: 52 additions & 52 deletions include/ps2s/drawenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,22 +99,22 @@ class CDrawEnv {
public:
CDrawEnv(GS::tContext context);
CDrawEnv(const CDrawEnv& rhs);
CDrawEnv(GS::tContext context, tU32 fbW, tU32 fbH, tU32 fbWordAddr, tU32 zbufWordAddr = NULL);
CDrawEnv(GS::tContext context, uint32_t fbW, uint32_t fbH, uint32_t fbWordAddr, uint32_t zbufWordAddr = NULL);

void operator=(const CDrawEnv& otherDE);

void SetContext(GS::tContext context);

inline void EnableAlphaTest(void) { gsrTest.atest_enable = 1; }
inline void DisableAlphaTest(void) { gsrTest.atest_enable = 0; }
inline void SetAlphaTestPassMode(tAlphaTestPassMode mode) { gsrTest.atest_method = (tU64)mode; }
inline void SetAlphaTestFailAction(tAlphaTestFailAction action) { gsrTest.atest_fail_method = (tU64)action; }
inline void SetAlphaRefVal(tU8 refVal) { gsrTest.atest_reference = refVal; }
inline void SetAlphaTestPassMode(tAlphaTestPassMode mode) { gsrTest.atest_method = (uint64_t)mode; }
inline void SetAlphaTestFailAction(tAlphaTestFailAction action) { gsrTest.atest_fail_method = (uint64_t)action; }
inline void SetAlphaRefVal(uint8_t refVal) { gsrTest.atest_reference = refVal; }

inline void EnableSelectiveAlphaBlend(void) { gsrPABE.enable = 1; }
inline void DisableSelectiveAlphaBlend(void) { gsrPABE.enable = 0; }

inline void SetAlphaBlendFunc(tAlphaBlendVal a, tAlphaBlendVal b, tAlphaBlendVal c, tAlphaBlendVal d, tU32 fix);
inline void SetAlphaBlendFunc(tAlphaBlendVal a, tAlphaBlendVal b, tAlphaBlendVal c, tAlphaBlendVal d, uint32_t fix);

inline void EnableColorClamp(void) { gsrColClamp.clamp = 1; }
inline void DisableColorClamp(void) { gsrColClamp.clamp = 0; }
Expand All @@ -126,11 +126,11 @@ class CDrawEnv {

inline void SetDepthTestPassMode(tZTestPassMode passMode)
{
gsrTest.ztest_method = (tU64)passMode;
gsrTest.ztest_method = (uint64_t)passMode;
eZTestPassMode = passMode;
}
inline void SetDepthBufferAddr(tU32 wordAddress) { gsrZBuf.fb_addr = wordAddress / 2048; }
inline void SetDepthBufferPSM(tU32 psm) { gsrZBuf.psm = (tU64)psm; }
inline void SetDepthBufferAddr(uint32_t wordAddress) { gsrZBuf.fb_addr = wordAddress / 2048; }
inline void SetDepthBufferPSM(uint32_t psm) { gsrZBuf.psm = (uint64_t)psm; }
inline void EnableDepthTest(void)
{
gsrZBuf.update_mask = 0;
Expand All @@ -139,34 +139,34 @@ class CDrawEnv {
inline void DisableDepthTest(void)
{
gsrZBuf.update_mask = 1;
gsrTest.ztest_method = (tU64)ZTest::kAlways;
gsrTest.ztest_method = (uint64_t)ZTest::kAlways;
}
inline void SetDepthWriteEnabled(bool write) { gsrZBuf.update_mask = !write; }

inline void SetFrameBufferAddr(tU32 wordAddress)
inline void SetFrameBufferAddr(uint32_t wordAddress)
{
mAssert((wordAddress & 2047) == 0);
gsrFrame.fb_addr = wordAddress / 2048;
}
inline void SetFrameBufferDrawMask(tU32 drawMask) { gsrFrame.draw_mask = drawMask; }
void SetFrameBufferDim(tU32 pixelW, tU32 pixelH);
inline void SetFrameBufferPSM(tU32 psm) { gsrFrame.psm = psm; }
inline void SetFrameBufferDrawMask(uint32_t drawMask) { gsrFrame.draw_mask = drawMask; }
void SetFrameBufferDim(uint32_t pixelW, uint32_t pixelH);
inline void SetFrameBufferPSM(uint32_t psm) { gsrFrame.psm = psm; }
float GetInterlacedPixelOffset() const { return InterlacedOffset; }
void SetInterlacedPixelOffset(float offset) { InterlacedOffset = offset; }
void CalculateClippedFBXYOffsets(bool addHalfPixel);
inline void SetXYOffsets(tU16 offsetX, tU16 offsetY)
inline void SetXYOffsets(uint16_t offsetX, uint16_t offsetY)
{
gsrXYOffset.offset_x = offsetX << 4;
gsrXYOffset.offset_y = offsetY << 4;
}
inline void SetXYOffsetsFix4(tU16 offsetX, tU16 offsetY)
inline void SetXYOffsetsFix4(uint16_t offsetX, uint16_t offsetY)
{
gsrXYOffset.offset_x = offsetX;
gsrXYOffset.offset_y = offsetY;
}

inline void SetFrameBufAlphaORMask(tU32 mask) { gsrFBA.alpha = mask; }
inline void SetFogColor(tU32 r, tU32 g, tU32 b)
inline void SetFrameBufAlphaORMask(uint32_t mask) { gsrFBA.alpha = mask; }
inline void SetFogColor(uint32_t r, uint32_t g, uint32_t b)
{
gsrFogCol.r = r;
gsrFogCol.g = g;
Expand All @@ -180,14 +180,14 @@ class CDrawEnv {
tDitherVal dm20, tDitherVal dm21, tDitherVal dm22, tDitherVal dm23,
tDitherVal dm30, tDitherVal dm31, tDitherVal dm32, tDitherVal dm33);

inline void SetScissorArea(tU32 scX, tU32 scY, tU32 scWidth, tU32 scHeight); // must be after SetFrameBufferDim() to have effect
inline void SetScissorArea(uint32_t scX, uint32_t scY, uint32_t scWidth, uint32_t scHeight); // must be after SetFrameBufferDim() to have effect

void SendSettings(bool waitForEnd = false, bool flushCache = true);
void SendSettings(CSCDmaPacket& packet);
void SendSettings(CVifSCDmaPacket& packet);

// accessors
tU32 GetFrameBufferAddr(void) { return gsrFrame.fb_addr * 2048; }
uint32_t GetFrameBufferAddr(void) { return gsrFrame.fb_addr * 2048; }

inline void* operator new(size_t size) { return Core::New16(size); }
inline void operator delete(void* p) { Core::Delete16(p); }
Expand All @@ -198,38 +198,38 @@ class CDrawEnv {
tSourceChainTag SettingsDmaTag;
tGifTag SettingsGifTag;
GS::tFrame gsrFrame;
tU64 FrameAddr;
uint64_t FrameAddr;
GS::tZbuf gsrZBuf;
tU64 ZBufAddr;
uint64_t ZBufAddr;
GS::tXyoffset gsrXYOffset;
tU64 XYOffsetAddr;
uint64_t XYOffsetAddr;
GS::tPrmodecont gsrPrModeCont;
tU64 PrModeContAddr;
uint64_t PrModeContAddr;
GS::tColclamp gsrColClamp;
tU64 ColClampAddr;
uint64_t ColClampAddr;
GS::tTest gsrTest;
tU64 TestAddr;
uint64_t TestAddr;
GS::tAlpha gsrAlpha;
tU64 AlphaAddr;
uint64_t AlphaAddr;
GS::tPabe gsrPABE;
tU64 PABEAddr;
uint64_t PABEAddr;
GS::tFba gsrFBA;
tU64 FBAAddr;
uint64_t FBAAddr;
GS::tDthe gsrDTHE;
tU64 DTHEAddr;
uint64_t DTHEAddr;
GS::tDimx gsrDIMX;
tU64 DIMXAddr;
uint64_t DIMXAddr;
GS::tScissor gsrScissor;
tU64 ScissorAddr;
uint64_t ScissorAddr;
GS::tFogcol gsrFogCol;
tU64 FogColAddr;
uint64_t FogColAddr;
} __attribute__((packed,aligned(16)));
tU32 uiNumGSRegs;
uint32_t uiNumGSRegs;

CSCDmaPacket GifPacket;

tZTestPassMode eZTestPassMode;
tU32 uiFBWidth, uiFBHeight;
uint32_t uiFBWidth, uiFBHeight;
float InterlacedOffset;

private:
Expand All @@ -242,7 +242,7 @@ class CDrawEnv {
*/

inline void
CDrawEnv::SetAlphaBlendFunc(tAlphaBlendVal a, tAlphaBlendVal b, tAlphaBlendVal c, tAlphaBlendVal d, tU32 fix)
CDrawEnv::SetAlphaBlendFunc(tAlphaBlendVal a, tAlphaBlendVal b, tAlphaBlendVal c, tAlphaBlendVal d, uint32_t fix)
{
gsrAlpha.a = a;
gsrAlpha.b = b;
Expand All @@ -257,26 +257,26 @@ CDrawEnv::SetDitherMatrix(tDitherVal dm00, tDitherVal dm01, tDitherVal dm02, tDi
tDitherVal dm20, tDitherVal dm21, tDitherVal dm22, tDitherVal dm23,
tDitherVal dm30, tDitherVal dm31, tDitherVal dm32, tDitherVal dm33)
{
gsrDIMX.DIMX00 = (tU64)dm00;
gsrDIMX.DIMX01 = (tU64)dm01;
gsrDIMX.DIMX02 = (tU64)dm02;
gsrDIMX.DIMX03 = (tU64)dm03;
gsrDIMX.DIMX10 = (tU64)dm10;
gsrDIMX.DIMX11 = (tU64)dm11;
gsrDIMX.DIMX12 = (tU64)dm12;
gsrDIMX.DIMX13 = (tU64)dm13;
gsrDIMX.DIMX20 = (tU64)dm20;
gsrDIMX.DIMX21 = (tU64)dm21;
gsrDIMX.DIMX22 = (tU64)dm22;
gsrDIMX.DIMX23 = (tU64)dm23;
gsrDIMX.DIMX30 = (tU64)dm30;
gsrDIMX.DIMX31 = (tU64)dm31;
gsrDIMX.DIMX32 = (tU64)dm32;
gsrDIMX.DIMX33 = (tU64)dm33;
gsrDIMX.DIMX00 = (uint64_t)dm00;
gsrDIMX.DIMX01 = (uint64_t)dm01;
gsrDIMX.DIMX02 = (uint64_t)dm02;
gsrDIMX.DIMX03 = (uint64_t)dm03;
gsrDIMX.DIMX10 = (uint64_t)dm10;
gsrDIMX.DIMX11 = (uint64_t)dm11;
gsrDIMX.DIMX12 = (uint64_t)dm12;
gsrDIMX.DIMX13 = (uint64_t)dm13;
gsrDIMX.DIMX20 = (uint64_t)dm20;
gsrDIMX.DIMX21 = (uint64_t)dm21;
gsrDIMX.DIMX22 = (uint64_t)dm22;
gsrDIMX.DIMX23 = (uint64_t)dm23;
gsrDIMX.DIMX30 = (uint64_t)dm30;
gsrDIMX.DIMX31 = (uint64_t)dm31;
gsrDIMX.DIMX32 = (uint64_t)dm32;
gsrDIMX.DIMX33 = (uint64_t)dm33;
}

inline void
CDrawEnv::SetScissorArea(tU32 scX, tU32 scY, tU32 scWidth, tU32 scHeight)
CDrawEnv::SetScissorArea(uint32_t scX, uint32_t scY, uint32_t scWidth, uint32_t scHeight)
{
gsrScissor.clip_x0 = scX;
gsrScissor.clip_y0 = scY;
Expand Down
4 changes: 2 additions & 2 deletions include/ps2s/eetimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class CEETimer {
tMode.OVFF = 0;
}

inline void SetCompareValue(tU16 val)
inline void SetCompareValue(uint16_t val)
{
tComp = val;
*pComp = tComp;
Expand Down Expand Up @@ -168,7 +168,7 @@ class CEETimer {
protected:
Timers::tMode tMode;
Timers::tCount tCount;
tU16 tComp;
uint16_t tComp;
tResolution Resolution;

volatile unsigned int* pMode;
Expand Down
Loading