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

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-06-19 19:53:52 +03:00
parent edb9595721
commit 8229c0ed3d
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/ARMv7/ARMv7Interpreter.cpp
View file

@ -2268,7 +2268,7 @@ void ARMv7_instrs::LDRB_IMM(ARMv7Context& context, const ARMv7Code code, const A
{ {
const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32; const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
const u32 addr = index ? offset_addr : context.read_gpr(n); const u32 addr = index ? offset_addr : context.read_gpr(n);
context.write_gpr(t, vm::psv::read8(addr)); context.write_gpr(t, vm::read8(addr));
if (wback) if (wback)
{ {
@ -2338,7 +2338,7 @@ void ARMv7_instrs::LDRB_REG(ARMv7Context& context, const ARMv7Code code, const A
const u32 offset = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C); const u32 offset = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C);
const u32 offset_addr = add ? context.read_gpr(n) + offset : context.read_gpr(n) - offset; const u32 offset_addr = add ? context.read_gpr(n) + offset : context.read_gpr(n) - offset;
const u32 addr = index ? offset_addr : context.read_gpr(n); const u32 addr = index ? offset_addr : context.read_gpr(n);
context.write_gpr(t, vm::psv::read8(addr)); context.write_gpr(t, vm::read8(addr));
if (wback) if (wback)
{ {
@ -2592,7 +2592,7 @@ void ARMv7_instrs::LDRSB_IMM(ARMv7Context& context, const ARMv7Code code, const
{ {
const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32; const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
const u32 addr = index ? offset_addr : context.read_gpr(n); const u32 addr = index ? offset_addr : context.read_gpr(n);
const s8 value = vm::psv::read8(addr); const s8 value = vm::read8(addr);
context.write_gpr(t, value); // sign-extend context.write_gpr(t, value); // sign-extend
if (wback) if (wback)
@ -4545,7 +4545,7 @@ void ARMv7_instrs::STRB_IMM(ARMv7Context& context, const ARMv7Code code, const A
{ {
const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32; const u32 offset_addr = add ? context.read_gpr(n) + imm32 : context.read_gpr(n) - imm32;
const u32 addr = index ? offset_addr : context.read_gpr(n); const u32 addr = index ? offset_addr : context.read_gpr(n);
vm::psv::write8(addr, (u8)context.read_gpr(t)); vm::write8(addr, (u8)context.read_gpr(t));
if (wback) if (wback)
{ {
@ -4605,7 +4605,7 @@ void ARMv7_instrs::STRB_REG(ARMv7Context& context, const ARMv7Code code, const A
const u32 offset = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C); const u32 offset = Shift(context.read_gpr(m), shift_t, shift_n, context.APSR.C);
const u32 offset_addr = add ? context.read_gpr(n) + offset : context.read_gpr(n) - offset; const u32 offset_addr = add ? context.read_gpr(n) + offset : context.read_gpr(n) - offset;
const u32 addr = index ? offset_addr : context.read_gpr(n); const u32 addr = index ? offset_addr : context.read_gpr(n);
vm::psv::write8(addr, (u8)context.read_gpr(t)); vm::write8(addr, (u8)context.read_gpr(t));
if (wback) if (wback)
{ {

2
rpcs3/Emu/ARMv7/Modules/scePerf.cpp
View file

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/ARMv7/PSVFuncList.h" #include "Emu/ARMv7/PSVFuncList.h"
#include "Emu/SysCalls/lv2/sys_time.h" extern u64 get_system_time();
#define RETURN_ERROR(code) { Emu.Pause(); scePerf.Error("%s() failed: %s", __FUNCTION__, #code); return code; } #define RETURN_ERROR(code) { Emu.Pause(); scePerf.Error("%s() failed: %s", __FUNCTION__, #code); return code; }

2
rpcs3/Emu/SysCalls/CB_FUNC.h
View file

@ -63,7 +63,7 @@ namespace cb_detail
{ {
const int stack_pos = (g_count - 9) * 8 - FIXED_STACK_FRAME_SIZE; const int stack_pos = (g_count - 9) * 8 - FIXED_STACK_FRAME_SIZE;
static_assert(stack_pos < 0, "TODO: Increase fixed stack frame size (arg count limit broken)"); static_assert(stack_pos < 0, "TODO: Increase fixed stack frame size (arg count limit broken)");
vm::write64(CPU.GPR[1] + stack_pos, cast_to_ppu_gpr<T>(arg)); vm::ps3::write64(CPU.GPR[1] + stack_pos, cast_to_ppu_gpr<T>(arg));
} }
}; };

1
rpcs3/stdafx.h
View file

@ -20,6 +20,7 @@
#include <cstring> #include <cstring>
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
#include <climits>
#include <cmath> #include <cmath>
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>