Skip to content

Commit 2b455e2

Browse files
committed
Merge branch 'master' into libretro
2 parents b0c8040 + a1d8282 commit 2b455e2

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

Makefile.libretro

+1
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ else ifeq ($(platform), vita)
347347
PARTIAL_LINKING = 1
348348
NO_MMAP := 1
349349
NO_POSIX_MEMALIGN := 1
350+
NDRC_THREAD := 0 # can't write to tc from thread
350351
HAVE_PHYSICAL_CDROM = 0
351352
EXTRA_EXTERN_SYMS += _newlib_vm_size_user
352353

libpcsxcore/new_dynarec/emu_if.c

-7
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
#include "../../frontend/libretro-rthreads.h"
2525
#include "features/features_cpu.h"
2626
#include "retro_timers.h"
27-
#ifdef VITA
28-
#include <psp2/kernel/sysmem.h>
29-
#endif
3027
#endif
3128
#ifdef _3DS
3229
#include <3ds_utils.h>
@@ -449,10 +446,6 @@ static void ari64_compile_thread(void *unused)
449446
void *target;
450447
u32 addr;
451448

452-
#ifdef VITA
453-
int ret = sceKernelOpenVMDomain();
454-
if (ret) SysPrintf("thread: sceKernelOpenVMDomain: %x\n", ret);
455-
#endif
456449
slock_lock(ndrc_g.thread.lock);
457450
while (!ndrc_g.thread.exit)
458451
{

plugins/gpulib/gpu.c

+15-15
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ static noinline void start_vram_transfer(struct psx_gpu *gpu, uint32_t pos_word,
493493
uint32_t size_word, int is_read)
494494
{
495495
if (gpu->dma.h)
496-
log_anomaly("start_vram_transfer while old unfinished\n");
496+
log_anomaly(gpu, "start_vram_transfer while old unfinished\n");
497497

498498
gpu->dma.x = pos_word & 0x3ff;
499499
gpu->dma.y = (pos_word >> 16) & 0x1ff;
@@ -511,7 +511,7 @@ static noinline void start_vram_transfer(struct psx_gpu *gpu, uint32_t pos_word,
511511
gpu->state.last_vram_read_frame = *gpu->state.frame_count;
512512
}
513513

514-
log_io("start_vram_transfer %c (%d, %d) %dx%d\n", is_read ? 'r' : 'w',
514+
log_io(gpu, "start_vram_transfer %c (%d, %d) %dx%d\n", is_read ? 'r' : 'w',
515515
gpu->dma.x, gpu->dma.y, gpu->dma.w, gpu->dma.h);
516516
if (gpu->gpu_state_change)
517517
gpu->gpu_state_change(PGS_VRAM_TRANSFER_START);
@@ -532,7 +532,7 @@ static void finish_vram_transfer(struct psx_gpu *gpu, int is_read)
532532
not_dirty |= dma_r - gpu->screen.src_x - 1;
533533
not_dirty |= dma_b - gpu->screen.src_y - 1;
534534
not_dirty >>= 31;
535-
log_io("dma %3d,%3d %dx%d scr %3d,%3d %3dx%3d -> dirty %d\n",
535+
log_io(gpu, "dma %3d,%3d %dx%d scr %3d,%3d %3dx%3d -> dirty %d\n",
536536
gpu->dma_start.x, gpu->dma_start.y, gpu->dma_start.w, gpu->dma_start.h,
537537
gpu->screen.src_x, gpu->screen.src_y, gpu->screen.hres, gpu->screen.vres, !not_dirty);
538538
gpu->state.fb_dirty |= !not_dirty;
@@ -715,7 +715,7 @@ static noinline int do_cmd_buffer(struct psx_gpu *gpu, uint32_t *data, int count
715715
if (cmd == 2)
716716
break;
717717
if (cmd == 0x1f)
718-
log_anomaly("irq1?\n");
718+
log_anomaly(gpu, "irq1?\n");
719719
pos++;
720720
continue;
721721
}
@@ -764,19 +764,19 @@ void GPUwriteDataMem(uint32_t *mem, int count)
764764
{
765765
int dummy = 0, left;
766766

767-
log_io("gpu_dma_write %p %d\n", mem, count);
767+
log_io(&gpu, "gpu_dma_write %p %d\n", mem, count);
768768

769769
if (unlikely(gpu.cmd_len > 0))
770770
flush_cmd_buffer(&gpu);
771771

772772
left = do_cmd_buffer(&gpu, mem, count, &dummy, &dummy);
773773
if (left)
774-
log_anomaly("GPUwriteDataMem: discarded %d/%d words\n", left, count);
774+
log_anomaly(&gpu, "GPUwriteDataMem: discarded %d/%d words\n", left, count);
775775
}
776776

777777
void GPUwriteData(uint32_t data)
778778
{
779-
log_io("gpu_write %08x\n", data);
779+
log_io(&gpu, "gpu_write %08x\n", data);
780780
gpu.cmd_buffer[gpu.cmd_len++] = HTOLE32(data);
781781
if (gpu.cmd_len >= CMD_BUFFER_LEN)
782782
flush_cmd_buffer(&gpu);
@@ -795,7 +795,7 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
795795
if (unlikely(gpu.cmd_len > 0))
796796
flush_cmd_buffer(&gpu);
797797

798-
log_io("gpu_dma_chain\n");
798+
log_io(&gpu, "gpu_dma_chain\n");
799799
addr = ld_addr = start_addr & 0xffffff;
800800
for (count = 0; (addr & 0x800000) == 0; count++)
801801
{
@@ -808,11 +808,11 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
808808
if (len > 0)
809809
cpu_cycles_sum += 5 + len;
810810

811-
log_io(".chain %08lx #%d+%d %u+%u\n",
811+
log_io(&gpu, ".chain %08lx #%d+%d %u+%u\n",
812812
(long)(list - rambase) * 4, len, gpu.cmd_len, cpu_cycles_sum, cpu_cycles_last);
813813
if (unlikely(gpu.cmd_len > 0)) {
814814
if (gpu.cmd_len + len > ARRAY_SIZE(gpu.cmd_buffer)) {
815-
log_anomaly("cmd_buffer overflow, likely garbage commands\n");
815+
log_anomaly(&gpu, "cmd_buffer overflow, likely garbage commands\n");
816816
gpu.cmd_len = 0;
817817
}
818818
memcpy(gpu.cmd_buffer + gpu.cmd_len, list + 1, len * 4);
@@ -826,7 +826,7 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
826826
if (left) {
827827
memcpy(gpu.cmd_buffer, list + 1 + len - left, left * 4);
828828
gpu.cmd_len = left;
829-
log_anomaly("GPUdmaChain: %d/%d words left\n", left, len);
829+
log_anomaly(&gpu, "GPUdmaChain: %d/%d words left\n", left, len);
830830
}
831831
}
832832

@@ -835,7 +835,7 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
835835
break;
836836
}
837837
if (addr == ld_addr) {
838-
log_anomaly("GPUdmaChain: loop @ %08x, cnt=%u\n", addr, count);
838+
log_anomaly(&gpu, "GPUdmaChain: loop @ %08x, cnt=%u\n", addr, count);
839839
break;
840840
}
841841
if (count == ld_count) {
@@ -856,7 +856,7 @@ long GPUdmaChain(uint32_t *rambase, uint32_t start_addr,
856856

857857
void GPUreadDataMem(uint32_t *mem, int count)
858858
{
859-
log_io("gpu_dma_read %p %d\n", mem, count);
859+
log_io(&gpu, "gpu_dma_read %p %d\n", mem, count);
860860

861861
if (unlikely(gpu.cmd_len > 0))
862862
flush_cmd_buffer(&gpu);
@@ -879,7 +879,7 @@ uint32_t GPUreadData(void)
879879
ret = LE32TOH(ret);
880880
}
881881

882-
log_io("gpu_read %08x\n", ret);
882+
log_io(&gpu, "gpu_read %08x\n", ret);
883883
return ret;
884884
}
885885

@@ -891,7 +891,7 @@ uint32_t GPUreadStatus(void)
891891
flush_cmd_buffer(&gpu);
892892

893893
ret = gpu.status;
894-
log_io("gpu_read_status %08x\n", ret);
894+
log_io(&gpu, "gpu_read_status %08x\n", ret);
895895
return ret;
896896
}
897897

plugins/gpulib/gpu.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
//#define RAW_FB_DISPLAY
1717

18-
#define gpu_log(fmt, ...) \
19-
printf("%d:%03d: " fmt, *gpu.state.frame_count, *gpu.state.hcnt, ##__VA_ARGS__)
18+
#define gpu_log(gpu, fmt, ...) \
19+
printf("%d:%03d: " fmt, *(gpu)->state.frame_count, *(gpu)->state.hcnt, ##__VA_ARGS__)
2020

2121
//#define log_anomaly gpu_log
2222
#define log_anomaly(...)

0 commit comments

Comments
 (0)