File tree Expand file tree Collapse file tree 7 files changed +19
-29
lines changed
Expand file tree Collapse file tree 7 files changed +19
-29
lines changed Original file line number Diff line number Diff line change @@ -57,10 +57,14 @@ inline ptrType MakePtrUncachedAccl(ptrType ptr)
5757
5858// used to override new() to allocate on qword boundaries (only for linux)
5959
60- // PLIN -- need to override delete as well...
6160inline void * New16 (size_t size)
6261{
63- return ::operator new (size);
62+ return ::operator new (size, std::align_val_t (16 ));
63+ }
64+
65+ inline void Delete16 (void * p)
66+ {
67+ ::operator delete (p);
6468}
6569
6670// cop0 counter
Original file line number Diff line number Diff line change @@ -126,10 +126,8 @@ class CDisplayEnv {
126126
127127 void SendSettings (void );
128128
129- inline void * operator new (size_t size)
130- {
131- return Core::New16 (size);
132- }
129+ inline void * operator new (size_t size) { return Core::New16 (size); }
130+ inline void operator delete (void * p) { Core::Delete16 (p); }
133131
134132protected:
135133private:
Original file line number Diff line number Diff line change @@ -189,10 +189,8 @@ class CDrawEnv {
189189 // accessors
190190 tU32 GetFrameBufferAddr (void ) { return gsrFrame.fb_addr * 2048 ; }
191191
192- inline void * operator new (size_t size)
193- {
194- return Core::New16 (size);
195- }
192+ inline void * operator new (size_t size) { return Core::New16 (size); }
193+ inline void operator delete (void * p) { Core::Delete16 (p); }
196194
197195protected:
198196 tSourceChainTag SettingsDmaTag;
Original file line number Diff line number Diff line change @@ -70,10 +70,8 @@ class CImageUploadPkt : protected CVifSCDmaPacket {
7070 void Send (CSCDmaPacket& packet);
7171 void Send (CVifSCDmaPacket& packet);
7272
73- inline void * operator new (size_t size)
74- {
75- return Core::New16 (size);
76- }
73+ inline void * operator new (size_t size) { return Core::New16 (size); }
74+ inline void operator delete (void * p) { Core::Delete16 (p); }
7775
7876protected:
7977private:
@@ -135,10 +133,8 @@ class CClutUploadPkt : protected CImageUploadPkt {
135133 inline void Send (CSCDmaPacket& packet) { CImageUploadPkt::Send (packet); }
136134 inline void Send (CVifSCDmaPacket& packet) { CImageUploadPkt::Send (packet); }
137135
138- inline void * operator new (size_t size)
139- {
140- return Core::New16 (size);
141- }
136+ inline void * operator new (size_t size) { return Core::New16 (size); }
137+ inline void operator delete (void * p) { Core::Delete16 (p); }
142138};
143139
144140#endif // ps2s_imagepackets_h
Original file line number Diff line number Diff line change @@ -82,10 +82,8 @@ class CSprite {
8282
8383 CDmaPacket& GetPacket (void ) { return GifPacket; }
8484
85- inline void * operator new (size_t size)
86- {
87- return Core::New16 (size);
88- }
85+ inline void * operator new (size_t size) { return Core::New16 (size); }
86+ inline void operator delete (void * p) { Core::Delete16 (p); }
8987
9088protected:
9189private:
Original file line number Diff line number Diff line change @@ -120,10 +120,8 @@ class CTexEnv {
120120 CTexEnv (const CTexEnv& rhs);
121121 CTexEnv& operator =(const CTexEnv& rhs);
122122
123- inline void * operator new (size_t size)
124- {
125- return Core::New16 (size);
126- }
123+ inline void * operator new (size_t size) { return Core::New16 (size); }
124+ inline void operator delete (void * p) { Core::Delete16 (p); }
127125
128126protected:
129127 // gs packet to setup texture environment
Original file line number Diff line number Diff line change @@ -108,15 +108,13 @@ void CMemSlotList::PrintSlots()
108108
109109void CMemSlotList::RemoveSlot (CMemSlot* slot)
110110{
111- bool found = false ;
112111 tSlotIter curSlot = Slots.begin ();
113112 for (; curSlot != Slots.end (); curSlot++)
114113 if (*curSlot == slot) {
115- found = true ;
116114 break ;
117115 }
118116
119- mErrorIf (!found , " This list does not contain the specified slot!" );
117+ mErrorIf ((*curSlot != slot) , " This list does not contain the specified slot!" );
120118
121119 Slots.erase (curSlot);
122120}
You can’t perform that action at this time.
0 commit comments