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
Merge pull request #802 from pcercuei/address-sanitizer
[pcsx_rearmed.git]
/
libpcsxcore
/
lightrec
/
plugin.c
diff --git
a/libpcsxcore/lightrec/plugin.c
b/libpcsxcore/lightrec/plugin.c
index
d51fbc2
..
70d01bf
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);
@@
-335,6
+335,14
@@
static void lightrec_enable_ram(struct lightrec_state *state, bool enable)
static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size)
{
static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size)
{
+ if (is_write && size != 32) {
+ // force32 so must go through handlers
+ if (0x1f801000 <= kaddr && kaddr < 0x1f801024)
+ return false;
+ if ((kaddr & 0x1fffff80) == 0x1f801080) // dma
+ return false;
+ }
+
switch (size) {
case 8:
switch (kaddr) {
switch (size) {
case 8:
switch (kaddr) {