mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 22:09:19 -07:00
faf586e8f1
from JIT generated code, the compiler may not get the heads-up to properly prepare for run-time instantiation of those template functions. Explicitly instantiating Pos_ReadDirect gets around that issue. Also force DataRead* inline as gcc didn't always do that itself when the DataRead functions in turn were called from (other) template functions. I am far from a C++ language lawyer, so I cannot speak learnedly about the correctness of this solution, but it works. Dolphin.app built on OS X 10.6 now actually works on 10.5 as well. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5901 8ced0084-cf51-0410-be5f-012b33b47a6e
129 lines
2.4 KiB
C++
129 lines
2.4 KiB
C++
// Copyright (C) 2003 Dolphin Project.
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, version 2.0.
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
// Official SVN repository and contact information can be found at
|
|
// http://code.google.com/p/dolphin-emu/
|
|
|
|
#ifndef _DATAREADER_H
|
|
#define _DATAREADER_H
|
|
|
|
extern u8* g_pVideoData;
|
|
|
|
__forceinline void DataSkip(u32 skip)
|
|
{
|
|
g_pVideoData += skip;
|
|
}
|
|
|
|
__forceinline u8 DataPeek8(int _uOffset)
|
|
{
|
|
return g_pVideoData[_uOffset];
|
|
}
|
|
|
|
__forceinline u16 DataPeek16(int _uOffset)
|
|
{
|
|
return Common::swap16(*(u16*)&g_pVideoData[_uOffset]);
|
|
}
|
|
|
|
__forceinline u32 DataPeek32(int _uOffset)
|
|
{
|
|
return Common::swap32(*(u32*)&g_pVideoData[_uOffset]);
|
|
}
|
|
|
|
__forceinline u8 DataReadU8()
|
|
{
|
|
return *g_pVideoData++;
|
|
}
|
|
|
|
__forceinline s8 DataReadS8()
|
|
{
|
|
return (s8)(*g_pVideoData++);
|
|
}
|
|
|
|
__forceinline u16 DataReadU16()
|
|
{
|
|
u16 tmp = Common::swap16(*(u16*)g_pVideoData);
|
|
g_pVideoData += 2;
|
|
return tmp;
|
|
}
|
|
|
|
__forceinline u32 DataReadU32()
|
|
{
|
|
u32 tmp = Common::swap32(*(u32*)g_pVideoData);
|
|
g_pVideoData += 4;
|
|
return tmp;
|
|
}
|
|
|
|
__forceinline u32 DataReadU32Unswapped()
|
|
{
|
|
u32 tmp = *(u32*)g_pVideoData;
|
|
g_pVideoData += 4;
|
|
return tmp;
|
|
}
|
|
|
|
template<class T>
|
|
__forceinline T DataRead()
|
|
{
|
|
T tmp = *(T*)g_pVideoData;
|
|
g_pVideoData += sizeof(T);
|
|
return tmp;
|
|
}
|
|
|
|
template <>
|
|
__forceinline u16 DataRead()
|
|
{
|
|
u16 tmp = Common::swap16(*(u16*)g_pVideoData);
|
|
g_pVideoData += 2;
|
|
return tmp;
|
|
}
|
|
|
|
template <>
|
|
__forceinline s16 DataRead()
|
|
{
|
|
s16 tmp = (s16)Common::swap16(*(u16*)g_pVideoData);
|
|
g_pVideoData += 2;
|
|
return tmp;
|
|
}
|
|
|
|
template <>
|
|
__forceinline u32 DataRead()
|
|
{
|
|
u32 tmp = (u32)Common::swap32(*(u32*)g_pVideoData);
|
|
g_pVideoData += 4;
|
|
return tmp;
|
|
}
|
|
|
|
template <>
|
|
__forceinline s32 DataRead()
|
|
{
|
|
s32 tmp = (s32)Common::swap32(*(u32*)g_pVideoData);
|
|
g_pVideoData += 4;
|
|
return tmp;
|
|
}
|
|
|
|
__forceinline float DataReadF32()
|
|
{
|
|
union {u32 i; float f;} temp;
|
|
temp.i = Common::swap32(*(u32*)g_pVideoData);
|
|
g_pVideoData += 4;
|
|
float tmp = temp.f;
|
|
return tmp;
|
|
}
|
|
|
|
__forceinline u8* DataGetPosition()
|
|
{
|
|
return g_pVideoData;
|
|
}
|
|
|
|
#endif
|