X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_neon%2Fgpu.c;h=c43fd3119e5e8768c3d1e29f0c4e04386c6d7549;hp=da6317ecd7e9cd0a9095a1e23693dbf1b09b7176;hb=8dd855cd6cdab41d1e38637a020681137eceb457;hpb=56f08d8331df07ee6b17dfdba0ca2b5f0b1058c8 diff --git a/plugins/gpu_neon/gpu.c b/plugins/gpu_neon/gpu.c index da6317ec..c43fd311 100644 --- a/plugins/gpu_neon/gpu.c +++ b/plugins/gpu_neon/gpu.c @@ -14,6 +14,7 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define unlikely(x) __builtin_expect((x), 0) +#define noinline __attribute__((noinline)) //#define log_io printf #define log_io(...) @@ -34,15 +35,40 @@ long GPUshutdown(void) return vout_finish(); } +static noinline void update_width(void) +{ + int sw = gpu.screen.x2 - gpu.screen.x1; + if (sw <= 0 || sw >= 2560) + // full width + gpu.screen.w = gpu.screen.hres; + else + gpu.screen.w = sw * gpu.screen.hres / 2560; +} + +static noinline void update_height(void) +{ + int sh = gpu.screen.y2 - gpu.screen.y1; + if (gpu.status.dheight) + sh *= 2; + if (sh <= 0) + sh = gpu.screen.vres; + + gpu.screen.h = sh; +} + void GPUwriteStatus(uint32_t data) { static const short hres[8] = { 256, 368, 320, 384, 512, 512, 640, 640 }; static const short vres[4] = { 240, 480, 256, 480 }; uint32_t cmd = data >> 24; - switch (data >> 24) { + if (cmd < ARRAY_SIZE(gpu.regs)) + gpu.regs[cmd] = data; + + switch (cmd) { case 0x00: gpu.status.reg = 0x14802000; + gpu.status.blanking = 1; break; case 0x03: gpu.status.blanking = data & 1; @@ -54,19 +80,24 @@ void GPUwriteStatus(uint32_t data) gpu.screen.x = data & 0x3ff; gpu.screen.y = (data >> 10) & 0x3ff; break; + case 0x06: + gpu.screen.x1 = data & 0xfff; + gpu.screen.x2 = (data >> 12) & 0xfff; + update_width(); + break; case 0x07: gpu.screen.y1 = data & 0x3ff; gpu.screen.y2 = (data >> 10) & 0x3ff; + update_height(); break; case 0x08: gpu.status.reg = (gpu.status.reg & ~0x7f0000) | ((data & 0x3F) << 17) | ((data & 0x40) << 10); - gpu.screen.w = hres[(gpu.status.reg >> 16) & 7]; - gpu.screen.h = vres[(gpu.status.reg >> 19) & 3]; + gpu.screen.hres = hres[(gpu.status.reg >> 16) & 7]; + gpu.screen.vres = vres[(gpu.status.reg >> 19) & 3]; + update_width(); + update_height(); break; } - - if (cmd < ARRAY_SIZE(gpu.regs)) - gpu.regs[cmd] = data; } const unsigned char cmd_lengths[256] = @@ -106,18 +137,26 @@ static int do_vram_io(uint32_t *data, int count, int is_read) uint16_t *sdata = (uint16_t *)data; int x = gpu.dma.x, y = gpu.dma.y; int w = gpu.dma.w, h = gpu.dma.h; + int o = gpu.dma.offset; int l; count *= 2; // operate in 16bpp pixels if (gpu.dma.offset) { l = w - gpu.dma.offset; - if (l > count) + if (count < l) l = count; - do_vram_line(x + gpu.dma.offset, y, sdata, l, is_read); + + do_vram_line(x + o, y, sdata, l, is_read); + + if (o + l < w) + o += l; + else { + o = 0; + y++; + h--; + } sdata += l; count -= l; - y++; - h--; } for (; h > 0 && count >= w; sdata += w, count -= w, y++, h--) { @@ -128,19 +167,21 @@ static int do_vram_io(uint32_t *data, int count, int is_read) if (h > 0 && count > 0) { y &= 511; do_vram_line(x, y, sdata, count, is_read); - gpu.dma.offset = count; + o = count; count = 0; } - else - gpu.dma.offset = 0; gpu.dma.y = y; gpu.dma.h = h; + gpu.dma.offset = o; return count_initial - (count + 1) / 2; } static void start_vram_transfer(uint32_t pos_word, uint32_t size_word, int is_read) { + if (gpu.dma.h) + log_anomaly("start_vram_transfer while old unfinished\n"); + gpu.dma.x = pos_word & 1023; gpu.dma.y = (pos_word >> 16) & 511; gpu.dma.w = size_word & 0xffff; // ? @@ -159,16 +200,19 @@ static int check_cmd(uint32_t *data, int count) int len, cmd, start, pos; // process buffer - for (start = pos = 0;; ) + for (start = pos = 0; pos < count; ) { cmd = -1; len = 0; if (gpu.dma.h) { pos += do_vram_io(data + pos, count - pos, 0); + if (pos == count) + break; start = pos; } + // do look-ahead pass to detect SR changes and VRAM i/o while (pos < count) { uint32_t *list = data + pos; cmd = list[0] >> 24; @@ -217,14 +261,11 @@ static int check_cmd(uint32_t *data, int count) pos += len; } - if (pos >= count) - return 0; - - if (pos + len > count) { - //printf("discarding %d words\n", pos + len - count); - return pos + len - count; - } + if (cmd == -1) + break; } + + return count - pos; } static void flush_cmd_buffer(void) @@ -257,26 +298,45 @@ void GPUwriteData(uint32_t data) flush_cmd_buffer(); } -long GPUdmaChain(uint32_t *base, uint32_t addr) +long GPUdmaChain(uint32_t *rambase, uint32_t start_addr) { - uint32_t *list; - int len, left; + uint32_t addr, *list; + int len, left, count; if (unlikely(gpu.cmd_len > 0)) flush_cmd_buffer(); log_io("gpu_dma_chain\n"); - while (addr != 0xffffff) { + addr = start_addr & 0xffffff; + for (count = 0; addr != 0xffffff; count++) + { log_io(".chain %08x\n", addr); - list = base + (addr & 0x1fffff) / 4; + list = rambase + (addr & 0x1fffff) / 4; len = list[0] >> 24; addr = list[0] & 0xffffff; + + // loop detection marker + // (bit23 set causes DMA error on real machine, so + // unlikely to be ever set by the game) + list[0] |= 0x800000; + if (len) { left = check_cmd(list + 1, len); if (left) log_anomaly("GPUwriteDataMem: discarded %d/%d words\n", left, len); } + + if (addr & 0x800000) + break; + } + + // remove loop detection markers + addr = start_addr & 0x1fffff; + while (count-- > 0) { + list = rambase + addr / 4; + addr = list[0] & 0x1fffff; + list[0] &= ~0x800000; } return 0; @@ -310,12 +370,14 @@ uint32_t GPUreadData(void) uint32_t GPUreadStatus(void) { - log_io("gpu_read_status\n"); + uint32_t ret; if (unlikely(gpu.cmd_len > 0)) flush_cmd_buffer(); - return gpu.status.reg | (*gpu.lcf_hc << 31); + ret = gpu.status.reg | (*gpu.lcf_hc << 31); + log_io("gpu_read_status %08x\n", ret); + return ret; } typedef struct GPUFREEZETAG