X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=libpcsxcore%2Fnew_dynarec%2Fpcsxmem.c;h=47b876ef3bdeb03179308ca124aa235ba2e3dba1;hb=5b9f1b9e4aa51af5712cf1d90552ace57d9f486b;hp=2306ca77b0fb8e13d8fc0fdfe45e8d1823ccc4ce;hpb=ddbaf678c49d33cf60f1eac5069e3275baa2c685;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 2306ca77..47b876ef 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -14,6 +14,10 @@
 #include "emu_if.h"
 #include "pcsxmem.h"
 
+#ifdef __thumb__
+#error the dynarec does not have Thumb support, please remove -mthumb
+#endif
+
 //#define memprintf printf
 #define memprintf(...)
 
@@ -28,8 +32,10 @@ static u32 mem_unmwtab[(1+2+4) * 0x1000 / 4];
 static void map_item(u32 *out, const void *h, u32 flag)
 {
 	u32 hv = (u32)h;
-	if (hv & 1)
-		fprintf(stderr, "%p has LSB set\n", h);
+	if (hv & 1) {
+		fprintf(stderr, "FATAL: %p has LSB set\n", h);
+		abort();
+	}
 	*out = (hv >> 1) | (flag << 31);
 }
 
@@ -212,9 +218,17 @@ static void io_spu_write32(u32 value)
 
 static u32 io_gpu_read_status(void)
 {
+	u32 v;
+
 	// meh2, syncing for img bit, might want to avoid it..
 	gpuSyncPluginSR();
-	return HW_GPU_STATUS;
+	v = HW_GPU_STATUS;
+
+	// XXX: because of large timeslices can't use hSyncCount, using rough
+	// approximization instead. Perhaps better use hcounter code here or something.
+	if (hSyncCount < 240 && (HW_GPU_STATUS & PSXGPU_ILACE_BITS) != PSXGPU_ILACE_BITS)
+		v |= PSXGPU_LCF & (psxRegs.cycle << 20);
+	return v;
 }
 
 static void io_gpu_write_status(u32 value)
@@ -285,9 +299,15 @@ void new_dyna_pcsx_mem_init(void)
 {
 	int i;
 
+#ifdef CUSTOM_MEMMAPS
+	// WIZ lack-of-RAM hack
+	extern void *memtab_mmap(void *addr, size_t size);
+	mem_readtab = memtab_mmap((void *)0x08000000, 0x200000 * 4);
+#else
 	// have to map these further to keep tcache close to .text
 	mem_readtab = mmap((void *)0x08000000, 0x200000 * 4, PROT_READ | PROT_WRITE,
 		MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#endif
 	if (mem_readtab == MAP_FAILED) {
 		fprintf(stderr, "failed to map mem tables\n");
 		exit(1);