notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rearrange cycle hack table
[pcsx_rearmed.git]
/
libpcsxcore
/
lightrec
/
plugin.c
diff --git
a/libpcsxcore/lightrec/plugin.c
b/libpcsxcore/lightrec/plugin.c
index
1fe04f6
..
22342fe
100644
(file)
--- a/
libpcsxcore/lightrec/plugin.c
+++ b/
libpcsxcore/lightrec/plugin.c
@@
-20,7
+20,7
@@
#include "../r3000a.h"
#include "../psxinterpreter.h"
#include "../psxhle.h"
#include "../r3000a.h"
#include "../psxinterpreter.h"
#include "../psxhle.h"
-#include "../
new_dynarec/
events.h"
+#include "../
psx
events.h"
#include "../frontend/main.h"
#include "../frontend/main.h"
@@
-163,7
+163,7
@@
static void lightrec_tansition_from_pcsx(struct lightrec_state *state)
}
static void hw_write_byte(struct lightrec_state *state,
}
static void hw_write_byte(struct lightrec_state *state,
- u32 op, void *host, u32 mem, u
8
val)
+ u32 op, void *host, u32 mem, u
32
val)
{
lightrec_tansition_to_pcsx(state);
{
lightrec_tansition_to_pcsx(state);
@@
-173,7
+173,7
@@
static void hw_write_byte(struct lightrec_state *state,
}
static void hw_write_half(struct lightrec_state *state,
}
static void hw_write_half(struct lightrec_state *state,
- u32 op, void *host, u32 mem, u
16
val)
+ u32 op, void *host, u32 mem, u
32
val)
{
lightrec_tansition_to_pcsx(state);
{
lightrec_tansition_to_pcsx(state);
@@
-492,6
+492,9
@@
static void lightrec_plugin_execute_internal(bool block_only)
regs = lightrec_get_registers(lightrec_state);
gen_interupt((psxCP0Regs *)regs->cp0);
regs = lightrec_get_registers(lightrec_state);
gen_interupt((psxCP0Regs *)regs->cp0);
+ if (!block_only && stop)
+ return;
+
cycles_pcsx = next_interupt - psxRegs.cycle;
assert((s32)cycles_pcsx > 0);
cycles_pcsx = next_interupt - psxRegs.cycle;
assert((s32)cycles_pcsx > 0);
@@
-549,8
+552,6
@@
static void lightrec_plugin_execute_internal(bool block_only)
static void lightrec_plugin_execute(void)
{
static void lightrec_plugin_execute(void)
{
- extern int stop;
-
while (!stop)
lightrec_plugin_execute_internal(false);
}
while (!stop)
lightrec_plugin_execute_internal(false);
}