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

GCC/Linux compilation fix for VTLB code modifications made earlier. These thanks to two apparently separate bugs, one in GCC 4.0-4.4 and another related one in 4.5. Sigh. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3646 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-08-17 01:37:19 +00:00
parent 6798f27d4d
commit 6a18d4f50a
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pcsx2/vtlb.cpp
View File

@ -288,6 +288,22 @@ _tmpl(void) vtlbDefaultPhyWriteLg(u32 addr,const OperandType* data)
} }
#undef _tmpl #undef _tmpl
// These explicit template instatisations applease GCC 4.5, which itself fixes the GCC4.4 ?: operator
// bug (below), but still fails due to not creating instances of the functions when we take their address
// below. (guess I shouldn't have templated that code >_<)
template vtlbMemR8FP vtlbDefaultPhyReadSm<mem8_t>;
template vtlbMemR16FP vtlbDefaultPhyReadSm<mem16_t>;
template vtlbMemR32FP vtlbDefaultPhyReadSm<mem32_t>;
template vtlbMemR64FP vtlbDefaultPhyReadLg<mem64_t>;
template vtlbMemR128FP vtlbDefaultPhyReadLg<mem128_t>;
template vtlbMemW8FP vtlbDefaultPhyWriteSm<mem8_t>;
template vtlbMemW16FP vtlbDefaultPhyWriteSm<mem16_t>;
template vtlbMemW32FP vtlbDefaultPhyWriteSm<mem32_t>;
template vtlbMemW64FP vtlbDefaultPhyWriteLg<mem64_t>;
template vtlbMemW128FP vtlbDefaultPhyWriteLg<mem128_t>;
// =========================================================================================== // ===========================================================================================
// VTLB Public API -- Init/Term/RegisterHandler stuff // VTLB Public API -- Init/Term/RegisterHandler stuff
// =========================================================================================== // ===========================================================================================
@ -304,17 +320,22 @@ __ri void vtlb_ReassignHandler( vtlbHandler rv,
vtlbMemR8FP* r8,vtlbMemR16FP* r16,vtlbMemR32FP* r32,vtlbMemR64FP* r64,vtlbMemR128FP* r128, vtlbMemR8FP* r8,vtlbMemR16FP* r16,vtlbMemR32FP* r32,vtlbMemR64FP* r64,vtlbMemR128FP* r128,
vtlbMemW8FP* w8,vtlbMemW16FP* w16,vtlbMemW32FP* w32,vtlbMemW64FP* w64,vtlbMemW128FP* w128 ) vtlbMemW8FP* w8,vtlbMemW16FP* w16,vtlbMemW32FP* w32,vtlbMemW64FP* w64,vtlbMemW128FP* w128 )
{ {
vtlbdata.RWFT[0][0][rv] = (void*)((r8!=0) ? r8 : vtlbDefaultPhyReadSm<mem8_t>); // This macro appleases GCC 4.4 and prior, which apparently cannot handle templated functions as
vtlbdata.RWFT[1][0][rv] = (void*)((r16!=0) ? r16 : vtlbDefaultPhyReadSm<mem16_t>); // part of ? : operators -- so we have to use expanded if()/else form instead. (ok, so I *really*
vtlbdata.RWFT[2][0][rv] = (void*)((r32!=0) ? r32 : vtlbDefaultPhyReadSm<mem32_t>); // shouldn't have templated that code >_<) --air
vtlbdata.RWFT[3][0][rv] = (void*)((r64!=0) ? r64 : vtlbDefaultPhyReadLg<mem64_t>); #define _gccHackFix(a,Type,Size) \
vtlbdata.RWFT[4][0][rv] = (void*)((r128!=0) ? r128 : vtlbDefaultPhyReadLg<mem128_t>); if (r8) vtlbdata.RWFT[a][0][rv] = (void*)r##Size; \
else vtlbdata.RWFT[a][0][rv] = (void*)vtlbDefaultPhyRead##Type<mem##Size##_t>; \
if (w8) vtlbdata.RWFT[a][1][rv] = (void*)w##Size; \
else vtlbdata.RWFT[a][1][rv] = (void*)vtlbDefaultPhyWrite##Type<mem##Size##_t>;
vtlbdata.RWFT[0][1][rv] = (void*)((w8!=0) ? w8 : vtlbDefaultPhyWriteSm<mem8_t>); _gccHackFix(0,Sm,8);
vtlbdata.RWFT[1][1][rv] = (void*)((w16!=0) ? w16 : vtlbDefaultPhyWriteSm<mem16_t>); _gccHackFix(1,Sm,16);
vtlbdata.RWFT[2][1][rv] = (void*)((w32!=0) ? w32 : vtlbDefaultPhyWriteSm<mem32_t>); _gccHackFix(2,Sm,32);
vtlbdata.RWFT[3][1][rv] = (void*)((w64!=0) ? w64 : vtlbDefaultPhyWriteLg<mem64_t>); _gccHackFix(3,Lg,64);
vtlbdata.RWFT[4][1][rv] = (void*)((w128!=0) ? w128 : vtlbDefaultPhyWriteLg<mem128_t>); _gccHackFix(4,Lg,128);
#undef _gccHackFix
} }
vtlbHandler vtlb_NewHandler() vtlbHandler vtlb_NewHandler()