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
dma: add optional slow linked list walking
[pcsx_rearmed.git]
/
plugins
/
gpulib
/
gpu.c
diff --git
a/plugins/gpulib/gpu.c
b/plugins/gpulib/gpu.c
index
8e92c78
..
f468cf8
100644
(file)
--- a/
plugins/gpulib/gpu.c
+++ b/
plugins/gpulib/gpu.c
@@
-126,17
+126,16
@@
static noinline void get_gpu_info(uint32_t data)
case 0x02:
case 0x03:
case 0x04:
case 0x02:
case 0x03:
case 0x04:
- case 0x05:
gpu.gp0 = gpu.ex_regs[data & 7] & 0xfffff;
break;
gpu.gp0 = gpu.ex_regs[data & 7] & 0xfffff;
break;
- case 0x0
6
:
- gpu.gp0 = gpu.ex_regs[5] & 0xfffff;
+ case 0x0
5
:
+ gpu.gp0 = gpu.ex_regs[5] & 0x
3
fffff;
break;
case 0x07:
gpu.gp0 = 2;
break;
default:
break;
case 0x07:
gpu.gp0 = 2;
break;
default:
- gpu.gp0 = 0;
+ // gpu.gp0 unchanged
break;
}
}
break;
}
}
@@
-360,7
+359,7
@@
static void start_vram_transfer(uint32_t pos_word, uint32_t size_word, int is_re
if (is_read) {
gpu.status |= PSX_GPU_STATUS_IMG;
// XXX: wrong for width 1
if (is_read) {
gpu.status |= PSX_GPU_STATUS_IMG;
// XXX: wrong for width 1
-
memcpy(&gpu.gp0, VRAM_MEM_XY(gpu.dma.x, gpu.dma.y), 4
);
+
gpu.gp0 = LE32TOH(*(uint32_t *) VRAM_MEM_XY(gpu.dma.x, gpu.dma.y)
);
gpu.state.last_vram_read_frame = *gpu.state.frame_count;
}
gpu.state.last_vram_read_frame = *gpu.state.frame_count;
}
@@
-528,7
+527,7
@@
void GPUwriteData(uint32_t data)
flush_cmd_buffer();
}
flush_cmd_buffer();
}
-long GPUdmaChain(uint32_t *rambase, uint32_t start_addr)
+long GPUdmaChain(uint32_t *rambase, uint32_t start_addr
, uint32_t *progress_addr
)
{
uint32_t addr, *list, ld_addr = 0;
int len, left, count;
{
uint32_t addr, *list, ld_addr = 0;
int len, left, count;
@@
-560,6
+559,10
@@
long GPUdmaChain(uint32_t *rambase, uint32_t start_addr)
log_anomaly("GPUdmaChain: discarded %d/%d words\n", left, len);
}
log_anomaly("GPUdmaChain: discarded %d/%d words\n", left, len);
}
+ if (progress_addr) {
+ *progress_addr = addr;
+ break;
+ }
#define LD_THRESHOLD (8*1024)
if (count >= LD_THRESHOLD) {
if (count == LD_THRESHOLD) {
#define LD_THRESHOLD (8*1024)
if (count >= LD_THRESHOLD) {
if (count == LD_THRESHOLD) {
@@
-612,8
+615,11
@@
uint32_t GPUreadData(void)
flush_cmd_buffer();
ret = gpu.gp0;
flush_cmd_buffer();
ret = gpu.gp0;
- if (gpu.dma.h)
+ if (gpu.dma.h) {
+ ret = HTOLE32(ret);
do_vram_io(&ret, 1, 1);
do_vram_io(&ret, 1, 1);
+ ret = LE32TOH(ret);
+ }
log_io("gpu_read %08x\n", ret);
return ret;
log_io("gpu_read %08x\n", ret);
return ret;