archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Travis compiling

Browse source
This commit is contained in:
Raul Tambre 2014-11-21 15:52:01 +02:00
parent cdfef3bf9e
commit 16b4b9bf40
9 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utilities/BEType.h
View file

@ -820,5 +820,5 @@ __forceinline Tto convert_le_be(Tfrom&& value)
template<typename Tto, typename Tfrom> template<typename Tto, typename Tfrom>
__forceinline void convert_le_be(Tto& dst, Tfrom&& src) __forceinline void convert_le_be(Tto& dst, Tfrom&& src)
{ {
dst = convert_le_be_t<Tto, Tfrom>::func(src) dst = convert_le_be_t<Tto, Tfrom>::func(src);
} }

2
rpcs3/Emu/CPU/CPUThread.h
View file

@ -292,6 +292,6 @@ public:
u32 get_id() const u32 get_id() const
{ {
thread->GetId(); return thread->GetId();
} }
}; };

4
rpcs3/Emu/Cell/PPUInterpreter.h
View file

@ -187,7 +187,7 @@ private:
case 0x104: case 0x104:
case 0x105: case 0x105:
case 0x106: case 0x106:
case 0x107: CPU.USPRG[n - 0x100] = value; break; case 0x107: CPU.USPRG[n - 0x100] = value; return;
case 0x10C: UNK("WriteSPR: Write to time-based SPR. Report this to a developer!"); return; case 0x10C: UNK("WriteSPR: Write to time-based SPR. Report this to a developer!"); return;
@ -198,7 +198,7 @@ private:
case 0x114: case 0x114:
case 0x115: case 0x115:
case 0x116: case 0x116:
case 0x117: CPU.SPRG[n - 0x110] = value; break; case 0x117: CPU.SPRG[n - 0x110] = value; return;
} }
UNK(fmt::Format("WriteSPR error: Unknown SPR 0x%x!", n)); UNK(fmt::Format("WriteSPR error: Unknown SPR 0x%x!", n));

4
rpcs3/Emu/Memory/vm_ptr.h
View file

@ -201,8 +201,8 @@ namespace vm
return m_addr; return m_addr;
} }
template<typename T> template<typename U>
void set(T&& value) void set(U&& value)
{ {
m_addr = convert_le_be<AT>(value); m_addr = convert_le_be<AT>(value);
} }

2
rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
View file

@ -900,7 +900,7 @@ int cellDmuxEnableEs(u32 demuxerHandle, vm::ptr<const CellCodecEsFilterId> esFil
*esHandle = id; *esHandle = id;
cellDmux->Warning("*** New ES(dmux=%d, addr=0x%x, size=0x%x, filter(0x%x, 0x%x, 0x%x, 0x%x), cb=0x%x(arg=0x%x), spec=0x%x): id = %d", cellDmux->Warning("*** New ES(dmux=%d, addr=0x%x, size=0x%x, filter(0x%x, 0x%x, 0x%x, 0x%x), cb=0x%x(arg=0x%x), spec=0x%x): id = %d",
demuxerHandle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, (u32)esCb->cbEsMsgFunc, es->cbArg, es->spec, id); demuxerHandle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, esCb->cbEsMsgFunc.addr(), es->cbArg, es->spec, id);
DemuxerTask task(dmuxEnableEs); DemuxerTask task(dmuxEnableEs);
task.es.es = id; task.es.es = id;

2
rpcs3/Emu/SysCalls/lv2/sys_spu.cpp
View file

@ -7,7 +7,7 @@
#include "Emu/Cell/RawSPUThread.h" #include "Emu/Cell/RawSPUThread.h"
#include "Emu/FS/vfsStreamMemory.h" #include "Emu/FS/vfsStreamMemory.h"
#include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsFile.h"
#include "Loader/elf32.h" #include "Loader/ELF32.h"
#include "Crypto/unself.h" #include "Crypto/unself.h"
#include "sys_spu.h" #include "sys_spu.h"

2
rpcs3/Emu/System.h
View file

@ -48,7 +48,7 @@ public:
proc_param.malloc_pagesize = be_t<u32>::make(0x100000); proc_param.malloc_pagesize = be_t<u32>::make(0x100000);
proc_param.sdk_version = be_t<u32>::make(0x360001); proc_param.sdk_version = be_t<u32>::make(0x360001);
proc_param.primary_stacksize = be_t<u32>::make(0x100000); proc_param.primary_stacksize = be_t<u32>::make(0x100000);
proc_param.primary_prio = be_t<u32>::make(0x50); proc_param.primary_prio = be_t<s32>::make(0x50);
} }
void SetTLSData(const u64 addr, const u64 filesz, const u64 memsz) void SetTLSData(const u64 addr, const u64 filesz, const u64 memsz)

2
rpcs3/Loader/ELF32.cpp
View file

@ -36,7 +36,7 @@ namespace loader
return broken_file; return broken_file;
} }
LOG_ERROR(LOADER, "m_ehdr.e_type = 0x%x", (u16)(m_ehdr.is_le() ? m_ehdr.data_le.e_type : m_ehdr.data_be.e_type)); LOG_WARNING(LOADER, "m_ehdr.e_type = 0x%x", (u16)(m_ehdr.is_le() ? m_ehdr.data_le.e_type : m_ehdr.data_be.e_type));
if (m_ehdr.data_le.e_phnum) if (m_ehdr.data_le.e_phnum)
{ {

10
rpcs3/Loader/ELF64.cpp
View file

@ -43,7 +43,7 @@ namespace loader
return broken_file; return broken_file;
} }
LOG_ERROR(LOADER, "m_ehdr.e_type = 0x%x", m_ehdr.e_type.ToLE()); LOG_WARNING(LOADER, "m_ehdr.e_type = 0x%x", m_ehdr.e_type.ToLE());
if (m_ehdr.e_machine != MACHINE_PPC64 && m_ehdr.e_machine != MACHINE_SPU) if (m_ehdr.e_machine != MACHINE_PPC64 && m_ehdr.e_machine != MACHINE_SPU)
{ {
@ -94,7 +94,7 @@ namespace loader
{ {
for (auto &phdr : m_phdrs) for (auto &phdr : m_phdrs)
{ {
switch (phdr.p_type) switch (phdr.p_type.ToLE())
{ {
case 0x1: //load case 0x1: //load
if (phdr.p_memsz) if (phdr.p_memsz)
@ -366,7 +366,7 @@ namespace loader
{ {
for (auto &phdr : m_phdrs) for (auto &phdr : m_phdrs)
{ {
switch (phdr.p_type) switch (phdr.p_type.ToLE())
{ {
case 0x00000001: //LOAD case 0x00000001: //LOAD
if (phdr.p_memsz) if (phdr.p_memsz)
@ -448,8 +448,8 @@ namespace loader
static const u32 tbl_section_size = 2 * 4; static const u32 tbl_section_size = 2 * 4;
static const u32 dst_section_size = 3 * 4; static const u32 dst_section_size = 3 * 4;
auto& tbl = ptr<u32>::make(alloc(stub->s_imports * tbl_section_size)); auto tbl = ptr<u32>::make(alloc(stub->s_imports * tbl_section_size));
auto& dst = ptr<u32>::make(alloc(stub->s_imports * dst_section_size)); auto dst = ptr<u32>::make(alloc(stub->s_imports * dst_section_size));
for (u32 i = 0; i < stub->s_imports; ++i) for (u32 i = 0; i < stub->s_imports; ++i)
{ {