We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 2
libretro-picodrive.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sun Aug 09 10:56:09 UTC 2020 - i@guoyunhe.me4
+5
+- Update to version 0~git20200716:6
+ * libretro, build fixes ffor android/ios7
+ * libretro, tentative fix for android build8
+ * sh2 drc, optimize standard division insns (default off, needs more scrutiny)9
+ * Buildfix10
+ * Buildfix11
+ * Fix more conflicting types for prototypes12
+ * Prevent collission with PS2 SDK13
+ * Make sure function prototype signatures match, and put typedefs into separate header file14
+ * core, keep offsets header from being build if no preprocessed asm files15
+ * libretro, build fixes16
+ * libretro, build fixes17
+ * core, fix type issues by using stdint types18
+ * libretro, build fixes19
+ * sh2, fix for interpreter crash if drc is compiled in too20
+ * sh2 drc, fix for x86_64 backend21
+ * libretro, more fixes and cleanups for windows and osx22
+ * libretro, fix for windows and osx23
+ * libretro, changes to allow for both standalone and libretro build24
+ * SDL UI, 2x overlay mode, for improved color resolution25
+ * libretro make fix for non-arm architectures26
+ * sh2 drc, fix for SH2 T handling in Mips/RiscV27
+ * SDL UI, preparation for 2x mode, for improved color resolution28
+ * sh2 drc, optimisation for SH2 16x16 multiplication29
+ * SDL UI, fix for CD LED display30
+ * sh2 drc, backend 32/64 bit compatibility fixes for Mips/RiscV31
+ * vdp fifo, DMA bugfix32
+ * sh2 drc, add powerpc64le backend33
+ * sh2 drc, preparations for powerpc support34
+ * vdp rendering, bugfix for overlapping high prio sprites35
+ * release 1.9636
+ * add copyright stuff to substantially changed files37
+ * sh2 drc: revised ARM A32 backend optimizer38
+ * 32x: libretro bugfix39
+ * sh2: optimisations in drc40
+ * audio: fix for save/load41
+ * sh2: bugfix in drc42
+ * audio: SN76496 fixes43
+ * 32x poll detection fix44
+ * vdp fifo, bugfix45
+ * audio: add option to switch off SSG-EG46
+ * audio: fixes and optimizations for SSG-EG47
+ * audio: improve cycle accuracy of SN76496+YM261248
+ * 32x, small improvement for poll detection49
+ * sh2, optimizations to innermost run loop50
+ * add sh2 ubc area to poll detection51
+ * 32x pwm, tiny optimization52
+ * sh2 timer optimization53
+ * menu background fix for pal mode54
+ * ym2612 ARM optimisations55
+ * vdp rendering, sprite caching optimization56
+ * ym2612 ARM, bug fixing and small optimizations57
+ * vdp DMA optimizations58
+ * fix for gp2x audio regression59
+ * vdp fifo speed optimization60
+ * fix for 68K cycle accounting61
+ * vdp rendering fixes62
+ * vdp rendering, fix for CD (sprites from WORD RAM)63
+ * ARM asm, symbol visibility fix64
+ * vdp rendering fixes (debug register, vscroll) for overdrive 265
+ * vdp fifo speed optimization66
+ * hvcounter table resolution reduced67
+ * vdp rendering improvements68
+ * vdp rendering, tiny improvement69
+ * 32x, small improvement for poll detector70
+ * vdp, some small improvements71
+ * fix config file parsing for long filenames72
+ * arm asm sprite rendering: add line accidently deleted in ea431e973
+ * ARM SVP drc revived74
+ * vdp sprite rendering fixes75
+ * more ARM asm sprite rendering bugfixes76
+ * improved hi prio sprite rendering speed77
+ * vdp, tentative fix for save/load compatibility78
+ * fix for VINT while DMA is running79
+ * fix for EI insn in cz80 (partial revert of 43e1401)80
+ * bugfix for ARM asm sprite rendering81
+ * vdp fifo, refined timing82
+ * vdp sprite rendering fix83
+ * vdp fifo, another revision84
+ * vdp sprite handling improvement (SAT cache)85
+ * vdp fifo, tentative fix for broken save/load86
+ * vdp rendering fixes87
+ * 32X poll detection fix88
+ * fix compatibility with ancient gas89
+ * vdp fifo: kludge for DMA fill interrupted by CPU90
+ * sh2 drc: fix for crash in generated code on x86_6491
+ * revised VDP fifo implementation92
+ * new hvcounter tables as per spritesmind.net threads93
+ * regression fix for gp2x 8bit fast mode94
+ * improved VRAM128K support (overdrive 2)95
+ * VDP timing improvements96
+ * added debug reg sprite plane support (fixes some issues in overdrive 2 demo)97
+ * sprite rendering improvements for masking and limit edge cases98
+ * audio fixes for overdrive demo99
+ * emulator timing fixes, VDP DMA fixes, improved DAC audio100
+ * bug fixes in drc, audio, display101
+ * audio: added SSG-EG to YM2612, plus some timing changes for SN76496+YM2612102
+ * add DC filter to sound mixer to remove potential PCM DC offset103
+ * sh2 drc: updates from mame for ym2612 sound104
+ * sh2 drc: optimize T bit handling for A64105
+ * sh2 drc: fix speed regression106
+ * sh2 drc: cleanup, fix for drc crash, for mips code emitter107
+ * remove textrels with -fPIC/-fPIE (for android/ios)108
+ * sh2 drc, tentative MIPS32/64 Release 2 support109
+ * release 1.95110
+ * sh2 drc: bug fixing111
+ * sh2 drc: fixed some RISC-V bugs112
+ * sh2 drc, small improvements and bug fixes for code emitters113
+ * sh2 drc, improved memory management114
+ * sh2 drc: RISC-V (RV64IM) code emitter, some work on MIPS64115
+ * sh2 drc: RISC-V (RV64IM) code emitter, some work on MIPS64116
+ * sh2 drc: optimizations for MIPS code emitting117
+ * sh2 drc: moved host register assignment to code emitters, minor bugfixing118
+ * 32x, finetuning119
+ * fix gp2x regression120
+ * sh2 drc: reorganised block mgmt code, plus some small scale optimisations121
+ * sh2 drc: bugfix in block management122
+ * sh2 drc: bugfix in block management123
+ * sh2 drc bugfix for aarch64/mips124
+ * 32x, improved auto frame skip, plus new config option for max auto skip125
+ * 32x, configurable pwm irq optimization to reduce pwm irq load126
+ * 32x, speed improvement127
+ * sh2 drc: speed optimization and bugfixing128
+ * sh2 drc: fix i386 regression129
+ * sh2 drc: bug fixing and optimization in register cache and branch handling130
+ * sh2 drc: drc exit, block linking and branch handling revised (overlooked commit)131
+ * sh2 drc: drc exit, block linking and branch handling revised132
+ * sh2 drc: improved RTS call stack cache133
+ * sh2 drc: rework of register cache to implement basic loop optmization134
+ * various smallish optimizations, cleanups, and bug fixes135
+ * cleanup and microoptimizations in SH2 hw handling136
+ * some drawing code C optimisations137
+ * bug fix in comm poll fifo, and back to -O3138
+ * pff... README, 2nd try139
+ * configuration changes and README140
+ * cleanup config files, copyright stuff141
+ * fix for mkoffsets without multiarch binutils142
+ * various small fixes and optimsations143
+ * sh2 drc: add aarch64 backend for A64144
+ * sh2 drc: add mipsel backend for MIPS32 Release 1 (for JZ47xx)145
+ * SH2 drc: register cache overhaul (bugfixing, speed, readability)146
+ * SH2 drc: bug fixing and small speed improvements147
+ * 32X: memory access and polling bug fixes148
+ * sh2 drc, x86 code emitter: use x86-64 registers R8-R15149
+ * 32x DMA memory copy performance optimisation150
+ * sh2 drc, change utils abi to pass sh2 PC in arg0 (reduces compiled code size)151
+ * sh2 drc, keep T bit in host flags as long as possible152
+ * add xSR/RTS call stack cache to sh2 drc153
+ * polling detection: communication poll fifo to avoid comm data loss154
+ * sh2 memory access improvements, revive ARM asm memory functions155
+ * sh2 drc, register cache optimisations156
+ * sh2 drc, block management bugfixes and cleanup157
+ * sh2 drc, add detection for in-memory polling158
+ * sh2 drc, add loop detector, handle delay/idle loops159
+ * sh2 drc, code emitter cleanup, add ARM reorder stage to reduce interlock160
+ * sh2 drc, make B/W read functions signed (reduces generated code size)161
+ * sh2 drc, improved constant handling and register allocator162
+ * speed improvement and fixes for 32x ARM asm draw163
+ * add literal pool to sh2 drc (for armv[456] without MOVT/W)164
+ * sh2 drc, reuse blocks if already previously compiled (speedup for Virtua *)165
+ * various small improvements and fixes166
+ * overhaul of translation cache and sh2 literals handling167
+ * added branch cache to sh2 drc to improve cross-tcache jump speed168
+ * sh2 memory interface optimzations169
+ * overhaul of the register cache (improves generated code by some 10+%)170
+ * debug stuff, bug fixing171
+ * move saving SH2 SR into memory access and do so only if needed172
+ * add 32bit memory access functions for SH2173
+ * sh2 drc: sh2 addr modes generalization, more const propagation, code gen optimizations174
+ * DRC: reworked scan_block (fix register usage masks, better block and literals detection)175
+ * minor changes176
+ * reworked palette and buffer handling due to some 32X bugs177
+ * revamped 32X draw arm asm code178
+ * kludges for wwf raw, nfl179
+ * substituted tool to obtain target structure offsets (for asm)180
+ * improved sh2 clock handling, bug fixing + small improvement to drc emitters181
+ * sh2 drc host disassembler integration for gp2x182
+ * bugfix for 32x183
+ * bfd-less arm disassembler for gph184
+ * config for x86 (32 bit only, for SH2 drc), add/revive profiling185
+ * arm asm memory access functions for m/s68k186
+ * config templates for gp2x, caanoo, dingux either with system toolchain (open2x,gph,opendingux) or ubuntu arm(gcc 4.7 is highest possible),mips187
+ * arm asm syntax fixes for open2x188
+ * make gp2x mp3 playback functional (need to unpack and compile helix decoder separately in platform/common/helix)189
+ * fix gp2x compilation (using linaro arm gcc 4.7 on ubuntu)190
+ * release 1.93191
+ * libretro: Allow setting GIT_VERSION.192
+ * Makefile: Build with optimizations if DEBUG=0193
+ * Remove not longer files in Picodrive for PS2194
+ * Change GSKit PS2 version195
+ * Update picodrive196
+ * Define HAVE_NO_LANGEXTRA197
+ * Adapt to newlib198
+ * Add option to change sound quality199
+ * Copy tile-based fast renderer buffer200
+ * Add option to change renderer201
libretro-picodrive.spec
Changed
10
1
2
3
4
Name: libretro-picodrive5
-Version: 0~git202001126
+Version: 0~git202007167
Release: 08
Summary: PicoDrive libretro core for MegaDrive/Genesis emulation9
License: NonFree10
_servicedata
Changed
9
1
2
<servicedata>3
<service name="tar_scm">4
<param name="url">https://github.com/libretro/picodrive.git</param>5
- <param name="changesrevision">495dddc0ad7847ab4a6ffeb54da3795a3f5a0e6d</param></service></servicedata>6
\ No newline at end of file7
+ <param name="changesrevision">e6b80af200f19d8d518d427dc20314606e9d8510</param></service></servicedata>8
\ No newline at end of file9
libretro-picodrive-0~git20200112.tar.xz/cpu/DrZ80/drz80.s
Deleted
201
1
2
-;@ Reesy's Z80 Emulator Version 0.0013
-4
-;@ (c) Copyright 2004 Reesy, All rights reserved5
-;@ DrZ80 is free for non-commercial use.6
-7
-;@ For commercial use, separate licencing terms must be obtained.8
-9
- .data10
- .align 411
-12
- .global DrZ80Run13
- .global DrZ80Ver14
-15
- .equiv INTERRUPT_MODE, 0 ;@0 = Use internal int handler, 1 = Use Mames int handler16
- .equiv FAST_Z80SP, 0 ;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer17
- .equiv UPDATE_CONTEXT, 018
- .equiv DRZ80_XMAP, 119
- .equiv DRZ80_XMAP_MORE_INLINE, 120
-21
-.if DRZ80_XMAP22
- .equ Z80_MEM_SHIFT, 1323
-.endif24
-25
-.if INTERRUPT_MODE26
- .extern Interrupt27
-.endif28
-29
-DrZ80Ver: .long 0x000130
-31
-;@ --------------------------- Defines ----------------------------32
-;@ Make sure that regs/pointers for z80pc to z80sp match up!33
-34
- z80_icount .req r335
- opcodes .req r436
- cpucontext .req r537
- z80pc .req r638
- z80a .req r739
- z80f .req r840
- z80bc .req r941
- z80de .req r1042
- z80hl .req r1143
- z80sp .req r12 44
- z80xx .req lr45
-46
- .equ z80pc_pointer, 0 ;@ 047
- .equ z80a_pointer, z80pc_pointer+4 ;@ 448
- .equ z80f_pointer, z80a_pointer+4 ;@ 849
- .equ z80bc_pointer, z80f_pointer+4 ;@ 50
- .equ z80de_pointer, z80bc_pointer+451
- .equ z80hl_pointer, z80de_pointer+452
- .equ z80sp_pointer, z80hl_pointer+453
- .equ z80pc_base, z80sp_pointer+454
- .equ z80sp_base, z80pc_base+455
- .equ z80ix, z80sp_base+456
- .equ z80iy, z80ix+457
- .equ z80i, z80iy+458
- .equ z80a2, z80i+459
- .equ z80f2, z80a2+460
- .equ z80bc2, z80f2+461
- .equ z80de2, z80bc2+462
- .equ z80hl2, z80de2+463
- .equ cycles_pointer, z80hl2+4 64
- .equ previouspc, cycles_pointer+4 65
- .equ z80irq, previouspc+466
- .equ z80if, z80irq+167
- .equ z80im, z80if+168
- .equ z80r, z80im+169
- .equ z80irqvector, z80r+170
- .equ z80irqcallback, z80irqvector+471
- .equ z80_write8, z80irqcallback+472
- .equ z80_write16, z80_write8+473
- .equ z80_in, z80_write16+474
- .equ z80_out, z80_in+475
- .equ z80_read8, z80_out+476
- .equ z80_read16, z80_read8+477
- .equ z80_rebaseSP, z80_read16+478
- .equ z80_rebasePC, z80_rebaseSP+479
-80
- .equ VFlag, 081
- .equ CFlag, 182
- .equ ZFlag, 283
- .equ SFlag, 384
- .equ HFlag, 485
- .equ NFlag, 586
- .equ Flag3, 687
- .equ Flag5, 788
-89
- .equ Z80_CFlag, 090
- .equ Z80_NFlag, 191
- .equ Z80_VFlag, 292
- .equ Z80_Flag3, 393
- .equ Z80_HFlag, 494
- .equ Z80_Flag5, 595
- .equ Z80_ZFlag, 696
- .equ Z80_SFlag, 797
-98
- .equ Z80_IF1, 1<<099
- .equ Z80_IF2, 1<<1100
- .equ Z80_HALT, 1<<2101
- .equ Z80_NMI, 1<<3102
-103
-;@---------------------------------------104
-105
-.text106
-107
-.if DRZ80_XMAP108
-109
-z80_xmap_read8: @ addr110
- ldr r1,[cpucontext,#z80_read8]111
- mov r2,r0,lsr #Z80_MEM_SHIFT112
- ldr r1,[r1,r2,lsl #2]113
- movs r1,r1,lsl #1114
- ldrccb r0,[r1,r0]115
- bxcc lr116
-117
-z80_xmap_read8_handler: @ addr, func118
- str z80_icount,[cpucontext,#cycles_pointer]119
- stmfd sp!,{r12,lr}120
- mov lr,pc121
- bx r1122
- ldr z80_icount,[cpucontext,#cycles_pointer]123
- ldmfd sp!,{r12,pc}124
-125
-z80_xmap_write8: @ data, addr126
- ldr r2,[cpucontext,#z80_write8]127
- add r2,r2,r1,lsr #Z80_MEM_SHIFT-2128
- bic r2,r2,#3129
- ldr r2,[r2]130
- movs r2,r2,lsl #1131
- strccb r0,[r2,r1]132
- bxcc lr133
-134
-z80_xmap_write8_handler: @ data, addr, func135
- str z80_icount,[cpucontext,#cycles_pointer]136
- mov r3,r0137
- mov r0,r1138
- mov r1,r3139
- stmfd sp!,{r12,lr}140
- mov lr,pc141
- bx r2142
- ldr z80_icount,[cpucontext,#cycles_pointer]143
- ldmfd sp!,{r12,pc}144
-145
-z80_xmap_read16: @ addr146
- @ check if we cross bank boundary147
- add r1,r0,#1148
- eor r1,r1,r0149
- tst r1,#1<<Z80_MEM_SHIFT150
- bne 0f151
-152
- ldr r1,[cpucontext,#z80_read8]153
- mov r2,r0,lsr #Z80_MEM_SHIFT154
- ldr r1,[r1,r2,lsl #2]155
- movs r1,r1,lsl #1156
- bcs 0f157
- ldrb r0,[r1,r0]!158
- ldrb r1,[r1,#1]159
- orr r0,r0,r1,lsl #8160
- bx lr161
-162
-0:163
- @ z80_xmap_read8 will save r3 and r12 for us164
- stmfd sp!,{r8,r9,lr}165
- mov r8,r0166
- bl z80_xmap_read8167
- mov r9,r0168
- add r0,r8,#1169
- bl z80_xmap_read8170
- orr r0,r9,r0,lsl #8171
- ldmfd sp!,{r8,r9,pc}172
-173
-z80_xmap_write16: @ data, addr174
- add r2,r1,#1175
- eor r2,r2,r1176
- tst r2,#1<<Z80_MEM_SHIFT177
- bne 0f178
-179
- ldr r2,[cpucontext,#z80_write8]180
- add r2,r2,r1,lsr #Z80_MEM_SHIFT-2181
- bic r2,r2,#3182
- ldr r2,[r2]183
- movs r2,r2,lsl #1184
- bcs 0f185
- strb r0,[r2,r1]!186
- mov r0,r0,lsr #8187
- strb r0,[r2,#1]188
- bx lr189
-190
-0:191
- stmfd sp!,{r8,r9,lr}192
- mov r8,r0193
- mov r9,r1194
- bl z80_xmap_write8195
- mov r0,r8,lsr #8196
- add r1,r9,#1197
- bl z80_xmap_write8198
- ldmfd sp!,{r8,r9,pc}199
-200
-z80_xmap_rebase_pc:201
libretro-picodrive-0~git20200112.tar.xz/pico/32x/draw_arm.s
Deleted
201
1
2
-@*3
-@* PicoDrive4
-@* (C) notaz, 20105
-@*6
-@* This work is licensed under the terms of MAME license.7
-@* See COPYING file in the top-level directory.8
-@*9
-10
-.extern Pico32x11
-.extern PicoDraw2FB12
-.extern HighPal13
-14
-.equiv P32XV_PRI, (1<< 7)15
-16
-.bss17
-.align 218
-.global Pico32xNativePal19
-Pico32xNativePal:20
- .word 021
-22
-.text23
-.align 224
-25
-26
-.macro call_scan_prep cond27
-.if \cond28
- ldr r4, =PicoScan32xBegin29
- ldr r5, =PicoScan32xEnd30
- ldr r6, =DrawLineDest31
- ldr r4, [r4]32
- ldr r5, [r5]33
- stmfd sp!, {r4,r5,r6}34
-.endif35
-.endm36
-37
-.macro call_scan_fin_ge cond38
-.if \cond39
- addge sp, sp, #4*340
-.endif41
-.endm42
-43
-.macro call_scan_begin cond44
-.if \cond45
- stmfd sp!, {r1-r3}46
- and r0, r2, #0xff47
- add r0, r0, r448
- mov lr, pc49
- ldr pc, [sp, #(3+0)*4]50
- ldr r0, [sp, #(3+2)*4] @ &DrawLineDest51
- ldmfd sp!, {r1-r3}52
- ldr r0, [r0]53
-.endif54
-.endm55
-56
-.macro call_scan_end cond57
-.if \cond58
- stmfd sp!, {r0-r3}59
- and r0, r2, #0xff60
- add r0, r0, r461
- mov lr, pc62
- ldr pc, [sp, #(4+1)*4]63
- ldmfd sp!, {r0-r3}64
-.endif65
-.endm66
-67
-@ direct color68
-@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg69
-.macro make_do_loop_dc name call_scan do_md70
-.global \name71
-\name:72
- stmfd sp!, {r4-r11,lr}73
-74
- ldr r10,=Pico32x75
- ldr r11,=PicoDraw2FB76
- ldr r10,[r10, #0x40] @ Pico32x.vdp_regs[0]77
- ldr r11,[r11]78
- ldr r9, =HighPal @ palmd79
- and r4, r2, #0xff80
- mov r5, #32881
- lsl r3, #26 @ mdbg << 2682
- mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data83
- tst r10,#P32XV_PRI84
- moveq r10,#085
- movne r10,#0x8000 @ r10 = inv_bit86
- call_scan_prep \call_scan87
-88
- mov r4, #0 @ line89
- b 1f @ loop_outer_entry90
-91
-0: @ loop_outer:92
- call_scan_end \call_scan93
- add r4, r4, #194
- sub r11,r11,#1 @ adjust for prev read95
- cmp r4, r2, lsr #1696
- call_scan_fin_ge \call_scan97
- ldmgefd sp!, {r4-r11,pc}98
-99
-1: @ loop_outer_entry:100
- call_scan_begin \call_scan101
- mov r12,r4, lsl #1102
- ldrh r12,[r1, r12]103
- add r11,r11,#8104
- mov r6, #320105
- add r5, r1, r12, lsl #1 @ p32x = dram + dram[l]106
-107
-2: @ loop_inner:108
- ldrb r7, [r11], #1 @ MD pixel109
- subs r6, r6, #1110
- blt 0b @ loop_outer111
- ldrh r8, [r5], #2 @ 32x pixel112
- cmp r3, r7, lsl #26 @ MD has bg pixel?113
- beq 3f @ draw32x114
- eor r12,r8, r10115
- ands r12,r12,#0x8000 @ !((t ^ inv) & 0x8000)116
-.if \do_md117
- mov r7, r7, lsl #1118
- ldreqh r12,[r9, r7]119
- streqh r12,[r0], #2 @ *dst++ = palmd[*pmd]120
-.endif121
- beq 2b @ loop_inner122
-123
-3: @ draw32x:124
- and r12,r8, #0x03e0125
- mov r8, r8, lsl #11126
- orr r8, r8, r8, lsr #(10+11)127
- orr r8, r8, r12,lsl #1128
- bic r8, r8, #0x0020 @ kill prio bit129
- strh r8, [r0], #2 @ *dst++ = bgr2rgb(*p32x++)130
- b 2b @ loop_inner131
-.endm132
-133
-134
-@ packed pixel135
-@ note: this may read a few bytes over the end of PicoDraw2FB and dram,136
-@ so those should have a bit more alloc'ed than really needed.137
-@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg138
-.macro make_do_loop_pp name call_scan do_md139
-.global \name140
-\name:141
- stmfd sp!, {r4-r11,lr}142
-143
- ldr r11,=PicoDraw2FB144
- ldr r10,=Pico32xNativePal145
- ldr r11,[r11]146
- ldr r10,[r10]147
- ldr r9, =HighPal @ palmd148
- and r4, r2, #0xff149
- mov r5, #328150
- lsl r3, #26 @ mdbg << 26151
- mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data152
- call_scan_prep \call_scan153
-154
- mov r4, #0 @ line155
- b 1f @ loop_outer_entry156
-157
-0: @ loop_outer:158
- call_scan_end \call_scan159
- add r4, r4, #1160
- cmp r4, r2, lsr #16161
- call_scan_fin_ge \call_scan162
- ldmgefd sp!, {r4-r11,pc}163
-164
-1: @ loop_outer_entry:165
- call_scan_begin \call_scan166
- mov r12,r4, lsl #1167
- ldrh r12,[r1, r12]168
- add r11,r11,#8169
- mov r6, #320/2170
- add r5, r1, r12, lsl #1 @ p32x = dram + dram[l]171
- and r12,r2, #0x100 @ shift172
- add r5, r5, r12,lsr #8173
-174
-2: @ loop_inner:175
-@ r4,r6 - counters; r5 - 32x data; r9,r10 - md,32x pal; r11 - md data176
-@ r7,r8,r12,lr - temp177
- tst r5, #1178
- ldreqb r8, [r5], #2179
- ldrb r7, [r5, #-1]180
- ldrneb r8, [r5, #2]! @ r7,r8 - pixel 0,1 index181
- subs r6, r6, #1182
- blt 0b @ loop_outer183
- cmp r7, r8184
- beq 5f @ check_fill @ +8185
-186
-3: @ no_fill:187
- mov r12,r7, lsl #1188
- mov lr, r8, lsl #1189
- ldrh r7, [r10,r12]190
- ldrh r8, [r10,lr]191
- add r11,r11,#2192
-193
- eor r12,r7, #0x20194
- tst r12,#0x20195
- ldrneb r12,[r11,#-2] @ MD pixel 0196
- eor lr, r8, #0x20197
- cmpne r3, r12, lsl #26 @ MD has bg pixel?198
-.if \do_md199
- mov r12,r12,lsl #1200
- ldrneh r7, [r9, r12] @ t = palmd[pmd[0]]201
libretro-picodrive-0~git20200112.tar.xz/pico/pico_int_o32.h
Deleted
30
1
2
-/* autogenerated by tools/mkoffsets, do not edit */3
-#define OFS_Pico_video_reg 0x00004
-#define OFS_Pico_m_rotate 0x00405
-#define OFS_Pico_m_z80Run 0x00416
-#define OFS_Pico_m_dirtyPal 0x00467
-#define OFS_Pico_m_hardware 0x00478
-#define OFS_Pico_m_z80_reset 0x004f9
-#define OFS_Pico_m_sram_reg 0x004910
-#define OFS_Pico_sv 0x008c11
-#define OFS_Pico_sv_data 0x008c12
-#define OFS_Pico_sv_start 0x009013
-#define OFS_Pico_sv_end 0x009414
-#define OFS_Pico_sv_flags 0x009815
-#define OFS_Pico_rom 0x033c16
-#define OFS_Pico_romsize 0x034017
-#define OFS_EST_DrawScanline 0x0018
-#define OFS_EST_rendstatus 0x0419
-#define OFS_EST_DrawLineDest 0x0820
-#define OFS_EST_HighCol 0x0c21
-#define OFS_EST_HighPreSpr 0x1022
-#define OFS_EST_Pico 0x1423
-#define OFS_EST_PicoMem_vram 0x1824
-#define OFS_EST_PicoMem_cram 0x1c25
-#define OFS_EST_PicoOpt 0x2026
-#define OFS_EST_Draw2FB 0x2427
-#define OFS_EST_HighPal 0x2828
-#define OFS_PMEM_vram 0x1000029
-#define OFS_PMEM_vsram 0x2210030
libretro-picodrive-0~git20200112.tar.xz/pico/sound/ym2612_arm.s
Deleted
201
1
2
-/*3
- * PicoDrive4
- * (C) notaz, 20065
- *6
- * This work is licensed under the terms of MAME license.7
- * See COPYING file in the top-level directory.8
- */9
-10
-@ this is a rewrite of MAME's ym2612 code, in particular this is only the main sample-generatin loop.11
-@ it does not seem to give much performance increase (if any at all), so don't use it if it causes trouble.12
-@ - notaz, 200613
-14
-@ vim:filetype=armasm15
-16
-.equiv SLOT1, 017
-.equiv SLOT2, 218
-.equiv SLOT3, 119
-.equiv SLOT4, 320
-.equiv SLOT_STRUCT_SIZE, 0x3021
-22
-.equiv TL_TAB_LEN, 0x1A0023
-24
-.equiv EG_ATT, 425
-.equiv EG_DEC, 326
-.equiv EG_SUS, 227
-.equiv EG_REL, 128
-.equiv EG_OFF, 029
-30
-.equiv EG_SH, 16 @ 16.16 fixed point (envelope generator timing)31
-.equiv EG_TIMER_OVERFLOW, (3*(1<<EG_SH)) @ envelope generator timer overflows every 3 samples (on real chip)32
-.equiv LFO_SH, 25 /* 7.25 fixed point (LFO calculations) */33
-34
-.equiv ENV_QUIET, (2*13*256/8)35
-36
-.text37
-.align 238
-39
-@ r5=slot, r1=eg_cnt, trashes: r0,r2,r340
-@ writes output to routp, but only if vol_out changes41
-.macro update_eg_phase_slot slot42
- ldrb r2, [r5,#0x17] @ state43
- add r3, r5, #0x1c44
- tst r2, r245
- beq 0f @ EG_OFF46
-47
- ldr r2, [r3, r2, lsl #2] @ pack48
- mov r3, #149
- mov r0, r2, lsr #24 @ shift50
- mov r3, r3, lsl r051
- sub r3, r3, #152
-53
- tst r1, r354
- bne 0f @ no volume change55
-56
- mov r3, r1, lsr r057
- and r3, r3, #758
- add r3, r3, r3, lsl #159
- mov r3, r2, lsr r360
- and r3, r3, #7 @ eg_inc_val shift, may be 061
- ldrb r2, [r5,#0x17] @ state62
- ldrh r0, [r5,#0x1a] @ volume, unsigned (0-1023)63
-64
- cmp r2, #4 @ EG_ATT65
- beq 4f66
- cmp r2, #267
- mov r2, #168
- mov r2, r2, lsl r369
- mov r2, r2, lsr #1 @ eg_inc_val70
- add r0, r0, r271
- blt 1f @ EG_REL72
- beq 2f @ EG_SUS73
-74
-3: @ EG_DEC75
- ldr r2, [r5,#0x1c] @ sl (can be 16bit?)76
- mov r3, #EG_SUS77
- cmp r0, r2 @ if ( volume >= (INT32) SLOT->sl )78
- strgeb r3, [r5,#0x17] @ state79
- b 10f80
-81
-4: @ EG_ATT82
- subs r3, r3, #1 @ eg_inc_val_shift - 183
- mov r2, #084
- mvnpl r2, r085
- mov r2, r2, lsl r386
- add r0, r0, r2, asr #487
- cmp r0, #0 @ if (volume <= MIN_ATT_INDEX)88
- movle r3, #EG_DEC89
- strleb r3, [r5,#0x17] @ state90
- movle r0, #091
- b 10f92
-93
-2: @ EG_SUS94
- mov r2, #102495
- sub r2, r2, #1 @ r2 = MAX_ATT_INDEX96
- cmp r0, r2 @ if ( volume >= MAX_ATT_INDEX )97
- movge r0, r298
- b 10f99
-100
-1: @ EG_REL101
- mov r2, #1024102
- sub r2, r2, #1 @ r2 = MAX_ATT_INDEX103
- cmp r0, r2 @ if ( volume >= MAX_ATT_INDEX )104
- movge r0, r2105
- movge r3, #EG_OFF106
- strgeb r3, [r5,#0x17] @ state107
-108
-10: @ finish109
- ldrh r3, [r5,#0x18] @ tl110
- strh r0, [r5,#0x1a] @ volume111
-.if \slot == SLOT1112
- mov r6, r6, lsr #16113
- add r0, r0, r3114
- orr r6, r0, r6, lsl #16115
-.elseif \slot == SLOT2116
- mov r6, r6, lsl #16117
- add r0, r0, r3118
- mov r0, r0, lsl #16119
- orr r6, r0, r6, lsr #16120
-.elseif \slot == SLOT3121
- mov r7, r7, lsr #16122
- add r0, r0, r3123
- orr r7, r0, r7, lsl #16124
-.elseif \slot == SLOT4125
- mov r7, r7, lsl #16126
- add r0, r0, r3127
- mov r0, r0, lsl #16128
- orr r7, r0, r7, lsr #16129
-.endif130
-131
-0: @ EG_OFF132
-.endm133
-134
-135
-@ r12=lfo_ampm[31:16], r1=lfo_cnt_old, r2=lfo_cnt, r3=scratch136
-.macro advance_lfo_m137
- mov r2, r2, lsr #LFO_SH138
- cmp r2, r1, lsr #LFO_SH139
- beq 0f140
- and r3, r2, #0x3f141
- cmp r2, #0x40142
- rsbge r3, r3, #0x3f143
- bic r12,r12, #0xff000000 @ lfo_ampm &= 0xff144
- orr r12,r12, r3, lsl #1+24145
-146
- mov r2, r2, lsr #2147
- cmp r2, r1, lsr #LFO_SH+2148
- bicne r12,r12, #0xff0000149
- orrne r12,r12, r2, lsl #16150
-151
-0:152
-.endm153
-154
-155
-@ result goes to r1, trashes r2156
-.macro make_eg_out slot157
- tst r12, #8158
- tstne r12, #(1<<(\slot+8))159
-.if \slot == SLOT1160
- mov r1, r6, lsl #16161
- mov r1, r1, lsr #16162
-.elseif \slot == SLOT2163
- mov r1, r6, lsr #16164
-.elseif \slot == SLOT3165
- mov r1, r7, lsl #16166
- mov r1, r1, lsr #16167
-.elseif \slot == SLOT4168
- mov r1, r7, lsr #16169
-.endif170
- andne r2, r12, #0xc0171
- movne r2, r2, lsr #6172
- addne r2, r2, #24173
- addne r1, r1, r12, lsr r2174
- bic r1, r1, #1175
-.endm176
-177
-178
-@ \r=sin/result, r1=env, r3=ym_tl_tab179
-.macro lookup_tl r180
- tst \r, #0x100181
- eorne \r, \r, #0xff @ if (sin & 0x100) sin = 0xff - (sin&0xff);182
- tst \r, #0x200183
- and \r, \r, #0xff184
- orr \r, \r, r1, lsl #7185
- mov \r, \r, lsl #1186
- ldrh \r, [r3, \r] @ 2ci if ne187
- rsbne \r, \r, #0188
-.endm189
-190
-191
-@ lr=context, r12=pack (stereo, lastchan, disabled, lfo_enabled | pan_r, pan_l, ams[2] | AMmasks[4] | FB[4] | lfo_ampm[16])192
-@ r0-r2=scratch, r3=sin_tab, r5=scratch, r6-r7=vol_out[4], r10=op1_out193
-.macro upd_algo0_m194
-195
- @ SLOT3196
- make_eg_out SLOT3197
- cmp r1, #ENV_QUIET198
- movcs r0, #0199
- bcs 0f200
- ldr r2, [lr, #0x18]201
libretro-picodrive-0~git20200112.tar.xz/platform/ps2/SMS_Utils.s
Deleted
201
1
2
-/*3
-# ___ _ _ ___4
-# | | | | |5
-# ___| | | ___| PS2DEV Open Source Project.6
-#----------------------------------------------------------7
-# MUL64 is pulled from some binary library (I don't remember which one).8
-# mips_memcpy routine is pulled from 'sde' library from MIPS.9
-#10
-*/11
-.set noat12
-.set noreorder13
-.set nomacro14
-15
-.globl MUL6416
-.globl mips_memcpy17
-.globl mips_memset18
-19
-.text20
-21
-MUL64:22
- pmultuw $v0, $a0, $a123
- dsra32 $a2, $a0, 024
- dsra32 $v1, $a1, 025
- mult $v1, $a0, $v126
- mult1 $a2, $a2, $a127
- addu $v1, $v1, $a228
- dsll32 $v1, $v1, 029
- jr $ra30
- daddu $v0, $v0, $v131
-32
-mips_memcpy:33
- addu $v0, $a0, $zero34
- beqz $a2, 1f35
- sltiu $t2, $a2, 1236
- bnez $t2, 2f37
- xor $v1, $a1, $a038
- andi $v1, $v1, 739
- negu $a3, $a040
- beqz $v1, 3f41
- andi $a3, $a3, 742
- beqz $a3, 4f43
- subu $a2, $a2, $a344
- ldr $v1, 0($a1)45
- ldl $v1, 7($a1)46
- addu $a1, $a1, $a347
- sdr $v1, 0($a0)48
- addu $a0, $a0, $a349
-4:50
- andi $v1, $a2, 3151
- subu $a3, $a2, $v152
- beqz $a3, 5f53
- addu $a2, $v1, $zero54
- addu $a3, $a3, $a155
-6:56
- ldr $v1, 0($a1)57
- ldl $v1, 7($a1)58
- ldr $t0, 8($a1)59
- ldl $t0, 15($a1)60
- ldr $t1, 16($a1)61
- ldl $t1, 23($a1)62
- ldr $t2, 24($a1)63
- ldl $t2, 31($a1)64
- sd $v1, 0($a0)65
- sd $t0, 8($a0)66
- sd $t1, 16($a0)67
- addiu $a1, $a1, 3268
- addiu $a0, $a0, 3269
- bne $a1, $a3, 6b70
- sd $t2, -8($a0)71
-5:72
- andi $v1, $a2, 773
- subu $a3, $a2, $v174
- beqz $a3, 2f75
- addu $a2, $v1, $zero76
- addu $a3, $a3, $a177
-7:78
- ldr $v1, 0($a1)79
- ldl $v1, 7($a1)80
- addiu $a1, $a1, 881
- addiu $a0, $a0, 882
- nop83
- bne $a1, $a3, 7b84
- sd $v1, -8($a0)85
- beq $zero, $zero, 2f86
- nop87
-3:88
- beqz $a3, 8f89
- subu $a2, $a2, $a390
- ldr $v1, 0($a1)91
- addu $a1, $a1, $a392
- sdr $v1, 0($a0)93
- addu $a0, $a0, $a394
-8:95
- andi $v1, $a2, 3196
- subu $a3, $a2, $v197
- beqz $a3, 9f98
- addu $a2, $v1, $zero99
- addu $a3, $a3, $a1100
-10:101
- ld $v1, 0($a1)102
- ld $t0, 8($a1)103
- ld $t1, 16($a1)104
- ld $t2, 24($a1)105
- sd $v1, 0($a0)106
- sd $t0, 8($a0)107
- sd $t1, 16($a0)108
- addiu $a1, $a1, 32109
- addiu $a0, $a0, 32110
- bne $a1, $a3, 10b111
- sd $t2, -8($a0)112
-9:113
- andi $v1, $a2, 7114
- subu $a3, $a2, $v1115
- beqz $a3, 2f116
- addu $a2, $v1, $zero117
- addu $a3, $a3, $a1118
-11:119
- ld $v1, 0($a1)120
- addiu $a1, $a1, 8121
- addiu $a0, $a0, 8122
- nop123
- nop124
- bne $a1, $a3, 11b125
- sd $v1, -8($a0)126
-2:127
- beqz $a2, 1f128
- addu $a3, $a2, $a1129
-12:130
- lbu $v1, 0($a1)131
- addiu $a1, $a1, 1132
- addiu $a0, $a0, 1133
- nop134
- nop135
- bne $a1, $a3, 12b136
- sb $v1, -1($a0)137
-1:138
- jr $ra139
- nop140
-141
-mips_memset:142
- beqz $a2, 1f143
- sltiu $at, $a2, 16144
- bnez $at, 2f145
- andi $a1, $a1, 0xFF146
- dsll $at, $a1, 0x8147
- or $a1, $a1, $at148
- dsll $at, $a1, 0x10149
- or $a1, $a1, $at150
- dsll32 $at, $a1, 0x0151
- or $a1, $a1, $at152
- andi $v1, $a0, 0x7153
- beqz $v1, 3f154
- li $a3, 8155
- subu $a3, $a3, $v1156
- subu $a2, $a2, $a3157
- sdr $a1, 0($a0)158
- addu $a0, $a0, $a3159
-3:160
- andi $v1, $a2, 0x1f161
- subu $a3, $a2, $v1162
- beqz $a3, 4f163
- move $a2, $v1164
- addu $a3, $a3, $a0165
-5:166
- sd $a1, 0($a0)167
- sd $a1, 8($a0)168
- sd $a1, 16($a0)169
- addiu $a0, $a0, 32170
- sd $a1, -8($a0)171
- bne $a0, $a3, 5b172
-4:173
- andi $v1, $a2, 0x7174
- subu $a3, $a2, $v1175
- beqz $a3, 2f176
- move $a2, $v1177
- addu $a3, $a3, $a0178
-6:179
- addiu $a0, $a0, 8180
- beq $a0, $a3, 2f181
- sd $a1, -8($a0)182
- addiu $a0, $a0, 8183
- beq $a0, $a3, 2f184
- sd $a1, -8($a0)185
- addiu $a0, $a0, 8186
- bne $a0, $a3, 6b187
- sd $a1, -8($a0)188
-2:189
- beqz $a2, 1f190
- addu $a3, $a2, $a0191
-7:192
- addiu $a0, $a0, 1193
- beq $a0, $a3, 1f194
- sb $a1, -1($a0)195
- addiu $a0, $a0, 1196
- beq $a0, $a3, 1f197
- sb $a1, -1($a0)198
- addiu $a0, $a0, 1199
- bne $a0, $a3, 7b200
- sb $a1, -1($a0)201
libretro-picodrive-0~git20200112.tar.xz/platform/ps2/stdint.h
Deleted
18
1
2
-#ifndef STDINT_H3
-#define STDINT_H4
-5
-typedef unsigned long uintptr_t;6
-typedef signed long intptr_t;7
-8
-typedef signed char int8_t;9
-typedef signed short int16_t;10
-typedef signed int int32_t;11
-typedef signed long int64_t;12
-typedef unsigned char uint8_t;13
-typedef unsigned short uint16_t;14
-typedef unsigned int uint32_t;15
-typedef unsigned long uint64_t;16
-17
-#endif //STDINT_H18
libretro-picodrive-0~git20200112.tar.xz/Makefile -> libretro-picodrive-0~git20200716.tar.xz/Makefile
Changed
175
1
2
CYCLONE_CC ?= gcc3
CYCLONE_CXX ?= g++4
5
-ifneq ("$(PLATFORM)", "libretro")6
- CFLAGS += -Wall -g7
- ifndef DEBUG8
- CFLAGS += -O3 -DNDEBUG9
- endif10
-endif11
-12
-# This is actually needed, bevieve me.13
-# If you really have to disable this, set NO_ALIGN_FUNCTIONS elsewhere.14
-ifndef NO_ALIGN_FUNCTIONS15
-CFLAGS += -falign-functions=216
-endif17
-18
all: config.mak target_19
20
ifndef NO_CONFIG_MAK21
22
config.mak:23
endif24
25
+# This is actually needed, believe me.26
+# If you really have to disable this, set NO_ALIGN_FUNCTIONS elsewhere.27
+ifndef NO_ALIGN_FUNCTIONS28
+CFLAGS += -falign-functions=229
+endif30
+31
+# profiling32
+pprof ?= 033
+gperf ?= 034
+35
+ifneq ("$(PLATFORM)", "libretro")36
+ CFLAGS += -Wall -g37
+ifneq ($(findstring gcc,$(CC)),)38
+ CFLAGS += -ffunction-sections -fdata-sections39
+ LDFLAGS += -Wl,--gc-sections40
+endif41
+ ifndef DEBUG42
+ CFLAGS += -O3 -DNDEBUG43
+ endif44
+45
+ LD = $(CC)46
+ OBJOUT ?= -o47
+ LINKOUT ?= -o48
+endif49
+50
+ifeq ("$(PLATFORM)",$(filter "$(PLATFORM)","gp2x" "opendingux" "rpi1"))51
+# very small caches, avoid optimization options making the binary much bigger52
+CFLAGS += -finline-limit=42 -fno-unroll-loops -fno-ipa-cp -ffast-math53
+# this gets you about 20% better execution speed on 32bit arm/mips54
+CFLAGS += -fno-common -fno-stack-protector -fno-guess-branch-probability -fno-caller-saves -fno-tree-loop-if-convert -fno-regmove55
+endif56
+#OBJS += align.o57
+58
# default settings59
ifeq "$(ARCH)" "arm"60
use_cyclone ?= 161
62
asm_misc ?= 163
asm_cdmemory ?= 164
asm_mix ?= 165
-else # if not arm66
+asm_32xdraw ?= 167
+asm_32xmemory ?= 168
+else69
use_fame ?= 170
use_cz80 ?= 171
-ifneq (,$(findstring 86,$(ARCH)))72
+ifneq (,$(filter x86% i386% mips% aarch% riscv% powerpc% ppc%, $(ARCH)))73
use_sh2drc ?= 174
endif75
endif76
77
USE_FRONTEND = 178
endif79
ifeq "$(PLATFORM)" "generic"80
+CFLAGS += -DSDL_OVERLAY_2X81
OBJS += platform/linux/emu.o platform/linux/blit.o # FIXME82
OBJS += platform/common/plat_sdl.o83
OBJS += platform/libpicofe/plat_sdl.o platform/libpicofe/in_sdl.o84
85
OBJS += platform/gp2x/warm.o 86
USE_FRONTEND = 187
PLATFORM_MP3 = 188
+PLATFORM_ZLIB = 189
+HAVE_ARMv6 = 090
endif91
ifeq "$(PLATFORM)" "libretro"92
OBJS += platform/libretro/libretro.o93
94
OBJS += platform/libretro/libretro-common/streams/file_stream_transforms.o95
OBJS += platform/libretro/libretro-common/vfs/vfs_implementation.o96
endif97
+PLATFORM_ZLIB = 198
endif99
100
ifeq "$(USE_FRONTEND)" "1"101
102
103
endif # USE_FRONTEND104
105
-OBJS += platform/common/mp3.o106
+OBJS += platform/common/mp3.o platform/common/mp3_sync.o107
ifeq "$(PLATFORM_MP3)" "1"108
+platform/common/mp3_helix.o: CFLAGS += -Iplatform/libpicofe109
+OBJS += platform/common/mp3_helix.o110
else ifeq "$(HAVE_LIBAVCODEC)" "1"111
OBJS += platform/common/mp3_libavcodec.o112
else113
OBJS += platform/common/mp3_dummy.o114
endif115
116
-ifeq "$(PLATFORM)" "libretro"117
+ifeq "$(PLATFORM_ZLIB)" "1"118
# zlib119
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \120
zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o zlib/uncompr.o121
122
target_: $(TARGET)123
124
clean:125
- $(RM) $(TARGET) $(OBJS)126
+ $(RM) $(TARGET) $(OBJS) pico/pico_int_offs.h127
$(RM) -r .opk_data128
129
$(TARGET): $(OBJS)130
131
endif132
133
pprof: platform/linux/pprof.c134
- $(CC) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@135
+ $(CC) $(CFLAGS) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@ $(LDFLAGS) $(LDLIBS)136
137
-tools/textfilter: tools/textfilter.c138
- make -C tools/ textfilter139
+pico/pico_int_offs.h: tools/mkoffsets.sh140
+ make -C tools/ XCC="$(CC)" XCFLAGS="$(CFLAGS)" XPLATFORM="$(platform)"141
142
%.o: %.c143
$(CC) -c $(OBJOUT)$@ $< $(CFLAGS)144
145
pico/cd/pcm.o: CFLAGS += -fno-strict-aliasing146
pico/cd/LC89510.o: CFLAGS += -fno-strict-aliasing147
pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing148
+ifeq (1,$(use_sh2drc))149
+ifneq (,$(findstring -flto,$(CFLAGS)))150
+# if using the DRC, memory and sh2soc directly use the DRC register for SH2 SR151
+# to avoid saving and reloading it. However, this collides with the use of LTO.152
+pico/32x/memory.o: CFLAGS += -fno-lto153
+pico/32x/sh2soc.o: CFLAGS += -fno-lto154
+endif155
+endif156
157
# fame needs ~2GB of RAM to compile on gcc 4.8158
# on x86, this is reduced by ~300MB when debug info is off (but not on ARM)159
160
pico/carthw_cfg.c: pico/carthw.cfg161
tools/make_carthw_c $< $@162
163
+# preprocessed asm files most probably include the offsets file164
+$(filter %.S,$(SRCS_COMMON)): pico/pico_int_offs.h165
+166
# random deps167
pico/carthw/svp/compiler.o : cpu/drc/emit_arm.c168
-cpu/sh2/compiler.o : cpu/drc/emit_arm.c169
-cpu/sh2/compiler.o : cpu/drc/emit_x86.c170
+cpu/sh2/compiler.o : cpu/drc/emit_arm.c cpu/drc/emit_arm64.c cpu/drc/emit_ppc.c171
+cpu/sh2/compiler.o : cpu/drc/emit_x86.c cpu/drc/emit_mips.c cpu/drc/emit_riscv.c172
cpu/sh2/mame/sh2pico.o : cpu/sh2/mame/sh2.c173
pico/pico.o pico/cd/mcd.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h174
pico/memory.o pico/cd/memory.o pico/32x/memory.o : pico/pico_int.h pico/memory.h175
libretro-picodrive-0~git20200112.tar.xz/Makefile.libretro -> libretro-picodrive-0~git20200716.tar.xz/Makefile.libretro
Changed
201
1
2
platform = win3
else ifneq ($(findstring Darwin,$(shell uname -a)),)4
platform = osx5
- arch = intel6
- ifeq ($(shell uname -p),powerpc)7
- arch = ppc8
- endif9
else ifneq ($(findstring win,$(shell uname -a)),)10
platform = win11
endif12
13
STATIC_LINKING:= 014
TARGET_NAME := picodrive15
LIBM := -lm16
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"17
-ifneq ($(GIT_VERSION)," unknown")18
+GIT_VERSION ?= $(shell git rev-parse --short HEAD || echo unknown)19
+ifneq ($(GIT_VERSION),"unknown")20
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"21
endif22
23
-asm_memory = 024
-asm_render = 025
-asm_ym2612 = 026
-asm_misc = 027
-asm_cdmemory = 028
-asm_mix = 029
-30
fpic :=31
32
ifeq ($(STATIC_LINKING),1)33
34
SHARED := -shared35
DONT_COMPILE_IN_ZLIB = 136
CFLAGS += -DFAMEC_NO_GOTOS37
- use_sh2drc = 138
ifneq ($(findstring SunOS,$(shell uname -a)),)39
CC=gcc40
endif41
42
LIBM :=43
DONT_COMPILE_IN_ZLIB = 144
CFLAGS += -DFAMEC_NO_GOTOS45
- use_sh2drc = 146
47
# OS X48
else ifeq ($(platform), osx)49
50
SHARED := -dynamiclib51
fpic := -fPIC52
APPLE := 153
- arch = intel54
ifeq ($(shell uname -p),powerpc)55
- arch = ppc56
- endif57
- ifeq ($(arch),ppc)58
+ CFLAGS += -DHAVE_NO_LANGEXTRA59
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS60
- else61
- use_sh2drc = 162
endif63
OSXVER = `sw_vers -productVersion | cut -d. -f 2`64
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`65
66
CXX += -miphoneos-version-min=8.067
CC_AS += -miphoneos-version-min=8.068
CFLAGS += -miphoneos-version-min=8.069
- ARCH := arm70
71
STATIC_LINKING = 172
- use_cyclone = 073
- use_fame = 174
- use_drz80 = 075
- use_cz80 = 176
- use_sh2drc = 077
- use_svpdrc = 078
79
# iOS80
else ifneq (,$(findstring ios,$(platform)))81
82
ifeq ($(platform),ios-arm64)83
CC = clang -arch arm64 -isysroot $(IOSSDK)84
CXX = clang++ -arch arm64 -isysroot $(IOSSDK)85
- CFLAGS += -marm -DARM -D__aarch64__=1 86
+ CFLAGS += -marm -DARM -D__aarch64__=1 87
else88
CC = clang -arch armv7 -isysroot $(IOSSDK)89
CXX = clang++ -arch armv7 -isysroot $(IOSSDK)90
- CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 91
+ CC_AS = perl ./tools/gas-preprocessor.pl $(CC)92
+ CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 93
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon94
+ NO_ARM_ASM = 195
endif96
- CC_AS = perl ./tools/gas-preprocessor.pl $(CC)97
CFLAGS += -DIOS98
99
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))100
101
CC_AS += -miphoneos-version-min=5.0102
CFLAGS += -miphoneos-version-min=5.0103
endif104
- ARCH := arm105
-106
- use_cyclone = 0107
- use_fame = 1108
- use_drz80 = 0109
- use_cz80 = 1110
- ifeq ($(platform),ios-arm64)111
- use_sh2drc = 0112
- use_svpdrc = 0113
- else114
- use_sh2drc = 1115
- use_svpdrc = 1116
- endif117
118
# tvOS119
else ifeq ($(platform), tvos-arm64)120
- ARCH := arm121
- use_cyclone = 0122
- use_fame = 1123
- use_drz80 = 0124
- use_cz80 = 1125
- use_sh2drc = 0126
- use_svpdrc = 0127
TARGET := $(TARGET_NAME)_libretro_tvos.dylib128
SHARED := -dynamiclib129
fpic := -fPIC130
131
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)132
endif133
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)134
+ CC = clang -arch arm64 -isysroot $(IOSSDK)135
+ CXX = clang++ -arch arm64 -isysroot $(IOSSDK)136
+ CFLAGS += -marm -DARM -D__aarch64__=1 137
CFLAGS += -DIOS138
139
# PS3140
141
NO_MMAP = 1142
DONT_COMPILE_IN_ZLIB = 1143
144
- asm_memory = 0145
- asm_render = 0146
- asm_ym2612 = 0147
- asm_misc = 0148
- asm_cdpico = 0149
- asm_cdmemory = 0150
- asm_mix = 0151
- use_cyclone = 0152
- use_fame = 1153
- use_drz80 = 0154
- use_cz80 = 1155
-156
# sncps3157
else ifeq ($(platform), sncps3)158
+ ARCH = powerpc159
TARGET := $(TARGET_NAME)_libretro_ps3.a160
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe161
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe162
163
NO_MMAP = 1164
DONT_COMPILE_IN_ZLIB = 1165
166
- asm_memory = 0167
- asm_render = 0168
- asm_ym2612 = 0169
- asm_misc = 0170
- asm_cdpico = 0171
- asm_cdmemory = 0172
- asm_mix = 0173
- use_cyclone = 0174
- use_fame = 1175
- use_drz80 = 0176
- use_cz80 = 1177
-178
# Lightweight PS3 Homebrew SDK179
else ifeq ($(platform), psl1ght)180
TARGET := $(TARGET_NAME)_libretro_$(platform).a181
182
NO_MMAP = 1183
DONT_COMPILE_IN_ZLIB = 1184
185
- asm_memory = 0186
- asm_render = 0187
- asm_ym2612 = 0188
- asm_misc = 0189
- asm_cdpico = 0190
- asm_cdmemory = 0191
- asm_mix = 0192
- use_cyclone = 0193
- use_fame = 1194
- use_drz80 = 0195
- use_cz80 = 1196
-197
# PSP198
else ifeq ($(platform), psp1)199
- TARGET := $(TARGET_NAME)_libretro_$(platform).a200
- CC = psp-gcc$(EXE_EXT)201
libretro-picodrive-0~git20200716.tar.xz/README.md
Added
72
1
2
+This is my foray into dynamic recompilation using PicoDrive, a3
+Megadrive / Genesis / Sega CD / Mega CD / 32X / SMS emulator.4
+5
+I added support for MIPS (mips32r1), ARM64 (aarch64) and RISC-V (RV64IM) to the6
+SH2 recompiler, as well as spent much effort to optimize the DRC-generated code.7
+I also optimized SH2 memory access inside the emulator, and did some work on8
+M68K/SH2 CPU synchronization to fix some problems and speed up the emulator.9
+10
+It got a bit out of hand. I ended up doing fixes and optimizations all over the11
+place, mainly for 32X and CD, 32X graphics handling, and probably some more,12
+see the commit history. As a result, 32X emulation speed has improved a lot.13
+14
+### compiling15
+16
+I mainly worked with standalone PicoDrive versions as created by configure/make.17
+A list of platforms for which this is possible can be obtained with18
+19
+> configure --help20
+21
+If you want to build an executable for a unixoid platform not listed in the22
+platform list, just use23
+24
+> configure --platform=generic25
+26
+If DRC is available for the platform, it should be enabled automatically.27
+28
+For other platforms using a cross-compiling toolchain I used this,29
+assuming $TC points to the appropriate cross compile toolchain directory:30
+31
+platform|toolchain|configure command32
+--------|---------|-----------------33
+gp2x,wiz,caanoo|open2x|CROSS_COMPILE=arm-open2x-linux- CFLAGS="-I$TC/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/include" LDFLAGS="--sysroot $TC/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux -L$TC/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/lib" ./configure --platform=gp2x34
+gp2x,wiz,caanoo|open2x with ubuntu arm gcc 4.7|CROSS_COMPILE=arm-linux-gnueabi- CFLAGS="-I$TC/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/include" LDFLAGS="-B$TC/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1 -B$TC/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/lib -L$TC/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/lib" ./configure --platform=gp2x35
+opendingux|opendingux|CROSS_COMPILE=mipsel-linux- CFLAGS="-I$TC/usr/include -I$TC/usr/include/SDL" LDFLAGS="--sysroot $TC -L$TC/lib" ./configure --platform=opendingux36
+opendingux|opendingux with ubuntu mips gcc 5.4|CROSS_COMPILE=mipsel-linux-gnu- CFLAGS="-I$TC/usr/include -I$TC/usr/include/SDL" LDFLAGS="-B$TC/usr/lib -B$TC/lib -Wl,-rpath-link=$TC/usr/lib -Wl,-rpath-link=$TC/lib" ./configure --platform=opendingux37
+gcw0|gcw0|CROSS_COMPILE=mipsel-gcw0-linux-uclibc- CFLAGS="-I$TC/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include -I$TC/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include/SDL" LDFLAGS="--sysroot $TC/usr/mipsel-gcw0-linux-uclibc/sysroot" ./configure --platform=gcw038
+39
+For gp2x, wiz, and caanoo you may need to compile libpng first.40
+41
+After configure, compile with42
+43
+> make opk # for opendingux and gcw044
+> 45
+> make # for anything else46
+47
+### helix MP3 decoder48
+49
+For 32 bit ARM platforms, there is the possibility to compile the helix MP350
+decoder into a shared library to be able to use MP3 audio files with CD games.51
+The helix source files aren't supplied because of licensing issues. However, if52
+you have obtained the sources, put them into the platform/common/helix53
+directory, set CROSS to your cross compiler prefix (e.g. arm-linux-gnueabi-)54
+and LIBGCC to your cross compiler's libgcc.a55
+(e.g. /usr/lib/gcc-cross/arm-linux-gnueabi/4.7/libgcc.a), and compile with56
+57
+> make -C platform/common/helix CROSS=$CROSS LIBGCC=$LIBGCC58
+59
+Copy the resulting ${CROSS}helix_mp3.so as libhelix.so to the directory where60
+the PicoDrive binary is.61
+62
+### installing63
+64
+You need to install the resulting binary onto your device manually.65
+For opendingux and gcw0, copy the opk to your SD card.66
+For gp2x, wiz and caanoo, the easiest way is to unpack67
+[PicoDrive_191.zip](http://notaz.gp2x.de/releases/PicoDrive/PicoDrive_191.zip)68
+on your SD card and replace the PicoDrive binary.69
+70
+Send bug reports, fixes etc to <derkub@gmail.com>71
+Kai-Uwe Bloem72
libretro-picodrive-0~git20200112.tar.xz/configure -> libretro-picodrive-0~git20200716.tar.xz/configure
Changed
201
1
2
$c >> config.log 2>&13
}4
5
+check_option()6
+{7
+ echo 'void test(void) { }' >$TMPC8
+ compile_object $1 || return 19
+ return 010
+}11
+12
check_define()13
{14
$CC -E -dD $CFLAGS pico/arm_features.h | grep -q $1 || return 115
16
# setting options to "yes" or "no" will make that choice default,17
# "" means "autodetect".18
19
-platform_list="generic pandora gp2x opendingux rpi1 rpi2"20
+platform_list="generic pandora gp2x wiz caanoo opendingux gcw0 rpi1 rpi2"21
platform="generic"22
sound_driver_list="oss alsa sdl"23
sound_drivers=""24
have_armv5=""25
have_armv6=""26
have_armv7=""27
+have_arm_oabi=""28
have_arm_neon=""29
have_libavcodec=""30
need_sdl="no"31
-need_xlib="no"32
+need_zlib="no"33
# these are for known platforms34
optimize_cortexa8="no"35
optimize_cortexa7="no"36
37
CXX="${CXX-${CROSS_COMPILE}g++}"38
AS="${AS-${CROSS_COMPILE}as}"39
STRIP="${STRIP-${CROSS_COMPILE}strip}"40
-test -n "$SDL_CONFIG" || SDL_CONFIG="`$CC --print-sysroot 2> /dev/null || true`/usr/bin/sdl-config"41
+test -n "$SDL_CONFIG" || SDL_CONFIG="`$CC $CFLAGS $LDFLAGS --print-sysroot 2> /dev/null || true`/usr/bin/sdl-config"42
MAIN_LDLIBS="$LDLIBS -lm"43
config_mak="config.mak"44
45
46
;;47
generic)48
;;49
- opendingux)50
+ opendingux | gcw0)51
sound_drivers="sdl"52
+ # both are really an opendingux53
+ platform="opendingux"54
;;55
pandora)56
sound_drivers="oss alsa"57
optimize_cortexa8="yes"58
have_arm_neon="yes"59
;;60
- gp2x)61
+ gp2x | wiz | caanoo)62
sound_drivers="oss"63
optimize_arm920="yes"64
+ # compile for OABI if toolchain provides it (faster code on caanoo)65
+ have_arm_oabi="yes"66
+ # always use static linking, since caanoo doesn't have OABI libs. Moreover,67
+ # dynamic linking slows Wiz 1-10%, and libm on F100 isn't compatible68
+ LDFLAGS="$LDFLAGS -static"69
+ # unified binary for all of them70
CFLAGS="$CFLAGS -D__GP2X__"71
- if [ "$CROSS_COMPILE" = "arm-linux-" ]; then72
- # still using static, dynamic linking slows Wiz 1-10%73
- # also libm on F100 is not compatible74
- MAIN_LDLIBS="$MAIN_LDLIBS -static"75
- fi76
+ platform="gp2x"77
;;78
*)79
fail "unsupported platform: $platform"80
81
# fi82
#fi83
84
-# basic compiler test85
-cat > $TMPC <<EOF86
-int main(void) { return 0; }87
-EOF88
-if ! compile_binary; then89
- fail "compiler test failed, please check config.log"90
-fi91
-92
if [ -z "$ARCH" ]; then93
ARCH=`$CC -dumpmachine | awk -F '-' '{print $1}'`94
fi95
96
+# CPU/ABI stuff first, else compile test may fail97
case "$ARCH" in98
arm*)99
# ARM stuff100
101
have_armv5=`check_define HAVE_ARMV5 && echo yes` || true102
fi103
104
+ # must disable thumb as recompiler can't handle it105
+ if check_define __thumb__; then106
+ CFLAGS="$CFLAGS -marm"107
+ fi108
+ # OABI/EABI selection109
+ if [ "$have_arm_oabi" = "yes" ] && check_option -mabi=apcs-gnu; then110
+ echo "$CFLAGS" | grep -q -- '-mabi=' || CFLAGS="$CFLAGS -mabi=apcs-gnu"111
+ echo "$CFLAGS" | grep -q -- '-m\(no-\)*thumb-interwork' || CFLAGS="$CFLAGS -mno-thumb-interwork"112
+ echo "$ASFLAGS" | grep -q -- '-mabi=' || ASFLAGS="$ASFLAGS -mabi=apcs-gnu"113
+ fi114
+115
# automatically set mfpu and mfloat-abi if they are not set116
if [ "$have_arm_neon" = "yes" ]; then117
fpu="neon"118
+ abi="hard"119
elif [ "$have_armv6" = "yes" ]; then120
fpu="vfp"121
+ abi="softfp"122
+ elif check_option -mfpu=fpa; then123
+ fpu="fpa" # compatibility option for arm-linux-gnueabi-gcc on ubuntu124
+ abi="soft"125
fi126
if [ "x$fpu" != "x" ]; then127
echo "$CFLAGS" | grep -q -- '-mfpu=' || CFLAGS="$CFLAGS -mfpu=$fpu"128
echo "$ASFLAGS" | grep -q -- '-mfpu=' || ASFLAGS="$ASFLAGS -mfpu=$fpu"129
- floatabi_set_by_gcc=`$CC -v 2>&1 | grep -q -- --with-float= && echo yes` || true130
- if [ "$floatabi_set_by_gcc" != "yes" ]; then131
- echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=softfp"132
- echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=softfp"133
- fi134
+ echo "$CFLAGS" | grep -q -- '-mfloat-abi=' || CFLAGS="$CFLAGS -mfloat-abi=$abi"135
+ echo "$ASFLAGS" | grep -q -- '-mfloat-abi=' || ASFLAGS="$ASFLAGS -mfloat-abi=$abi"136
fi137
138
- # must disable thumb as recompiler can't handle it139
- if check_define __thumb__; then140
- CFLAGS="$CFLAGS -marm"141
- fi142
+ # add -ldl for helix support143
+ case "$MAIN_LDLIBS" in144
+ *"-ldl"*) ;;145
+ *) MAIN_LDLIBS="-ldl $MAIN_LDLIBS" ;;146
+ esac147
148
# warn about common mistakes149
if [ "$platform" != "gp2x" -a "$have_armv5" != "yes" ]; then150
151
;;152
esac153
154
+# basic compiler test155
+cat > $TMPC <<EOF156
+int main(void) { return 0; }157
+EOF158
+if ! compile_binary; then159
+ fail "compiler test failed, please check config.log"160
+fi161
+162
# header/library presence tests163
check_zlib()164
{165
166
compile_object "$@"167
}168
169
-MAIN_LDLIBS="$MAIN_LDLIBS -lz"170
-check_zlib -lz || fail "please install zlib (libz-dev)"171
+check_zlib -lz &&MAIN_LDLIBS="$MAIN_LDLIBS -lz" || need_zlib="yes"172
173
MAIN_LDLIBS="-lpng $MAIN_LDLIBS"174
check_libpng || fail "please install libpng (libpng-dev)"175
176
check_sdl `$SDL_CONFIG --libs` || fail "please install libsdl (libsdl1.2-dev)"177
fi178
179
-cat > $TMPC <<EOF180
-void test(void *f, void *d) { fread(d, 1, 1, f); }181
-EOF182
-if compile_object -Wno-unused-result; then183
+if check_option -Wno-unused_result; then184
CFLAGS="$CFLAGS -Wno-unused-result"185
fi186
187
188
if [ "$have_libavcodec" = "yes" ]; then189
echo "HAVE_LIBAVCODEC = 1" >> $config_mak190
fi191
+if [ "$need_zlib" = "yes" ]; then192
+ echo "PLATFORM_ZLIB = 1" >> $config_mak193
+fi194
195
# GP2X toolchains are too old for UAL asm,196
# so add this here to not litter main Makefile197
-if [ "$platform" = "g1p2x" ]; then198
- echo >> $config_mak199
- echo "%.o: %.S" >> $config_mak200
- echo " $(CC) $(CFLAGS) -E -c $^ -o /tmp/$(notdir $@).s" >> $config_mak201
libretro-picodrive-0~git20200716.tar.xz/cpu/DrZ80/drz80.S
Added
201
1
2
+;@ Reesy's Z80 Emulator Version 0.0013
+4
+;@ (c) Copyright 2004 Reesy, All rights reserved5
+;@ DrZ80 is free for non-commercial use.6
+7
+;@ For commercial use, separate licencing terms must be obtained.8
+9
+#include "../../pico/arm_features.h"10
+11
+ .data12
+ .align 413
+14
+ .global DrZ80Run15
+ .global DrZ80Ver16
+17
+ .equiv INTERRUPT_MODE, 0 ;@0 = Use internal int handler, 1 = Use Mames int handler18
+ .equiv FAST_Z80SP, 0 ;@0 = Use mem functions for stack pointer, 1 = Use direct mem pointer19
+ .equiv UPDATE_CONTEXT, 020
+ .equiv DRZ80_XMAP, 121
+ .equiv DRZ80_XMAP_MORE_INLINE, 122
+23
+.if DRZ80_XMAP24
+ .equ Z80_MEM_SHIFT, 1325
+.endif26
+27
+.if INTERRUPT_MODE28
+ .extern Interrupt29
+.endif30
+31
+DrZ80Ver: .long 0x000132
+33
+;@ --------------------------- Defines ----------------------------34
+;@ Make sure that regs/pointers for z80pc to z80sp match up!35
+36
+ z80_icount .req r337
+ opcodes .req r438
+ cpucontext .req r539
+ z80pc .req r640
+ z80a .req r741
+ z80f .req r842
+ z80bc .req r943
+ z80de .req r1044
+ z80hl .req r1145
+ z80sp .req r12 46
+ z80xx .req lr47
+48
+ .equ z80pc_pointer, 0 ;@ 049
+ .equ z80a_pointer, z80pc_pointer+4 ;@ 450
+ .equ z80f_pointer, z80a_pointer+4 ;@ 851
+ .equ z80bc_pointer, z80f_pointer+4 ;@ 52
+ .equ z80de_pointer, z80bc_pointer+453
+ .equ z80hl_pointer, z80de_pointer+454
+ .equ z80sp_pointer, z80hl_pointer+455
+ .equ z80pc_base, z80sp_pointer+456
+ .equ z80sp_base, z80pc_base+457
+ .equ z80ix, z80sp_base+458
+ .equ z80iy, z80ix+459
+ .equ z80i, z80iy+460
+ .equ z80a2, z80i+461
+ .equ z80f2, z80a2+462
+ .equ z80bc2, z80f2+463
+ .equ z80de2, z80bc2+464
+ .equ z80hl2, z80de2+465
+ .equ cycles_pointer, z80hl2+4 66
+ .equ previouspc, cycles_pointer+4 67
+ .equ z80irq, previouspc+468
+ .equ z80if, z80irq+169
+ .equ z80im, z80if+170
+ .equ z80r, z80im+171
+ .equ z80irqvector, z80r+172
+ .equ z80irqcallback, z80irqvector+473
+ .equ z80_write8, z80irqcallback+474
+ .equ z80_write16, z80_write8+475
+ .equ z80_in, z80_write16+476
+ .equ z80_out, z80_in+477
+ .equ z80_read8, z80_out+478
+ .equ z80_read16, z80_read8+479
+ .equ z80_rebaseSP, z80_read16+480
+ .equ z80_rebasePC, z80_rebaseSP+481
+82
+ .equ VFlag, 083
+ .equ CFlag, 184
+ .equ ZFlag, 285
+ .equ SFlag, 386
+ .equ HFlag, 487
+ .equ NFlag, 588
+ .equ Flag3, 689
+ .equ Flag5, 790
+91
+ .equ Z80_CFlag, 092
+ .equ Z80_NFlag, 193
+ .equ Z80_VFlag, 294
+ .equ Z80_Flag3, 395
+ .equ Z80_HFlag, 496
+ .equ Z80_Flag5, 597
+ .equ Z80_ZFlag, 698
+ .equ Z80_SFlag, 799
+100
+ .equ Z80_IF1, 1<<0101
+ .equ Z80_IF2, 1<<1102
+ .equ Z80_HALT, 1<<2103
+ .equ Z80_NMI, 1<<3104
+105
+;@---------------------------------------106
+107
+.text108
+ PIC_LDR_INIT()109
+110
+.if DRZ80_XMAP111
+112
+z80_xmap_read8: @ addr113
+ ldr r1,[cpucontext,#z80_read8]114
+ mov r2,r0,lsr #Z80_MEM_SHIFT115
+ ldr r1,[r1,r2,lsl #2]116
+ movs r1,r1,lsl #1117
+ ldrccb r0,[r1,r0]118
+ bxcc lr119
+120
+z80_xmap_read8_handler: @ addr, func121
+ str z80_icount,[cpucontext,#cycles_pointer]122
+ stmfd sp!,{r12,lr}123
+ mov lr,pc124
+ bx r1125
+ ldr z80_icount,[cpucontext,#cycles_pointer]126
+ ldmfd sp!,{r12,pc}127
+128
+z80_xmap_write8: @ data, addr129
+ ldr r2,[cpucontext,#z80_write8]130
+ add r2,r2,r1,lsr #Z80_MEM_SHIFT-2131
+ bic r2,r2,#3132
+ ldr r2,[r2]133
+ movs r2,r2,lsl #1134
+ strccb r0,[r2,r1]135
+ bxcc lr136
+137
+z80_xmap_write8_handler: @ data, addr, func138
+ str z80_icount,[cpucontext,#cycles_pointer]139
+ mov r3,r0140
+ mov r0,r1141
+ mov r1,r3142
+ stmfd sp!,{r12,lr}143
+ mov lr,pc144
+ bx r2145
+ ldr z80_icount,[cpucontext,#cycles_pointer]146
+ ldmfd sp!,{r12,pc}147
+148
+z80_xmap_read16: @ addr149
+ @ check if we cross bank boundary150
+ add r1,r0,#1151
+ eor r1,r1,r0152
+ tst r1,#1<<Z80_MEM_SHIFT153
+ bne 0f154
+155
+ ldr r1,[cpucontext,#z80_read8]156
+ mov r2,r0,lsr #Z80_MEM_SHIFT157
+ ldr r1,[r1,r2,lsl #2]158
+ movs r1,r1,lsl #1159
+ bcs 0f160
+ ldrb r0,[r1,r0]!161
+ ldrb r1,[r1,#1]162
+ orr r0,r0,r1,lsl #8163
+ bx lr164
+165
+0:166
+ @ z80_xmap_read8 will save r3 and r12 for us167
+ stmfd sp!,{r8,r9,lr}168
+ mov r8,r0169
+ bl z80_xmap_read8170
+ mov r9,r0171
+ add r0,r8,#1172
+ bl z80_xmap_read8173
+ orr r0,r9,r0,lsl #8174
+ ldmfd sp!,{r8,r9,pc}175
+176
+z80_xmap_write16: @ data, addr177
+ add r2,r1,#1178
+ eor r2,r2,r1179
+ tst r2,#1<<Z80_MEM_SHIFT180
+ bne 0f181
+182
+ ldr r2,[cpucontext,#z80_write8]183
+ add r2,r2,r1,lsr #Z80_MEM_SHIFT-2184
+ bic r2,r2,#3185
+ ldr r2,[r2]186
+ movs r2,r2,lsl #1187
+ bcs 0f188
+ strb r0,[r2,r1]!189
+ mov r0,r0,lsr #8190
+ strb r0,[r2,#1]191
+ bx lr192
+193
+0:194
+ stmfd sp!,{r8,r9,lr}195
+ mov r8,r0196
+ mov r9,r1197
+ bl z80_xmap_write8198
+ mov r0,r8,lsr #8199
+ add r1,r9,#1200
+ bl z80_xmap_write8201
libretro-picodrive-0~git20200112.tar.xz/cpu/cz80/cz80.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/cz80/cz80.c
Changed
28
1
2
#include "cz80.h"3
4
#if PICODRIVE_HACKS5
+#include <pico/pico_int.h>6
#include <pico/memory.h>7
#endif8
9
10
CPU->ICount -= CPU->ExtraCycles;11
CPU->ExtraCycles = 0;12
}13
- goto Cz80_Exec;14
+ if (!CPU->HaltState)15
+ goto Cz80_Exec;16
}17
}18
else CPU->ICount = 0;19
20
#if CZ80_ENCRYPTED_ROM21
CPU->OPBase = OPBase;22
#endif23
+ if (CPU->HaltState)24
+ CPU->ICount = 0;25
cycles -= CPU->ICount;26
#if !CZ80_EMULATE_R_EXACTLY27
zR = (zR + (cycles >> 2)) & 0x7f;28
libretro-picodrive-0~git20200112.tar.xz/cpu/cz80/cz80_op.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/cz80/cz80_op.c
Changed
17
1
2
OP(0x76): // HALT3
OP_HALT:4
CPU->HaltState = 1;5
- CPU->ICount = 0;6
goto Cz80_Check_Interrupt;7
8
OP(0xf3): // DI9
OP_DI:10
zIFF = 0;11
- RET(4)12
+ USE_CYCLES(4)13
+ goto Cz80_Exec_nocheck;14
15
OP(0xfb): // EI16
OP_EI:17
libretro-picodrive-0~git20200112.tar.xz/cpu/drc/cmn.h -> libretro-picodrive-0~git20200716.tar.xz/cpu/drc/cmn.h
Changed
55
1
2
-#ifndef UTYPES_DEFINED3
-typedef unsigned char u8;4
-typedef signed char s8;5
-typedef unsigned short u16;6
-typedef signed short s16;7
-typedef unsigned int u32;8
-typedef signed int s32;9
-#endif10
11
-#define DRC_TCACHE_SIZE (2*1024*1024)12
+#define DRC_TCACHE_SIZE (4*1024*1024)13
14
extern u8 *tcache;15
16
void drc_cmn_init(void);17
void drc_cmn_cleanup(void);18
19
+#define BITMASK1(v0) (1 << (v0))20
+#define BITMASK2(v0,v1) ((1 << (v0)) | (1 << (v1)))21
+#define BITMASK3(v0,v1,v2) (BITMASK2(v0,v1) | (1 << (v2)))22
+#define BITMASK4(v0,v1,v2,v3) (BITMASK3(v0,v1,v2) | (1 << (v3)))23
+#define BITMASK5(v0,v1,v2,v3,v4) (BITMASK4(v0,v1,v2,v3) | (1 << (v4)))24
+#define BITMASK6(v0,v1,v2,v3,v4,v5) (BITMASK5(v0,v1,v2,v3,v4) | (1 << (v5)))25
+#define BITRANGE(v0,v1) (BITMASK1(v1+1)-BITMASK1(v0)) // set with v0..v126
+27
+// binary search approach, since we don't have CLZ on ARM920T28
+#define FOR_ALL_BITS_SET_DO(mask, bit, code) { \29
+ u32 __mask = mask; \30
+ for (bit = 0; bit < 32 && mask; bit++, __mask >>= 1) { \31
+ if (!(__mask & 0xffff)) \32
+ bit += 16,__mask >>= 16; \33
+ if (!(__mask & 0xff)) \34
+ bit += 8, __mask >>= 8; \35
+ if (!(__mask & 0xf)) \36
+ bit += 4, __mask >>= 4; \37
+ if (!(__mask & 0x3)) \38
+ bit += 2, __mask >>= 2; \39
+ if (!(__mask & 0x1)) \40
+ bit += 1, __mask >>= 1; \41
+ if (__mask & 0x1) { \42
+ code; \43
+ } \44
+ } \45
+}46
+47
+// inspired by https://graphics.stanford.edu/~seander/bithacks.html48
+static inline int count_bits(unsigned val)49
+{50
+ val = val - ((val >> 1) & 0x55555555);51
+ val = (val & 0x33333333) + ((val >> 2) & 0x33333333);52
+ return (((val + (val >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;53
+}54
+55
libretro-picodrive-0~git20200112.tar.xz/cpu/drc/emit_arm.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/drc/emit_arm.c
Changed
201
1
2
/*3
* Basic macros to emit ARM instructions and some utils4
* Copyright (C) 2008,2009,2010 notaz5
+ * Copyright (C) 2019 kub6
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
*/10
-#define CONTEXT_REG 1111
-#define RET_REG 012
+#define HOST_REGS 1613
+14
+// OABI/EABI: params: r0-r3, return: r0-r1, temp: r12,r14, saved: r4-r8,r10,r1115
+// SP,PC: r13,r15 must not be used. saved: r9 (for platform use, e.g. on ios)16
+#define RET_REG 017
+#define PARAM_REGS { 0, 1, 2, 3 }18
+#ifndef __MACH__19
+#define PRESERVED_REGS { 4, 5, 6, 7, 8, 9, 10, 11 }20
+#else21
+#define PRESERVED_REGS { 4, 5, 6, 7, 8, 10, 11 } // no r9..22
+#endif23
+#define TEMPORARY_REGS { 12, 14 }24
+25
+#define CONTEXT_REG 1126
+#define STATIC_SH2_REGS { SHR_SR,10 , SHR_R(0),8 , SHR_R(1),9 }27
28
// XXX: tcache_ptr type for SVP and SH2 compilers differs..29
#define EMIT_PTR(ptr, x) \30
do { \31
*(u32 *)ptr = x; \32
ptr = (void *)((u8 *)ptr + sizeof(u32)); \33
- COUNT_OP; \34
} while (0)35
36
-#define EMIT(x) EMIT_PTR(tcache_ptr, x)37
+// ARM special registers and peephole optimization flags38
+#define SP 13 // stack pointer39
+#define LR 14 // link (return address)40
+#define PC 15 // program counter41
+#define SR 16 // CPSR, status register42
+#define MEM 17 // memory access (src=LDR, dst=STR)43
+#define CYC1 20 // 1 cycle interlock (LDR, reg-cntrld shift)44
+#define CYC2 (CYC1+1)// 2+ cycles interlock (LDR[BH], MUL/MLA etc)45
+#define NO 32 // token for "no register"46
+47
+// bitmask builders48
+#define M1(x) (u32)(1ULL<<(x)) // u32 to have NO evaluate to 049
+#define M2(x,y) (M1(x)|M1(y))50
+#define M3(x,y,z) (M2(x,y)|M1(z))51
+#define M4(x,y,z,a) (M3(x,y,z)|M1(a))52
+#define M5(x,y,z,a,b) (M4(x,y,z,a)|M1(b))53
+#define M6(x,y,z,a,b,c) (M5(x,y,z,a,b)|M1(c))54
+#define M10(a,b,c,d,e,f,g,h,i,j) (M5(a,b,c,d,e)|M5(f,g,h,i,j))55
+56
+// avoid a warning with clang57
+static inline uintptr_t pabs(intptr_t v) { return labs(v); }58
+59
+// sys_cacheflush always flushes whole pages, and it's rather expensive on ARMs60
+// hold a list of pending cache updates and merge requests to reduce cacheflush61
+static struct { void *base, *end; } pageflush[4];62
+static unsigned pagesize = 4096;63
+64
+static void emith_update_cache(void)65
+{66
+ int i;67
+68
+ for (i = 0; i < 4 && pageflush[i].base; i++) {69
+ cache_flush_d_inval_i(pageflush[i].base, pageflush[i].end + pagesize-1);70
+ pageflush[i].base = NULL;71
+ }72
+}73
+74
+static inline void emith_update_add(void *base, void *end)75
+{76
+ void *p_base = (void *)((uintptr_t)(base) & ~(pagesize-1));77
+ void *p_end = (void *)((uintptr_t)(end ) & ~(pagesize-1));78
+ int i;79
+80
+ for (i = 0; i < 4 && pageflush[i].base; i++) {81
+ if (p_base <= pageflush[i].end+pagesize && p_end >= pageflush[i].end) {82
+ if (p_base < pageflush[i].base) pageflush[i].base = p_base;83
+ pageflush[i].end = p_end;84
+ return;85
+ }86
+ if (p_base <= pageflush[i].base && p_end >= pageflush[i].base-pagesize) {87
+ if (p_end > pageflush[i].end) pageflush[i].end = p_end;88
+ pageflush[i].base = p_base;89
+ return;90
+ }91
+ }92
+ if (i == 4) {93
+ /* list full and not mergeable -> flush list */94
+ emith_update_cache();95
+ i = 0;96
+ }97
+ pageflush[i].base = p_base, pageflush[i].end = p_end;98
+}99
+100
+// peephole optimizer. ATM only tries to reduce interlock101
+#define EMIT_CACHE_SIZE 6102
+struct emit_op {103
+ u32 op;104
+ u32 src, dst;105
+};106
+107
+// peephole cache, last commited insn + cache + next insn = size+2108
+static struct emit_op emit_cache[EMIT_CACHE_SIZE+2];109
+static int emit_index;110
+#define emith_insn_ptr() (u8 *)((u32 *)tcache_ptr-emit_index)111
+112
+static inline void emith_pool_adjust(int tcache_offs, int move_offs);113
+114
+static NOINLINE void EMIT(u32 op, u32 dst, u32 src)115
+{116
+ void * emit_ptr = (u32 *)tcache_ptr - emit_index;117
+ struct emit_op *const ptr = emit_cache;118
+ const int n = emit_index+1;119
+ int i, bi, bd = 0;120
+121
+ // account for new insn in tcache122
+ tcache_ptr = (void *)((u32 *)tcache_ptr + 1);123
+ COUNT_OP;124
+ // for conditional execution SR is always source125
+ if (op < 0xe0000000 /*A_COND_AL << 28*/)126
+ src |= M1(SR);127
+ // put insn on back of queue // mask away the NO token128
+ emit_cache[n] = (struct emit_op)129
+ { .op=op, .src=src & ~M1(NO), .dst=dst & ~M1(NO) };130
+ // check insns down the queue as long as permitted by dependencies131
+ for (bd = bi = 0, i = emit_index; i > 1 && !(dst & M1(PC)); i--) {132
+ int deps = 0;133
+ // dst deps between i and n must not be swapped, since any deps134
+ // but [i].src & [n].src lead to changed semantics if swapped.135
+ if ((ptr[i].dst & ptr[n].src) || (ptr[n].dst & ptr[i].src) ||136
+ (ptr[i].dst & ptr[n].dst))137
+ break;138
+ // don't swap insns reading PC if it's not a word pool load139
+ // (ptr[i].op&0xf700000) != EOP_C_AM2_IMM(0,0,0,1,0,0,0))140
+ if ((ptr[i].src & M1(PC)) && (ptr[i].op&0xf700000) != 0x5100000)141
+ break;142
+143
+ // calculate ARM920T interlock cycles (differences only)144
+#define D2(x,y) ((ptr[x].dst & ptr[y].src)?((ptr[x].src >> CYC2) & 1):0)145
+#define D1(x,y) ((ptr[x].dst & ptr[y].src)?((ptr[x].src >> CYC1) & 3):0)146
+ // insn sequence: [..., i-2, i-1, i, i+1, ..., n-2, n-1, n]147
+ deps -= D2(i-2,i)+D2(i-1,i+1)+D2(n-2,n ) + D1(i-1,i)+D1(n-1,n);148
+ deps -= !!(ptr[n].src & M2(CYC1,CYC2));// favour moving LDR down149
+ // insn sequence: [..., i-2, i-1, n, i, i+1, ..., n-2, n-1]150
+ deps += D2(i-2,n)+D2(i-1,i )+D2(n ,i+1) + D1(i-1,n)+D1(n ,i);151
+ deps += !!(ptr[i].src & M2(CYC1,CYC2));// penalize moving LDR up152
+ // remember best match found153
+ if (bd > deps)154
+ bd = deps, bi = i;155
+ }156
+ // swap if fewer depencies157
+ if (bd < 0) {158
+ // make room for new insn at bi159
+ struct emit_op tmp = ptr[n];160
+ for (i = n-1; i >= bi; i--) {161
+ ptr[i+1] = ptr[i];162
+ if (ptr[i].src & M1(PC))163
+ emith_pool_adjust(n-i+1, 1);164
+ }165
+ // insert new insn at bi166
+ ptr[bi] = tmp;167
+ if (ptr[bi].src & M1(PC))168
+ emith_pool_adjust(1, bi-n);169
+ }170
+ if (dst & M1(PC)) {171
+ // commit everything if a branch insn is emitted172
+ for (i = 1; i <= emit_index+1; i++)173
+ EMIT_PTR(emit_ptr, emit_cache[i].op);174
+ emit_index = 0;175
+ } else if (emit_index < EMIT_CACHE_SIZE) {176
+ // queue not yet full177
+ emit_index++;178
+ } else {179
+ // commit oldest insn from cache180
+ EMIT_PTR(emit_ptr, emit_cache[1].op);181
+ for (i = 0; i <= emit_index; i++)182
+ emit_cache[i] = emit_cache[i+1];183
+ }184
+}185
+186
+static void emith_flush(void)187
+{188
+ int i;189
+ void *emit_ptr = tcache_ptr - emit_index*sizeof(u32);190
191
-#define A_R4M (1 << 4)192
-#define A_R5M (1 << 5)193
-#define A_R6M (1 << 6)194
-#define A_R7M (1 << 7)195
-#define A_R8M (1 << 8)196
-#define A_R9M (1 << 9)197
-#define A_R10M (1 << 10)198
-#define A_R11M (1 << 11)199
-#define A_R12M (1 << 12)200
-#define A_R14M (1 << 14)201
libretro-picodrive-0~git20200716.tar.xz/cpu/drc/emit_arm64.c
Added
201
1
2
+/*3
+ * Basic macros to emit ARM A64 instructions and some utils4
+ * Copyright (C) 2019 kub5
+ *6
+ * This work is licensed under the terms of MAME license.7
+ * See COPYING file in the top-level directory.8
+ */9
+#define HOST_REGS 3210
+11
+// AAPCS64: params: r0-r7, return: r0-r1, temp: r8-r17, saved: r19-r2912
+// reserved: r18 (for platform use)13
+#define RET_REG 014
+#define PARAM_REGS { 0, 1, 2, 3, 4, 5, 6, 7 }15
+#define PRESERVED_REGS { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }16
+#define TEMPORARY_REGS { 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 }17
+18
+#define CONTEXT_REG 2919
+#define STATIC_SH2_REGS { SHR_SR,28 , SHR_R(0),27 , SHR_R(1),26 }20
+21
+// R31 doesn't exist, it aliases either with zero or SP22
+#define SP 31 // stack pointer23
+#define Z0 31 // zero register24
+#define LR 30 // link register25
+#define FP 29 // frame pointer26
+#define PR 18 // platform register27
+28
+// All operations but ptr ops are using the lower 32 bits of the A64 registers.29
+// The upper 32 bits are only used in ptr ops and are zeroed by A64 32 bit ops.30
+31
+32
+#define A64_COND_EQ 0x033
+#define A64_COND_NE 0x134
+#define A64_COND_HS 0x235
+#define A64_COND_LO 0x336
+#define A64_COND_MI 0x437
+#define A64_COND_PL 0x538
+#define A64_COND_VS 0x639
+#define A64_COND_VC 0x740
+#define A64_COND_HI 0x841
+#define A64_COND_LS 0x942
+#define A64_COND_GE 0xa43
+#define A64_COND_LT 0xb44
+#define A64_COND_GT 0xc45
+#define A64_COND_LE 0xd46
+#define A64_COND_CS A64_COND_HS47
+#define A64_COND_CC A64_COND_LO48
+// "fake" conditions for T bit handling49
+#define A64_COND_AL 0xe50
+#define A64_COND_NV 0xf51
+52
+// DRC conditions53
+#define DCOND_EQ A64_COND_EQ54
+#define DCOND_NE A64_COND_NE55
+#define DCOND_MI A64_COND_MI56
+#define DCOND_PL A64_COND_PL57
+#define DCOND_HI A64_COND_HI58
+#define DCOND_HS A64_COND_HS59
+#define DCOND_LO A64_COND_LO60
+#define DCOND_GE A64_COND_GE61
+#define DCOND_GT A64_COND_GT62
+#define DCOND_LT A64_COND_LT63
+#define DCOND_LS A64_COND_LS64
+#define DCOND_LE A64_COND_LE65
+#define DCOND_VS A64_COND_VS66
+#define DCOND_VC A64_COND_VC67
+68
+#define DCOND_CS A64_COND_HS69
+#define DCOND_CC A64_COND_LO70
+71
+72
+// unified insn73
+#define A64_INSN(op, b29, b22, b21, b16, b12, b10, b5, b0) \74
+ (((op)<<25)|((b29)<<29)|((b22)<<22)|((b21)<<21)|((b16)<<16)|((b12)<<12)|((b10)<<10)|((b5)<<5)|((b0)<<0))75
+76
+#define _ 0 // marker for "field unused"77
+78
+#define A64_NOP \79
+ A64_INSN(0xa,0x6,0x4,_,0x3,0x2,_,0,0x1f) // 0xd503201f80
+81
+// arithmetic/logical82
+83
+enum { OP_AND, OP_OR, OP_EOR, OP_ANDS, OP_ADD, OP_ADDS, OP_SUB, OP_SUBS };84
+enum { ST_LSL, ST_LSR, ST_ASR, ST_ROR };85
+enum { XT_UXTW=0x4, XT_UXTX=0x6, XT_LSL=0x7, XT_SXTW=0xc, XT_SXTX=0xe };86
+#define OP_SZ64 (1 << 31) // bit for 64 bit op selection87
+#define OP_N64 (1 << 22) // N-bit for 64 bit logical immediate ops88
+89
+#define A64_OP_REG(op, n, rd, rn, rm, stype, simm) /* arith+logical, ST_ */ \90
+ A64_INSN(0x5,(op)&3,((op)&4)|stype,n,rm,_,simm,rn,rd)91
+#define A64_OP_XREG(op, rd, rn, rm, xtopt, simm) /* arith, XT_ */ \92
+ A64_INSN(0x5,(op)&3,0x4,1,rm,xtopt,simm,rn,rd)93
+#define A64_OP_IMM12(op, rd, rn, imm, lsl12) /* arith */ \94
+ A64_INSN(0x8,(op)&3,((op)&4)|lsl12,_,_,_,(imm)&0xfff,rn,rd)95
+#define A64_OP_IMMBM(op, rd, rn, immr, imms) /* logical */ \96
+ A64_INSN(0x9,(op)&3,0x0,_,immr,_,(imms)&0x3f,rn,rd)97
+98
+// rd = rn OP (rm SHIFT simm)99
+#define A64_ADD_REG(rd, rn, rm, stype, simm) \100
+ A64_OP_REG(OP_ADD,0,rd,rn,rm,stype,simm)101
+#define A64_ADDS_REG(rd, rn, rm, stype, simm) \102
+ A64_OP_REG(OP_ADDS,0,rd,rn,rm,stype,simm)103
+#define A64_SUB_REG(rd, rn, rm, stype, simm) \104
+ A64_OP_REG(OP_SUB,0,rd,rn,rm,stype,simm)105
+#define A64_SUBS_REG(rd, rn, rm, stype, simm) \106
+ A64_OP_REG(OP_SUBS,0,rd,rn,rm,stype,simm)107
+108
+#define A64_NEG_REG(rd, rm, stype, simm) \109
+ A64_SUB_REG(rd,Z0,rm,stype,simm)110
+#define A64_NEGS_REG(rd, rm, stype, simm) \111
+ A64_SUBS_REG(rd,Z0,rm,stype,simm)112
+#define A64_NEGC_REG(rd, rm) \113
+ A64_SBC_REG(rd,Z0,rm)114
+#define A64_NEGCS_REG(rd, rm) \115
+ A64_SBCS_REG(rd,Z0,rm)116
+#define A64_CMP_REG(rn, rm, stype, simm) \117
+ A64_SUBS_REG(Z0, rn, rm, stype, simm)118
+#define A64_CMN_REG(rn, rm, stype, simm) \119
+ A64_ADDS_REG(Z0, rn, rm, stype, simm)120
+121
+#define A64_EOR_REG(rd, rn, rm, stype, simm) \122
+ A64_OP_REG(OP_EOR,0,rd,rn,rm,stype,simm)123
+#define A64_OR_REG(rd, rn, rm, stype, simm) \124
+ A64_OP_REG(OP_OR,0,rd,rn,rm,stype,simm)125
+#define A64_ORN_REG(rd, rn, rm, stype, simm) \126
+ A64_OP_REG(OP_OR,1,rd,rn,rm,stype,simm)127
+#define A64_AND_REG(rd, rn, rm, stype, simm) \128
+ A64_OP_REG(OP_AND,0,rd,rn,rm,stype,simm)129
+#define A64_ANDS_REG(rd, rn, rm, stype, simm) \130
+ A64_OP_REG(OP_ANDS,0,rd,rn,rm,stype,simm)131
+#define A64_BIC_REG(rd, rn, rm, stype, simm) \132
+ A64_OP_REG(OP_AND,1,rd,rn,rm,stype,simm)133
+#define A64_BICS_REG(rd, rn, rm, stype, simm) \134
+ A64_OP_REG(OP_ANDS,1,rd,rn,rm,stype,simm)135
+136
+#define A64_TST_REG(rn, rm, stype, simm) \137
+ A64_ANDS_REG(Z0, rn, rm, stype, simm)138
+#define A64_MOV_REG(rd, rm, stype, simm) \139
+ A64_OR_REG(rd, Z0, rm, stype, simm)140
+#define A64_MVN_REG(rd, rm, stype, simm) \141
+ A64_ORN_REG(rd, Z0, rm, stype, simm)142
+143
+// rd = rn OP (rm EXTEND simm)144
+#define A64_ADD_XREG(rd, rn, rm, xtopt, simm) \145
+ A64_OP_XREG(OP_ADD,rd,rn,rm,xtopt,simm)146
+#define A64_ADDS_XREG(rd, rn, rm, xtopt, simm) \147
+ A64_OP_XREG(OP_ADDS,rd,rn,rm,xtopt,simm)148
+#define A64_SUB_XREG(rd, rn, rm, stype, simm) \149
+ A64_OP_XREG(OP_SUB,rd,rn,rm,xtopt,simm)150
+#define A64_SUBS_XREG(rd, rn, rm, stype, simm) \151
+ A64_OP_XREG(OP_SUBS,rd,rn,rm,xtopt,simm)152
+153
+// rd = rn OP rm OP carry154
+#define A64_ADC_REG(rd, rn, rm) \155
+ A64_INSN(0xd,OP_ADD &3,0x0,_,rm,_,_,rn,rd)156
+#define A64_ADCS_REG(rd, rn, rm) \157
+ A64_INSN(0xd,OP_ADDS&3,0x0,_,rm,_,_,rn,rd)158
+#define A64_SBC_REG(rd, rn, rm) \159
+ A64_INSN(0xd,OP_SUB &3,0x0,_,rm,_,_,rn,rd)160
+#define A64_SBCS_REG(rd, rn, rm) \161
+ A64_INSN(0xd,OP_SUBS&3,0x0,_,rm,_,_,rn,rd)162
+163
+// rd = rn SHIFT rm164
+#define A64_LSL_REG(rd, rn, rm) \165
+ A64_INSN(0xd,0x0,0x3,_,rm,_,0x8,rn,rd)166
+#define A64_LSR_REG(rd, rn, rm) \167
+ A64_INSN(0xd,0x0,0x3,_,rm,_,0xa,rn,rd)168
+#define A64_ASR_REG(rd, rn, rm) \169
+ A64_INSN(0xd,0x0,0x3,_,rm,_,0x9,rn,rd)170
+#define A64_ROR_REG(rd, rn, rm) \171
+ A64_INSN(0xd,0x0,0x3,_,rm,_,0xb,rn,rd)172
+173
+// rd = REVERSE(rn)174
+#define A64_RBIT_REG(rd, rn) \175
+ A64_INSN(0xd,0x2,0x3,_,_,_,_,rn,rd)176
+177
+// rd = rn OP (imm12 << (0|12))178
+#define A64_ADD_IMM(rd, rn, imm12, lsl12) \179
+ A64_OP_IMM12(OP_ADD, rd, rn, imm12, lsl12)180
+#define A64_ADDS_IMM(rd, rn, imm12, lsl12) \181
+ A64_OP_IMM12(OP_ADDS, rd, rn, imm12, lsl12)182
+#define A64_SUB_IMM(rd, rn, imm12, lsl12) \183
+ A64_OP_IMM12(OP_SUB, rd, rn, imm12, lsl12)184
+#define A64_SUBS_IMM(rd, rn, imm12, lsl12) \185
+ A64_OP_IMM12(OP_SUBS, rd, rn, imm12, lsl12)186
+187
+#define A64_CMP_IMM(rn, imm12, lsl12) \188
+ A64_SUBS_IMM(Z0,rn,imm12,lsl12)189
+#define A64_CMN_IMM(rn, imm12, lsl12) \190
+ A64_ADDS_IMM(Z0,rn,imm12,lsl12)191
+192
+// rd = rn OP immbm; immbm is a repeated special pattern of 2^n bits length193
+#define A64_EOR_IMM(rd, rn, immr, imms) \194
+ A64_OP_IMMBM(OP_EOR,rd,rn,immr,imms)195
+#define A64_OR_IMM(rd, rn, immr, imms) \196
+ A64_OP_IMMBM(OP_OR,rd,rn,immr,imms)197
+#define A64_AND_IMM(rd, rn, immr, imms) \198
+ A64_OP_IMMBM(OP_AND,rd,rn,immr,imms)199
+#define A64_ANDS_IMM(rd, rn, immr, imms) \200
+ A64_OP_IMMBM(OP_ANDS,rd,rn,immr,imms)201
libretro-picodrive-0~git20200716.tar.xz/cpu/drc/emit_mips.c
Added
201
1
2
+/*3
+ * Basic macros to emit MIPS32/MIPS64 Release 1 or 2 instructions and some utils4
+ * Copyright (C) 2019 kub5
+ *6
+ * This work is licensed under the terms of MAME license.7
+ * See COPYING file in the top-level directory.8
+ */9
+#define HOST_REGS 3210
+11
+// MIPS32 ABI: params: r4-r7, return: r2-r3, temp: r1(at),r8-r15,r24-r25,r31(ra)12
+// saved: r16-r23,r30, reserved: r0(zero), r26-r27(irq), r28(gp), r29(sp)13
+// r1,r15,r24,r25(at,t7-t9) are used internally by the code emitter14
+// MIPSN32/MIPS64 ABI: params: r4-r11, no caller-reserved save area on stack15
+#define RET_REG 2 // v016
+#define PARAM_REGS { 4, 5, 6, 7 } // a0-a317
+#define PRESERVED_REGS { 16, 17, 18, 19, 20, 21, 22, 23 } // s0-s718
+#define TEMPORARY_REGS { 2, 3, 8, 9, 10, 11, 12, 13, 14 } // v0-v1,t0-t619
+20
+#define CONTEXT_REG 23 // s721
+#define STATIC_SH2_REGS { SHR_SR,22 , SHR_R(0),21 , SHR_R(1),20 }22
+23
+// NB: the ubiquitous JZ74[46]0 uses MIPS32 Release 1, a slight MIPS II superset24
+#ifndef __mips_isa_rev25
+#define __mips_isa_rev 1 // surprisingly not always defined26
+#endif27
+28
+// registers usable for user code: r1-r25, others reserved or special29
+#define Z0 0 // zero register30
+#define GP 28 // global pointer31
+#define SP 29 // stack pointer32
+#define FP 30 // frame pointer33
+#define LR 31 // link register34
+// internally used by code emitter:35
+#define AT 1 // used to hold intermediate results36
+#define FNZ 15 // emulated processor flags: N (bit 31) ,Z (all bits)37
+#define FC 24 // emulated processor flags: C (bit 0), others 038
+#define FV 25 // emulated processor flags: Nt^Ns (bit 31). others x39
+40
+// All operations but ptr ops are using the lower 32 bits of the registers.41
+// The upper 32 bits always contain the sign extension from the lower 32 bits.42
+43
+// unified conditions; virtual, not corresponding to anything real on MIPS44
+#define DCOND_EQ 0x045
+#define DCOND_NE 0x146
+#define DCOND_HS 0x247
+#define DCOND_LO 0x348
+#define DCOND_MI 0x449
+#define DCOND_PL 0x550
+#define DCOND_VS 0x651
+#define DCOND_VC 0x752
+#define DCOND_HI 0x853
+#define DCOND_LS 0x954
+#define DCOND_GE 0xa55
+#define DCOND_LT 0xb56
+#define DCOND_GT 0xc57
+#define DCOND_LE 0xd58
+59
+#define DCOND_CS DCOND_LO60
+#define DCOND_CC DCOND_HS61
+62
+// unified insn63
+#define MIPS_INSN(op, rs, rt, rd, sa, fn) \64
+ (((op)<<26)|((rs)<<21)|((rt)<<16)|((rd)<<11)|((sa)<<6)|((fn)<<0))65
+66
+#define _ 0 // marker for "field unused"67
+#define __(n) o##n // enum marker for "undefined"68
+69
+// opcode field (encoded in op)70
+enum { OP__FN=000, OP__RT, OP_J, OP_JAL, OP_BEQ, OP_BNE, OP_BLEZ, OP_BGTZ };71
+enum { OP_ADDI=010, OP_ADDIU, OP_SLTI, OP_SLTIU, OP_ANDI, OP_ORI, OP_XORI, OP_LUI };72
+enum { OP_DADDI=030, OP_DADDIU, OP_LDL, OP_LDR, OP__FN2=034, OP__FN3=037 };73
+enum { OP_LB=040, OP_LH, OP_LWL, OP_LW, OP_LBU, OP_LHU, OP_LWR, OP_LWU };74
+enum { OP_SB=050, OP_SH, OP_SWL, OP_SW, OP_SDL, OP_SDR, OP_SWR };75
+enum { OP_SD=067, OP_LD=077 };76
+// function field (encoded in fn if opcode = OP__FN)77
+enum { FN_SLL=000, __(01), FN_SRL, FN_SRA, FN_SLLV, __(05), FN_SRLV, FN_SRAV };78
+enum { FN_JR=010, FN_JALR, FN_MOVZ, FN_MOVN, FN_SYNC=017 };79
+enum { FN_MFHI=020, FN_MTHI, FN_MFLO, FN_MTLO, FN_DSSLV, __(25), FN_DSLRV, FN_DSRAV };80
+enum { FN_MULT=030, FN_MULTU, FN_DIV, FN_DIVU, FN_DMULT, FN_DMULTU, FN_DDIV, FN_DDIVU };81
+enum { FN_ADD=040, FN_ADDU, FN_SUB, FN_SUBU, FN_AND, FN_OR, FN_XOR, FN_NOR };82
+enum { FN_SLT=052, FN_SLTU, FN_DADD, FN_DADDU, FN_DSUB, FN_DSUBU };83
+enum { FN_DSLL=070, __(71), FN_DSRL, FN_DSRA, FN_DSLL32, __(75), FN_DSRL32, FN_DSRA32 };84
+// function field (encoded in fn if opcode = OP__FN2)85
+enum { FN2_MADD=000, FN2_MADDU, FN2_MUL, __(03), FN2_MSUB, FN2_MSUBU };86
+enum { FN2_CLZ=040, FN2_CLO, FN2_DCLZ=044, FN2_DCLO };87
+// function field (encoded in fn if opcode = OP__FN3)88
+enum { FN3_EXT=000, FN3_DEXTM, FN3_DEXTU, FN3_DEXT, FN3_INS, FN3_DINSM, FN3_DINSU, FN3_DINS };89
+enum { FN3_BSHFL=040, FN3_DBSHFL=044 };90
+// rt field (encoded in rt if opcode = OP__RT)91
+enum { RT_BLTZ=000, RT_BGEZ, RT_BLTZAL=020, RT_BGEZAL, RT_SYNCI=037 };92
+93
+// bit shuffle function (encoded in sa if function = FN3_BSHFL)94
+enum { BS_SBH=002, BS_SHD=005, BS_SEB=020, BS_SEH=030 };95
+// r (rotate) bit function (encoded in rs/sa if function = FN_SRL/FN_SRLV)96
+enum { RB_SRL=0, RB_ROTR=1 };97
+98
+#define MIPS_NOP 000 // null operation: SLL r0, r0, #099
+100
+// arithmetic/logical101
+102
+#define MIPS_OP_REG(op, sa, rd, rs, rt) \103
+ MIPS_INSN(OP__FN, rs, rt, rd, sa, op) // R-type, SPECIAL104
+#define MIPS_OP2_REG(op, sa, rd, rs, rt) \105
+ MIPS_INSN(OP__FN2, rs, rt, rd, sa, op) // R-type, SPECIAL2106
+#define MIPS_OP3_REG(op, sa, rd, rs, rt) \107
+ MIPS_INSN(OP__FN3, rs, rt, rd, sa, op) // R-type, SPECIAL3108
+#define MIPS_OP_IMM(op, rt, rs, imm) \109
+ MIPS_INSN(op, rs, rt, _, _, (u16)(imm)) // I-type110
+111
+// rd = rs OP rt112
+#define MIPS_ADD_REG(rd, rs, rt) \113
+ MIPS_OP_REG(FN_ADDU,_, rd, rs, rt)114
+#define MIPS_DADD_REG(rd, rs, rt) \115
+ MIPS_OP_REG(FN_DADDU,_, rd, rs, rt)116
+#define MIPS_SUB_REG(rd, rs, rt) \117
+ MIPS_OP_REG(FN_SUBU,_, rd, rs, rt)118
+#define MIPS_DSUB_REG(rd, rs, rt) \119
+ MIPS_OP_REG(FN_DSUBU,_, rd, rs, rt)120
+121
+#define MIPS_NEG_REG(rd, rt) \122
+ MIPS_SUB_REG(rd, Z0, rt)123
+124
+#define MIPS_XOR_REG(rd, rs, rt) \125
+ MIPS_OP_REG(FN_XOR,_, rd, rs, rt)126
+#define MIPS_OR_REG(rd, rs, rt) \127
+ MIPS_OP_REG(FN_OR,_, rd, rs, rt)128
+#define MIPS_AND_REG(rd, rs, rt) \129
+ MIPS_OP_REG(FN_AND,_, rd, rs, rt)130
+#define MIPS_NOR_REG(rd, rs, rt) \131
+ MIPS_OP_REG(FN_NOR,_, rd, rs, rt)132
+133
+#define MIPS_MOVE_REG(rd, rs) \134
+ MIPS_OR_REG(rd, rs, Z0)135
+#define MIPS_MVN_REG(rd, rs) \136
+ MIPS_NOR_REG(rd, rs, Z0)137
+138
+// rd = rt SHIFT rs139
+#define MIPS_LSL_REG(rd, rt, rs) \140
+ MIPS_OP_REG(FN_SLLV,_, rd, rs, rt)141
+#define MIPS_LSR_REG(rd, rt, rs) \142
+ MIPS_OP_REG(FN_SRLV,RB_SRL, rd, rs, rt)143
+#define MIPS_ASR_REG(rd, rt, rs) \144
+ MIPS_OP_REG(FN_SRAV,_, rd, rs, rt)145
+#define MIPS_ROR_REG(rd, rt, rs) \146
+ MIPS_OP_REG(FN_SRLV,RB_ROTR, rd, rs, rt)147
+148
+#define MIPS_SEB_REG(rd, rt) \149
+ MIPS_OP3_REG(FN3_BSHFL, BS_SEB, rd, _, rt)150
+#define MIPS_SEH_REG(rd, rt) \151
+ MIPS_OP3_REG(FN3_BSHFL, BS_SEH, rd, _, rt)152
+153
+#define MIPS_EXT_IMM(rt, rs, lsb, sz) \154
+ MIPS_OP3_REG(FN3_EXT, lsb, (sz)-1, rs, rt)155
+#define MIPS_INS_IMM(rt, rs, lsb, sz) \156
+ MIPS_OP3_REG(FN3_INS, lsb, (lsb)+(sz)-1, rs, rt)157
+158
+// rd = (rs < rt)159
+#define MIPS_SLT_REG(rd, rs, rt) \160
+ MIPS_OP_REG(FN_SLT,_, rd, rs, rt)161
+#define MIPS_SLTU_REG(rd, rs, rt) \162
+ MIPS_OP_REG(FN_SLTU,_, rd, rs, rt)163
+164
+// rt = rs OP imm16165
+#define MIPS_ADD_IMM(rt, rs, imm16) \166
+ MIPS_OP_IMM(OP_ADDIU, rt, rs, imm16)167
+#define MIPS_DADD_IMM(rt, rs, imm16) \168
+ MIPS_OP_IMM(OP_DADDIU, rt, rs, imm16)169
+170
+#define MIPS_XOR_IMM(rt, rs, imm16) \171
+ MIPS_OP_IMM(OP_XORI, rt, rs, imm16)172
+#define MIPS_OR_IMM(rt, rs, imm16) \173
+ MIPS_OP_IMM(OP_ORI, rt, rs, imm16)174
+#define MIPS_AND_IMM(rt, rs, imm16) \175
+ MIPS_OP_IMM(OP_ANDI, rt, rs, imm16)176
+177
+// rt = (imm16 << (0|16))178
+#define MIPS_MOV_IMM(rt, imm16) \179
+ MIPS_OP_IMM(OP_ORI, rt, Z0, imm16)180
+#define MIPS_MOVT_IMM(rt, imm16) \181
+ MIPS_OP_IMM(OP_LUI, rt, _, imm16)182
+183
+// rd = rt SHIFT imm5184
+#define MIPS_LSL_IMM(rd, rt, bits) \185
+ MIPS_INSN(OP__FN, _, rt, rd, bits, FN_SLL)186
+#define MIPS_LSR_IMM(rd, rt, bits) \187
+ MIPS_INSN(OP__FN, RB_SRL, rt, rd, bits, FN_SRL)188
+#define MIPS_ASR_IMM(rd, rt, bits) \189
+ MIPS_INSN(OP__FN, _, rt, rd, bits, FN_SRA)190
+#define MIPS_ROR_IMM(rd, rt, bits) \191
+ MIPS_INSN(OP__FN, RB_ROTR, rt, rd, bits, FN_SRL)192
+193
+#define MIPS_DLSL_IMM(rd, rt, bits) \194
+ MIPS_INSN(OP__FN, _, rt, rd, bits, FN_DSLL)195
+#define MIPS_DLSL32_IMM(rd, rt, bits) \196
+ MIPS_INSN(OP__FN, _, rt, rd, bits, FN_DSLL32)197
+198
+// rt = (rs < imm16)199
+#define MIPS_SLT_IMM(rt, rs, imm16) \200
+ MIPS_OP_IMM(OP_SLTI, rt, rs, imm16)201
libretro-picodrive-0~git20200716.tar.xz/cpu/drc/emit_ppc.c
Added
201
1
2
+/*3
+ * Basic macros to emit PowerISA 2.03 64 bit instructions and some utils4
+ * Copyright (C) 2020 kub5
+ *6
+ * This work is licensed under the terms of MAME license.7
+ * See COPYING file in the top-level directory.8
+ */9
+10
+// NB bit numbers are reversed in PPC (MSB is bit 0). The emith_* functions and11
+// macros must take this into account.12
+13
+// NB PPC was a 64 bit architecture from the onset, so basically all operations14
+// are operating on 64 bits. 32 bit arch was only added later on, and there are15
+// very few 32 bit operations (cmp*, shift/rotate, extract/insert, load/store).16
+// For most operations the upper bits don't spill into the lower word, for the17
+// others there is an appropriate 32 bit operation available.18
+19
+// NB PowerPC isn't a clean RISC design. Several insns use microcode, which is20
+// AFAIK notably slower than using some 2-3 non-microcode insns. So, using21
+// such insns should by avoided if possible. Listed in Cell handbook, App. A:22
+// - shift/rotate having the amount in a register23
+// - arithmetic/logical having the RC flag set (except cmp*)24
+// - load/store algebraic (l?a*), multiple (lmw/stmw), string (ls*/sts*)25
+// - mtcrf (and some more SPR related, not used here)26
+// moreover, misaligned load/store crossing a cacheline boundary are microcoded.27
+// Note also that load/store string isn't available in little endian mode.28
+29
+// NB flag handling in PPC differs grossly from the ARM/X86 model. There are 830
+// fields in the condition register, each having 4 condition bits. However, only31
+// the EQ bit is similar to the Z flag. The CA and OV bits in the XER register32
+// are similar to the C and V bits, but shifts don't use CA, and cmp* doesn't33
+// use CA and OV.34
+// Moreover, there's no easy possibility to get CA and OV for 32 bit arithmetic35
+// since all arithmetic/logical insns use 64 bit.36
+// For now, use the "no flags" code from the RISC-V backend.37
+38
+#define HOST_REGS 3239
+40
+// PPC64: params: r3-r10, return: r3, temp: r0,r11-r12, saved: r14-r3141
+// reserved: r0(zero), r1(stack), r2(TOC), r13(TID)42
+#define RET_REG 343
+#define PARAM_REGS { 3, 4, 5, 6, 7, 8, 9, 10 }44
+#define PRESERVED_REGS { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 }45
+#define TEMPORARY_REGS { 11, 12 }46
+47
+#define CONTEXT_REG 3148
+#define STATIC_SH2_REGS { SHR_SR,30 , SHR_R(0),29 , SHR_R(1),28 }49
+50
+// if RA is 0 in non-update memory insns, ADDI/ADDIS, ISEL, it aliases with zero51
+#define Z0 0 // zero register52
+#define SP 1 // stack pointer53
+// SPR registers54
+#define XER -1 // exception register55
+#define LR -8 // link register56
+#define CTR -9 // counter register57
+// internally used by code emitter:58
+#define AT 0 // emitter temporary (can't be fully used anyway)59
+#define FNZ 14 // emulated processor flags: N (bit 31) ,Z (all bits)60
+#define FC 15 // emulated processor flags: C (bit 0), others 061
+#define FV 16 // emulated processor flags: Nt^Ns (bit 31). others x62
+63
+64
+// unified conditions; virtual, not corresponding to anything real on PPC65
+#define DCOND_EQ 0x066
+#define DCOND_NE 0x167
+#define DCOND_HS 0x268
+#define DCOND_LO 0x369
+#define DCOND_MI 0x470
+#define DCOND_PL 0x571
+#define DCOND_VS 0x672
+#define DCOND_VC 0x773
+#define DCOND_HI 0x874
+#define DCOND_LS 0x975
+#define DCOND_GE 0xa76
+#define DCOND_LT 0xb77
+#define DCOND_GT 0xc78
+#define DCOND_LE 0xd79
+80
+#define DCOND_CS DCOND_LO81
+#define DCOND_CC DCOND_HS82
+83
+// unified insn; use right-aligned bit offsets for the bitfields84
+#define PPC_INSN(op, b10, b15, b20, b31) \85
+ (((op)<<26)|((b10)<<21)|((b15)<<16)|((b20)<<11)|((b31)<<0))86
+87
+#define _ 0 // marker for "field unused"88
+#define __(n) o##n // enum marker for "undefined"89
+#define _CB(v,l,s,d) ((((v)>>(s))&((1<<(l))-1))<<(d)) // copy l bits90
+91
+// NB everything privileged or unneeded at 1st sight is left out92
+// opcode field (encoded in OPCD, bits 0-5)93
+enum { OP__LMA=004, OP_MULLI=007,94
+ OP_SUBFIC, __(11), OP_CMPLI, OP_CMPI, OP_ADDIC, OP_ADDICF, OP_ADDI, OP_ADDIS,95
+ OP_BC, __(21), OP_B, OP__CR, OP_RLWIMI, OP_RLWINM, __(26), OP_RLWNM,96
+ OP_ORI, OP_ORIS, OP_XORI, OP_XORIS, OP_ANDI, OP_ANDIS, OP__RLD, OP__EXT,97
+ OP_LWZ, OP_LWZU, OP_LBZ, OP_LBZU, OP_STW, OP_STWU, OP_STB, OP_STBU,98
+ OP_LHZ, OP_LHZU, OP_LHA, OP_LHAU, OP_STH, OP_STHU, OP_LMW, OP_STMW,99
+ /*OP_LQ=070,*/ OP__LD=072, OP__ST=076 };100
+// CR subops (encoded in bits 21-31)101
+enum { OPC_MCRF=0, OPC_BCLR=32, OPC_BCCTR=1056 };102
+// RLD subops (encoded in XO bits 27-31)103
+enum { OPR_RLDICL=0, OPR_RLDICR=4, OPR_RLDIC=8, OPR_RLDIMI=12, OPR_RLDCL=16, OPR_RLDCR=18 };104
+// EXT subops (encoded in XO bits 21-31)105
+enum {106
+ // arith/logical107
+ OPE_CMP=0, OPE_SUBFC=16, OPE_ADDC=20, OPE_AND=56,108
+ OPE_CMPL=64, OPE_SUBF=80, OPE_ANDC=120, OPE_NEG=208, OPE_NOR=248,109
+ OPE_SUBFE=272, OPE_ADDE=276, OPE_SUBFZE=400, OPE_ADDZE=404, OPE_SUBFME=464, OPE_ADDME=468,110
+ OPE_ADD=532, OPE_EQV=568, OPE_XOR=632, OPE_ORC=824, OPE_OR=888, OPE_NAND=952,111
+ // shift112
+ OPE_SLW=48, OPE_SLD=54, OPE_SRW=1072, OPE_SRD=1078, OPE_SRAW=1584, OPE_SRAD=1588, OPE_SRAWI=1648, OPE_SRADI=1652,113
+ // extend, bitcount114
+ OPE_CNTLZW=52, OPE_CNTLZD=116, OPE_EXTSH=1844, OPE_EXTSB=1908, OPE_EXTSW=1972,115
+ // mult/div116
+ OPE_MULHDU=18, OPE_MULHWU=22, OPE_MULHD=146, OPE_MULHW=150, OPE_MULLD=466, OPE_MULLW=470,117
+ OPE_DIVDU=914, OPE_DIVWU=918, OPE_DIVD=978, OPE_DIVW=982,118
+ // load/store indexed119
+ OPE_LDX=42, OPE_LDUX=106, OPE_STDX=298, OPE_STDUX=362,120
+ OPE_LWZX=46, OPE_LWZUX=110, OPE_LWAX=682, OPE_LWAUX=746, OPE_STWX=302, OPE_STWUX=366,121
+ OPE_LBZX=174, OPE_LBZUX=238, /* no LBAX/LBAUX... */ OPE_STBX=430, OPE_STBUX=494,122
+ OPE_LHZX=558, OPE_LHZUX=622, OPE_LHAX=686, OPE_LHAUX=750, OPE_STHX=814, OPE_STHUX=878,123
+ // SPR, CR related124
+ OPE_ISEL=15, OPE_MFCR=38, OPE_MTCRF=288, OPE_MFSPR=678, OPE_MTSPR=934, OPE_MCRXR=1024, 125
+};126
+// LD subops (encoded in XO bits 30-31)127
+enum { OPL_LD, OPL_LDU, OPL_LWA };128
+// ST subops (encoded in XO bits 30-31)129
+enum { OPS_STD, OPS_STDU /*,OPS_STQ*/ };130
+131
+// X*,M*-forms insns often have overflow detect in b21 and CR0 update in b31132
+#define XOE (1<<10) // (31-21)133
+#define XRC (1<<0) // (31-31)134
+#define XF (XOE|XRC)135
+// MB and ME in M*-forms rotate left136
+#define MM(b,e) (((b)<<6)|((e)<<1))137
+#define MD(b,s) (_CB(b,5,0,6)|_CB(b,1,5,5)|_CB(s,5,0,11)|_CB(s,1,5,1))138
+// AA and LK in I,B-forms branches139
+#define BAA (1<<1)140
+#define BLK (1<<0)141
+// BO and BI condition codes in B-form, BO0-BO4:BI2-BI4 since we only need CR0142
+#define BLT 0x60143
+#define BGE 0x20144
+#define BGT 0x61145
+#define BLE 0x21146
+#define BEQ 0x62147
+#define BNE 0x22148
+#define BXX 0xa0 // unconditional, aka always149
+150
+#define PPC_NOP \151
+ PPC_INSN(OP_ORI, 0, 0, _, 0) // ori r0, r0, 0152
+153
+// arithmetic/logical154
+155
+#define PPC_OP_REG(op, xop, rt, ra, rb) /* X*,M*-form */ \156
+ PPC_INSN((unsigned)op, rt, ra, rb, xop)157
+#define PPC_OP_IMM(op, rt, ra, imm) /* D,B,I-form */ \158
+ PPC_INSN((unsigned)op, rt, ra, _, imm)159
+160
+// rt = ra OP rb161
+#define PPC_ADD_REG(rt, ra, rb) \162
+ PPC_OP_REG(OP__EXT,OPE_ADD,rt,ra,rb)163
+#define PPC_ADDC_REG(rt, ra, rb) \164
+ PPC_OP_REG(OP__EXT,OPE_ADD|XOE,rt,ra,rb)165
+#define PPC_SUB_REG(rt, rb, ra) /* NB reversed args (rb-ra) */ \166
+ PPC_OP_REG(OP__EXT,OPE_SUBF,rt,ra,rb)167
+#define PPC_SUBC_REG(rt, rb, ra) \168
+ PPC_OP_REG(OP__EXT,OPE_SUBF|XOE,rt,ra,rb)169
+#define PPC_NEG_REG(rt, ra) \170
+ PPC_OP_REG(OP__EXT,OPE_NEG,rt,ra,_)171
+#define PPC_NEGC_REG(rt, ra) \172
+ PPC_OP_REG(OP__EXT,OPE_NEG|XOE,rt,ra,_)173
+174
+#define PPC_CMP_REG(ra, rb) \175
+ PPC_OP_REG(OP__EXT,OPE_CMP,1,ra,rb)176
+#define PPC_CMPL_REG(ra, rb) \177
+ PPC_OP_REG(OP__EXT,OPE_CMPL,1,ra,rb)178
+179
+#define PPC_CMPW_REG(ra, rb) \180
+ PPC_OP_REG(OP__EXT,OPE_CMP,0,ra,rb)181
+#define PPC_CMPLW_REG(ra, rb) \182
+ PPC_OP_REG(OP__EXT,OPE_CMPL,0,ra,rb)183
+184
+#define PPC_XOR_REG(ra, rt, rb) \185
+ PPC_OP_REG(OP__EXT,OPE_XOR,rt,ra,rb)186
+#define PPC_OR_REG(ra, rt, rb) \187
+ PPC_OP_REG(OP__EXT,OPE_OR,rt,ra,rb)188
+#define PPC_ORN_REG(ra, rt, rb) \189
+ PPC_OP_REG(OP__EXT,OPE_ORC,rt,ra,rb)190
+#define PPC_NOR_REG(ra, rt, rb) \191
+ PPC_OP_REG(OP__EXT,OPE_NOR,rt,ra,rb)192
+#define PPC_AND_REG(ra, rt, rb) \193
+ PPC_OP_REG(OP__EXT,OPE_AND,rt,ra,rb)194
+#define PPC_BIC_REG(ra, rt, rb) \195
+ PPC_OP_REG(OP__EXT,OPE_ANDC,rt,ra,rb)196
+197
+#define PPC_MOV_REG(rt, ra) \198
+ PPC_OR_REG(rt, ra, ra)199
+#define PPC_MVN_REG(rt, ra) \200
+ PPC_NOR_REG(rt, ra, ra)201
libretro-picodrive-0~git20200716.tar.xz/cpu/drc/emit_riscv.c
Added
201
1
2
+/*3
+ * Basic macros to emit RISC-V RV64IM instructions and some utils4
+ * Copyright (C) 2019 kub5
+ *6
+ * This work is licensed under the terms of MAME license.7
+ * See COPYING file in the top-level directory.8
+ */9
+#define HOST_REGS 3210
+11
+// RISC-V ABI: params: x10-x17, return: x10-x11, temp: x1(ra),x5-x7,x28-x3112
+// saved: x8(fp),x9,x18-x27, reserved: x0(zero), x4(tp), x3(gp), x2(sp)13
+// x28-x31(t3-t6) are used internally by the code emitter14
+#define RET_REG 10 // a015
+#define PARAM_REGS { 10, 11, 12, 13, 14, 15, 16, 17 } // a0-a716
+#define PRESERVED_REGS { 9, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 } // s1-s1117
+#define TEMPORARY_REGS { 5, 6, 7 } // t0-t218
+19
+#define CONTEXT_REG 9 // s120
+#define STATIC_SH2_REGS { SHR_SR,27 , SHR_R(0),26 , SHR_R(1),25 }21
+22
+// registers usable for user code: r1-r25, others reserved or special23
+#define Z0 0 // zero register24
+#define GP 3 // global pointer25
+#define SP 2 // stack pointer26
+#define FP 8 // frame pointer27
+#define LR 1 // link register28
+// internally used by code emitter:29
+#define AT 31 // used to hold intermediate results30
+#define FNZ 30 // emulated processor flags: N (bit 31) ,Z (all bits)31
+#define FC 29 // emulated processor flags: C (bit 0), others 032
+#define FV 28 // emulated processor flags: Nt^Ns (bit 31). others x33
+34
+// All operations but ptr ops are using the lower 32 bits of the registers.35
+// The upper 32 bits always contain the sign extension from the lower 32 bits.36
+37
+// unified conditions; virtual, not corresponding to anything real on RISC-V38
+#define DCOND_EQ 0x039
+#define DCOND_NE 0x140
+#define DCOND_HS 0x241
+#define DCOND_LO 0x342
+#define DCOND_MI 0x443
+#define DCOND_PL 0x544
+#define DCOND_VS 0x645
+#define DCOND_VC 0x746
+#define DCOND_HI 0x847
+#define DCOND_LS 0x948
+#define DCOND_GE 0xa49
+#define DCOND_LT 0xb50
+#define DCOND_GT 0xc51
+#define DCOND_LE 0xd52
+53
+#define DCOND_CS DCOND_LO54
+#define DCOND_CC DCOND_HS55
+56
+// unified insn57
+#define R5_INSN(b25, b20, b15, b12, b7, op) \58
+ (((b25)<<25)|((b20)<<20)|((b15)<<15)|((b12)<<12)|((b7)<<7)|((op)<<0))59
+60
+#define _ 0 //marker for "field unused"61
+#define _CB(v,l,s,d) ((((v)>>(s))&((1<<(l))-1))<<(d)) // copy l bits62
+63
+#define R5_R_INSN(op, f1, f2, rd, rs, rt) \64
+ R5_INSN(f2, rt, rs, f1, rd, op)65
+#define R5_I_INSN(op, f1, rd, rs, imm) \66
+ R5_INSN(_, _CB(imm,12,0,0), rs, f1, rd, op)67
+#define R5_S_INSN(op, f1, rt, rs, imm) \68
+ R5_INSN(_CB(imm,7,5,0), rt, rs, f1, _CB(imm,5,0,0), op)69
+#define R5_U_INSN(op, rd, imm) \70
+ R5_INSN(_,_,_, _CB(imm,20,12,0), rd, op)71
+// oy vey... R5 immediate encoding in branches is really unwieldy :-/72
+#define R5_B_INSN(op, f1, rt, rs, imm) \73
+ R5_INSN(_CB(imm,1,12,6)|_CB(imm,6,5,0), rt, rs, f1, \74
+ _CB(imm,4,1,1)|_CB(imm,1,11,0), op)75
+#define R5_J_INSN(op, rd, imm) \76
+ R5_INSN(_CB(imm,1,20,6)|_CB(imm,6,5,0), _CB(imm,4,1,1)|_CB(imm,1,11,0),\77
+ _CB(imm,8,12,0), rd, op)78
+79
+// opcode80
+enum { OP_LUI=0x37, OP_AUIPC=0x17, OP_JAL=0x6f, // 20-bit immediate81
+ OP_JALR=0x67, OP_BCOND=0x63, OP_LD=0x03, OP_ST=0x23, // 12-bit immediate82
+ OP_IMM=0x13, OP_REG=0x33, OP_IMM32=0x1b, OP_REG32=0x3b };83
+// func384
+enum { F1_ADD, F1_SL, F1_SLT, F1_SLTU, F1_XOR, F1_SR, F1_OR, F1_AND };// IMM/REG85
+enum { F1_MUL, F1_MULH, F1_MULHSU, F1_MULHU, F1_DIV, F1_DIVU, F1_REM, F1_REMU };86
+enum { F1_BEQ, F1_BNE, F1_BLT=4, F1_BGE, F1_BLTU, F1_BGEU }; // BCOND87
+enum { F1_B, F1_H, F1_W, F1_D, F1_BU, F1_HU, F1_WU }; // LD/ST88
+// func789
+enum { F2_ALT=0x20, F2_MULDIV=0x01 };90
+91
+#define R5_NOP R5_I_INSN(OP_IMM, F1_ADD, Z0, Z0, 0) // nop: ADDI r0, r0, #092
+93
+// arithmetic/logical94
+95
+// rd = rs OP rt96
+#define R5_ADD_REG(rd, rs, rt) \97
+ R5_R_INSN(OP_REG, F1_ADD, _, rd, rs, rt)98
+#define R5_SUB_REG(rd, rs, rt) \99
+ R5_R_INSN(OP_REG, F1_ADD, F2_ALT, rd, rs, rt)100
+101
+#define R5_NEG_REG(rd, rt) \102
+ R5_SUB_REG(rd, Z0, rt)103
+104
+#define R5_XOR_REG(rd, rs, rt) \105
+ R5_R_INSN(OP_REG, F1_XOR, _, rd, rs, rt)106
+#define R5_OR_REG(rd, rs, rt) \107
+ R5_R_INSN(OP_REG, F1_OR , _, rd, rs, rt)108
+#define R5_AND_REG(rd, rs, rt) \109
+ R5_R_INSN(OP_REG, F1_AND, _, rd, rs, rt)110
+111
+// rd = rs SHIFT rt112
+#define R5_LSL_REG(rd, rs, rt) \113
+ R5_R_INSN(OP_REG, F1_SL , _, rd, rs, rt)114
+#define R5_LSR_REG(rd, rs, rt) \115
+ R5_R_INSN(OP_REG, F1_SR , _, rd, rs, rt)116
+#define R5_ASR_REG(rd, rs, rt) \117
+ R5_R_INSN(OP_REG, F1_SR , F2_ALT, rd, rs, rt)118
+119
+// rd = (rs < rt)120
+#define R5_SLT_REG(rd, rs, rt) \121
+ R5_R_INSN(OP_REG, F1_SLT, _, rd, rs, rt)122
+#define R5_SLTU_REG(rd, rs, rt) \123
+ R5_R_INSN(OP_REG, F1_SLTU,_, rd, rs, rt)124
+125
+// rd = rs OP imm12126
+#define R5_ADD_IMM(rd, rs, imm12) \127
+ R5_I_INSN(OP_IMM, F1_ADD , rd, rs, imm12)128
+129
+#define R5_XOR_IMM(rd, rs, imm12) \130
+ R5_I_INSN(OP_IMM, F1_XOR , rd, rs, imm12)131
+#define R5_OR_IMM(rd, rs, imm12) \132
+ R5_I_INSN(OP_IMM, F1_OR , rd, rs, imm12)133
+#define R5_AND_IMM(rd, rs, imm12) \134
+ R5_I_INSN(OP_IMM, F1_AND , rd, rs, imm12)135
+136
+#define R5_MOV_REG(rd, rs) \137
+ R5_ADD_IMM(rd, rs, 0)138
+#define R5_MVN_REG(rd, rs) \139
+ R5_XOR_IMM(rd, rs, -1)140
+141
+// rd = (imm12 << (0|12))142
+#define R5_MOV_IMM(rd, imm12) \143
+ R5_OR_IMM(rd, Z0, imm12)144
+#define R5_MOVT_IMM(rd, imm20) \145
+ R5_U_INSN(OP_LUI, rd, imm20)146
+#define R5_MOVA_IMM(rd, imm20) \147
+ R5_U_INSN(OP_AUIPC, rd, imm20)148
+149
+// rd = rs SHIFT imm5/imm6150
+#define R5_LSL_IMM(rd, rs, bits) \151
+ R5_R_INSN(OP_IMM, F1_SL , _, rd, rs, bits)152
+#define R5_LSR_IMM(rd, rs, bits) \153
+ R5_R_INSN(OP_IMM, F1_SR , _, rd, rs, bits)154
+#define R5_ASR_IMM(rd, rs, bits) \155
+ R5_R_INSN(OP_IMM, F1_SR , F2_ALT, rd, rs, bits)156
+157
+// rd = (rs < imm12)158
+#define R5_SLT_IMM(rd, rs, imm12) \159
+ R5_I_INSN(OP_IMM, F1_SLT , rd, rs, imm12)160
+#define R5_SLTU_IMM(rd, rs, imm12) \161
+ R5_I_INSN(OP_IMM, F1_SLTU, rd, rs, imm12)162
+163
+// multiplication164
+165
+#define R5_MULHU(rd, rs, rt) \166
+ R5_R_INSN(OP_REG, F1_MULHU, F2_MULDIV, rd, rs, rt)167
+#define R5_MULHS(rd, rs, rt) \168
+ R5_R_INSN(OP_REG, F1_MULH, F2_MULDIV, rd, rs, rt)169
+#define R5_MUL(rd, rs, rt) \170
+ R5_R_INSN(OP_REG, F1_MUL, F2_MULDIV, rd, rs, rt)171
+172
+// branching173
+174
+#define R5_J(imm20) \175
+ R5_J_INSN(OP_JAL, Z0, imm20)176
+#define R5_JAL(rd, imm20) \177
+ R5_J_INSN(OP_JAL, rd, imm20)178
+#define R5_JR(rs, offs12) \179
+ R5_I_INSN(OP_JALR, _, Z0, rs, offs12)180
+#define R5_JALR(rd, rs, offs12) \181
+ R5_I_INSN(OP_JALR, _, rd, rs, offs12)182
+183
+// conditional branches; no condition code, these compare rs against rt184
+#define R5_BCOND(cond, rs, rt, offs13) \185
+ R5_B_INSN(OP_BCOND, cond, rt, rs, offs13)186
+#define R5_BCONDZ(cond, rs, offs13) \187
+ R5_B_INSN(OP_BCOND, cond, Z0, rs, offs13)188
+#define R5_B(offs13) \189
+ R5_BCOND(F1_BEQ, Z0, Z0, offs13)190
+191
+// load/store indexed base192
+193
+#define R5_LW(rd, rs, offs12) \194
+ R5_I_INSN(OP_LD, F1_W, rd, rs, offs12)195
+#define R5_LH(rd, rs, offs12) \196
+ R5_I_INSN(OP_LD, F1_H, rd, rs, offs12)197
+#define R5_LB(rd, rs, offs12) \198
+ R5_I_INSN(OP_LD, F1_B, rd, rs, offs12)199
+#define R5_LHU(rd, rs, offs12) \200
+ R5_I_INSN(OP_LD, F1_HU, rd, rs, offs12)201
libretro-picodrive-0~git20200112.tar.xz/cpu/drc/emit_x86.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/drc/emit_x86.c
Changed
201
1
2
/*3
* Basic macros to emit x86 instructions and some utils4
* Copyright (C) 2008,2009,2010 notaz5
+ * Copyright (C) 2019 kub6
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
*/11
#include <stdarg.h>12
13
-enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };14
+enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI, // x86-64,i386 common15
+ xR8, xR9, xR10, xR11, xR12, xR13, xR14, xR15 }; // x86-64 only16
17
-#define CONTEXT_REG xBP18
-#define RET_REG xAX19
+#define CONTEXT_REG xBP20
+#define RET_REG xAX21
22
#define ICOND_JO 0x0023
#define ICOND_JNO 0x0124
25
#define DCOND_VS ICOND_JO // oVerflow Set26
#define DCOND_VC ICOND_JNO // oVerflow Clear27
28
+#define DCOND_CS ICOND_JB // carry set29
+#define DCOND_CC ICOND_JAE // carry clear30
+31
#define EMIT_PTR(ptr, val, type) \32
*(type *)(ptr) = val33
34
35
36
#define EMIT_OP(op) do { \37
COUNT_OP; \38
- EMIT(op, u8); \39
+ if ((op) > 0xff) EMIT((op) >> 8, u8); \40
+ EMIT((u8)(op), u8); \41
} while (0)42
43
#define EMIT_MODRM(mod, r, rm) do { \44
45
EMIT_PTR(ptr + 1, (tcache_ptr - (ptr+2)), u8)46
47
// _r_r48
-#define emith_move_r_r(dst, src) \49
- EMIT_OP_MODRM(0x8b, 3, dst, src)50
+#define emith_move_r_r(dst, src) do {\51
+ EMIT_REX_IF(0, dst, src); \52
+ EMIT_OP_MODRM64(0x8b, 3, dst, src); \53
+} while (0)54
55
#define emith_move_r_r_ptr(dst, src) do { \56
EMIT_REX_IF(1, dst, src); \57
EMIT_OP_MODRM64(0x8b, 3, dst, src); \58
} while (0)59
60
-#define emith_add_r_r(d, s) \61
- EMIT_OP_MODRM(0x01, 3, s, d)62
+#define emith_add_r_r(d, s) do { \63
+ EMIT_REX_IF(0, s, d); \64
+ EMIT_OP_MODRM64(0x01, 3, s, d); \65
+} while (0)66
67
-#define emith_sub_r_r(d, s) \68
- EMIT_OP_MODRM(0x29, 3, s, d)69
+#define emith_add_r_r_ptr(d, s) do { \70
+ EMIT_REX_IF(1, s, d); \71
+ EMIT_OP_MODRM64(0x01, 3, s, d); \72
+} while (0)73
74
-#define emith_adc_r_r(d, s) \75
- EMIT_OP_MODRM(0x11, 3, s, d)76
+#define emith_sub_r_r(d, s) do {\77
+ EMIT_REX_IF(0, s, d); \78
+ EMIT_OP_MODRM64(0x29, 3, s, d); \79
+} while (0)80
81
-#define emith_sbc_r_r(d, s) \82
- EMIT_OP_MODRM(0x19, 3, s, d) /* SBB */83
+#define emith_adc_r_r(d, s) do { \84
+ EMIT_REX_IF(0, s, d); \85
+ EMIT_OP_MODRM64(0x11, 3, s, d); \86
+} while (0)87
88
-#define emith_or_r_r(d, s) \89
- EMIT_OP_MODRM(0x09, 3, s, d)90
+#define emith_sbc_r_r(d, s) do { \91
+ EMIT_REX_IF(0, s, d); \92
+ EMIT_OP_MODRM64(0x19, 3, s, d); /* SBB */ \93
+} while (0)94
95
-#define emith_and_r_r(d, s) \96
- EMIT_OP_MODRM(0x21, 3, s, d)97
+#define emith_or_r_r(d, s) do { \98
+ EMIT_REX_IF(0, s, d); \99
+ EMIT_OP_MODRM64(0x09, 3, s, d); \100
+} while (0)101
102
-#define emith_eor_r_r(d, s) \103
- EMIT_OP_MODRM(0x31, 3, s, d) /* XOR */104
+#define emith_and_r_r(d, s) do { \105
+ EMIT_REX_IF(0, s, d); \106
+ EMIT_OP_MODRM64(0x21, 3, s, d); \107
+} while (0)108
109
-#define emith_tst_r_r(d, s) \110
- EMIT_OP_MODRM(0x85, 3, s, d) /* TEST */111
+#define emith_eor_r_r(d, s) do { \112
+ EMIT_REX_IF(0, s, d); \113
+ EMIT_OP_MODRM64(0x31, 3, s, d); /* XOR */ \114
+} while (0)115
+116
+#define emith_tst_r_r(d, s) do { \117
+ EMIT_REX_IF(0, s, d); \118
+ EMIT_OP_MODRM64(0x85, 3, s, d); /* TEST */ \119
+} while (0)120
121
#define emith_tst_r_r_ptr(d, s) do { \122
EMIT_REX_IF(1, s, d); \123
EMIT_OP_MODRM64(0x85, 3, s, d); /* TEST */ \124
} while (0)125
126
-#define emith_cmp_r_r(d, s) \127
- EMIT_OP_MODRM(0x39, 3, s, d)128
+#define emith_cmp_r_r(d, s) do { \129
+ EMIT_REX_IF(0, s, d); \130
+ EMIT_OP_MODRM64(0x39, 3, s, d); \131
+} while (0)132
133
// fake teq - test equivalence - get_flags(d ^ s)134
#define emith_teq_r_r(d, s) do { \135
136
#define emith_mvn_r_r(d, s) do { \137
if (d != s) \138
emith_move_r_r(d, s); \139
- EMIT_OP_MODRM(0xf7, 3, 2, d); /* NOT d */ \140
+ EMIT_REX_IF(0, 0, d); \141
+ EMIT_OP_MODRM64(0xf7, 3, 2, d); /* NOT d */ \142
} while (0)143
144
#define emith_negc_r_r(d, s) do { \145
146
#define emith_neg_r_r(d, s) do { \147
if (d != s) \148
emith_move_r_r(d, s); \149
- EMIT_OP_MODRM(0xf7, 3, 3, d); /* NEG d */ \150
+ EMIT_REX_IF(0, 0, d); \151
+ EMIT_OP_MODRM64(0xf7, 3, 3, d); /* NEG d */ \152
} while (0)153
154
// _r_r_r155
156
} \157
} while (0)158
159
+#define emith_add_r_r_r_ptr(d, s1, s2) do { \160
+ if (d == s1) { \161
+ emith_add_r_r_ptr(d, s2); \162
+ } else if (d == s2) { \163
+ emith_add_r_r_ptr(d, s1); \164
+ } else { \165
+ emith_move_r_r_ptr(d, s1); \166
+ emith_add_r_r_ptr(d, s2); \167
+ } \168
+} while (0)169
+170
+#define emith_sub_r_r_r(d, s1, s2) do { \171
+ if (d == s1) { \172
+ emith_sub_r_r(d, s2); \173
+ } else if (d == s2) { \174
+ emith_sub_r_r(d, s1); \175
+ } else { \176
+ emith_move_r_r(d, s1); \177
+ emith_sub_r_r(d, s2); \178
+ } \179
+} while (0)180
+181
+#define emith_adc_r_r_r(d, s1, s2) do { \182
+ if (d == s1) { \183
+ emith_adc_r_r(d, s2); \184
+ } else if (d == s2) { \185
+ emith_adc_r_r(d, s1); \186
+ } else { \187
+ emith_move_r_r(d, s1); \188
+ emith_adc_r_r(d, s2); \189
+ } \190
+} while (0)191
+192
+#define emith_sbc_r_r_r(d, s1, s2) do { \193
+ if (d == s1) { \194
+ emith_sbc_r_r(d, s2); \195
+ } else if (d == s2) { \196
+ emith_sbc_r_r(d, s1); \197
+ } else { \198
+ emith_move_r_r(d, s1); \199
+ emith_sbc_r_r(d, s2); \200
+ } \201
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/compiler.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/compiler.c
Changed
201
1
2
/*3
* SH2 recompiler4
* (C) notaz, 2009,2010,20135
+ * (C) kub, 2018,2019,20206
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
*10
* notes:11
- * - tcache, block descriptor, link buffer overflows result in sh2_translate()12
- * failure, followed by full tcache invalidation for that region13
+ * - tcache, block descriptor, block entry buffer overflows result in oldest14
+ * blocks being deleted until enough space is available15
+ * - link and list element buffer overflows result in failure and exit16
* - jumps between blocks are tracked for SMC handling (in block_entry->links),17
- * except jumps between different tcaches18
+ * except jumps from global to CPU-local tcaches19
*20
* implemented:21
* - static register allocation22
* - remaining register caching and tracking in temporaries23
* - block-local branch linking24
- * - block linking (except between tcaches)25
+ * - block linking26
* - some constant propagation27
+ * - call stack caching for host block entry address28
+ * - delay, poll, and idle loop detection and handling29
+ * - some T/M flag optimizations where the value is known or isn't used30
*31
* TODO:32
* - better constant propagation33
- * - stack caching?34
* - bug fixing35
*/36
#include <stddef.h>37
38
// features39
#define PROPAGATE_CONSTANTS 140
#define LINK_BRANCHES 141
-42
-// limits (per block)43
-#define MAX_BLOCK_SIZE (BLOCK_INSN_LIMIT * 6 * 6)44
-45
-// max literal offset from the block end46
-#define MAX_LITERAL_OFFSET 32*247
-#define MAX_LITERALS (BLOCK_INSN_LIMIT / 4)48
-#define MAX_LOCAL_BRANCHES 3249
+#define BRANCH_CACHE 150
+#define CALL_STACK 151
+#define ALIAS_REGISTERS 152
+#define REMAP_REGISTER 153
+#define LOOP_DETECTION 154
+#define LOOP_OPTIMIZER 155
+#define T_OPTIMIZER 156
+#define DIV_OPTIMIZER 057
+58
+#define MAX_LITERAL_OFFSET 0x200 // max. MOVA, MOV @(PC) offset59
+#define MAX_LOCAL_TARGETS (BLOCK_INSN_LIMIT / 4)60
+#define MAX_LOCAL_BRANCHES (BLOCK_INSN_LIMIT / 2)61
62
// debug stuff63
// 01 - warnings/errors64
65
// 04 - asm66
// 08 - runtime block entry log67
// 10 - smc self-check68
+// 20 - runtime block entry counter69
+// 40 - rcache checking70
+// 80 - branch cache statistics71
+// 100 - write trace72
+// 200 - compare trace73
+// 400 - block entry backtrace on exit74
+// 800 - state dump on exit75
// {76
#ifndef DRC_DEBUG77
-#define DRC_DEBUG 078
+#define DRC_DEBUG 0//x84779
#endif80
81
#if DRC_DEBUG82
83
#define dbg(...)84
#endif85
86
+87
///88
#define FETCH_OP(pc) \89
dr_pc_base[(pc) / 2]90
91
#define GET_Rn() \92
((op >> 8) & 0x0f)93
94
-#define BITMASK1(v0) (1 << (v0))95
-#define BITMASK2(v0,v1) ((1 << (v0)) | (1 << (v1)))96
-#define BITMASK3(v0,v1,v2) (BITMASK2(v0,v1) | (1 << (v2)))97
-#define BITMASK4(v0,v1,v2,v3) (BITMASK3(v0,v1,v2) | (1 << (v3)))98
-#define BITMASK5(v0,v1,v2,v3,v4) (BITMASK4(v0,v1,v2,v3) | (1 << (v4)))99
+#define SHR_T 30 // separate T for not-used detection100
+#define SHR_MEM 31101
+#define SHR_TMP -1102
103
-#define SHR_T SHR_SR // might make them separate someday104
+#define T 0x00000001105
+#define S 0x00000002106
+#define I 0x000000f0107
+#define Q 0x00000100108
+#define M 0x00000200109
+#define T_save 0x00000800110
+111
+#define I_SHIFT 4112
+#define Q_SHIFT 8113
+#define M_SHIFT 9114
+#define T_SHIFT 11115
116
static struct op_data {117
u8 op;118
119
enum op_types {120
OP_UNHANDLED = 0,121
OP_BRANCH,122
+ OP_BRANCH_N, // conditional known not to be taken123
OP_BRANCH_CT, // conditional, branch if T set124
OP_BRANCH_CF, // conditional, branch if T clear125
OP_BRANCH_R, // indirect126
OP_BRANCH_RF, // indirect far (PC + Rm)127
OP_SETCLRT, // T flag set/clear128
OP_MOVE, // register move129
+ OP_LOAD_CONST,// load const to register130
OP_LOAD_POOL, // literal pool load, imm is address131
- OP_MOVA,132
- OP_SLEEP,133
- OP_RTE,134
+ OP_MOVA, // MOVA instruction135
+ OP_SLEEP, // SLEEP instruction136
+ OP_RTE, // RTE instruction137
+ OP_TRAPA, // TRAPA instruction138
+ OP_LDC, // LDC instruction139
+ OP_DIV0, // DIV0[US] instruction140
+ OP_UNDEFINED,141
};142
143
-#ifdef DRC_SH2144
+struct div {145
+ u32 state:1; // 0: expect DIV1/ROTCL, 1: expect DIV1146
+ u32 rn:5, rm:5, ro:5; // rn and rm for DIV1, ro for ROTCL147
+ u32 div1:8, rotcl:8; // DIV1 count, ROTCL count148
+};149
+union _div { u32 imm; struct div div; }; // XXX tut-tut type punning...150
+#define div(opd) ((union _div *)&((opd)->imm))->div151
152
-static int literal_disabled_frames;153
+// XXX consider trap insns: OP_TRAPA, OP_UNDEFINED?154
+#define OP_ISBRANCH(op) ((BITRANGE(OP_BRANCH, OP_BRANCH_RF)| BITMASK1(OP_RTE)) \155
+ & BITMASK1(op))156
+#define OP_ISBRAUC(op) (BITMASK4(OP_BRANCH, OP_BRANCH_R, OP_BRANCH_RF, OP_RTE) \157
+ & BITMASK1(op))158
+#define OP_ISBRACND(op) (BITMASK2(OP_BRANCH_CT, OP_BRANCH_CF) \159
+ & BITMASK1(op))160
+#define OP_ISBRAIMM(op) (BITMASK3(OP_BRANCH, OP_BRANCH_CT, OP_BRANCH_CF) \161
+ & BITMASK1(op))162
+#define OP_ISBRAIND(op) (BITMASK3(OP_BRANCH_R, OP_BRANCH_RF, OP_RTE) \163
+ & BITMASK1(op))164
+165
+#ifdef DRC_SH2166
167
#if (DRC_DEBUG & 4)168
static u8 *tcache_dsm_ptrs[3];169
static char sh2dasm_buff[64];170
#define do_host_disasm(tcid) \171
- host_dasm(tcache_dsm_ptrs[tcid], tcache_ptr - tcache_dsm_ptrs[tcid]); \172
- tcache_dsm_ptrs[tcid] = tcache_ptr173
+ host_dasm(tcache_dsm_ptrs[tcid], emith_insn_ptr() - tcache_dsm_ptrs[tcid]); \174
+ tcache_dsm_ptrs[tcid] = emith_insn_ptr()175
#else176
#define do_host_disasm(x)177
#endif178
179
-#if (DRC_DEBUG & 8) || defined(PDB)180
+#define SH2_DUMP(sh2, reason) { \181
+ char ms = (sh2)->is_slave ? 's' : 'm'; \182
+ printf("%csh2 %s %08x\n", ms, reason, (sh2)->pc); \183
+ printf("%csh2 r0-7 %08x %08x %08x %08x %08x %08x %08x %08x\n", ms, \184
+ (sh2)->r[0], (sh2)->r[1], (sh2)->r[2], (sh2)->r[3], \185
+ (sh2)->r[4], (sh2)->r[5], (sh2)->r[6], (sh2)->r[7]); \186
+ printf("%csh2 r8-15 %08x %08x %08x %08x %08x %08x %08x %08x\n", ms, \187
+ (sh2)->r[8], (sh2)->r[9], (sh2)->r[10], (sh2)->r[11], \188
+ (sh2)->r[12], (sh2)->r[13], (sh2)->r[14], (sh2)->r[15]); \189
+ printf("%csh2 pc-ml %08x %08x %08x %08x %08x %08x %08x %08x\n", ms, \190
+ (sh2)->pc, (sh2)->ppc, (sh2)->pr, (sh2)->sr&0xfff, \191
+ (sh2)->gbr, (sh2)->vbr, (sh2)->mach, (sh2)->macl); \192
+ printf("%csh2 tmp-p %08x %08x %08x %08x %08x %08x %08x %08x\n", ms, \193
+ (sh2)->drc_tmp, (sh2)->irq_cycles, \194
+ (sh2)->pdb_io_csum[0], (sh2)->pdb_io_csum[1], (sh2)->state, \195
+ (sh2)->poll_addr, (sh2)->poll_cycles, (sh2)->poll_cnt); \196
+}197
+198
+#if (DRC_DEBUG & (8|256|512|1024)) || defined(PDB)199
+#if (DRC_DEBUG & (256|512|1024))200
+static SH2 csh2[2][8];201
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/compiler.h -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/compiler.h
Changed
97
1
2
int sh2_drc_init(SH2 *sh2);3
void sh2_drc_finish(SH2 *sh2);4
-void sh2_drc_wcheck_ram(unsigned int a, int val, int cpuid);5
-void sh2_drc_wcheck_da(unsigned int a, int val, int cpuid);6
+void sh2_drc_wcheck_ram(uint32_t a, unsigned len, SH2 *sh2);7
+void sh2_drc_wcheck_da(uint32_t a, unsigned len, SH2 *sh2);8
9
#ifdef DRC_SH210
void sh2_drc_mem_setup(SH2 *sh2);11
void sh2_drc_flush_all(void);12
-void sh2_drc_frame(void);13
#else14
#define sh2_drc_mem_setup(x)15
#define sh2_drc_flush_all()16
#define sh2_drc_frame()17
#endif18
19
-#define BLOCK_INSN_LIMIT 12820
+#define BLOCK_INSN_LIMIT 102421
22
/* op_flags */23
#define OF_DELAY_OP (1 << 0)24
#define OF_BTARGET (1 << 1)25
-#define OF_T_SET (1 << 2) // T is known to be set26
-#define OF_T_CLEAR (1 << 3) // ... clear27
+#define OF_LOOP (3 << 2) // NONE, IDLE, DELAY, POLL loop28
#define OF_B_IN_DS (1 << 4)29
+#define OF_DELAY_INSN (1 << 5) // DT, (TODO ADD+CMP?)30
+#define OF_POLL_INSN (1 << 6) // MOV @(...),Rn (no post increment), TST @(...)31
+#define OF_BASIC_LOOP (1 << 7) // pinnable loop without any branches in it32
33
-void scan_block(unsigned int base_pc, int is_slave,34
- unsigned char *op_flags, unsigned int *end_pc,35
- unsigned int *end_literals);36
+#define OF_IDLE_LOOP (1 << 2)37
+#define OF_DELAY_LOOP (2 << 2)38
+#define OF_POLL_LOOP (3 << 2)39
+40
+unsigned short scan_block(uint32_t base_pc, int is_slave,41
+ unsigned char *op_flags, uint32_t *end_pc,42
+ uint32_t *base_literals, uint32_t *end_literals);43
+44
+#if defined(DRC_SH2) && defined(__GNUC__) && !defined(__clang__)45
+// direct access to some host CPU registers used by the DRC if gcc is used.46
+// XXX MUST match SHR_SR definitions in cpu/drc/emit_*.c; should be moved there47
+// XXX yuck, there's no portable way to determine register size. Use long long48
+// if target is 64 bit and data model is ILP32 or LLP64(windows), else long49
+#if defined(__arm__)50
+#define DRC_SR_REG "r10"51
+#define DRC_REG_LL 0 // 32 bit52
+#elif defined(__aarch64__)53
+#define DRC_SR_REG "r28"54
+#define DRC_REG_LL (__ILP32__ || _WIN32)55
+#elif defined(__mips__)56
+#define DRC_SR_REG "s6"57
+#define DRC_REG_LL (_MIPS_SIM == _ABIN32)58
+#elif defined(__riscv__) || defined(__riscv)59
+#define DRC_SR_REG "s11"60
+#define DRC_REG_LL 0 // no ABI for (__ILP32__ && __riscv_xlen != 32)61
+#elif defined(__powerpc__)62
+#define DRC_SR_REG "r30"63
+#define DRC_REG_LL 0 // no ABI for __ILP32__64
+#elif defined(__i386__)65
+#define DRC_SR_REG "edi"66
+#define DRC_REG_LL 0 // 32 bit67
+#elif defined(__x86_64__)68
+#define DRC_SR_REG "rbx"69
+#define DRC_REG_LL (__ILP32__ || _WIN32)70
+#endif71
+#endif72
+73
+#ifdef DRC_SR_REG74
+// XXX this is more clear but produces too much overhead for slow platforms75
+extern void REGPARM(1) (*sh2_drc_save_sr)(SH2 *sh2);76
+extern void REGPARM(1) (*sh2_drc_restore_sr)(SH2 *sh2);77
+78
+// NB: sh2_sr MUST have register size if optimizing with -O3 (-fif-conversion)79
+#if DRC_REG_LL80
+#define DRC_DECLARE_SR register long long _sh2_sr asm(DRC_SR_REG)81
+#else82
+#define DRC_DECLARE_SR register long _sh2_sr asm(DRC_SR_REG)83
+#endif84
+#define DRC_SAVE_SR(sh2) \85
+ if (likely(sh2->state & SH2_IN_DRC)) \86
+ sh2->sr = (s32)_sh2_sr87
+// sh2_drc_save_sr(sh2)88
+#define DRC_RESTORE_SR(sh2) \89
+ if (likely(sh2->state & SH2_IN_DRC)) \90
+ _sh2_sr = (s32)sh2->sr91
+// sh2_drc_restore_sr(sh2)92
+#else93
+#define DRC_DECLARE_SR94
+#define DRC_SAVE_SR(sh2)95
+#define DRC_RESTORE_SR(sh2)96
+#endif97
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/mame/sh2.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/mame/sh2.c
Changed
35
1
2
#if BUSY_LOOP_HACKS3
if (disp == -2)4
{5
- UINT32 next_opcode = RW( sh2, sh2->ppc & AM );6
+ UINT32 next_opcode = (UINT32)(UINT16)RW( sh2, sh2->ppc & AM );7
/* BRA $8
* NOP9
*/10
11
sh2->sr &= ~T;12
#if BUSY_LOOP_HACKS13
{14
- UINT32 next_opcode = RW( sh2, sh2->ppc & AM );15
+ UINT32 next_opcode = (UINT32)(UINT16)RW( sh2, sh2->ppc & AM );16
/* DT Rn17
* BF $-218
*/19
20
INT32 tempm, tempn, dest, src, ans;21
UINT32 templ;22
23
- tempn = (INT32) RW( sh2, sh2->r[n] );24
+ tempn = (INT32)(INT16) RW( sh2, sh2->r[n] );25
sh2->r[n] += 2;26
- tempm = (INT32) RW( sh2, sh2->r[m] );27
+ tempm = (INT32)(INT16) RW( sh2, sh2->r[m] );28
sh2->r[m] += 2;29
templ = sh2->macl;30
- tempm = ((INT32) (short) tempn * (INT32) (short) tempm);31
+ tempm = (tempn * tempm);32
if ((INT32) sh2->macl >= 0)33
dest = 0;34
else35
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/mame/sh2dasm.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/mame/sh2dasm.c
Changed
10
1
2
sprintf(buffer, "MOV.B @($%02X,%s),R0", (opcode & 15), regname[Rm]);3
break;4
case 5:5
- sprintf(buffer, "MOV.W @($%02X,%s),R0", (opcode & 15), regname[Rm]);6
+ sprintf(buffer, "MOV.W @($%02X,%s),R0", (opcode & 15) * 2, regname[Rm]);7
break;8
case 8:9
sprintf(buffer, "CMP/EQ #$%02X,R0", (opcode & 0xff));10
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/mame/sh2pico.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/mame/sh2pico.c
Changed
44
1
2
if (sh2->delay)3
{4
sh2->ppc = sh2->delay;5
- opcode = RW(sh2, sh2->delay);6
+ opcode = (UINT32)(UINT16)RW(sh2, sh2->delay);7
8
// TODO: more branch types9
if ((opcode >> 13) == 5) { // BRA/BSR10
11
else12
{13
sh2->ppc = sh2->pc;14
- opcode = RW(sh2, sh2->pc);15
+ opcode = (UINT32)(UINT16)RW(sh2, sh2->pc);16
}17
18
sh2->delay = 0;19
20
if (sh2->pc < *base_pc || sh2->pc >= *end_pc) {21
*base_pc = sh2->pc;22
scan_block(*base_pc, sh2->is_slave,23
- op_flags, end_pc, NULL);24
+ op_flags, end_pc, NULL, NULL);25
}26
if ((op_flags[(sh2->pc - *base_pc) / 2]27
& OF_BTARGET) || sh2->pc == *base_pc28
29
if (sh2->delay)30
{31
sh2->ppc = sh2->delay;32
- opcode = RW(sh2, sh2->delay);33
+ opcode = (UINT32)(UINT16)RW(sh2, sh2->delay);34
sh2->pc -= 2;35
}36
else37
{38
sh2->ppc = sh2->pc;39
- opcode = RW(sh2, sh2->pc);40
+ opcode = (UINT32)(UINT16)RW(sh2, sh2->pc);41
}42
43
sh2->delay = 0;44
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/sh2.c -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/sh2.c
Changed
10
1
2
// do this to avoid missing irqs that other SH2 might clear3
int vector = sh2->irq_callback(sh2, level);4
sh2_do_irq(sh2, level, vector);5
- sh2->m68krcycles_done += C_SH2_TO_M68K(*sh2, 13);6
+ sh2->m68krcycles_done += C_SH2_TO_M68K(sh2, 13);7
}8
else9
sh2->test_irq = 1;10
libretro-picodrive-0~git20200112.tar.xz/cpu/sh2/sh2.h -> libretro-picodrive-0~git20200716.tar.xz/cpu/sh2/sh2.h
Changed
155
1
2
#ifndef __SH2_H__3
#define __SH2_H__4
5
+#include "../../pico/pico_types.h"6
#include "../../pico/pico_port.h"7
8
// registers - matches structure order9
10
SHR_R0 = 0, SHR_SP = 15,11
SHR_PC, SHR_PPC, SHR_PR, SHR_SR,12
SHR_GBR, SHR_VBR, SHR_MACH, SHR_MACL,13
+ SH2_REGS // register set size14
} sh2_reg_e;15
+#define SHR_R(n) (SHR_R0+(n))16
17
typedef struct SH2_18
{19
- unsigned int r[16]; // 0020
- unsigned int pc; // 4021
- unsigned int ppc;22
- unsigned int pr;23
- unsigned int sr;24
- unsigned int gbr, vbr; // 5025
- unsigned int mach, macl; // 5826
+ // registers. this MUST correlate with enum sh2_reg_e.27
+ uint32_t r[16] ALIGNED(32);28
+ uint32_t pc; // 4029
+ uint32_t ppc;30
+ uint32_t pr;31
+ uint32_t sr;32
+ uint32_t gbr, vbr; // 5033
+ uint32_t mach, macl; // 5834
35
// common36
- const void *read8_map; // 6037
+ const void *read8_map;38
const void *read16_map;39
+ const void *read32_map;40
const void **write8_tab;41
const void **write16_tab;42
+ const void **write32_tab;43
44
// drc stuff45
- int drc_tmp; // 7046
+ int drc_tmp;47
int irq_cycles;48
void *p_bios; // convenience pointers49
void *p_da;50
- void *p_sdram; // 8051
+ void *p_sdram;52
void *p_rom;53
+ void *p_dram;54
+ void *p_drcblk_da;55
+ void *p_drcblk_ram;56
unsigned int pdb_io_csum[2];57
58
#define SH2_STATE_RUN (1 << 0) // to prevent recursion59
-#define SH2_STATE_SLEEP (1 << 1)60
+#define SH2_STATE_SLEEP (1 << 1) // temporarily stopped (DMA, IO, ...)61
#define SH2_STATE_CPOLL (1 << 2) // polling comm regs62
#define SH2_STATE_VPOLL (1 << 3) // polling VDP63
+#define SH2_STATE_RPOLL (1 << 4) // polling address in SDRAM64
+#define SH2_TIMER_RUN (1 << 7) // SOC WDT timer is running65
+#define SH2_IN_DRC (1 << 8) // DRC in use66
unsigned int state;67
- unsigned int poll_addr;68
+ uint32_t poll_addr;69
int poll_cycles;70
int poll_cnt;71
72
+ // DRC branch cache. size must be 2^n and <=12873
+ int rts_cache_idx;74
+ struct { uint32_t pc; void *code; } rts_cache[16];75
+ struct { uint32_t pc; void *code; } branch_cache[128];76
+77
// interpreter stuff78
int icount; // cycles left in current timeslice79
unsigned int ea;80
81
unsigned int cycles_timeslice;82
83
struct SH2_ *other_sh2;84
+ int (*run)(struct SH2_ *, int);85
86
// we use 68k reference cycles for easier sync87
unsigned int m68krcycles_done;88
unsigned int mult_m68k_to_sh2;89
unsigned int mult_sh2_to_m68k;90
91
- unsigned char data_array[0x1000]; // cache (can be used as RAM)92
- unsigned int peri_regs[0x200/4]; // periphereal regs93
+ uint8_t data_array[0x1000]; // cache (can be used as RAM)94
+ uint32_t peri_regs[0x200/4]; // peripheral regs95
} SH2;96
97
#define CYCLE_MULT_SHIFT 1098
#define C_M68K_TO_SH2(xsh2, c) \99
- ((int)((c) * (xsh2).mult_m68k_to_sh2) >> CYCLE_MULT_SHIFT)100
+ (int)(((uint64_t)(c) * (xsh2)->mult_m68k_to_sh2) >> CYCLE_MULT_SHIFT)101
#define C_SH2_TO_M68K(xsh2, c) \102
- ((int)((c + 3) * (xsh2).mult_sh2_to_m68k) >> CYCLE_MULT_SHIFT)103
+ (int)(((uint64_t)(c+3U) * (xsh2)->mult_sh2_to_m68k) >> CYCLE_MULT_SHIFT)104
105
int sh2_init(SH2 *sh2, int is_slave, SH2 *other_sh2);106
void sh2_finish(SH2 *sh2);107
108
int sh2_execute_drc(SH2 *sh2c, int cycles);109
int sh2_execute_interpreter(SH2 *sh2c, int cycles);110
111
-static __inline int sh2_execute(SH2 *sh2, int cycles, int use_drc)112
+static __inline void sh2_execute_prepare(SH2 *sh2, int use_drc)113
+{114
+#ifdef DRC_SH2115
+ sh2->run = use_drc ? sh2_execute_drc : sh2_execute_interpreter;116
+#else117
+ sh2->run = sh2_execute_interpreter;118
+#endif119
+}120
+121
+static __inline int sh2_execute(SH2 *sh2, int cycles)122
{123
int ret;124
125
sh2->cycles_timeslice = cycles;126
-#ifdef DRC_SH2127
- if (use_drc)128
- ret = sh2_execute_drc(sh2, cycles);129
- else130
-#endif131
- ret = sh2_execute_interpreter(sh2, cycles);132
+ ret = sh2->run(sh2, cycles);133
134
return sh2->cycles_timeslice - ret;135
}136
137
138
// pico memhandlers139
// XXX: move somewhere else140
-unsigned int REGPARM(2) p32x_sh2_read8(unsigned int a, SH2 *sh2);141
-unsigned int REGPARM(2) p32x_sh2_read16(unsigned int a, SH2 *sh2);142
-unsigned int REGPARM(2) p32x_sh2_read32(unsigned int a, SH2 *sh2);143
-void REGPARM(3) p32x_sh2_write8 (unsigned int a, unsigned int d, SH2 *sh2);144
-void REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);145
-void REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);146
+u32 REGPARM(2) p32x_sh2_read8(u32 a, SH2 *sh2);147
+u32 REGPARM(2) p32x_sh2_read16(u32 a, SH2 *sh2);148
+u32 REGPARM(2) p32x_sh2_read32(u32 a, SH2 *sh2);149
+void REGPARM(3) p32x_sh2_write8 (u32 a, u32 d, SH2 *sh2);150
+void REGPARM(3) p32x_sh2_write16(u32 a, u32 d, SH2 *sh2);151
+void REGPARM(3) p32x_sh2_write32(u32 a, u32 d, SH2 *sh2);152
153
// debug154
#ifdef DRC_CMP155
libretro-picodrive-0~git20200112.tar.xz/jni/Android.mk -> libretro-picodrive-0~git20200716.tar.xz/jni/Android.mk
Changed
71
1
2
use_drz80 := 03
use_cz80 := 14
use_sh2drc := 05
-use_sh2mame := 16
use_svpdrc := 07
8
asm_memory := 09
10
asm_misc := 011
asm_cdmemory := 012
asm_mix := 013
+asm_32xdraw := 014
+asm_32xmemory := 015
16
ifeq ($(TARGET_ARCH),arm)17
- use_cyclone := 118
- use_sh2drc := 119
- use_svpdrc := 120
- asm_render := 121
- asm_misc := 122
- asm_mix := 123
- use_fame := 024
- use_sh2mame := 025
+# use_cyclone := 126
+# use_fame := 027
+# use_drz80 := 128
+# use_cz80 := 029
+ use_sh2drc := 130
+# use_svpdrc := 131
+32
+# asm_memory := 133
+# asm_render := 134
+# asm_ym2612 := 135
+# asm_misc := 136
+# asm_cdmemory := 137
+# asm_mix := 138
+# asm_32xdraw := 139
+# asm_32xmemory := 140
endif41
42
ifeq ($(TARGET_ARCH_ABI),armeabi)43
44
45
SOURCES_C := $(LIBRETRO_DIR)/libretro.c \46
$(COMMON_DIR)/mp3.c \47
+ $(COMMON_DIR)/mp3_sync.c \48
$(COMMON_DIR)/mp3_dummy.c \49
$(UNZIP_DIR)/unzip.c50
51
COREFLAGS := $(addprefix -D,$(DEFINES)) -fno-strict-aliasing52
53
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"54
-ifneq ($(GIT_VERSION)," unknown")55
+GIT_VERSION := $(shell git rev-parse --short HEAD || echo unknown)56
+ifneq ($(GIT_VERSION),"unknown")57
COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"58
endif59
60
+ifneq ($(filter armeabi%, $(TARGET_ARCH_ABI)),)61
+$(CORE_DIR)/pico/pico_int_offs.h:62
+ cp $(CORE_DIR)/tools/offsets/generic-ilp32-offsets.h $@63
+.PHONY: $(CORE_DIR)/pico/pico_int_offs.h64
+65
+$(filter %.S,$(SRCS_COMMON)): $(CORE_DIR)/pico/pico_int_offs.h66
+endif67
+68
include $(CLEAR_VARS)69
LOCAL_MODULE := retro70
LOCAL_SRC_FILES := $(SRCS_COMMON) $(SOURCES_C)71
libretro-picodrive-0~git20200112.tar.xz/pico/32x/32x.c -> libretro-picodrive-0~git20200716.tar.xz/pico/32x/32x.c
Changed
201
1
2
struct Pico32x Pico32x;3
SH2 sh2s[2];4
5
-#define SH2_IDLE_STATES (SH2_STATE_CPOLL|SH2_STATE_VPOLL|SH2_STATE_SLEEP)6
+#define SH2_IDLE_STATES (SH2_STATE_CPOLL|SH2_STATE_VPOLL|SH2_STATE_RPOLL|SH2_STATE_SLEEP)7
8
static int REGPARM(2) sh2_irq_cb(SH2 *sh2, int level)9
{10
11
}12
13
// MUST specify active_sh2 when called from sh2 memhandlers14
-void p32x_update_irls(SH2 *active_sh2, int m68k_cycles)15
+void p32x_update_irls(SH2 *active_sh2, unsigned int m68k_cycles)16
{17
int irqs, mlvl = 0, slvl = 0;18
int mrun, srun;19
20
if (active_sh2 != NULL)21
m68k_cycles = sh2_cycles_done_m68k(active_sh2);22
23
+ // find top bit = highest irq number (0 <= irl <= 14/2) by binary search24
+25
// msh226
irqs = Pico32x.sh2irqs | Pico32x.sh2irqi[0];27
- while ((irqs >>= 1))28
- mlvl++;29
- mlvl *= 2;30
+ if (irqs >= 0x10) mlvl += 8, irqs >>= 4;31
+ if (irqs >= 0x04) mlvl += 4, irqs >>= 2;32
+ if (irqs >= 0x02) mlvl += 2, irqs >>= 1;33
34
// ssh235
irqs = Pico32x.sh2irqs | Pico32x.sh2irqi[1];36
- while ((irqs >>= 1))37
- slvl++;38
- slvl *= 2;39
+ if (irqs >= 0x10) slvl += 8, irqs >>= 4;40
+ if (irqs >= 0x04) slvl += 4, irqs >>= 2;41
+ if (irqs >= 0x02) slvl += 2, irqs >>= 1;42
43
- mrun = sh2_irl_irq(&msh2, mlvl, active_sh2 == &msh2);44
+ mrun = sh2_irl_irq(&msh2, mlvl, msh2.state & SH2_STATE_RUN);45
if (mrun) {46
p32x_sh2_poll_event(&msh2, SH2_IDLE_STATES, m68k_cycles);47
- if (active_sh2 == &msh2)48
- sh2_end_run(active_sh2, 1);49
+ if (msh2.state & SH2_STATE_RUN)50
+ sh2_end_run(&msh2, 1);51
}52
53
- srun = sh2_irl_irq(&ssh2, slvl, active_sh2 == &ssh2);54
+ srun = sh2_irl_irq(&ssh2, slvl, ssh2.state & SH2_STATE_RUN);55
if (srun) {56
p32x_sh2_poll_event(&ssh2, SH2_IDLE_STATES, m68k_cycles);57
- if (active_sh2 == &ssh2)58
- sh2_end_run(active_sh2, 1);59
+ if (ssh2.state & SH2_STATE_RUN)60
+ sh2_end_run(&ssh2, 1);61
}62
63
elprintf(EL_32X, "update_irls: m %d/%d, s %d/%d", mlvl, mrun, slvl, srun);64
65
// the mask register is inconsistent, CMD is supposed to be a mask,66
// while others are actually irq trigger enables?67
// TODO: test on hw..68
-void p32x_trigger_irq(SH2 *sh2, int m68k_cycles, unsigned int mask)69
+void p32x_trigger_irq(SH2 *sh2, unsigned int m68k_cycles, unsigned int mask)70
{71
Pico32x.sh2irqs |= mask & P32XI_VRES;72
Pico32x.sh2irqi[0] |= mask & (Pico32x.sh2irq_mask[0] << 3);73
74
p32x_update_irls(sh2, m68k_cycles);75
}76
77
-void p32x_update_cmd_irq(SH2 *sh2, int m68k_cycles)78
+void p32x_update_cmd_irq(SH2 *sh2, unsigned int m68k_cycles)79
{80
if ((Pico32x.sh2irq_mask[0] & 2) && (Pico32x.regs[2 / 2] & 1))81
Pico32x.sh2irqi[0] |= P32XI_CMD;82
83
84
void PicoUnload32x(void)85
{86
+ sh2_finish(&msh2);87
+ sh2_finish(&ssh2);88
if (Pico32xMem != NULL)89
plat_munmap(Pico32xMem, sizeof(*Pico32xMem));90
Pico32xMem = NULL;91
- sh2_finish(&msh2);92
- sh2_finish(&ssh2);93
94
PicoIn.AHW &= ~PAHW_32X;95
}96
97
{98
if (PicoIn.AHW & PAHW_32X) {99
p32x_trigger_irq(NULL, SekCyclesDone(), P32XI_VRES);100
- p32x_sh2_poll_event(&msh2, SH2_IDLE_STATES, 0);101
- p32x_sh2_poll_event(&ssh2, SH2_IDLE_STATES, 0);102
+ p32x_sh2_poll_event(&msh2, SH2_IDLE_STATES, SekCyclesDone());103
+ p32x_sh2_poll_event(&ssh2, SH2_IDLE_STATES, SekCyclesDone());104
p32x_pwm_ctl_changed();105
p32x_timers_recalc();106
}107
108
}109
110
p32x_trigger_irq(NULL, SekCyclesDone(), P32XI_VINT);111
- p32x_sh2_poll_event(&msh2, SH2_STATE_VPOLL, 0);112
- p32x_sh2_poll_event(&ssh2, SH2_STATE_VPOLL, 0);113
+ p32x_sh2_poll_event(&msh2, SH2_STATE_VPOLL, SekCyclesDone());114
+ p32x_sh2_poll_event(&ssh2, SH2_STATE_VPOLL, SekCyclesDone());115
}116
117
-void p32x_schedule_hint(SH2 *sh2, int m68k_cycles)118
+void p32x_schedule_hint(SH2 *sh2, unsigned int m68k_cycles)119
{120
// rather rough, 32x hint is useless in practice121
int after;122
123
return; // nobody cares124
// note: when Pico.m.scanline is 224, SH2s might125
// still be at scanline 93 (or so)126
- if (!(Pico32x.sh2_regs[0] & 0x80) && Pico.m.scanline > 224)127
+ if (!(Pico32x.sh2_regs[0] & 0x80) &&128
+ Pico.m.scanline > (Pico.video.reg[1] & 0x08 ? 240 : 224))129
return;130
131
after = (Pico32x.sh2_regs[4 / 2] + 1) * 488;132
133
134
p32x_event_schedule(now, event, after);135
136
- left_to_next = (event_time_next - now) * 3;137
- sh2_end_run(sh2, left_to_next);138
+ left_to_next = C_M68K_TO_SH2(sh2, (int)(event_time_next - now));139
+ if (sh2_cycles_left(sh2) > left_to_next) {140
+ if (left_to_next < 1)141
+ left_to_next = 1;142
+ sh2_end_run(sh2, left_to_next);143
+ }144
}145
146
static void p32x_run_events(unsigned int until)147
148
oldest, event_time_next);149
}150
151
-static void run_sh2(SH2 *sh2, int m68k_cycles)152
+static void run_sh2(SH2 *sh2, unsigned int m68k_cycles)153
{154
- int cycles, done;155
+ unsigned int cycles, done;156
157
pevt_log_sh2_o(sh2, EVT_RUN_START);158
sh2->state |= SH2_STATE_RUN;159
- cycles = C_M68K_TO_SH2(*sh2, m68k_cycles);160
+ cycles = C_M68K_TO_SH2(sh2, m68k_cycles);161
elprintf_sh2(sh2, EL_32X, "+run %u %d @%08x",162
sh2->m68krcycles_done, cycles, sh2->pc);163
164
- done = sh2_execute(sh2, cycles, PicoIn.opt & POPT_EN_DRC);165
+ done = sh2_execute(sh2, cycles);166
167
- sh2->m68krcycles_done += C_SH2_TO_M68K(*sh2, done);168
+ sh2->m68krcycles_done += C_SH2_TO_M68K(sh2, done);169
sh2->state &= ~SH2_STATE_RUN;170
pevt_log_sh2_o(sh2, EVT_RUN_END);171
elprintf_sh2(sh2, EL_32X, "-run %u %d",172
173
174
// there might be new event to schedule current sh2 to175
if (event_time_next) {176
- left_to_event = event_time_next - m68k_target;177
- left_to_event *= 3;178
+ left_to_event = C_M68K_TO_SH2(sh2, (int)(event_time_next - m68k_target));179
if (sh2_cycles_left(sh2) > left_to_event) {180
if (left_to_event < 1)181
left_to_event = 1;182
183
}184
185
#define STEP_LS 24186
-#define STEP_N 440187
+#define STEP_N 528 // at least one line (488)188
189
#define sync_sh2s_normal p32x_sync_sh2s190
//#define sync_sh2s_lockstep p32x_sync_sh2s191
192
/* most timing is in 68k clock */193
void sync_sh2s_normal(unsigned int m68k_target)194
{195
- unsigned int now, target, timer_cycles;196
+ unsigned int now, target, next, timer_cycles;197
int cycles;198
199
elprintf(EL_32X, "sh2 sync to %u", m68k_target);200
201
libretro-picodrive-0~git20200112.tar.xz/pico/32x/draw.c -> libretro-picodrive-0~git20200716.tar.xz/pico/32x/draw.c
Changed
174
1
2
/*3
* PicoDrive4
* (C) notaz, 2009,20105
+ * (C) kub, 20196
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
int (*PicoScan32xEnd)(unsigned int num);11
int Pico32xDrawMode;12
13
+void *DrawLineDestBase32x;14
+int DrawLineDestIncrement32x;15
+16
static void convert_pal555(int invert_prio)17
{18
unsigned int *ps = (void *)Pico32xMem->pal;19
20
const unsigned int m1 = 0x001f; \21
const unsigned int m2 = 0x03e0; \22
const unsigned int m3 = 0x7c00; \23
- int i; \24
+ unsigned short t; \25
+ int i = 320; \26
\27
- for (i = 320; i > 0; i--, pd++, p32x++, pmd++) { \28
- unsigned short t = *p32x; \29
- if ((*pmd & 0x3f) != mdbg && !((t ^ inv) & 0x8000)) { \30
- pmd_draw_code; \31
- continue; \32
+ while (i > 0) { \33
+ for (; i > 0 && (*pmd & 0x3f) == mdbg; pd++, pmd++, i--) { \34
+ t = *p32x++; \35
+ *pd = ((t&m1) << 11) | ((t&m2) << 1) | ((t&m3) >> 10); \36
+ } \37
+ for (; i > 0 && (*pmd & 0x3f) != mdbg; pd++, pmd++, i--) { \38
+ t = *p32x++; \39
+ if ((t ^ inv) & 0x8000) \40
+ *pd = ((t&m1) << 11) | ((t&m2) << 1) | ((t&m3) >> 10); \41
+ else \42
+ pmd_draw_code; \43
} \44
- \45
- *pd = ((t & m1) << 11) | ((t & m2) << 1) | ((t & m3) >> 10); \46
} \47
}48
49
50
#define do_line_pp(pd, p32x, pmd, pmd_draw_code) \51
{ \52
unsigned short t; \53
- int i; \54
- for (i = 320; i > 0; i--, pd++, p32x++, pmd++) { \55
- t = pal[*(unsigned char *)((uintptr_t)p32x ^ 1)]; \56
- if ((t & 0x20) || (*pmd & 0x3f) == mdbg) \57
+ int i = 320; \58
+ while (i > 0) { \59
+ for (; i > 0 && (*pmd & 0x3f) == mdbg; pd++, pmd++, i--) { \60
+ t = pal[*(unsigned char *)((uintptr_t)(p32x++) ^ 1)]; \61
*pd = t; \62
- else \63
- pmd_draw_code; \64
+ } \65
+ for (; i > 0 && (*pmd & 0x3f) != mdbg; pd++, pmd++, i--) { \66
+ t = pal[*(unsigned char *)((uintptr_t)(p32x++) ^ 1)]; \67
+ if (t & 0x20) \68
+ *pd = t; \69
+ else \70
+ pmd_draw_code; \71
+ } \72
} \73
-} 74
+}75
76
// run length mode77
#define do_line_rl(pd, p32x, pmd, pmd_draw_code) \78
79
int lines_sft_offs;80
int which_func;81
82
- Pico.est.DrawLineDest = (char *)DrawLineDestBase + offs * DrawLineDestIncrement;83
+ Pico.est.DrawLineDest = (char *)DrawLineDestBase32x + offs * DrawLineDestIncrement32x;84
dram = Pico32xMem->dram[Pico32x.vdp_regs[0x0a/2] & P32XV_FS];85
86
- if (Pico32xDrawMode == PDM32X_BOTH) {87
- if (Pico.m.dirtyPal)88
- PicoDrawUpdateHighPal();89
- }90
+ if (Pico32xDrawMode == PDM32X_BOTH)91
+ PicoDrawUpdateHighPal();92
93
if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 2)94
{95
96
void PicoDraw32xLayerMdOnly(int offs, int lines)97
{98
int have_scan = PicoScan32xBegin != NULL && PicoScan32xEnd != NULL;99
- unsigned short *dst = (void *)((char *)DrawLineDestBase + offs * DrawLineDestIncrement);100
+ unsigned short *dst = (void *)((char *)DrawLineDestBase32x + offs * DrawLineDestIncrement32x);101
unsigned char *pmd = Pico.est.Draw2FB + 328 * offs + 8;102
unsigned short *pal = Pico.est.HighPal;103
int poffs = 0, plen = 320;104
int l, p;105
106
if (!(Pico.video.reg[12] & 1)) {107
- // 32col mode108
+ // 32col mode. for some render modes MD pixel data carries an offset109
+ if (!(PicoIn.opt & (POPT_ALT_RENDERER|POPT_DIS_32C_BORDER)))110
+ pmd += 32;111
poffs = 32;112
plen = 256;113
}114
115
- if (Pico.m.dirtyPal)116
- PicoDrawUpdateHighPal();117
+ PicoDrawUpdateHighPal();118
119
dst += poffs;120
for (l = 0; l < lines; l++) {121
122
dst[p + 2] = pal[*pmd++];123
dst[p + 3] = pal[*pmd++];124
}125
- dst = (void *)((char *)dst + DrawLineDestIncrement);126
+ dst = (void *)((char *)dst + DrawLineDestIncrement32x);127
pmd += 328 - plen;128
if (have_scan)129
PicoScan32xEnd(l + offs);130
131
132
void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode)133
{134
-#ifdef _ASM_32X_DRAW135
- extern void *Pico32xNativePal;136
- Pico32xNativePal = Pico32xMem->pal_native;137
-#endif138
+ if (which == PDF_RGB555) {139
+ // need CLUT pixels in PicoDraw2FB for layer transparency140
+ PicoDrawSetInternalBuf(Pico.est.Draw2FB, 328);141
+ PicoDrawSetOutBufMD(DrawLineDestBase32x, DrawLineDestIncrement32x);142
+ } else {143
+ // use the same layout as alt renderer144
+ PicoDrawSetInternalBuf(NULL, 0);145
+ PicoDrawSetOutBufMD(Pico.est.Draw2FB + 8, 328);146
+ }147
148
- if (which == PDF_RGB555 && use_32x_line_mode) {149
+ if (use_32x_line_mode)150
// we'll draw via FinalizeLine32xRGB555 (rare)151
- PicoDrawSetInternalBuf(NULL, 0);152
Pico32xDrawMode = PDM32X_OFF;153
- return;154
- }155
+ else156
+ // in RGB555 mode the 32x layer is drawn over the MD layer, in the other157
+ // modes 32x and MD layer are merged together by the 32x renderer158
+ Pico32xDrawMode = (which == PDF_RGB555) ? PDM32X_32X_ONLY : PDM32X_BOTH;159
+}160
161
- // use the same layout as alt renderer162
- PicoDrawSetInternalBuf(Pico.est.Draw2FB, 328);163
- Pico32xDrawMode = (which == PDF_RGB555) ? PDM32X_32X_ONLY : PDM32X_BOTH;164
+void PicoDrawSetOutBuf32X(void *dest, int increment)165
+{166
+ DrawLineDestBase32x = dest;167
+ DrawLineDestIncrement32x = increment;168
+ // in RGB555 mode this buffer is also used by the MD renderer169
+ if (Pico32xDrawMode != PDM32X_BOTH)170
+ PicoDrawSetOutBufMD(DrawLineDestBase32x, DrawLineDestIncrement32x);171
}172
173
// vim:shiftwidth=2:ts=2:expandtab174
libretro-picodrive-0~git20200716.tar.xz/pico/32x/draw_arm.S
Added
201
1
2
+@*3
+@* PicoDrive4
+@* (C) notaz, 20105
+@* (C) kub, 20196
+@*7
+@* This work is licensed under the terms of MAME license.8
+@* See COPYING file in the top-level directory.9
+@*10
+11
+#include "pico/arm_features.h"12
+#include "pico/pico_int_offs.h"13
+14
+.extern Pico32x15
+.extern Pico16
+17
+.equiv P32XV_PRI, (1<< 7)18
+19
+.text20
+.align 221
+22
+ PIC_LDR_INIT()23
+24
+.macro call_scan_prep cond est @ &Pico.est25
+.if \cond26
+ PIC_LDR(r4, r6, PicoScan32xBegin)27
+ PIC_LDR(r5, r6, PicoScan32xEnd)28
+ ldr r6, [\est, #OFS_EST_DrawLineDest]29
+ ldr r4, [r4]30
+ ldr r5, [r5]31
+ stmfd sp!, {r4,r5,r6}32
+.endif33
+.endm34
+35
+.macro call_scan_fin_ge cond36
+.if \cond37
+ addge sp, sp, #4*338
+.endif39
+.endm40
+41
+.macro call_scan_begin cond42
+.if \cond43
+ stmfd sp!, {r1-r3}44
+ and r0, r2, #0xff45
+ add r0, r0, r446
+ mov lr, pc47
+ ldr pc, [sp, #(3+0)*4]48
+ ldr r0, [sp, #(3+2)*4] @ &DrawLineDest49
+ ldmfd sp!, {r1-r3}50
+ ldr r0, [r0]51
+.endif52
+.endm53
+54
+.macro call_scan_end cond55
+.if \cond56
+ stmfd sp!, {r0-r3}57
+ and r0, r2, #0xff58
+ add r0, r0, r459
+ mov lr, pc60
+ ldr pc, [sp, #(4+1)*4]61
+ ldmfd sp!, {r0-r3}62
+.endif63
+.endm64
+65
+@ direct color66
+@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg67
+.macro make_do_loop_dc name call_scan do_md68
+.global \name69
+\name:70
+ stmfd sp!, {r4-r11,lr}71
+72
+ PIC_LDR(lr, r9, Pico)73
+ PIC_LDR(r10,r9, Pico32x)74
+ ldr r11, [lr, #OFS_Pico_est+OFS_EST_Draw2FB]75
+ ldrh r10,[r10, #0x40] @ Pico32x.vdp_regs[0]76
+ add r9, lr, #OFS_Pico_est+OFS_EST_HighPal @ palmd77
+78
+ and r4, r2, #0xff79
+ mov r5, #32880
+ mov r3, r3, lsl #26 @ mdbg << 2681
+ mla r11,r4,r5,r11 @ r11 = pmd = PicoDraw2FB + offs*328: md data82
+ tst r10,#P32XV_PRI83
+ movne r10,#084
+ moveq r10,#0x8000 @ r10 = inv_bit85
+ call_scan_prep \call_scan lr86
+87
+ mov r4, #0 @ line88
+ b 1f @ loop_outer_entry89
+90
+0: @ loop_outer:91
+ call_scan_end \call_scan92
+ add r4, r4, #193
+ cmp r4, r2, lsr #1694
+ call_scan_fin_ge \call_scan95
+ ldmgefd sp!, {r4-r11,pc}96
+97
+1: @ loop_outer_entry:98
+ call_scan_begin \call_scan99
+ mov r12,r4, lsl #1100
+ ldrh r12,[r1, r12]101
+ add r11,r11,#8102
+ mov r6, #320103
+ add r5, r1, r12, lsl #1 @ p32x = dram + dram[l]104
+105
+2: @ loop_inner:106
+ ldrh r8, [r5], #2107
+ subs lr, r6, #1108
+ blt 0b @ loop_outer109
+110
+3: @ loop_innermost:111
+ ldrh r7, [r5], #2 @ 32x pixel112
+ subs lr, lr, #1113
+ cmpge r7, r8114
+ beq 3b @ loop_innermost115
+116
+ sub r5, r5, #2117
+ add lr, lr, #1118
+ sub lr, r6, lr119
+ sub r6, r6, lr120
+121
+ eor r12,r8, r10122
+ tst r12, #0x8000 @ !((t ^ inv) & 0x8000)123
+ bne 5f @ draw_md124
+125
+ and r7 ,r8, #0x03e0126
+ mov r8, r8, lsl #11127
+ orr r8, r8, r8, lsr #(10+11)128
+ orr r8, r8, r7 ,lsl #1129
+ bic r8, r8, #0x0020 @ kill prio bit130
+131
+ add r11,r11,lr132
+ tst r0, #2 @ dst unaligned?133
+ strneh r8, [r0], #2134
+ subne lr, lr, #1135
+ cmp lr, #0136
+ beq 2b @ loop_inner137
+ mov r8, r8, lsl #16138
+ orr r12,r8, r8, lsr #16139
+ mov r8 ,r12140
+4: @ draw_32x:141
+ subs lr, lr, #4 @ store 4 pixels142
+ stmgeia r0!, {r8, r12}143
+ bgt 4b @ draw_32x144
+ beq 2b @ loop_inner145
+ adds lr, lr, #2 @ store 1-3 leftover pixels146
+ strge r8, [r0], #4147
+ strneh r8, [r0], #2148
+ b 2b @ loop_inner149
+150
+5: @ draw_md:151
+ subs lr, lr, #1152
+ ldrgeb r7, [r11], #1 @ MD pixel153
+ blt 2b @ loop_inner154
+ cmp r3, r7, lsl #26 @ MD has bg pixel?155
+.if \do_md156
+ mov r7, r7, lsl #1157
+ ldrneh r7 ,[r9, r7]158
+ strneh r7 ,[r0], #2 @ *dst++ = palmd[*pmd]159
+.else160
+ addne r0, r0, #2161
+.endif162
+ bne 5b @ draw_md163
+164
+ and r7 ,r8, #0x03e0165
+ mov r8, r8, lsl #11166
+ orr r8, r8, r8, lsr #(10+11)167
+ orr r8, r8, r7 ,lsl #1168
+ bic r8, r8, #0x0020 @ kill prio bit169
+ strh r8, [r0], #2 @ *dst++ = bgr2rgb(*p32x++)170
+171
+6: @ draw_md_32x:172
+ subs lr, lr, #1173
+ ldrgeb r7, [r11], #1 @ MD pixel174
+ blt 2b @ loop_inner175
+ cmp r3, r7, lsl #26 @ MD has bg pixel?176
+.if \do_md177
+ mov r7, r7, lsl #1178
+ ldrneh r7 ,[r9, r7] @ *dst++ = palmd[*pmd]179
+ moveq r7 ,r8 @ *dst++ = bgr2rgb(*p32x++)180
+ strh r7 ,[r0], #2181
+.else182
+ streqh r8, [r0] @ *dst++ = bgr2rgb(*p32x++)183
+ add r0, r0, #2184
+.endif185
+ b 6b @ draw_md_32x186
+.endm187
+188
+189
+@ packed pixel190
+@ note: this may read a few bytes over the end of PicoDraw2FB and dram,191
+@ so those should have a bit more alloc'ed than really needed.192
+@ unsigned short *dst, unsigned short *dram, int lines_sft_offs, int mdbg193
+.macro make_do_loop_pp name call_scan do_md194
+.global \name195
+\name:196
+ stmfd sp!, {r4-r11,lr}197
+198
+ PIC_LDR(lr, r9, Pico)199
+ PIC_LDR(r10,r9, Pico32xMem)200
+ ldr r9,=OFS_PMEM32x_pal_native201
libretro-picodrive-0~git20200112.tar.xz/pico/32x/memory.c -> libretro-picodrive-0~git20200716.tar.xz/pico/32x/memory.c
Changed
201
1
2
/*3
* PicoDrive4
* (C) notaz, 2009,2010,20135
+ * (C) kub, 20196
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
*/11
#include "../pico_int.h"12
#include "../memory.h"13
+14
#include "../../cpu/sh2/compiler.h"15
+DRC_DECLARE_SR;16
17
static const char str_mars[] = "MARS";18
19
20
#define REG8IN16(ptr, offs) ((u8 *)ptr)[(offs) ^ 1]21
22
// poll detection23
-#define POLL_THRESHOLD 324
+#define POLL_THRESHOLD 525
26
static struct {27
- u32 addr, cycles;28
+ u32 addr1, addr2, cycles;29
int cnt;30
} m68k_poll;31
32
static int m68k_poll_detect(u32 a, u32 cycles, u32 flags)33
{34
int ret = 0;35
+ // support polling on 2 addresses - seen in Wolfenstein36
+ int match = (a - m68k_poll.addr1 <= 2 || a - m68k_poll.addr2 <= 2);37
38
- if (a - 2 <= m68k_poll.addr && m68k_poll.addr <= a + 239
- && cycles - m68k_poll.cycles <= 64 && !SekNotPolling)40
+ if (match && cycles - m68k_poll.cycles <= 64 && !SekNotPolling)41
{42
- if (m68k_poll.cnt++ > POLL_THRESHOLD) {43
+ // detect split 32bit access by same cycle count, and ignore those44
+ if (cycles != m68k_poll.cycles && ++m68k_poll.cnt >= POLL_THRESHOLD) {45
if (!(Pico32x.emu_flags & flags)) {46
elprintf(EL_32X, "m68k poll addr %08x, cyc %u",47
a, cycles - m68k_poll.cycles);48
- ret = 1;49
}50
Pico32x.emu_flags |= flags;51
+ ret = 1;52
}53
}54
else {55
+ // reset poll state in case of restart by interrupt56
+ Pico32x.emu_flags &= ~(P32XF_68KCPOLL|P32XF_68KVPOLL);57
+ SekSetStop(0);58
m68k_poll.cnt = 0;59
- m68k_poll.addr = a;60
+ if (!match) {61
+ m68k_poll.addr2 = m68k_poll.addr1;62
+ m68k_poll.addr1 = a;63
+ }64
SekNotPolling = 0;65
}66
m68k_poll.cycles = cycles;67
68
Pico32x.emu_flags &= ~flags;69
SekSetStop(0);70
}71
- m68k_poll.addr = m68k_poll.cnt = 0;72
+ m68k_poll.addr1 = m68k_poll.addr2 = m68k_poll.cnt = 0;73
}74
75
-static void sh2_poll_detect(SH2 *sh2, u32 a, u32 flags, int maxcnt)76
+void NOINLINE p32x_sh2_poll_detect(u32 a, SH2 *sh2, u32 flags, int maxcnt)77
{78
- int cycles_left = sh2_cycles_left(sh2);79
+ u32 cycles_done = sh2_cycles_done_t(sh2);80
+ u32 cycles_diff = cycles_done - sh2->poll_cycles;81
82
- if (a == sh2->poll_addr && sh2->poll_cycles - cycles_left <= 10) {83
- if (sh2->poll_cnt++ > maxcnt) {84
+ // reading 2 consecutive 16bit values is probably a 32bit access. detect this85
+ // by checking address (max 2 bytes away) and cycles (max 2 cycles later).86
+ // no polling if more than 20 cycles have passed since last detect call.87
+ if (a - sh2->poll_addr <= 2 && CYCLES_GE(20, cycles_diff)) {88
+ if (CYCLES_GT(cycles_diff, 2) && ++sh2->poll_cnt >= maxcnt) {89
if (!(sh2->state & flags))90
elprintf_sh2(sh2, EL_32X, "state: %02x->%02x",91
sh2->state, sh2->state | flags);92
93
sh2->state |= flags;94
sh2_end_run(sh2, 1);95
pevt_log_sh2(sh2, EVT_POLL_START);96
- return;97
+#ifdef DRC_SH298
+ // mark this as an address used for polling if SDRAM99
+ if ((a & 0xc6000000) == 0x06000000) {100
+ unsigned char *p = sh2->p_drcblk_ram;101
+ p[(a & 0x3ffff) >> SH2_DRCBLK_RAM_SHIFT] |= 0x80;102
+ // mark next word too to enable poll fifo for 32bit access103
+ p[((a+2) & 0x3ffff) >> SH2_DRCBLK_RAM_SHIFT] |= 0x80;104
+ }105
+#endif106
}107
}108
- else109
+ else if (!(sh2->state & (SH2_STATE_CPOLL|SH2_STATE_VPOLL|SH2_STATE_RPOLL))) {110
sh2->poll_cnt = 0;111
- sh2->poll_addr = a;112
- sh2->poll_cycles = cycles_left;113
+ sh2->poll_addr = a;114
+ }115
+ sh2->poll_cycles = cycles_done;116
}117
118
-void p32x_sh2_poll_event(SH2 *sh2, u32 flags, u32 m68k_cycles)119
+void NOINLINE p32x_sh2_poll_event(SH2 *sh2, u32 flags, u32 m68k_cycles)120
{121
if (sh2->state & flags) {122
elprintf_sh2(sh2, EL_32X, "state: %02x->%02x", sh2->state,123
sh2->state & ~flags);124
125
- if (sh2->m68krcycles_done < m68k_cycles)126
+ if (sh2->m68krcycles_done < m68k_cycles && !(sh2->state & SH2_STATE_RUN))127
sh2->m68krcycles_done = m68k_cycles;128
129
pevt_log_sh2_o(sh2, EVT_POLL_END);130
+ sh2->state &= ~flags;131
}132
133
- sh2->state &= ~flags;134
- sh2->poll_addr = sh2->poll_cycles = sh2->poll_cnt = 0;135
+ if (!(sh2->state & (SH2_STATE_CPOLL|SH2_STATE_VPOLL|SH2_STATE_RPOLL)))136
+ sh2->poll_addr = sh2->poll_cycles = sh2->poll_cnt = 0;137
}138
139
-static void sh2s_sync_on_read(SH2 *sh2)140
+static void sh2s_sync_on_read(SH2 *sh2, unsigned cycles)141
{142
- int cycles;143
if (sh2->poll_cnt != 0)144
return;145
146
- cycles = sh2_cycles_done(sh2);147
- if (cycles > 600)148
- p32x_sync_other_sh2(sh2, sh2->m68krcycles_done + cycles / 3);149
+ if (p32x_sh2_ready(sh2->other_sh2, cycles-250))150
+ p32x_sync_other_sh2(sh2, cycles);151
+}152
+153
+// poll fifo, stores writes to potential addresses used for polling.154
+// This is used to correctly deliver syncronisation data to the 3 cpus. The155
+// fifo stores 16 bit values, 8/32 bit accesses must be adapted accordingly.156
+#define PFIFO_SZ 4157
+#define PFIFO_CNT 8158
+struct sh2_poll_fifo {159
+ u32 cycles;160
+ u32 a;161
+ u16 d;162
+ int cpu;163
+} sh2_poll_fifo[PFIFO_CNT][PFIFO_SZ];164
+unsigned sh2_poll_rd[PFIFO_CNT], sh2_poll_wr[PFIFO_CNT]; // ringbuffer pointers165
+166
+static NOINLINE u32 sh2_poll_read(u32 a, u32 d, unsigned int cycles, SH2* sh2)167
+{168
+ int hix = (a >> 1) % PFIFO_CNT;169
+ struct sh2_poll_fifo *fifo = sh2_poll_fifo[hix];170
+ struct sh2_poll_fifo *p;171
+ int cpu = sh2 ? sh2->is_slave : -1;172
+ unsigned idx;173
+174
+ a &= ~0x20000000; // ignore writethrough bit175
+ // fetch oldest write to address from fifo, but stop when reaching the present176
+ idx = sh2_poll_rd[hix];177
+ while (idx != sh2_poll_wr[hix] && CYCLES_GE(cycles, fifo[idx].cycles)) {178
+ p = &fifo[idx];179
+ idx = (idx+1) % PFIFO_SZ;180
+181
+ if (cpu != p->cpu) {182
+ if (CYCLES_GT(cycles, p->cycles+80)) {183
+ // drop older fifo stores that may cause synchronisation problems.184
+ p->a = -1;185
+ } else if (p->a == a) {186
+ // replace current data with fifo value and discard fifo entry187
+ d = p->d;188
+ p->a = -1;189
+ break;190
+ }191
+ }192
+ }193
+ return d;194
+}195
+196
+static NOINLINE void sh2_poll_write(u32 a, u32 d, unsigned int cycles, SH2 *sh2)197
+{198
+ int hix = (a >> 1) % PFIFO_CNT;199
+ struct sh2_poll_fifo *fifo = sh2_poll_fifo[hix];200
+ struct sh2_poll_fifo *q;201
libretro-picodrive-0~git20200716.tar.xz/pico/32x/memory_arm.S
Added
201
1
2
+/*3
+ * PicoDrive 32X memory access functions, assembler version4
+ * (C) KUB, 20185
+ *6
+ * This work is licensed under the terms of MAME license.7
+ * See COPYING file in the top-level directory.8
+ */9
+10
+#include "../pico_int_offs.h"11
+12
+@ 32X bank sizes... TODO this should somehow come from an include file13
+.equ SH2_ROM_SHIFT, 10 @ 0x003fffff14
+.equ SH2_RAM_SHIFT, 14 @ 0x0003ffff15
+.equ SH2_DRAM_SHIFT,15 @ 0x0001ffff16
+.equ SH2_DA_SHIFT, 20 @ 0x00000fff17
+18
+.equ SH2_DRAM_OW, 1<<(32-SH2_DRAM_SHIFT) @ DRAM overwrite mode bit19
+20
+.text21
+.align 522
+23
+#if 024
+@ u32 a, SH2 *sh225
+.global sh2_read8_rom26
+.global sh2_read8_sdram27
+.global sh2_read8_da28
+.global sh2_read8_dram29
+.global sh2_read16_rom30
+.global sh2_read16_sdram31
+.global sh2_read16_da32
+.global sh2_read16_dram33
+.global sh2_read32_rom34
+.global sh2_read32_sdram35
+.global sh2_read32_da36
+.global sh2_read32_dram37
+#endif38
+39
+@ u32 a, u32 d, SH2 *sh240
+.global sh2_write8_sdram41
+.global sh2_write8_da42
+.global sh2_write8_dram43
+.global sh2_write16_sdram44
+.global sh2_write16_da45
+.global sh2_write16_dram46
+.global sh2_write32_sdram47
+.global sh2_write32_da48
+.global sh2_write32_dram49
+50
+#if 051
+sh2_read8_rom:52
+ ldr ip, [r1, #OFS_SH2_p_rom]53
+ eor r0, r0, #154
+ mov r0, r0, lsl #SH2_ROM_SHIFT55
+ ldrb r0, [ip, r0, lsr #SH2_ROM_SHIFT]56
+ bx lr57
+58
+sh2_read8_sdram:59
+ ldr ip, [r1, #OFS_SH2_p_sdram]60
+ eor r0, r0, #161
+ mov r0, r0, lsl #SH2_RAM_SHIFT62
+ ldrb r0, [ip, r0, lsr #SH2_RAM_SHIFT]63
+ bx lr64
+65
+sh2_read8_da:66
+ ldr ip, [r1, #OFS_SH2_p_da]67
+ eor r0, r0, #168
+ mov r0, r0, lsl #SH2_DA_SHIFT69
+ ldrb r0, [ip, r0, lsr #SH2_DA_SHIFT]70
+ bx lr71
+72
+sh2_read8_dram:73
+ ldr ip, [r1, #OFS_SH2_p_dram]74
+ eor r0, r0, #175
+ mov r0, r0, lsl #SH2_DRAM_SHIFT76
+ ldrb r0, [ip, r0, lsr #SH2_DRAM_SHIFT]77
+ bx lr78
+79
+sh2_read16_rom:80
+ ldr ip, [r1, #OFS_SH2_p_rom]81
+ mov r0, r0, lsl #SH2_ROM_SHIFT82
+ mov r0, r0, lsr #SH2_ROM_SHIFT83
+ ldrh r0, [ip, r0]84
+ bx lr85
+86
+sh2_read16_sdram:87
+ ldr ip, [r1, #OFS_SH2_p_sdram]88
+ mov r0, r0, lsl #SH2_RAM_SHIFT89
+ mov r0, r0, lsr #SH2_RAM_SHIFT90
+ ldrh r0, [ip, r0]91
+ bx lr92
+93
+sh2_read16_da:94
+ ldr ip, [r1, #OFS_SH2_p_da]95
+ mov r0, r0, lsl #SH2_DA_SHIFT96
+ mov r0, r0, lsr #SH2_DA_SHIFT97
+ ldrh r0, [ip, r0]98
+ bx lr99
+100
+sh2_read16_dram:101
+ ldr ip, [r1, #OFS_SH2_p_dram]102
+ mov r0, r0, lsl #SH2_DRAM_SHIFT103
+ mov r0, r0, lsr #SH2_DRAM_SHIFT104
+ ldrh r0, [ip, r0]105
+ bx lr106
+107
+sh2_read32_rom:108
+ ldr ip, [r1, #OFS_SH2_p_rom]109
+ mov r0, r0, lsl #SH2_ROM_SHIFT110
+ ldr r0, [ip, r0, lsr #SH2_ROM_SHIFT]111
+ mov r0, r0, ror #16112
+ bx lr113
+114
+sh2_read32_sdram:115
+ ldr ip, [r1, #OFS_SH2_p_sdram]116
+ mov r0, r0, lsl #SH2_RAM_SHIFT117
+ ldr r0, [ip, r0, lsr #SH2_RAM_SHIFT]118
+ mov r0, r0, ror #16119
+ bx lr120
+121
+sh2_read32_da:122
+ ldr ip, [r1, #OFS_SH2_p_da]123
+ mov r0, r0, lsl #SH2_DA_SHIFT124
+ ldr r0, [ip, r0, lsr #SH2_DA_SHIFT]125
+ mov r0, r0, ror #16126
+ bx lr127
+128
+sh2_read32_dram:129
+ ldr ip, [r1, #OFS_SH2_p_dram]130
+ mov r0, r0, lsl #SH2_DRAM_SHIFT131
+ ldr r0, [ip, r0, lsr #SH2_DRAM_SHIFT]132
+ mov r0, r0, ror #16133
+ bx lr134
+#endif135
+136
+sh2_write8_sdram:137
+ @ preserve r0-r2 for tail call138
+ ldr ip, [r2, #OFS_SH2_p_sdram]139
+ eor r3, r0, #1140
+ mov r3, r3, lsl #SH2_RAM_SHIFT141
+ strb r1, [ip, r3, lsr #SH2_RAM_SHIFT]142
+#ifdef DRC_SH2143
+ ldr r1, [r2, #OFS_SH2_p_drcblk_ram]144
+ ldrb r3, [r1, r3, lsr #SH2_RAM_SHIFT+1]145
+ cmp r3, #0146
+ bxeq lr147
+ @ need to load aligned 16 bit data for check148
+ bic r0, r0, #1149
+ mov r1, r0, lsl #SH2_RAM_SHIFT150
+ mov r1, r1, lsr #SH2_RAM_SHIFT151
+ ldrh r1, [ip, r1]152
+ b sh2_sdram_checks153
+#else154
+ bx lr155
+#endif156
+157
+sh2_write8_da:158
+ @ preserve r0 and r2 for tail call159
+ ldr ip, [r2, #OFS_SH2_p_da]160
+ eor r3, r0, #1161
+ mov r3, r3, lsl #SH2_DA_SHIFT162
+ strb r1, [ip, r3, lsr #SH2_DA_SHIFT]163
+#ifdef DRC_SH2164
+ ldr ip, [r2, #OFS_SH2_p_drcblk_da]165
+ ldrb r1, [ip, r3, lsr #SH2_DA_SHIFT+1]166
+ bic r0, r0, #1167
+ cmp r1, #0168
+ bxeq lr169
+ mov r1, #2170
+ b sh2_drc_wcheck_da171
+#else172
+ bx lr173
+#endif174
+175
+sh2_write8_dram:176
+ tst r1, #0xff177
+ ldrne ip, [r2, #OFS_SH2_p_dram]178
+ eorne r3, r0, #1179
+ movne r3, r3, lsl #SH2_DRAM_SHIFT180
+ strneb r1, [ip, r3, lsr #SH2_DRAM_SHIFT]181
+ bx lr182
+183
+sh2_write16_sdram:184
+ @ preserve r0-r2 for tail call185
+ ldr ip, [r2, #OFS_SH2_p_sdram]186
+ mov r3, r0, lsl #SH2_RAM_SHIFT187
+ mov r3, r3, lsr #SH2_RAM_SHIFT188
+ strh r1, [ip, r3]189
+#ifdef DRC_SH2190
+ ldr ip, [r2, #OFS_SH2_p_drcblk_ram]191
+ ldrb r3, [ip, r3, lsr #1]192
+ cmp r3, #0193
+ bxeq lr194
+ b sh2_sdram_checks195
+#else196
+ bx lr197
+#endif198
+199
+sh2_write16_da:200
+ @ preserve r0 and r2 for tail call201
libretro-picodrive-0~git20200112.tar.xz/pico/32x/pwm.c -> libretro-picodrive-0~git20200716.tar.xz/pico/32x/pwm.c
Changed
201
1
2
*/3
#include "../pico_int.h"4
5
-static int pwm_cycles;6
-static int pwm_mult;7
-static int pwm_ptr;8
-static int pwm_irq_reload;9
-static int pwm_doing_fifo;10
-static int pwm_silent;11
+static struct {12
+ int cycles;13
+ unsigned mult;14
+ int ptr;15
+ int irq_reload;16
+ int doing_fifo;17
+ int silent;18
+ int irq_timer;19
+ int irq_state;20
+ short current[2];21
+} pwm;22
+23
+enum { PWM_IRQ_LOCKED, PWM_IRQ_STOPPED, PWM_IRQ_LOW, PWM_IRQ_HIGH };24
25
void p32x_pwm_ctl_changed(void)26
{27
int control = Pico32x.regs[0x30 / 2];28
int cycles = Pico32x.regs[0x32 / 2];29
+ int pwm_irq_opt = PicoIn.opt & POPT_PWM_IRQ_OPT;30
31
cycles = (cycles - 1) & 0x0fff;32
- pwm_cycles = cycles;33
+ pwm.cycles = cycles;34
35
// supposedly we should stop FIFO when xMd is 0,36
// but mars test disagrees37
- pwm_mult = 0;38
+ pwm.mult = 0;39
if ((control & 0x0f) != 0)40
- pwm_mult = 0x10000 / cycles;41
+ pwm.mult = 0x10000 / cycles;42
43
- pwm_irq_reload = (control & 0x0f00) >> 8;44
- pwm_irq_reload = ((pwm_irq_reload - 1) & 0x0f) + 1;45
+ pwm.irq_timer = (control & 0x0f00) >> 8;46
+ pwm.irq_timer = ((pwm.irq_timer - 1) & 0x0f) + 1;47
+ pwm.irq_reload = pwm.irq_timer;48
+ pwm.irq_state = pwm_irq_opt ? PWM_IRQ_STOPPED: PWM_IRQ_LOCKED;49
50
if (Pico32x.pwm_irq_cnt == 0)51
- Pico32x.pwm_irq_cnt = pwm_irq_reload;52
+ Pico32x.pwm_irq_cnt = pwm.irq_reload;53
}54
55
static void do_pwm_irq(SH2 *sh2, unsigned int m68k_cycles)56
57
p32x_trigger_irq(sh2, m68k_cycles, P32XI_PWM);58
59
if (Pico32x.regs[0x30 / 2] & P32XP_RTP) {60
- p32x_event_schedule(m68k_cycles, P32X_EVENT_PWM, pwm_cycles / 3 + 1);61
+ p32x_event_schedule(m68k_cycles, P32X_EVENT_PWM, pwm.cycles / 3 + 1);62
// note: might recurse63
p32x_dreq1_trigger();64
}65
66
67
static int convert_sample(unsigned int v)68
{69
+ if (v > pwm.cycles)70
+ v = pwm.cycles;71
if (v == 0)72
return 0;73
- if (v > pwm_cycles)74
- v = pwm_cycles;75
- return ((int)v - pwm_cycles / 2) * pwm_mult;76
+ return v * pwm.mult - 0x10000/2;77
}78
79
#define consume_fifo(sh2, m68k_cycles) { \80
int cycles_diff = ((m68k_cycles) * 3) - Pico32x.pwm_cycle_p; \81
- if (cycles_diff >= pwm_cycles) \82
+ if (cycles_diff >= pwm.cycles) \83
consume_fifo_do(sh2, m68k_cycles, cycles_diff); \84
}85
86
87
unsigned short *fifo_r = mem->pwm_fifo[1];88
int sum = 0;89
90
- if (pwm_cycles == 0 || pwm_doing_fifo)91
+ if (pwm.cycles == 0 || pwm.doing_fifo)92
return;93
94
elprintf(EL_PWM, "pwm: %u: consume %d/%d, %d,%d ptr %d",95
- m68k_cycles, sh2_cycles_diff, sh2_cycles_diff / pwm_cycles,96
- Pico32x.pwm_p[0], Pico32x.pwm_p[1], pwm_ptr);97
+ m68k_cycles, sh2_cycles_diff, sh2_cycles_diff / pwm.cycles,98
+ Pico32x.pwm_p[0], Pico32x.pwm_p[1], pwm.ptr);99
100
// this is for recursion from dreq1 writes101
- pwm_doing_fifo = 1;102
+ pwm.doing_fifo = 1;103
104
- for (; sh2_cycles_diff >= pwm_cycles; sh2_cycles_diff -= pwm_cycles)105
+ while (sh2_cycles_diff >= pwm.cycles)106
{107
+ sh2_cycles_diff -= pwm.cycles;108
+109
if (Pico32x.pwm_p[0] > 0) {110
- fifo_l[0] = fifo_l[1];111
- fifo_l[1] = fifo_l[2];112
- fifo_l[2] = fifo_l[3];113
+ mem->pwm_index[0] = (mem->pwm_index[0]+1) % 4;114
Pico32x.pwm_p[0]--;115
- mem->pwm_current[0] = convert_sample(fifo_l[0]);116
- sum += mem->pwm_current[0];117
+ pwm.current[0] = convert_sample(fifo_l[mem->pwm_index[0]]);118
+ sum |= (u16)pwm.current[0];119
}120
if (Pico32x.pwm_p[1] > 0) {121
- fifo_r[0] = fifo_r[1];122
- fifo_r[1] = fifo_r[2];123
- fifo_r[2] = fifo_r[3];124
+ mem->pwm_index[1] = (mem->pwm_index[1]+1) % 4;125
Pico32x.pwm_p[1]--;126
- mem->pwm_current[1] = convert_sample(fifo_r[0]);127
- sum += mem->pwm_current[1];128
+ pwm.current[1] = convert_sample(fifo_r[mem->pwm_index[1]]);129
+ sum |= (u16)pwm.current[1];130
}131
132
- mem->pwm[pwm_ptr * 2 ] = mem->pwm_current[0];133
- mem->pwm[pwm_ptr * 2 + 1] = mem->pwm_current[1];134
- pwm_ptr = (pwm_ptr + 1) & (PWM_BUFF_LEN - 1);135
+ mem->pwm[pwm.ptr * 2 ] = pwm.current[0];136
+ mem->pwm[pwm.ptr * 2 + 1] = pwm.current[1];137
+ pwm.ptr = (pwm.ptr + 1) & (PWM_BUFF_LEN - 1);138
139
if (--Pico32x.pwm_irq_cnt == 0) {140
- Pico32x.pwm_irq_cnt = pwm_irq_reload;141
+ Pico32x.pwm_irq_cnt = pwm.irq_reload;142
do_pwm_irq(sh2, m68k_cycles);143
+ } else if (Pico32x.pwm_p[1] == 0 && pwm.irq_state >= PWM_IRQ_LOW) {144
+ // buffer underrun. Reduce reload rate if above programmed setting.145
+ if (pwm.irq_reload > pwm.irq_timer)146
+ pwm.irq_reload--;147
+ pwm.irq_state = PWM_IRQ_LOW;148
}149
}150
Pico32x.pwm_cycle_p = m68k_cycles * 3 - sh2_cycles_diff;151
- pwm_doing_fifo = 0;152
+ pwm.doing_fifo = 0;153
if (sum != 0)154
- pwm_silent = 0;155
+ pwm.silent = 0;156
}157
158
static int p32x_pwm_schedule_(SH2 *sh2, unsigned int m68k_now)159
{160
- unsigned int sh2_now = m68k_now * 3;161
+ unsigned int pwm_now = m68k_now * 3;162
int cycles_diff_sh2;163
164
- if (pwm_cycles == 0)165
+ if (pwm.cycles == 0)166
return 0;167
168
- cycles_diff_sh2 = sh2_now - Pico32x.pwm_cycle_p;169
- if (cycles_diff_sh2 >= pwm_cycles)170
+ cycles_diff_sh2 = pwm_now - Pico32x.pwm_cycle_p;171
+ if (cycles_diff_sh2 >= pwm.cycles)172
consume_fifo_do(sh2, m68k_now, cycles_diff_sh2);173
174
if (!((Pico32x.sh2irq_mask[0] | Pico32x.sh2irq_mask[1]) & 1))175
return 0; // masked by everyone176
177
- cycles_diff_sh2 = sh2_now - Pico32x.pwm_cycle_p;178
- return (Pico32x.pwm_irq_cnt * pwm_cycles179
+ cycles_diff_sh2 = pwm_now - Pico32x.pwm_cycle_p;180
+ return (Pico32x.pwm_irq_cnt * pwm.cycles181
- cycles_diff_sh2) / 3 + 1;182
}183
184
185
consume_fifo(sh2, m68k_cycles);186
187
a &= 0x0e;188
- switch (a) {189
- case 0: // control190
- case 2: // cycle191
+ switch (a/2) {192
+ case 0/2: // control193
+ case 2/2: // cycle194
d = Pico32x.regs[(0x30 + a) / 2];195
break;196
197
- case 4: // L ch198
+ case 4/2: // L ch199
if (Pico32x.pwm_p[0] == 3)200
d |= P32XP_FULL;201
libretro-picodrive-0~git20200112.tar.xz/pico/32x/sh2soc.c -> libretro-picodrive-0~git20200716.tar.xz/pico/32x/sh2soc.c
Changed
201
1
2
#include "../pico_int.h"3
#include "../memory.h"4
5
+#include "../../cpu/sh2/compiler.h"6
+DRC_DECLARE_SR;7
+8
// DMAC handling9
struct dma_chan {10
unsigned int sar, dar; // src, dst addr11
12
case 0:13
d = p32x_sh2_read8(chan->sar, sh2);14
p32x_sh2_write8(chan->dar, d, sh2);15
+ break;16
case 1:17
d = p32x_sh2_read16(chan->sar, sh2);18
p32x_sh2_write16(chan->dar, d, sh2);19
20
chan->sar += size;21
}22
23
+// optimization for copying around memory with SH2 DMA24
+static void dmac_memcpy(struct dma_chan *chan, SH2 *sh2)25
+{26
+ u32 size = (chan->chcr >> 10) & 3, up = chan->chcr & (1 << 14);27
+ int count;28
+29
+ if (!up || chan->tcr < 4)30
+ return;31
+#if MARS_CHECK_HACK32
+ // XXX Mars Check Program copies 32K longwords (128KB) from a 64KB buffer in33
+ // ROM or DRAM to SDRAM in 4-longword mode, overwriting an SDRAM comm area in34
+ // turn, which crashes the test on emulators without CPU cache emulation.35
+ // This may be a bug in Mars Check. As a kludge limit the transfer to 64KB,36
+ // which is what the check program test uses for checking the result.37
+ // A better way would clearly be to have a mechanism to patch the ROM...38
+ if (size == 3 && chan->tcr == 32768 && chan->dar == 0x06020000) size = 1;39
+#endif40
+ if (size == 3) size = 2; // 4-word xfer mode still counts in words41
+ // XXX check TCR being a multiple of 4 in 4-word xfer mode?42
+ // XXX check alignment of sar/dar, generating a bus error if unaligned?43
+ count = p32x_sh2_memcpy(chan->dar, chan->sar, chan->tcr, 1 << size, sh2);44
+45
+ chan->sar += count << size;46
+ chan->dar += count << size;47
+ chan->tcr -= count;48
+}49
+50
// DMA trigger by SH2 register write51
static void dmac_trigger(SH2 *sh2, struct dma_chan *chan)52
{53
54
55
if (chan->chcr & DMA_AR) {56
// auto-request transfer57
+ sh2->state |= SH2_STATE_SLEEP;58
+ if ((((chan->chcr >> 12) ^ (chan->chcr >> 14)) & 3) == 0 &&59
+ (((chan->chcr >> 14) ^ (chan->chcr >> 15)) & 1) == 1) {60
+ // SM == DM and either DM0 or DM1 are set. check for mem to mem copy61
+ dmac_memcpy(chan, sh2);62
+ }63
while ((int)chan->tcr > 0)64
dmac_transfer_one(sh2, chan);65
dmac_transfer_complete(sh2, chan);66
67
}68
69
// timer state - FIXME70
-static int timer_cycles[2];71
-static int timer_tick_cycles[2];72
+static u32 timer_cycles[2];73
+static u32 timer_tick_cycles[2];74
+static u32 timer_tick_factor[2];75
76
// timers77
void p32x_timers_recalc(void)78
79
80
// SH2 timer step81
for (i = 0; i < 2; i++) {82
+ sh2s[i].state &= ~SH2_TIMER_RUN;83
+ if (PREG8(sh2s[i].peri_regs, 0x80) & 0x20) // TME84
+ sh2s[i].state |= SH2_TIMER_RUN;85
tmp = PREG8(sh2s[i].peri_regs, 0x80) & 7;86
// Sclk cycles per timer tick87
if (tmp)88
89
else90
cycles = 2;91
timer_tick_cycles[i] = cycles;92
+ timer_tick_factor[i] = (1ULL << 32) / cycles;93
timer_cycles[i] = 0;94
elprintf(EL_32XP, "WDT cycles[%d] = %d", i, cycles);95
}96
}97
98
-void p32x_timers_do(unsigned int m68k_slice)99
+NOINLINE void p32x_timer_do(SH2 *sh2, unsigned int m68k_slice)100
{101
unsigned int cycles = m68k_slice * 3;102
- int cnt, i;103
-104
- // WDT timers105
- for (i = 0; i < 2; i++) {106
- void *pregs = sh2s[i].peri_regs;107
- if (PREG8(pregs, 0x80) & 0x20) { // TME108
- timer_cycles[i] += cycles;109
- cnt = PREG8(pregs, 0x81);110
- while (timer_cycles[i] >= timer_tick_cycles[i]) {111
- timer_cycles[i] -= timer_tick_cycles[i];112
- cnt++;113
- }114
- if (cnt >= 0x100) {115
- int level = PREG8(pregs, 0xe3) >> 4;116
- int vector = PREG8(pregs, 0xe4) & 0x7f;117
- elprintf(EL_32XP, "%csh2 WDT irq (%d, %d)",118
- i ? 's' : 'm', level, vector);119
- sh2_internal_irq(&sh2s[i], level, vector);120
- cnt &= 0xff;121
- }122
- PREG8(pregs, 0x81) = cnt;123
+ void *pregs = sh2->peri_regs;124
+ int cnt; int i = sh2->is_slave;125
+126
+ // WDT timer127
+ timer_cycles[i] += cycles;128
+ if (timer_cycles[i] > timer_tick_cycles[i]) {129
+ // cnt = timer_cycles[i] / timer_tick_cycles[i];130
+ cnt = (1ULL * timer_cycles[i] * timer_tick_factor[i]) >> 32;131
+ timer_cycles[i] -= timer_tick_cycles[i] * cnt;132
+133
+ cnt += PREG8(pregs, 0x81);134
+ if (cnt >= 0x100) {135
+ int level = PREG8(pregs, 0xe3) >> 4;136
+ int vector = PREG8(pregs, 0xe4) & 0x7f;137
+ elprintf(EL_32XP, "%csh2 WDT irq (%d, %d)",138
+ i ? 's' : 'm', level, vector);139
+ sh2_internal_irq(sh2, level, vector);140
+ cnt &= 0xff;141
}142
+ PREG8(pregs, 0x81) = cnt;143
}144
}145
146
147
// SH2 internal peripheral memhandlers148
// we keep them in little endian format149
150
-u32 sh2_peripheral_read8(u32 a, SH2 *sh2)151
+u32 REGPARM(2) sh2_peripheral_read8(u32 a, SH2 *sh2)152
{153
u8 *r = (void *)sh2->peri_regs;154
u32 d;155
156
157
elprintf_sh2(sh2, EL_32XP, "peri r8 [%08x] %02x @%06x",158
a | ~0x1ff, d, sh2_pc(sh2));159
+ if ((a & 0x1c0) == 0x140) {160
+ // abused as comm area161
+ DRC_SAVE_SR(sh2);162
+ p32x_sh2_poll_detect(a, sh2, SH2_STATE_CPOLL, 3);163
+ DRC_RESTORE_SR(sh2);164
+ }165
return d;166
}167
168
-u32 sh2_peripheral_read16(u32 a, SH2 *sh2)169
+u32 REGPARM(2) sh2_peripheral_read16(u32 a, SH2 *sh2)170
{171
u16 *r = (void *)sh2->peri_regs;172
u32 d;173
174
- a &= 0x1ff;175
+ a &= 0x1fe;176
d = r[(a / 2) ^ 1];177
178
elprintf_sh2(sh2, EL_32XP, "peri r16 [%08x] %04x @%06x",179
a | ~0x1ff, d, sh2_pc(sh2));180
+ if ((a & 0x1c0) == 0x140) {181
+ // abused as comm area182
+ DRC_SAVE_SR(sh2);183
+ p32x_sh2_poll_detect(a, sh2, SH2_STATE_CPOLL, 3);184
+ DRC_RESTORE_SR(sh2);185
+ }186
return d;187
}188
189
-u32 sh2_peripheral_read32(u32 a, SH2 *sh2)190
+u32 REGPARM(2) sh2_peripheral_read32(u32 a, SH2 *sh2)191
{192
u32 d;193
+194
a &= 0x1fc;195
d = sh2->peri_regs[a / 4];196
197
elprintf_sh2(sh2, EL_32XP, "peri r32 [%08x] %08x @%06x",198
a | ~0x1ff, d, sh2_pc(sh2));199
+ if (a == 0x18c)200
+ // kludge for polling COMM while polling for end of DMA201
libretro-picodrive-0~git20200112.tar.xz/pico/arm_features.h -> libretro-picodrive-0~git20200716.tar.xz/pico/arm_features.h
Changed
34
1
2
3
#endif4
5
+// indexed branch (XB) via branch table (BT)6
+#ifdef __PIC__7
+#define PIC_XB(c,r,s) add##c pc, r, s8
+#define PIC_BT(a) b a9
+#else10
+#define PIC_XB(c,r,s) ldr##c pc, [pc, r, s]11
+#define PIC_BT(a) .word a12
+#endif13
+14
+// load data address (LDR) either via literal pool or via GOT15
+#ifdef __PIC__16
+// can't use pool loads since ldr= only allows a symbol or a constant expr :-(17
+#define PIC_LDR_INIT() \18
+ .macro pic_ldr r t a; \19
+ ldr \r, [pc, $.LD\@-.-8]; \20
+ ldr \t, [pc, $.LD\@-.-4]; \21
+ .LP\@:add \r, pc; \22
+ ldr \r, [\r, \t]; \23
+ add pc, $4; \24
+ .LD\@:.word _GLOBAL_OFFSET_TABLE_-.LP\@-8; \25
+ .word \a(GOT); \26
+ .endm;27
+#define PIC_LDR(r,t,a) pic_ldr r, t, a28
+#else29
+#define PIC_LDR_INIT()30
+#define PIC_LDR(r,t,a) ldr r, =a31
+#endif32
+33
#endif /* __ARM_FEATURES_H__ */34
libretro-picodrive-0~git20200112.tar.xz/pico/carthw/carthw.h -> libretro-picodrive-0~git20200716.tar.xz/pico/carthw/carthw.h
Changed
17
1
2
3
/* svp */4
+#include "../pico_types.h"5
#include "svp/ssp16.h"6
7
typedef struct {8
9
extern int carthw_ssf2_active;10
extern unsigned char carthw_ssf2_banks[8];11
void carthw_ssf2_startup(void);12
-void carthw_ssf2_write8(unsigned int a, unsigned int d);13
+void carthw_ssf2_write8(u32 a, u32 d);14
15
/* misc */16
void carthw_Xin1_startup(void);17
libretro-picodrive-0~git20200112.tar.xz/pico/carthw/svp/compiler.c -> libretro-picodrive-0~git20200716.tar.xz/pico/carthw/svp/compiler.c
Changed
53
1
2
/* spacial version of call for calling C needed on ios, since we use r9.. */3
static void emith_call_c_func(void *target)4
{5
- EOP_STMFD_SP(A_R7M|A_R9M);6
+ EOP_STMFD_SP(M2(7,9));7
emith_call(target);8
- EOP_LDMFD_SP(A_R7M|A_R9M);9
+ EOP_LDMFD_SP(M2(7,9));10
}11
#else12
#define emith_call_c_func emith_call13
14
}15
tr_mov16(0, *pc);16
tr_r0_to_STACK(*pc);17
- if (tmpv != A_COND_AL) {18
- u32 *real_ptr = tcache_ptr;19
- tcache_ptr = jump_op;20
- EOP_C_B(tr_neg_cond(tmpv),0,real_ptr - jump_op - 2);21
- tcache_ptr = real_ptr;22
- }23
+ if (tmpv != A_COND_AL)24
+ EOP_C_B_PTR(jump_op, tr_neg_cond(tmpv), 0,25
+ tcache_ptr - jump_op - 2);26
tr_mov16_cond(tmpv, 0, imm);27
if (tmpv != A_COND_AL)28
tr_mov16_cond(tr_neg_cond(tmpv), 0, *pc);29
30
ssp_block_table[pc];31
if (target != NULL)32
emith_jump(target);33
- else {34
- int ops = emith_jump(ssp_drc_next);35
- end_ptr = tcache_ptr;36
- // cause the next block to be emitted over jump instruction37
- tcache_ptr -= ops;38
- }39
+ else40
+ emith_jump(ssp_drc_next);41
}42
else {43
u32 *target1 = (pc < 0x400) ?44
45
tr_flush_dirty_ST();46
tr_flush_dirty_pmcrs();47
block_end = emit_block_epilogue(ccount, end_cond, jump_pc, pc);48
+ emith_pool_commit(0);49
+ emith_flush();50
51
if (tcache_ptr - (u32 *)tcache > DRC_TCACHE_SIZE/4) {52
elprintf(EL_ANOMALY|EL_STATUS|EL_SVP, "tcache overflow!\n");53
libretro-picodrive-0~git20200112.tar.xz/pico/carthw/svp/stub_arm.S -> libretro-picodrive-0~git20200716.tar.xz/pico/carthw/svp/stub_arm.S
Changed
61
1
2
3
#include "../../arm_features.h"4
5
-.syntax unified6
+@.syntax unified7
.text8
.align 29
10
11
bgt ssp_hle_902_loop12
13
tst r12, #114
- ldrhne r0, [r2], #215
- strhne r0, [r3], #216
+ ldrneh r0, [r2], #217
+ strneh r0, [r3], #218
19
ldr r0, [r7, #SSP_OFFS_IRAM_ROM]20
add r1, r7, #0x20021
22
mov r12, #0x400023
orr r12,r12,#0x001824
subs r12,r3, r1225
- subsne r12,r12,#0x040026
+ subnes r12,r12,#0x040027
blne tr_unhandled28
29
orr r2, r2, r2, lsl #1630
31
32
hle_07_036_no_ovrwr:33
tst r1, #234
- strhne r2, [r1], #0x3e @ align35
+ strneh r2, [r1], #0x3e @ align36
subne r0, r0, #137
subs r0, r0, #438
blt hle_07_036_l239
40
tst r0, #241
strne r2, [r1], #0x4042
tst r0, #143
- strhne r2, [r1], #244
+ strneh r2, [r1], #245
b hle_07_036_end_copy46
47
hle_07_036_ovrwr:48
49
50
hle_07_036_ol2:51
tst r0, #152
- ldrhne r3, [r1]53
+ ldrneh r3, [r1]54
andne r3, r3, r1255
orrne r3, r3, r256
- strhne r3, [r1], #257
+ strneh r3, [r1], #258
59
hle_07_036_end_copy:60
ldr r2, [r7, #SSP_OFFS_DRAM]61
libretro-picodrive-0~git20200112.tar.xz/pico/cd/gfx_dma.c -> libretro-picodrive-0~git20200716.tar.xz/pico/cd/gfx_dma.c
Changed
21
1
2
3
#include "cell_map.c"4
5
-#ifndef UTYPES_DEFINED6
-typedef unsigned short u16;7
-#endif8
-9
// check: Heart of the alien, jaguar xj 22010
PICO_INTERNAL void DmaSlowCell(unsigned int source, unsigned int a, int len, unsigned char inc)11
{12
13
asrc = cell_map(source >> 2) << 2;14
asrc |= source & 2;15
// if(a&1) d=(d<<8)|(d>>8); // ??16
- r[a>>1] = *(u16 *)(base + asrc);17
+ VideoWriteVRAM(a, *(u16 *)(base + asrc));18
source += 2;19
// AutoIncrement20
a=(u16)(a+inc);21
libretro-picodrive-0~git20200112.tar.xz/pico/cd/mcd.c -> libretro-picodrive-0~git20200716.tar.xz/pico/cd/mcd.c
Changed
17
1
2
if (SekShouldInterrupt())3
Pico_mcd->m.s68k_poll_a = 0;4
5
+ pprof_start(s68k);6
SekCycleCntS68k += cyc_do;7
#if defined(EMU_C68K)8
PicoCpuCS68k.cycles = cyc_do;9
10
#elif defined(EMU_F68K)11
SekCycleCntS68k += fm68k_emulate(&PicoCpuFS68k, cyc_do, 0) - cyc_do;12
#endif13
+ pprof_end(s68k);14
}15
16
static void pcd_set_cycle_mult(void)17
libretro-picodrive-0~git20200112.tar.xz/pico/cd/memory.c -> libretro-picodrive-0~git20200716.tar.xz/pico/cd/memory.c
Changed
16
1
2
uptr s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];3
uptr s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];4
5
+#ifndef _ASM_CD_MEMORY_C6
MAKE_68K_READ8(s68k_read8, s68k_read8_map)7
MAKE_68K_READ16(s68k_read16, s68k_read16_map)8
MAKE_68K_READ32(s68k_read32, s68k_read16_map)9
MAKE_68K_WRITE8(s68k_write8, s68k_write8_map)10
MAKE_68K_WRITE16(s68k_write16, s68k_write16_map)11
MAKE_68K_WRITE32(s68k_write32, s68k_write16_map)12
+#endif13
14
// -----------------------------------------------------------------15
16
libretro-picodrive-0~git20200112.tar.xz/pico/cd/memory_arm.S -> libretro-picodrive-0~git20200716.tar.xz/pico/cd/memory_arm.S
Changed
201
1
2
@* See COPYING file in the top-level directory.3
@*4
5
-#include "../pico_int_o32.h"6
+#include "../arm_features.h"7
+#include "../pico_int_offs.h"8
9
.equiv PCM_STEP_SHIFT, 1110
11
12
.extern PicoWrite16_io13
.extern m68k_comm_check14
15
+ PIC_LDR_INIT()16
17
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@18
19
20
@ r0=addr[in,out], r1,r2=tmp21
.macro cell_map22
ands r1, r0, #0x01c00023
- ldrne pc, [pc, r1, lsr #12]24
- beq 0f @ most common?25
- .long 0f26
- .long 0f27
- .long 0f28
- .long 0f29
- .long 1f30
- .long 1f31
- .long 2f32
- .long 3f33
+ PIC_XB(ne ,r1, lsr #12)34
+ b 0f @ most common?35
+ PIC_BT(0f)36
+ PIC_BT(0f)37
+ PIC_BT(0f)38
+ PIC_BT(0f)39
+ PIC_BT(1f)40
+ PIC_BT(1f)41
+ PIC_BT(2f)42
+ PIC_BT(3f)43
1: @ x16 cells44
and r1, r0, #0x7e00 @ col45
and r2, r0, #0x01fc @ row46
47
mov r3, #0x0e000048
0:49
cell_map50
- ldr r1, =Pico51
+ PIC_LDR(r1, r2, Pico)52
add r0, r0, r353
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd (used everywhere)54
eor r0, r0, #155
56
cmp r1, #0x2000 @ a120xx?57
bne PicoRead8_io58
59
- ldr r1, =Pico60
+ PIC_LDR(r1, r2, Pico)61
and r0, r0, #0x3f62
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd63
cmp r0, #0x0e64
- ldrlt pc, [pc, r0, lsl #2]65
+ PIC_XB(lt ,r0, lsl #2)66
b m_m68k_read8_hi67
- .long m_m68k_read8_r0068
- .long m_m68k_read8_r0169
- .long m_m68k_read8_r0270
- .long m_m68k_read8_r0371
- .long m_m68k_read8_r0472
- .long m_read_null @ unused bits73
- .long m_m68k_read8_r0674
- .long m_m68k_read8_r0775
- .long m_m68k_read8_r0876
- .long m_m68k_read8_r0977
- .long m_read_null @ reserved78
- .long m_read_null79
- .long m_m68k_read8_r0c80
- .long m_m68k_read8_r0d81
+ PIC_BT(m_m68k_read8_r00)82
+ PIC_BT(m_m68k_read8_r01)83
+ PIC_BT(m_m68k_read8_r02)84
+ PIC_BT(m_m68k_read8_r03)85
+ PIC_BT(m_m68k_read8_r04)86
+ PIC_BT(m_read_null) @ unused bits87
+ PIC_BT(m_m68k_read8_r06)88
+ PIC_BT(m_m68k_read8_r07)89
+ PIC_BT(m_m68k_read8_r08)90
+ PIC_BT(m_m68k_read8_r09)91
+ PIC_BT(m_read_null) @ reserved92
+ PIC_BT(m_read_null)93
+ PIC_BT(m_m68k_read8_r0c)94
+ PIC_BT(m_m68k_read8_r0d)95
m_m68k_read8_r00:96
add r1, r1, #0x11000097
ldr r0, [r1, #0x30]98
99
bx lr100
m_m68k_read8_r03:101
add r1, r1, #0x110000102
- push {r1, lr}103
+ stmfd sp!, {r1, lr}104
bl m68k_comm_check105
- pop {r1, lr}106
+ ldmfd sp!, {r1, lr}107
ldrb r0, [r1, #3]108
and r0, r0, #0xc7109
bx lr110
111
add r1, r1, #0x110000112
movge r0, #0113
bxge lr114
- add r1, r0115
- push {r1, lr}116
+ add r1, r1, r0117
+ stmfd sp!, {r1, lr}118
bl m68k_comm_check119
- pop {r1, lr}120
+ ldmfd sp!, {r1, lr}121
ldrb r0, [r1]122
bx lr123
124
125
mov r3, #0x0e0000126
0:127
cell_map128
- ldr r1, =Pico129
+ PIC_LDR(r1, r2, Pico)130
add r0, r0, r3131
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd132
bic r0, r0, #1133
134
bne PicoRead16_io135
136
m_m68k_read16_m68k_regs:137
- ldr r1, =Pico138
+ PIC_LDR(r1, r2, Pico)139
and r0, r0, #0x3e140
ldr r1, [r1, #OFS_Pico_rom] @ Pico.mcd141
cmp r0, #0x0e142
- ldrlt pc, [pc, r0, lsl #1]143
+ PIC_XB(lt ,r0, lsl #1)144
b m_m68k_read16_hi145
- .long m_m68k_read16_r00146
- .long m_m68k_read16_r02147
- .long m_m68k_read16_r04148
- .long m_m68k_read16_r06149
- .long m_m68k_read16_r08150
- .long m_read_null @ reserved151
- .long m_m68k_read16_r0c152
+ PIC_BT(m_m68k_read16_r00)153
+ PIC_BT(m_m68k_read16_r02)154
+ PIC_BT(m_m68k_read16_r04)155
+ PIC_BT(m_m68k_read16_r06)156
+ PIC_BT(m_m68k_read16_r08)157
+ PIC_BT(m_read_null) @ reserved158
+ PIC_BT(m_m68k_read16_r0c)159
m_m68k_read16_r00:160
add r1, r1, #0x110000161
ldr r0, [r1, #0x30]162
163
bx lr164
m_m68k_read16_r02:165
add r1, r1, #0x110000166
- push {r1, lr}167
+ stmfd sp!, {r1, lr}168
bl m68k_comm_check169
- pop {r1, lr}170
+ ldmfd sp!, {r1, lr}171
ldrb r2, [r1, #3]172
ldrb r0, [r1, #2]173
and r2, r2, #0xc7174
175
bxge lr176
177
add r1, r0, r1178
- push {r1, lr}179
+ stmfd sp!, {r1, lr}180
bl m68k_comm_check181
- pop {r0, lr}182
+ ldmfd sp!, {r0, lr}183
ldrh r0, [r0]184
mov r1, r0, lsr #8185
and r0, r0, #0xff186
187
0:188
mov r3, r1189
cell_map190
- ldr r2, =Pico191
+ PIC_LDR(r2, r1, Pico)192
add r0, r0, r12193
ldr r2, [r2, #OFS_Pico_rom] @ Pico.mcd194
ldr r2, [r2]195
196
0:197
mov r3, r1198
cell_map199
- ldr r1, =Pico200
+ PIC_LDR(r1, r2, Pico)201
libretro-picodrive-0~git20200112.tar.xz/pico/debug.c -> libretro-picodrive-0~git20200716.tar.xz/pico/debug.c
Changed
63
1
2
!!(Pico.sv.flags & SRF_ENABLED), !!(Pico.sv.flags & SRF_EEPROM), Pico.sv.eeprom_type); MVP;3
sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", Pico.sv.start, Pico.sv.end, Pico.m.sram_reg); MVP;4
sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status); MVP;5
+ sprintf(dstrp, "VDP regs 00-07: %02x %02x %02x %02x %02x %02x %02x %02x\n",reg[0],reg[1],reg[2],reg[3],reg[4],reg[5],reg[6],reg[7]); MVP;6
+ sprintf(dstrp, "VDP regs 08-0f: %02x %02x %02x %02x %02x %02x %02x %02x\n",reg[8],reg[9],reg[10],reg[11],reg[12],reg[13],reg[14],reg[15]); MVP;7
+ sprintf(dstrp, "VDP regs 10-17: %02x %02x %02x %02x %02x %02x %02x %02x\n",reg[16],reg[17],reg[18],reg[19],reg[20],reg[21],reg[22],reg[23]); MVP;8
+ sprintf(dstrp, "VDP regs 18-1f: %02x %02x %02x %02x %02x %02x %02x %02x\n",reg[24],reg[25],reg[26],reg[27],reg[28],reg[29],reg[30],reg[31]); MVP;9
+ r = (reg[5]<<9)+(reg[6]<<11);10
+ sprintf(dstrp, "sprite #0: %04x %04x %04x %04x\n",PicoMem.vram[r/2],PicoMem.vram[r/2+1],PicoMem.vram[r/2+2],PicoMem.vram[r/2+3]); MVP;11
sprintf(dstrp, "pal: %i, hw: %02x, frame#: %i, cycles: %u\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count, SekCyclesDone()); MVP;12
sprintf(dstrp, "M68k: PC: %06x, SR: %04x, irql: %i\n", SekPc, SekSr, SekIrqLevel); MVP;13
for (r = 0; r < 8; r++) {14
15
16
void PDebugZ80Frame(void)17
{18
- int lines, line_sample;19
+ int lines;20
21
if (PicoIn.AHW & PAHW_SMS)22
return;23
24
- if (Pico.m.pal) {25
+ if (Pico.m.pal)26
lines = 313;27
- line_sample = 68;28
- } else {29
+ else30
lines = 262;31
- line_sample = 93;32
- }33
34
z80_resetCycles();35
PsndStartFrame();36
37
- if (/*Pico.m.z80Run &&*/ !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80))38
- PicoSyncZ80(Pico.t.m68c_cnt + line_sample * 488);39
- if (PicoIn.sndOut)40
- PsndGetSamples(line_sample);41
-42
if (/*Pico.m.z80Run &&*/ !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80)) {43
PicoSyncZ80(Pico.t.m68c_cnt + 224 * 488);44
z80_int();45
}46
- if (PicoIn.sndOut)47
- PsndGetSamples(224);48
49
// sync z8050
if (/*Pico.m.z80Run &&*/ !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80)) {51
Pico.t.m68c_cnt += Pico.m.pal ? 151809 : 127671; // cycles adjusted for converter52
PicoSyncZ80(Pico.t.m68c_cnt);53
}54
- if (PicoIn.sndOut && ym2612.dacen && Pico.snd.dac_line < lines)55
- PsndDoDAC(lines - 1);56
- PsndDoPSG(lines - 1);57
+58
+ if (PicoIn.sndOut)59
+ PsndGetSamples(lines);60
61
timers_cycle();62
Pico.t.m68c_aim = Pico.t.m68c_cnt;63
libretro-picodrive-0~git20200112.tar.xz/pico/draw.c -> libretro-picodrive-0~git20200716.tar.xz/pico/draw.c
Changed
201
1
2
* line renderer3
* (c) Copyright Dave, 20044
* (C) notaz, 2006-20105
+ * (C) kub, 2019-20206
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
*/11
12
#include "pico_int.h"13
+#define FORCE // layer forcing via debug register?14
15
int (*PicoScanBegin)(unsigned int num) = NULL;16
int (*PicoScanEnd) (unsigned int num) = NULL;17
18
static int HighCacheB[41+1];19
static int HighPreSpr[80*2+1]; // slightly preprocessed sprites20
21
+unsigned int VdpSATCache[128]; // VDP sprite cache (1st 32 sprite attr bits)22
+23
#define LF_PLANE_1 (1 << 0)24
#define LF_SH (1 << 1) // must be = 225
#define LF_FORCE (1 << 2)26
27
#define SPRL_HAVE_LO 0x40 // *lo*28
#define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line29
#define SPRL_LO_ABOVE_HI 0x10 // low priority sprites may be on top of hi30
-unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES]; // sprite_count, ^flags, tile_count, [spritep]...31
+#define SPRL_HAVE_X 0x08 // have sprites with x != 032
+#define SPRL_TILE_OVFL 0x04 // tile limit exceeded on previous line33
+#define SPRL_HAVE_MASK0 0x02 // have sprite with x == 0 in 1st slot34
+#define SPRL_MASKED 0x01 // lo prio masking by sprite with x == 0 active35
+unsigned char HighLnSpr[240][4+MAX_LINE_SPRITES+1]; // sprite_count, ^flags, tile_count, sprites_total, [spritep]..., last_width36
37
int rendstatus_old;38
int rendlines;39
40
#define blockcpy memcpy41
#endif42
43
-#define TileNormMaker_(pix_func) \44
+#define TileNormMaker_(pix_func,ret) \45
{ \46
unsigned int t; \47
\48
49
t = (pack&0x0f000000)>>24; pix_func(5); \50
t = (pack&0x00f00000)>>20; pix_func(6); \51
t = (pack&0x000f0000)>>16; pix_func(7); \52
+ return ret; \53
}54
55
-#define TileFlipMaker_(pix_func) \56
+#define TileFlipMaker_(pix_func,ret) \57
{ \58
unsigned int t; \59
\60
61
t = (pack&0x000000f0)>> 4; pix_func(5); \62
t = (pack&0x00000f00)>> 8; pix_func(6); \63
t = (pack&0x0000f000)>>12; pix_func(7); \64
+ return ret; \65
}66
67
#define TileNormMaker(funcname, pix_func) \68
static void funcname(unsigned char *pd, unsigned int pack, int pal) \69
-TileNormMaker_(pix_func)70
+TileNormMaker_(pix_func,)71
72
#define TileFlipMaker(funcname, pix_func) \73
static void funcname(unsigned char *pd, unsigned int pack, int pal) \74
-TileFlipMaker_(pix_func)75
+TileFlipMaker_(pix_func,)76
77
#define TileNormMakerAS(funcname, pix_func) \78
-static void funcname(unsigned char *pd, unsigned char *mb, unsigned int pack, int pal) \79
-TileNormMaker_(pix_func)80
+static unsigned funcname(unsigned char *pd, unsigned m, unsigned int pack, int pal) \81
+TileNormMaker_(pix_func,m)82
83
#define TileFlipMakerAS(funcname, pix_func) \84
-static void funcname(unsigned char *pd, unsigned char *mb, unsigned int pack, int pal) \85
-TileFlipMaker_(pix_func)86
+static unsigned funcname(unsigned char *pd, unsigned m, unsigned int pack, int pal) \87
+TileFlipMaker_(pix_func,m)88
89
#define pix_just_write(x) \90
if (t) pd[x]=pal|t91
92
93
#endif94
95
+// AS: sprite mask bits in m shifted to bits 8-15, see DrawSpritesHiAS96
+97
// draw a sprite pixel (AS)98
#define pix_as(x) \99
- if (t & mb[x]) mb[x] = 0, pd[x] = pal | t100
+ if (t && (m & (1<<(x+8)))) m &= ~(1<<(x+8)), pd[x] = pal | t101
102
TileNormMakerAS(TileNormAS, pix_as)103
TileFlipMakerAS(TileFlipAS, pix_as)104
105
// draw a sprite pixel, process operator colors (AS)106
#define pix_sh_as(x) \107
- if (t & mb[x]) { \108
- mb[x] = 0; \109
+ if (t && (m & (1<<(x+8)))) { \110
+ m &= ~(1<<(x+8)); \111
if (t>=0xe) pd[x]=(pd[x]&0x3f)|(t<<6); /* c0 shadow, 80 hilight */ \112
else pd[x] = pal | t; \113
}114
115
TileFlipMakerAS(TileFlipSH_AS, pix_sh_as)116
117
#define pix_sh_as_onlyop(x) \118
- if (t & mb[x]) { \119
- mb[x] = 0; \120
+ if (t && (m & (1<<(x+8)))) { \121
+ m &= ~(1<<(x+8)); \122
pix_sh_onlyop(x); \123
}124
125
126
127
// mark pixel as sprite pixel (AS)128
#define pix_sh_as_onlymark(x) \129
- if (t) mb[x] = 0130
+ if (t) m &= ~(1<<(x+8))131
132
TileNormMakerAS(TileNormAS_onlymark, pix_sh_as_onlymark)133
TileFlipMakerAS(TileFlipAS_onlymark, pix_sh_as_onlymark)134
135
+#ifdef FORCE136
// forced both layer draw (through debug reg)137
#define pix_and(x) \138
pd[x] = (pd[x] & 0xc0) | (pd[x] & (pal | t))139
140
TileNormMaker(TileNorm_and, pix_and)141
TileFlipMaker(TileFlip_and, pix_and)142
143
+// forced sprite draw (through debug reg)144
+#define pix_sh_as_and(x) /* XXX is there S/H with forced draw? */ \145
+ if (m & (1<<(x+8))) { \146
+ m &= ~(1<<(x+8)); \147
+ if (t>=0xe) pd[x]=(pd[x]&0x3f)|(t<<6); /* c0 shadow, 80 hilight */ \148
+ else pd[x] = (pd[x] & 0xc0) | (pd[x] & (pal | t)); \149
+ }150
+ 151
+TileNormMakerAS(TileNormSH_AS_and, pix_sh_as_and)152
+TileFlipMakerAS(TileFlipSH_AS_and, pix_sh_as_and)153
+#endif154
+155
// --------------------------------------------156
157
#ifndef _ASM_DRAW_C158
159
int adj = ((ts->hscroll ^ dx) >> 3) & 1;160
cell -= adj + 1;161
ts->cells -= adj;162
+ PicoMem.vsram[0x3e] = PicoMem.vsram[0x3f] = plane_sh >> 16;163
}164
cell+=cellskip;165
tilex+=cellskip;166
167
//if((cell&1)==0)168
{169
int line,vscroll;170
- vscroll=PicoMem.vsram[(plane_sh&1)+(cell&~1)];171
+ vscroll=PicoMem.vsram[(plane_sh&1)+(cell&0x3e)];172
173
// Find the line in the name table174
line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..175
176
}177
178
code=PicoMem.vram[ts->nametab+nametabadd+(tilex&ts->xmask)];179
- if (code==blank) continue;180
+ if ((code<<16|ty)==blank) continue;181
if (code>>15) { // high priority tile182
int cval = code | (dx<<16) | (ty<<25);183
if(code&0x1000) cval^=7<<26;184
185
oldcode = code;186
// Get tile address/2:187
addr=(code&0x7ff)<<4;188
- if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip189
190
pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);191
}192
193
- pack = *(unsigned int *)(PicoMem.vram + addr);194
+ if (code & 0x1000) ty ^= 0xe; // Y-flip195
+ pack = *(unsigned int *)(PicoMem.vram + addr+ty);196
+197
if (!pack) {198
- blank = code;199
+ blank = code<<16|ty;200
continue;201
libretro-picodrive-0~git20200112.tar.xz/pico/draw2.c -> libretro-picodrive-0~git20200716.tar.xz/pico/draw2.c
Changed
73
1
2
#define LINE_WIDTH 3283
#endif4
5
-static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];6
+static unsigned char PicoDraw2FB_[(8+320) * (8+240+8) + 8];7
8
static int HighCache2A[41*(TILE_ROWS+1)+1+1]; // caches for high layers9
static int HighCache2B[41*(TILE_ROWS+1)+1+1];10
11
{12
nametab=(pvid->reg[3]&0x3e)<<9; // 32-cell mode13
nametab_step = 1<<5;14
+ if (!(PicoIn.opt&POPT_DIS_32C_BORDER))15
+ scrpos += 32;16
}17
nametab += nametab_step*start;18
19
20
else nametab=(pvid->reg[4]&0x07)<<12; // B21
22
scrpos = est->Draw2FB;23
+ if (!(pvid->reg[12]&1) && !(PicoIn.opt&POPT_DIS_32C_BORDER))24
+ scrpos += 32;25
scrpos+=8*LINE_WIDTH*(planestart-START_ROW);26
27
// Get vertical scroll value:28
29
short blank=-1; // The tile we know is blank30
unsigned char *scrpos = est->Draw2FB, *pd = 0;31
32
+ if (!(Pico.video.reg[12]&1) && !(PicoIn.opt&POPT_DIS_32C_BORDER))33
+ scrpos += 32;34
// *hcache++ = code|(dx<<16)|(trow<<27); // cache it35
scrpos+=(*hc++)*LINE_WIDTH - START_ROW*LINE_WIDTH*8;36
37
38
while(sy <= START_ROW*8) { sy+=8; tile+=tdeltay; height--; }39
40
scrpos = est->Draw2FB;41
+ if (!(Pico.video.reg[12]&1) && !(PicoIn.opt&POPT_DIS_32C_BORDER))42
+ scrpos += 32;43
scrpos+=(sy-START_ROW*8)*LINE_WIDTH;44
45
for (; height > 0; height--, sy+=8, tile+=tdeltay)46
47
int i,u,link=0;48
unsigned int *sprites[80]; // Sprites49
int y_min=START_ROW*8, y_max=END_ROW*8; // for a simple sprite masking50
+ int max_sprites = Pico.video.reg[12]&1 ? 80 : 64;51
52
table=pvid->reg[5]&0x7f;53
if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode54
table<<=8; // Get sprite table address/255
56
- for (i=u=0; u < 80; u++)57
+ for (i = u = 0; u < max_sprites && link < max_sprites; u++)58
{59
unsigned int *sprite=NULL;60
int code, code2, sx, sy, height;61
62
maxw = 264; maxcolc = 32;63
}64
65
+ // 32C border for centering? (for asm)66
+ est->rendstatus &= ~PDRAW_BORDER_32;67
+ if ((est->rendstatus&PDRAW_32_COLS) && !(PicoIn.opt&POPT_DIS_32C_BORDER))68
+ est->rendstatus |= PDRAW_BORDER_32;69
+70
// horizontal window?71
if ((win=pvid->reg[0x12]))72
{73
libretro-picodrive-0~git20200112.tar.xz/pico/draw2_arm.S -> libretro-picodrive-0~git20200716.tar.xz/pico/draw2_arm.S
Changed
76
1
2
* this is highly specialized, be careful if changing related C code!3
*/4
5
-#include "pico_int_o32.h"6
+#include "pico_int_offs.h"7
8
@ define these constants in your include file:9
@ .equiv START_ROW, 110
11
12
ldr r11,[sp, #9*4] @ est13
sub r4, r9, #(START_ROW<<24)14
+ ldr r7, [r11, #OFS_EST_rendstatus]15
ldr r11, [r11, #OFS_EST_Draw2FB]16
+ tst r7, #0x100 @ H32 border mode?17
+ addne r11, r11, #3218
mov r4, r4, asr #2419
mov r7, #328*820
mla r11, r4, r7, r11 @ scrpos+=8*328*(planestart-START_ROW);21
22
mov r9, #0xff000000 @ r9=prevcode=-123
mvn r6, #0 @ r6=prevy=-124
25
+ ldr r7, [r1, #OFS_EST_rendstatus]26
ldr r4, [r1, #OFS_EST_Draw2FB]27
ldr r2, [r0], #4 @ read y offset28
+ tst r7, #0x100 @ H32 border mode?29
+ addne r4, r4, #3230
mov r7, #32831
mla r2, r7, r2, r432
sub r12, r2, #(328*8*START_ROW) @ r12=scrpos33
34
35
ldr r4, [r11, #OFS_Pico_video_reg+12]36
mov r5, #1 @ nametab_step37
+ ldr r11, [r3, #OFS_EST_Draw2FB]38
tst r4, #1 @ 40 cell mode?39
andne r12, r12, #0xf000 @ 0x3c<<1040
- andeq r12, r12, #0xf80041
movne r5, r5, lsl #742
- moveq r5, r5, lsl #6 @ nametab_step43
-44
- and r4, r0, #0xff45
+ bne 0f46
+ ldr r7, [r3, #OFS_EST_rendstatus]47
+ and r12, r12, #0xf80048
+ mov r5, r5, lsl #6 @ nametab_step49
+ tst r7, #0x10050
+ addne r11, r11, #32 @ center screen in H32 mode51
+52
+0: and r4, r0, #0xff53
mla r12, r5, r4, r12 @ nametab += nametab_step*start;54
55
ldr r10, [r3, #OFS_EST_PicoMem_vram]56
57
58
mov r9, #0xff000000 @ r9=prevcode=-159
60
- ldr r11, [r3, #OFS_EST_Draw2FB]61
and r4, r0, #0xff62
add r11, r11, #328*863
sub r4, r4, #START_ROW64
65
and r3, lr, #0x600066
mov r3, r3, lsr #9 @ r3=pal=((code>>9)&0x30);67
68
+ ldr r0, [r1, #OFS_EST_rendstatus]69
ldr r11, [r1, #OFS_EST_Draw2FB]70
ldr r10, [r1, #OFS_EST_PicoMem_vram]71
+ tst r0, #0x100 @ H32 border mode?72
+ addne r11, r11, #3273
sub r1, r12, #(START_ROW*8)74
mov r0, #32875
mla r11, r1, r0, r11 @ scrpos+=(sy-START_ROW*8)*328;76
libretro-picodrive-0~git20200112.tar.xz/pico/draw_arm.S -> libretro-picodrive-0~git20200716.tar.xz/pico/draw_arm.S
Changed
201
1
2
/*3
* assembly optimized versions of most funtions from draw.c4
* (C) notaz, 2006-2010,20175
+ * (C) kub, 20206
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
* this is highly specialized, be careful if changing related C code!11
*/12
13
-#include "pico_int_o32.h"14
+#include "pico_int_offs.h"15
16
.extern DrawStripInterlace17
18
.equ PDRAW_SPRITES_MOVED, (1<<0)19
.equ PDRAW_WND_DIFF_PRIO, (1<<1)20
-.equ PDRAW_ACC_SPRITES, (1<<2)21
+.equ PDRAW_PARSE_SPRITES, (1<<2)22
.equ PDRAW_DIRTY_SPRITES, (1<<4)23
.equ PDRAW_PLANE_HI_PRIO, (1<<6)24
.equ PDRAW_SHHI_DONE, (1<<7)25
26
moveq r1, #0x000727
movgt r1, #0x00ff @ r1=ymask=(height<<8)|0xff; ...; // Y Mask in pixels28
29
- add r10, r10, #530
- cmp r10, #731
- subge r10, r10, #1 @ r10=shift[width] (5,6,6,7)32
+ cmp r10, #233
+ addlt r10, r10, #534
+ moveq r10, #535
+ movgt r10, #7 @ r10=shift[width] (5,6,5,7)36
37
ldr r2, [r12, #OFS_EST_DrawScanline]38
ldr lr, [r12, #OFS_EST_PicoMem_vram]39
40
41
mov r4, r8, lsr #8 @ pvid->reg[13]42
mov r4, r4, lsl #10 @ htab=pvid->reg[13]<<9; (halfwords)43
- tst r7, #244
- addne r4, r4, r2, lsl #2 @ htab+=DrawScanline<<1; // Offset by line45
- tst r7, #146
- biceq r4, r4, #0x1f @ htab&=~0xf; // Offset by tile47
- add r4, r4, r0, lsl #1 @ htab+=plane48
+49
+ ands r3, r7, #0x0350
+ beq 0f51
+ cmp r3, #252
+ mov r3, r2, lsl #2 @ htab+=DrawScanline<<1; // Offset by line53
+ biceq r3, #0x1f @ htab&=~0xf; // Offset by tile54
+ andlt r3, #0x1f55
+ add r4, r4, r356
+0: add r4, r4, r0, lsl #1 @ htab+=plane57
bic r4, r4, #0x00ff0000 @ just in case58
ldrh r3, [lr, r4] @ r3=hscroll59
60
61
bne .DrawStrip_interlace62
63
tst r0, r064
- movne r7, r7, lsr #1665
+ moveq r7, r7, lsl #1666
+ mov r7, r7, lsr #1667
68
@ Find the line in the name table69
add r2, r2, r770
71
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@72
73
.DrawStrip_vsscroll:74
+ tst r8, #1 @ if h40: lflags |= 0x1000075
+ orrne r0, r0, #0x1000076
+77
rsb r8, r3, #078
mov r8, r8, lsr #3 @ r8=tilex=(-ts->hscroll)>>379
bic r8, r8, #0x3fc0000080
81
tst r3, #0x0882
subne r10,r10, #1<<16 @ cells--83
subne r10,r10, #1<<24 @ cell-- // even more negative84
+85
+ add_c24 r1, lr, (OFS_PMEM_vsram-OFS_PMEM_vram)86
+ tst r0, #0x10000 @ h40?87
+ ldrne r3, [r1, #0x00] @ r3=vsram[0x00..0x01]88
+ ldreq r3, [r1, #0x40] @ r3=vsram[0x20..0x21]89
+ str r3, [r1, #0x7c] @ vsram[0x3e..0x3f]=r390
0:91
tst r9, #1<<3192
mov r3, #093
94
95
@ calc offset and read tileline code to r7, also calc ty96
add_c24 r7, lr, (OFS_PMEM_vsram-OFS_PMEM_vram)97
- add r7, r7, r10,asr #23 @ vsram + ((cell&~1)<<1)98
- bic r7, r7, #399
+ and r4, r10, #0x3e000000100
+ add r7, r7, r4, asr #23 @ vsram + ((cell&0x3e)<<1)101
tst r10,#0x8000 @ plane1?102
addne r7, r7, #2103
ldrh r7, [r7] @ r7=vscroll104
105
tst r7, #0x8000106
bne .DrawStrip_vs_hiprio107
108
+ orr r7, r7, r10, lsl #24 @ code | (ty << 24)109
cmp r7, r9110
beq .DrawStrip_vs_samecode @ we know stuff about this tile already111
112
113
@ interlace mode 2? Sonic 2?114
.DrawStrip_interlace:115
tst r0, r0116
- moveq r7, r7, lsl #21117
- movne r7, r7, lsl #5118
+ movne r7, r7, lsr #16119
+ mov r7, r7, lsl #21120
121
@ Find the line in the name table122
add r2, r7, r2, lsl #22 @ r2=(vscroll+(DrawScanline<<1))<<21 (11 bits);123
124
add r1, r11, r4 @ r1=pdest125
126
movs r7, r6, lsl #16127
- bpl .dtfc_loop @ !(code & 0x8000)128
cmp r5, r7, lsr #16129
beq .dtfc_samecode @ if (code==prevcode)130
131
132
.global DrawSpritesSHi133
134
DrawSpritesSHi:135
- ldr r3, [r0]136
+ ldrb r3, [r0]137
mov r12,#0xff138
ands r3, r3, #0x7f139
bxeq lr140
141
- stmfd sp!, {r1,r4-r11,lr} @ +est142
- strb r12,[r0,#2] @ set end marker143
- add r10,r0, #3 @ r10=HighLnSpr end144
+ stmfd sp!, {r1,r3-r11,lr} @ +est145
+ strb r12,[r0,#3] @ set end marker146
+ ldrb r12,[r0,#1]147
+ add r10,r0, #4 @ r10=HighLnSpr end148
+ mvn r12,r12149
+ tst r12,#0x6 @ masking in slot 1 and tile ovfl?150
+ ldmeqfd sp!, {r1,r3-r11,pc}151
add r10,r10,r3 @ r10=HighLnSpr end152
153
+ ldrb r12,[r10,#0] @ width of last sprite154
ldr r11,[r1, #OFS_EST_HighCol]155
+ str r12,[sp, #4]156
mov r12,#0xf157
ldr lr, [r1, #OFS_EST_PicoMem_vram]158
159
160
ldr r7, [sp] @ est161
ldr r1, [r7, #OFS_EST_HighPreSpr]162
cmp r0, #0xff163
- ldmeqfd sp!, {r1,r4-r11,pc} @ end of list164
+ ldmeqfd sp!, {r1,r3-r11,pc} @ end of list165
and r0, r0, #0x7f166
add r0, r1, r0, lsl #3167
168
169
and r7, r7, #7170
add r8, r8, r7, lsl #1 @ tile+=(row&7)<<1; // Tile address171
172
+ ldr r0, [sp, #4]173
+ add r6, r6, #1 @ inc now174
+ cmp r0, #0 @ check width of last sprite175
+ movne r6, r0176
+ movne r0, #0177
+ strne r0, [sp, #4]178
+179
mov r5, r5, lsl #4 @ delta<<=4; // Delta of address180
mov r3, r4, lsr #9 @ r3=pal=((code>>9)&0x30);181
182
- add r6, r6, #1 @ inc now183
adds r0, r2, #0 @ mov sx to r0 and set ZV flags184
b .dsprShi_loop_enter185
186
187
@ time to do some real work188
stmfd sp!, {r1,r3-r11,lr} @ +sh|prio<<1 +est189
mov r12,#0xff190
- strb r12,[r0,#2] @ set end marker191
- add r10,r0, #3192
+ strb r12,[r0,#3] @ set end marker193
+ ldrb r12,[r0,#1]194
+ add r10,r0 ,#4195
+ mvn r12,r12196
+ tst r12,#0x6 @ masking in slot 1 and tile ovfl?197
+ ldmeqfd sp!, {r1,r3-r11,pc}198
add r10,r10,r2 @ r10=HighLnSpr end199
200
+ ldrb r12,[r10,#0] @ width of last sprite201
libretro-picodrive-0~git20200112.tar.xz/pico/m68kif_cyclone.s -> libretro-picodrive-0~git20200716.tar.xz/pico/m68kif_cyclone.s
Changed
25
1
2
orrcc r0, r1, r0, lsl #163
bxcc lr4
5
- stmfd sp!,{r0,r1,lr}6
+ stmfd sp!,{r0,r1,r2,lr}7
mov lr, pc8
bx r19
mov r2, r0, lsl #1610
- ldmia sp, {r0,r1}11
+ ldmfd sp!, {r0,r1}12
str r2, [sp]13
add r0, r0, #214
mov lr, pc15
bx r116
- ldr r1, [sp]17
+ ldmfd sp!, {r1,lr}18
mov r0, r0, lsl #1619
orr r0, r1, r0, lsr #1620
- ldmfd sp!,{r1,r2,pc}21
+ bx lr22
23
24
cyclone_write8: @ u32 a, u8 d25
libretro-picodrive-0~git20200112.tar.xz/pico/memory.c -> libretro-picodrive-0~git20200716.tar.xz/pico/memory.c
Changed
134
1
2
m68k_write16_map[i] = (addr >> 1) | MAP_FLAG;3
}4
5
+#ifndef _ASM_MEMORY_C6
MAKE_68K_READ8(m68k_read8, m68k_read8_map)7
MAKE_68K_READ16(m68k_read16, m68k_read16_map)8
MAKE_68K_READ32(m68k_read32, m68k_read16_map)9
MAKE_68K_WRITE8(m68k_write8, m68k_write8_map)10
MAKE_68K_WRITE16(m68k_write16, m68k_write16_map)11
MAKE_68K_WRITE32(m68k_write32, m68k_write16_map)12
+#endif13
14
// -----------------------------------------------------------------15
16
17
static void psg_write_68k(u32 d)18
{19
// look for volume write and update if needed20
- if ((d & 0x90) == 0x90 && Pico.snd.psg_line < Pico.m.scanline)21
+ if ((d & 0x90) == 0x90)22
PsndDoPSG(Pico.m.scanline);23
24
SN76496Write(d);25
26
{27
if ((d & 0x90) == 0x90) {28
int scanline = get_scanline(1);29
- if (Pico.snd.psg_line < scanline)30
- PsndDoPSG(scanline);31
+ PsndDoPSG(scanline);32
}33
34
SN76496Write(d);35
36
d = EEPROM_read();37
if (!(a & 1))38
d >>= 8;39
+ d &= 0xff;40
} else41
d = *(u8 *)(Pico.sv.data - Pico.sv.start + a);42
elprintf(EL_SRAMIO, "sram r8 [%06x] %02x @ %06x", a, d, SekPc);43
44
}45
if ((a & 0x6000) == 0x4000) { // FM Sound46
if (PicoIn.opt & POPT_EN_FM)47
- Pico.m.status |= ym2612_write_local(a & 3, d & 0xff, 0) & 1;48
+ ym2612_write_local(a & 3, d & 0xff, 0);49
return;50
}51
// TODO: probably other VDP access too? Maybe more mirrors?52
53
54
static void PicoWrite16_vdp(u32 a, u32 d)55
{56
- if ((a & 0x00f9) == 0x0010) // PSG Sound57
+ if ((a & 0x00f9) == 0x0010) { // PSG Sound58
psg_write_68k(d);59
+ return;60
+ }61
if ((a & 0x00e0) == 0x0000) {62
PicoVideoWrite(a, d);63
return;64
65
static int get_scanline(int is_from_z80)66
{67
if (is_from_z80) {68
- int mclk_z80 = z80_cyclesDone() * 15;69
+ int mclk_z80 = (z80_cyclesLeft<0 ? Pico.t.z80c_aim : z80_cyclesDone()) * 15;70
int mclk_line = Pico.t.z80_scanline * 488 * 7;71
while (mclk_z80 - mclk_line >= 488 * 7)72
Pico.t.z80_scanline++, mclk_line += 488 * 7;73
74
int xcycles = z80_cycles << 8;75
76
/* check for overflows */77
- if ((mode_old & 4) && xcycles > Pico.t.timer_a_next_oflow)78
+ if ((mode_old & 4) && xcycles >= Pico.t.timer_a_next_oflow)79
ym2612.OPN.ST.status |= 1;80
81
- if ((mode_old & 8) && xcycles > Pico.t.timer_b_next_oflow)82
+ if ((mode_old & 8) && xcycles >= Pico.t.timer_b_next_oflow)83
ym2612.OPN.ST.status |= 2;84
85
/* update timer a */86
87
a &= 3;88
if (a == 1 && ym2612.OPN.ST.address == 0x2a) /* DAC data */89
{90
- int scanline = get_scanline(is_from_z80);91
- //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", Pico.snd.dac_line, scanline, d, is_from_z80);92
+ int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();93
+ //elprintf(EL_STATUS, "%03i dac w %08x z80 %i", cycles, d, is_from_z80);94
ym2612.dacout = ((int)d - 0x80) << 6;95
if (ym2612.dacen)96
- PsndDoDAC(scanline);97
+ PsndDoDAC(cycles);98
return 0;99
}100
101
102
return 0;103
}104
case 0x2b: { /* DAC Sel (YM2612) */105
- int scanline = get_scanline(is_from_z80);106
- if (ym2612.dacen != (d & 0x80)) {107
- ym2612.dacen = d & 0x80;108
- Pico.snd.dac_line = scanline;109
- }110
+ ym2612.dacen = d & 0x80;111
#ifdef __GP2X__112
- if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);113
+ if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));114
#endif115
return 0;116
}117
118
if (PicoIn.opt & POPT_EXT_FM)119
return YM2612Write_940(a, d, get_scanline(is_from_z80));120
#endif121
+ PsndDoFM(is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k());122
return YM2612Write_(a, d);123
}124
125
126
static void z80_md_ym2612_write(unsigned int a, unsigned char data)127
{128
if (PicoIn.opt & POPT_EN_FM)129
- Pico.m.status |= ym2612_write_local(a, data, 1) & 1;130
+ ym2612_write_local(a, data, 1);131
}132
133
static void z80_md_vdp_br_write(unsigned int a, unsigned char data)134
libretro-picodrive-0~git20200112.tar.xz/pico/memory.h -> libretro-picodrive-0~git20200716.tar.xz/pico/memory.h
Changed
33
1
2
3
#include "pico_port.h"4
5
-#ifndef UTYPES_DEFINED6
-typedef unsigned char u8;7
-typedef unsigned short u16;8
-typedef unsigned int u32;9
-#endif10
-typedef uintptr_t uptr; // unsigned pointer-sized int11
-12
#define M68K_MEM_SHIFT 1613
// minimum size we can map14
#define M68K_BANK_SIZE (1 << M68K_MEM_SHIFT)15
16
17
extern u32 m68k_read8(u32 a);18
extern u32 m68k_read16(u32 a);19
+extern u32 m68k_read32(u32 a);20
extern void m68k_write8(u32 a, u8 d);21
extern void m68k_write16(u32 a, u16 d);22
+extern void m68k_write32(u32 a, u32 d);23
+24
+extern u32 s68k_read8(u32 a);25
+extern u32 s68k_read16(u32 a);26
+extern u32 s68k_read32(u32 a);27
+extern void s68k_write8(u32 a, u8 d);28
+extern void s68k_write16(u32 a, u16 d);29
+extern void s68k_write32(u32 a, u32 d);30
31
// z8032
#define Z80_MEM_SHIFT 1333
libretro-picodrive-0~git20200112.tar.xz/pico/memory_amips.S -> libretro-picodrive-0~git20200716.tar.xz/pico/memory_amips.S
Changed
10
1
2
3
# OUT OF DATE4
5
-#include "pico_int_o32.h"6
+#include "pico_int_offs.h"7
8
.set noreorder9
.set noat10
libretro-picodrive-0~git20200112.tar.xz/pico/memory_arm.S -> libretro-picodrive-0~git20200716.tar.xz/pico/memory_arm.S
Changed
186
1
2
/*3
* PicoDrive4
* (C) notaz, 2006-20095
+ * (C) kub, 20196
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
*/10
11
-#include "pico_int_o32.h"12
+#include "arm_features.h"13
+#include "pico_int_offs.h"14
15
.equ SRR_MAPPED, (1 << 0)16
.equ SRR_READONLY, (1 << 1)17
18
.global PicoWrite8_io19
.global PicoWrite16_io20
21
+ PIC_LDR_INIT()22
+23
PicoRead8_sram: @ u32 a24
- ldr r3, =Pico25
+ PIC_LDR(r3, r1, Pico)26
ldr r1, [r3, #OFS_Pico_sv_end]27
cmp r0, r128
bgt m_read8_nosram29
30
ldmfd sp!,{r1,lr}31
tst r1, #132
moveq r0, r0, lsr #833
+ and r0, r0, #0xff34
bx lr35
36
37
38
cmp r2, #0x100039
bne PicoRead8_32x40
41
- ldr r3, =Pico42
+ PIC_LDR(r3, r1, Pico)43
mov r1, r044
ldr r0, [r3, #OFS_Pico_m_rotate]45
add r0, r0, #146
47
@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@48
49
PicoRead16_sram: @ u32 a, u32 d50
- ldr r3, =Pico51
+ PIC_LDR(r3, r1, Pico)52
ldr r1, [r3, #OFS_Pico_sv_end]53
cmp r0, r154
bgt m_read16_nosram55
56
cmp r2, #0x100057
bne PicoRead16_32x58
59
- ldr r3, =Pico60
+ PIC_LDR(r3, r2, Pico)61
and r2, r0, #0xff0062
ldr r0, [r3, #OFS_Pico_m_rotate]63
add r0, r0, #164
65
eor r2, r2, #0x00300066
eors r2, r2, #0x0000f167
bne PicoWrite8_32x68
- ldr r3, =Pico69
+ PIC_LDR(r3, r2, Pico)70
ldrb r2, [r3, #OFS_Pico_m_sram_reg]71
and r1, r1, #(SRR_MAPPED|SRR_READONLY)72
bic r2, r2, #(SRR_MAPPED|SRR_READONLY)73
74
eor r2, r2, #0x00300075
eors r2, r2, #0x0000f076
bne PicoWrite16_32x77
- ldr r3, =Pico78
+ PIC_LDR(r3, r2, Pico)79
ldrb r2, [r3, #OFS_Pico_m_sram_reg]80
and r1, r1, #(SRR_MAPPED|SRR_READONLY)81
bic r2, r2, #(SRR_MAPPED|SRR_READONLY)82
83
strb r2, [r3, #OFS_Pico_m_sram_reg]84
bx lr85
86
+.global m68k_read887
+.global m68k_read1688
+.global m68k_read3289
+.global m68k_write890
+.global m68k_write1691
+.global m68k_write3292
+93
+m68k_read8:94
+ PIC_LDR(r3, r2, m68k_read8_map)95
+ bic r0, r0, #0xff00000096
+ mov r2, r0, lsr #1697
+ ldr r3, [r3, r2, lsl #2]98
+ eor r2, r0, #199
+ movs r3, r3, lsl #1100
+ ldrccb r0, [r3, r2]101
+ bxcc lr102
+ bx r3103
+104
+m68k_read16:105
+ PIC_LDR(r3, r2, m68k_read16_map)106
+ bic r0, r0, #0xff000000107
+ mov r2, r0, lsr #16108
+ ldr r3, [r3, r2, lsl #2]109
+ bic r0, r0, #1110
+ movs r3, r3, lsl #1111
+ ldrcch r0, [r3, r0]112
+ bxcc lr113
+ bx r3114
+115
+m68k_read32:116
+ PIC_LDR(r3, r2, m68k_read16_map)117
+ bic r0, r0, #0xff000000118
+ mov r2, r0, lsr #16119
+ ldr r3, [r3, r2, lsl #2]120
+ bic r0, r0, #1121
+ movs r3, r3, lsl #1122
+ ldrcch r1, [r3, r0]!123
+ ldrcch r0, [r3, #2]124
+ orrcc r0, r0, r1, lsl #16125
+ bxcc lr126
+127
+ stmfd sp!, {r0, r3, r4, lr}128
+ mov lr, pc129
+ bx r3130
+ ldmfd sp!, {r1, r3}131
+ str r0, [sp]132
+ add r0, r1, #2133
+ mov lr, pc134
+ bx r3135
+ ldmfd sp!, {r1, lr}136
+ mov r0, r0, lsl #16137
+ mov r1, r1, lsl #16138
+ orr r0, r1, r0, lsr #16139
+ bx lr140
+141
+m68k_write8:142
+ PIC_LDR(r3, r2, m68k_write8_map)143
+ bic r0, r0, #0xff000000144
+ mov r2, r0, lsr #16145
+ ldr r3, [r3, r2, lsl #2]146
+ eor r2, r0, #1147
+ movs r3, r3, lsl #1148
+ strccb r1, [r3, r2]149
+ bxcc lr150
+ bx r3151
+152
+m68k_write16:153
+ PIC_LDR(r3, r2, m68k_write16_map)154
+ bic r0, r0, #0xff000000155
+ mov r2, r0, lsr #16156
+ ldr r3, [r3, r2, lsl #2]157
+ bic r0, r0, #1158
+ movs r3, r3, lsl #1159
+ strcch r1, [r3, r0]160
+ bxcc lr161
+ bx r3162
+163
+m68k_write32:164
+ PIC_LDR(r3, r2, m68k_write16_map)165
+ bic r0, r0, #0xff000000166
+ mov r2, r0, lsr #16167
+ ldr r3, [r3, r2, lsl #2]168
+ bic r0, r0, #1169
+ movs r3, r3, lsl #1170
+ movcc r2, r1, lsr #16171
+ strcch r2, [r3, r0]!172
+ strcch r1, [r3, #2]173
+ bxcc lr174
+175
+ stmfd sp!, {r0, r1, r3, lr}176
+ mov r1, r1, lsr #16177
+ mov lr, pc178
+ bx r3179
+ ldmfd sp!, {r0, r1, r3, lr}180
+ add r0, r0, #2181
+ bx r3182
+183
.pool184
185
@ vim:filetype=armasm186
libretro-picodrive-0~git20200112.tar.xz/pico/misc.c -> libretro-picodrive-0~git20200716.tar.xz/pico/misc.c
Changed
201
1
2
/*3
* rarely used EEPROM code4
* (C) notaz, 2006-20085
+ * (C) kub, 20206
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
11
#include "pico_int.h"12
13
-// H-counter table for hvcounter reads in 40col mode14
-// based on Gens code15
+// H-counter table for hvcounter reads in 40col mode, starting at HINT16
const unsigned char hcounts_40[] = {17
-0x07,0x07,0x08,0x08,0x08,0x09,0x09,0x0a,0x0a,0x0b,0x0b,0x0b,0x0c,0x0c,0x0d,0x0d,18
-0x0e,0x0e,0x0e,0x0f,0x0f,0x10,0x10,0x10,0x11,0x11,0x12,0x12,0x13,0x13,0x13,0x14,19
-0x14,0x15,0x15,0x15,0x16,0x16,0x17,0x17,0x18,0x18,0x18,0x19,0x19,0x1a,0x1a,0x1b,20
-0x1b,0x1b,0x1c,0x1c,0x1d,0x1d,0x1d,0x1e,0x1e,0x1f,0x1f,0x20,0x20,0x20,0x21,0x21,21
-0x22,0x22,0x23,0x23,0x23,0x24,0x24,0x25,0x25,0x25,0x26,0x26,0x27,0x27,0x28,0x28,22
-0x28,0x29,0x29,0x2a,0x2a,0x2a,0x2b,0x2b,0x2c,0x2c,0x2d,0x2d,0x2d,0x2e,0x2e,0x2f,23
-0x2f,0x30,0x30,0x30,0x31,0x31,0x32,0x32,0x32,0x33,0x33,0x34,0x34,0x35,0x35,0x35,24
-0x36,0x36,0x37,0x37,0x38,0x38,0x38,0x39,0x39,0x3a,0x3a,0x3a,0x3b,0x3b,0x3c,0x3c,25
-0x3d,0x3d,0x3d,0x3e,0x3e,0x3f,0x3f,0x3f,0x40,0x40,0x41,0x41,0x42,0x42,0x42,0x43,26
-0x43,0x44,0x44,0x45,0x45,0x45,0x46,0x46,0x47,0x47,0x47,0x48,0x48,0x49,0x49,0x4a,27
-0x4a,0x4a,0x4b,0x4b,0x4c,0x4c,0x4d,0x4d,0x4d,0x4e,0x4e,0x4f,0x4f,0x4f,0x50,0x50,28
-0x51,0x51,0x52,0x52,0x52,0x53,0x53,0x54,0x54,0x55,0x55,0x55,0x56,0x56,0x57,0x57,29
-0x57,0x58,0x58,0x59,0x59,0x5a,0x5a,0x5a,0x5b,0x5b,0x5c,0x5c,0x5c,0x5d,0x5d,0x5e,30
-0x5e,0x5f,0x5f,0x5f,0x60,0x60,0x61,0x61,0x62,0x62,0x62,0x63,0x63,0x64,0x64,0x64,31
-0x65,0x65,0x66,0x66,0x67,0x67,0x67,0x68,0x68,0x69,0x69,0x6a,0x6a,0x6a,0x6b,0x6b,32
-0x6c,0x6c,0x6c,0x6d,0x6d,0x6e,0x6e,0x6f,0x6f,0x6f,0x70,0x70,0x71,0x71,0x71,0x72,33
-0x72,0x73,0x73,0x74,0x74,0x74,0x75,0x75,0x76,0x76,0x77,0x77,0x77,0x78,0x78,0x79,34
-0x79,0x79,0x7a,0x7a,0x7b,0x7b,0x7c,0x7c,0x7c,0x7d,0x7d,0x7e,0x7e,0x7f,0x7f,0x7f,35
-0x80,0x80,0x81,0x81,0x81,0x82,0x82,0x83,0x83,0x84,0x84,0x84,0x85,0x85,0x86,0x86,36
-0x86,0x87,0x87,0x88,0x88,0x89,0x89,0x89,0x8a,0x8a,0x8b,0x8b,0x8c,0x8c,0x8c,0x8d,37
-0x8d,0x8e,0x8e,0x8e,0x8f,0x8f,0x90,0x90,0x91,0x91,0x91,0x92,0x92,0x93,0x93,0x94,38
-0x94,0x94,0x95,0x95,0x96,0x96,0x96,0x97,0x97,0x98,0x98,0x99,0x99,0x99,0x9a,0x9a,39
-0x9b,0x9b,0x9b,0x9c,0x9c,0x9d,0x9d,0x9e,0x9e,0x9e,0x9f,0x9f,0xa0,0xa0,0xa1,0xa1,40
-0xa1,0xa2,0xa2,0xa3,0xa3,0xa3,0xa4,0xa4,0xa5,0xa5,0xa6,0xa6,0xa6,0xa7,0xa7,0xa8,41
-0xa8,0xa9,0xa9,0xa9,0xaa,0xaa,0xab,0xab,0xab,0xac,0xac,0xad,0xad,0xae,0xae,0xae,42
-0xaf,0xaf,0xb0,0xb0,43
-0xe4,0xe4,0xe4,0xe5,0xe5,0xe6,0xe6,0xe6,0xe7,0xe7,0xe8,0xe8,0xe9,0xe9,0xe9,0xea,44
-0xea,0xeb,0xeb,0xeb,0xec,0xec,0xed,0xed,0xee,0xee,0xee,0xef,0xef,0xf0,0xf0,0xf1,45
-0xf1,0xf1,0xf2,0xf2,0xf3,0xf3,0xf3,0xf4,0xf4,0xf5,0xf5,0xf6,0xf6,0xf6,0xf7,0xf7,46
-0xf8,0xf8,0xf9,0xf9,0xf9,0xfa,0xfa,0xfb,0xfb,0xfb,0xfc,0xfc,0xfd,0xfd,0xfe,0xfe,47
-0xfe,0xff,0xff,0x00,0x00,0x00,0x01,0x01,0x02,0x02,0x03,0x03,0x03,0x04,0x04,0x05,48
-0x05,0x06,0x06,0x06,49
-0x07,0x07,0x08,0x08,0x08,0x09,0x09,0x0a,0x0a,0x0b,0x0b,0x0b,0x0c,0x0c,0x0d,0x0d,50
-0x0e,0x0e,0x0e,0x0f,0x0f,0x10,0x10,0x10,51
+0xa5,0xa6,0xa7,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xae,0xaf,0xb0,0xb1,0xb2,52
+0xb3,0xb4,0xb5,0xb5,0xe4,0xe5,0xe6,0xe7,0xe8,0xe8,0xe9,0xea,0xea,0xeb,0xec,0xed,53
+0xed,0xee,0xef,0xef,0xf0,0xf1,0xf2,0xf2,0xf3,0xf4,0xf4,0xf5,0xf6,0xf7,0xf7,0xf8,54
+0xf9,0xfa,0xfb,0xfc,0xfd,0xfd,0xfe,0xff,0x00,0x01,0x02,0x03,0x04,0x04,0x05,0x06,55
+0x07,0x08,0x09,0x0a,0x0b,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x12,0x13,0x14,56
+0x15,0x16,0x17,0x18,0x19,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x20,0x21,0x22,57
+0x23,0x24,0x25,0x26,0x27,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2e,0x2f,0x30,58
+0x31,0x32,0x33,0x34,0x35,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3c,0x3d,0x3e,59
+0x3f,0x40,0x41,0x42,0x43,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4a,0x4b,0x4c,60
+0x4d,0x4e,0x4f,0x50,0x51,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x58,0x59,0x5a,61
+0x5b,0x5c,0x5d,0x5e,0x5f,0x5f,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x66,0x67,0x68,62
+0x69,0x6a,0x6b,0x6c,0x6d,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0x74,0x75,0x76,63
+0x77,0x78,0x79,0x7a,0x7b,0x7b,0x7c,0x7d,0x7e,0x7f,0x80,0x81,0x82,0x82,0x83,0x84,64
+0x85,0x86,0x87,0x88,0x89,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x90,0x91,0x92,65
+0x93,0x94,0x95,0x96,0x97,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9e,0x9f,0xa0,66
+0xa1,0xa2,0xa3,0xa4,0xa5,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xac,0xad,0xae,67
};68
69
-// H-counter table for hvcounter reads in 32col mode70
+// H-counter table for hvcounter reads in 32col mode, starting at HINT71
const unsigned char hcounts_32[] = {72
-0x05,0x05,0x05,0x06,0x06,0x07,0x07,0x07,0x08,0x08,0x08,0x09,0x09,0x09,0x0a,0x0a,73
-0x0a,0x0b,0x0b,0x0b,0x0c,0x0c,0x0c,0x0d,0x0d,0x0d,0x0e,0x0e,0x0f,0x0f,0x0f,0x10,74
-0x10,0x10,0x11,0x11,0x11,0x12,0x12,0x12,0x13,0x13,0x13,0x14,0x14,0x14,0x15,0x15,75
-0x15,0x16,0x16,0x17,0x17,0x17,0x18,0x18,0x18,0x19,0x19,0x19,0x1a,0x1a,0x1a,0x1b,76
-0x1b,0x1b,0x1c,0x1c,0x1c,0x1d,0x1d,0x1d,0x1e,0x1e,0x1f,0x1f,0x1f,0x20,0x20,0x20,77
-0x21,0x21,0x21,0x22,0x22,0x22,0x23,0x23,0x23,0x24,0x24,0x24,0x25,0x25,0x26,0x26,78
-0x26,0x27,0x27,0x27,0x28,0x28,0x28,0x29,0x29,0x29,0x2a,0x2a,0x2a,0x2b,0x2b,0x2b,79
-0x2c,0x2c,0x2c,0x2d,0x2d,0x2e,0x2e,0x2e,0x2f,0x2f,0x2f,0x30,0x30,0x30,0x31,0x31,80
-0x31,0x32,0x32,0x32,0x33,0x33,0x33,0x34,0x34,0x34,0x35,0x35,0x36,0x36,0x36,0x37,81
-0x37,0x37,0x38,0x38,0x38,0x39,0x39,0x39,0x3a,0x3a,0x3a,0x3b,0x3b,0x3b,0x3c,0x3c,82
-0x3d,0x3d,0x3d,0x3e,0x3e,0x3e,0x3f,0x3f,0x3f,0x40,0x40,0x40,0x41,0x41,0x41,0x42,83
-0x42,0x42,0x43,0x43,0x43,0x44,0x44,0x45,0x45,0x45,0x46,0x46,0x46,0x47,0x47,0x47,84
-0x48,0x48,0x48,0x49,0x49,0x49,0x4a,0x4a,0x4a,0x4b,0x4b,0x4b,0x4c,0x4c,0x4d,0x4d,85
-0x4d,0x4e,0x4e,0x4e,0x4f,0x4f,0x4f,0x50,0x50,0x50,0x51,0x51,0x51,0x52,0x52,0x52,86
-0x53,0x53,0x53,0x54,0x54,0x55,0x55,0x55,0x56,0x56,0x56,0x57,0x57,0x57,0x58,0x58,87
-0x58,0x59,0x59,0x59,0x5a,0x5a,0x5a,0x5b,0x5b,0x5c,0x5c,0x5c,0x5d,0x5d,0x5d,0x5e,88
-0x5e,0x5e,0x5f,0x5f,0x5f,0x60,0x60,0x60,0x61,0x61,0x61,0x62,0x62,0x62,0x63,0x63,89
-0x64,0x64,0x64,0x65,0x65,0x65,0x66,0x66,0x66,0x67,0x67,0x67,0x68,0x68,0x68,0x69,90
-0x69,0x69,0x6a,0x6a,0x6a,0x6b,0x6b,0x6c,0x6c,0x6c,0x6d,0x6d,0x6d,0x6e,0x6e,0x6e,91
-0x6f,0x6f,0x6f,0x70,0x70,0x70,0x71,0x71,0x71,0x72,0x72,0x72,0x73,0x73,0x74,0x74,92
-0x74,0x75,0x75,0x75,0x76,0x76,0x76,0x77,0x77,0x77,0x78,0x78,0x78,0x79,0x79,0x79,93
-0x7a,0x7a,0x7b,0x7b,0x7b,0x7c,0x7c,0x7c,0x7d,0x7d,0x7d,0x7e,0x7e,0x7e,0x7f,0x7f,94
-0x7f,0x80,0x80,0x80,0x81,0x81,0x81,0x82,0x82,0x83,0x83,0x83,0x84,0x84,0x84,0x85,95
-0x85,0x85,0x86,0x86,0x86,0x87,0x87,0x87,0x88,0x88,0x88,0x89,0x89,0x89,0x8a,0x8a,96
-0x8b,0x8b,0x8b,0x8c,0x8c,0x8c,0x8d,0x8d,0x8d,0x8e,0x8e,0x8e,0x8f,0x8f,0x8f,0x90,97
-0x90,0x90,0x91,0x91,98
-0xe8,0xe8,0xe8,0xe9,0xe9,0xe9,0xea,0xea,0xea,0xeb,0xeb,0xeb,0xec,0xec,0xec,0xed,99
-0xed,0xed,0xee,0xee,0xee,0xef,0xef,0xf0,0xf0,0xf0,0xf1,0xf1,0xf1,0xf2,0xf2,0xf2,100
-0xf3,0xf3,0xf3,0xf4,0xf4,0xf4,0xf5,0xf5,0xf5,0xf6,0xf6,0xf6,0xf7,0xf7,0xf8,0xf8,101
-0xf8,0xf9,0xf9,0xf9,0xfa,0xfa,0xfa,0xfb,0xfb,0xfb,0xfc,0xfc,0xfc,0xfd,0xfd,0xfd,102
-0xfe,0xfe,0xfe,0xff,0xff,0x00,0x00,0x00,0x01,0x01,0x01,0x02,0x02,0x02,0x03,0x03,103
-0x03,0x04,0x04,0x04,104
-0x05,0x05,0x05,0x06,0x06,0x07,0x07,0x07,0x08,0x08,0x08,0x09,0x09,0x09,0x0a,0x0a,105
-0x0a,0x0b,0x0b,0x0b,0x0c,0x0c,0x0c,0x0d,106
+0x85,0x86,0x86,0x87,0x88,0x88,0x89,0x8a,0x8a,0x8b,0x8c,0x8d,0x8d,0x8e,0x8f,0x8f,107
+0x90,0x91,0x91,0x92,0x93,0xe9,0xe9,0xea,0xeb,0xeb,0xec,0xed,0xed,0xee,0xef,0xf0,108
+0xf0,0xf1,0xf2,0xf2,0xf3,0xf4,0xf4,0xf5,0xf6,0xf7,0xf7,0xf8,0xf9,0xf9,0xfa,0xfb,109
+0xfb,0xfc,0xfd,0xfe,0xfe,0xff,0x00,0x00,0x01,0x02,0x02,0x03,0x04,0x05,0x05,0x06,110
+0x07,0x07,0x08,0x09,0x09,0x0a,0x0b,0x0c,0x0c,0x0d,0x0e,0x0e,0x0f,0x10,0x10,0x11,111
+0x12,0x13,0x13,0x14,0x15,0x15,0x16,0x17,0x17,0x18,0x19,0x1a,0x1a,0x1b,0x1c,0x1c,112
+0x1d,0x1e,0x1e,0x1f,0x20,0x21,0x21,0x22,0x23,0x23,0x24,0x25,0x25,0x26,0x27,0x28,113
+0x28,0x29,0x2a,0x2a,0x2b,0x2c,0x2c,0x2d,0x2e,0x2f,0x2f,0x30,0x31,0x31,0x32,0x33,114
+0x33,0x34,0x35,0x36,0x36,0x37,0x38,0x38,0x39,0x3a,0x3a,0x3b,0x3c,0x3d,0x3d,0x3e,115
+0x3f,0x3f,0x40,0x41,0x41,0x42,0x43,0x44,0x44,0x45,0x46,0x46,0x47,0x48,0x48,0x49,116
+0x4a,0x4b,0x4b,0x4c,0x4d,0x4d,0x4e,0x4f,0x4f,0x50,0x51,0x52,0x52,0x53,0x54,0x54,117
+0x55,0x56,0x56,0x57,0x58,0x59,0x59,0x5a,0x5b,0x5b,0x5c,0x5d,0x5d,0x5e,0x5f,0x60,118
+0x60,0x61,0x62,0x62,0x63,0x64,0x64,0x65,0x66,0x67,0x67,0x68,0x69,0x69,0x6a,0x6b,119
+0x6b,0x6c,0x6d,0x6e,0x6e,0x6f,0x70,0x70,0x71,0x72,0x72,0x73,0x74,0x75,0x75,0x76,120
+0x77,0x77,0x78,0x79,0x79,0x7a,0x7b,0x7c,0x7c,0x7d,0x7e,0x7e,0x7f,0x80,0x80,0x81,121
+0x82,0x83,0x83,0x84,0x85,0x85,0x86,0x87,0x87,0x88,0x89,0x8a,0x8a,0x8b,0x8c,0x8c,122
};123
124
+// VDP transfer slots for blanked and active display in 32col and 40col mode.125
+// 1 slot is 488/171 = 2.8538 68k cycles in h32, and 488/210 = 2.3238 in h40126
+// In blanked display, all slots but 5(h32) / 6(h40) are usable for transfers,127
+// in active display only 16(h32) / 18(h40) slots can be used.128
+129
+// XXX inactive tables by slot#=cycles*maxslot#/488. should be through hv tables130
+// VDP transfer slots in inactive (blanked) display 32col mode.131
+// refresh slots: 250, 26, 58, 90, 122 -> 32, 64, 96, 128, 160132
+const unsigned char vdpcyc2sl_32_bl[] = { // 68k cycles/2 to slot #133
+// 0 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30134
+ 0, 0, 1, 2, 2, 3, 4, 4, 5, 6, 6, 7, 8, 8, 9, 10,135
+ 10, 11, 12, 12, 13, 14, 14, 15, 16, 17, 17, 18, 19, 19, 20, 21,136
+ 21, 22, 23, 23, 24, 25, 25, 26, 27, 27, 28, 29, 29, 30, 31, 31,137
+ 32, 33, 34, 34, 35, 36, 36, 37, 38, 38, 39, 40, 40, 41, 42, 42,138
+ 43, 44, 44, 45, 46, 46, 47, 48, 48, 49, 50, 51, 51, 52, 53, 53,139
+ 54, 55, 55, 56, 57, 57, 58, 59, 59, 60, 61, 61, 62, 63, 63, 64,140
+ 65, 65, 66, 67, 68, 68, 69, 70, 70, 71, 72, 72, 73, 74, 74, 75,141
+ 76, 76, 77, 78, 78, 79, 80, 80, 81, 82, 83, 83, 84, 85, 85, 86,142
+ 87, 87, 88, 89, 89, 90, 91, 91, 92, 93, 93, 94, 95, 95, 96, 97,143
+ 97, 98, 99,100,100,101,102,102,103,104,104,105,106,106,107,108,144
+ 108,109,110,110,111,112,112,113,114,114,115,116,117,117,118,119,145
+ 119,120,121,121,122,123,123,124,125,125,126,127,127,128,129,129,146
+ 130,131,131,132,133,134,134,135,136,136,137,138,138,139,140,140,147
+ 141,142,142,143,144,144,145,146,146,147,148,148,149,150,151,151,148
+ 152,153,153,154,155,155,156,157,157,158,159,159,160,161,161,162,149
+ 163,163,164,165,166,166,167,168,168,169,170,170,171,172,172,173,150
+};151
+// VDP transfer slots in inactive (blanked) display 40col mode.152
+// refresh slots: 250, 26, 58, 90, 122, 154 -> 40, 72, 104, 136, 168, 200153
+const unsigned char vdpcyc2sl_40_bl[] = { // 68k cycles/2 to slot #154
+// 0 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30155
+ 0, 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 10, 10, 11, 12,156
+ 13, 14, 15, 15, 16, 17, 18, 19, 20, 20, 21, 22, 23, 24, 25, 25,157
+ 26, 27, 28, 29, 30, 30, 31, 32, 33, 34, 35, 35, 36, 37, 38, 39,158
+ 40, 40, 41, 42, 43, 44, 45, 45, 46, 47, 48, 49, 50, 51, 51, 52,159
+ 53, 54, 55, 56, 56, 57, 58, 59, 60, 61, 61, 62, 63, 64, 65, 66,160
+ 66, 67, 68, 69, 70, 71, 71, 72, 73, 74, 75, 76, 76, 77, 78, 79,161
+ 80, 81, 81, 82, 83, 84, 85, 86, 86, 87, 88, 89, 90, 91, 91, 92,162
+ 93, 94, 95, 96, 96, 97, 98, 99,100,101,102,102,103,104,105,106,163
+ 107,107,108,109,110,111,112,112,113,114,115,116,117,117,118,119,164
+ 120,121,122,122,123,124,125,126,127,127,128,129,130,131,132,132,165
+ 133,134,135,136,137,137,138,139,140,141,142,142,143,144,145,146,166
+ 147,147,148,149,150,151,152,153,153,154,155,156,157,158,158,159,167
+ 160,161,162,163,163,164,165,166,167,168,168,169,170,171,172,173,168
+ 173,174,175,176,177,178,178,179,180,181,182,183,183,184,185,186,169
+ 187,188,188,189,190,191,192,193,193,194,195,196,197,198,198,199,170
+ 200,201,202,203,204,204,205,206,207,208,209,209,210,211,212,213,171
+};172
+// VDP transfer slots in active display 32col mode. Transfer slots (Hint=0):173
+// 11,25,40,48,56,72,80,88,104,112,120,136,144,152,167,168174
+const unsigned char vdpcyc2sl_32[] = { // 68k cycles/2 to slot #175
+// 0 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30176
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,177
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,178
+ 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,179
+ 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,180
+ 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5,181
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,182
+ 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,183
+ 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,184
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,185
+ 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10,186
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11,187
+ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,188
+ 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13,189
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14,190
+ 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15,191
+ 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,192
+};193
+// VDP transfer slots in active display 40col mode. Transfer slots (Hint=0):194
+// 21,47,55,63,79,87,95,111,119,127,143,151,159,175,183,191,206,207195
+const unsigned char vdpcyc2sl_40[] = { // 68k cycles/2 to slot #196
+// 0 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30197
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0198
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, // 32199
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 64200
+ 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 96201
libretro-picodrive-0~git20200112.tar.xz/pico/pico.c -> libretro-picodrive-0~git20200716.tar.xz/pico/pico.c
Changed
97
1
2
3
memset(&Pico.video,0,sizeof(Pico.video));4
memset(&Pico.m,0,sizeof(Pico.m));5
+ memset(&Pico.t,0,sizeof(Pico.t));6
7
Pico.video.pending_ints=0;8
z80_reset();9
10
Pico.video.reg[0] = Pico.video.reg[1] = 0x04;11
Pico.video.reg[0xc] = 0x81;12
Pico.video.reg[0xf] = 0x02;13
+ PicoVideoFIFOMode(0, 1);14
15
if (PicoIn.AHW & PAHW_MCD)16
PicoPowerMCD();17
18
PsndReset(); // pal must be known here19
20
// create an empty "dma" to cause 68k exec start at random frame location21
- if (Pico.m.dma_xfers == 0 && !(PicoIn.opt & POPT_DIS_VDP_FIFO))22
- Pico.m.dma_xfers = rand() & 0x1fff;23
+ PicoVideoFIFOWrite(rand() & 0x1fff, 0, 0, PVS_CPURD);24
25
SekFinishIdleDet();26
27
28
rendstatus_old = -1;29
}30
31
-// this table is wrong and should be removed32
-// keeping it for now to compensate wrong timing elswhere, mainly for Outrunners33
-static const int dma_timings[] = {34
- 83, 166, 83, 83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy35
- 102, 204, 102, 102, // vblank: 40cell:36
- 8, 16, 8, 8, // active: 32cell:37
- 17, 18, 9, 9 // ...38
-};39
-40
-static const int dma_bsycles[] = {41
- (488<<8)/83, (488<<8)/166, (488<<8)/83, (488<<8)/83,42
- (488<<8)/102, (488<<8)/204, (488<<8)/102, (488<<8)/102,43
- (488<<8)/8, (488<<8)/16, (488<<8)/8, (488<<8)/8,44
- (488<<8)/9, (488<<8)/18, (488<<8)/9, (488<<8)/945
-};46
-47
-// grossly inaccurate.. FIXME FIXXXMEE48
-PICO_INTERNAL int CheckDMA(void)49
-{50
- int burn = 0, xfers_can, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes51
- int xfers = Pico.m.dma_xfers;52
- int dma_op1;53
-54
- if(!(dma_op&2)) dma_op = (Pico.video.type==1) ? 0 : 1; // setting dma_timings offset here according to Gens55
- dma_op1 = dma_op;56
- if(Pico.video.reg[12] & 1) dma_op |= 4; // 40 cell mode?57
- if(!(Pico.video.status&8)&&(Pico.video.reg[1]&0x40)) dma_op|=8; // active display?58
- xfers_can = dma_timings[dma_op];59
- if(xfers <= xfers_can)60
- {61
- Pico.video.status &= ~SR_DMA;62
- if (!(dma_op & 2))63
- burn = xfers * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..64
- Pico.m.dma_xfers = 0;65
- } else {66
- if(!(dma_op&2)) burn = 488;67
- Pico.m.dma_xfers -= xfers_can;68
- }69
-70
- elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%u]",71
- Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());72
- //dprintf("~aim: %i, cnt: %i", Pico.t.m68c_aim, Pico.t.m68c_cnt);73
- return burn;74
-}75
-76
#include "pico_cmn.c"77
78
/* sync z80 to 68k */79
80
goto end;81
}82
83
- //if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode84
+ //if(Pico.video.reg[12]&0x2) Pico.video.status ^= SR_ODD; // change odd bit in interlace mode85
86
PicoFrameStart();87
PicoFrameHints();88
89
{90
if (!(PicoIn.AHW & PAHW_SMS)) {91
PicoFrameStart();92
- PicoDrawSync(223, 0);93
+ PicoDrawSync(Pico.m.pal?239:223, 0);94
} else {95
PicoFrameDrawOnlyMS();96
}97
libretro-picodrive-0~git20200112.tar.xz/pico/pico.h -> libretro-picodrive-0~git20200716.tar.xz/pico/pico.h
Changed
32
1
2
#define POPT_EN_DRC (1<<17)3
#define POPT_DIS_SPRITE_LIM (1<<18)4
#define POPT_DIS_IDLE_DET (1<<19)5
-#define POPT_EN_32X (1<<20)6
+#define POPT_EN_32X (1<<20) // x0 00007
#define POPT_EN_PWM (1<<21)8
+#define POPT_PWM_IRQ_OPT (1<<22)9
+#define POPT_DIS_FM_SSGEG (1<<23)10
11
#define PAHW_MCD (1<<0)12
#define PAHW_32X (1<<1)13
14
#endif15
void PicoDoHighPal555(int sh, int line, struct PicoEState *est);16
// internals17
-#define PDRAW_SPRITES_MOVED (1<<0) // (asm)18
+#define PDRAW_SPRITES_MOVED (1<<0) // SAT address modified19
#define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority20
+#define PDRAW_PARSE_SPRITES (1<<2) // SAT needs parsing21
#define PDRAW_INTERLACE (1<<3)22
-#define PDRAW_DIRTY_SPRITES (1<<4) // (asm)23
+#define PDRAW_DIRTY_SPRITES (1<<4) // SAT modified24
#define PDRAW_SONIC_MODE (1<<5) // mid-frame palette changes for 8bit renderer25
#define PDRAW_PLANE_HI_PRIO (1<<6) // have layer with all hi prio tiles (mk3)26
#define PDRAW_SHHI_DONE (1<<7) // layer sh/hi already processed27
#define PDRAW_32_COLS (1<<8) // 32 column mode28
+#define PDRAW_BORDER_32 (1<<9) // center H32 in buffer (32 px border)29
extern int rendstatus_old;30
extern int rendlines;31
32
libretro-picodrive-0~git20200112.tar.xz/pico/pico_cmn.c -> libretro-picodrive-0~git20200716.tar.xz/pico/pico_cmn.c
Changed
201
1
2
#endif3
4
// sync m68k to Pico.t.m68c_aim5
-static void SekSyncM68k(void)6
+static void SekExecM68k(int cyc_do)7
{8
- int cyc_do;9
- pprof_start(m68k);10
- pevt_log_m68k_o(EVT_RUN_START);11
-12
- while ((cyc_do = Pico.t.m68c_aim - Pico.t.m68c_cnt) > 0) {13
- Pico.t.m68c_cnt += cyc_do;14
+ Pico.t.m68c_cnt += cyc_do;15
16
#if defined(EMU_C68K)17
- PicoCpuCM68k.cycles = cyc_do;18
- CycloneRun(&PicoCpuCM68k);19
- Pico.t.m68c_cnt -= PicoCpuCM68k.cycles;20
+ PicoCpuCM68k.cycles = cyc_do;21
+ CycloneRun(&PicoCpuCM68k);22
+ Pico.t.m68c_cnt -= PicoCpuCM68k.cycles;23
#elif defined(EMU_M68K)24
- Pico.t.m68c_cnt += m68k_execute(cyc_do) - cyc_do;25
+ Pico.t.m68c_cnt += m68k_execute(cyc_do) - cyc_do;26
#elif defined(EMU_F68K)27
- Pico.t.m68c_cnt += fm68k_emulate(&PicoCpuFM68k, cyc_do, 0) - cyc_do;28
+ Pico.t.m68c_cnt += fm68k_emulate(&PicoCpuFM68k, cyc_do, 0) - cyc_do;29
#endif30
- }31
-32
SekCyclesLeft = 0;33
+}34
+35
+static void SekSyncM68k(void)36
+{37
+ int cyc_do;38
+ pprof_start(m68k);39
+ pevt_log_m68k_o(EVT_RUN_START);40
+41
+ while ((cyc_do = Pico.t.m68c_aim - Pico.t.m68c_cnt) > 0)42
+ SekExecM68k(cyc_do);43
44
SekTrace(0);45
pevt_log_m68k_o(EVT_RUN_END);46
47
static __inline void SekRunM68k(int cyc)48
{49
Pico.t.m68c_aim += cyc;50
+ Pico.t.m68c_cnt += cyc >> 6; // refresh slowdowns51
cyc = Pico.t.m68c_aim - Pico.t.m68c_cnt;52
if (cyc <= 0)53
return;54
- Pico.t.m68c_cnt += cyc >> 6; // refresh slowdowns55
SekSyncM68k();56
}57
58
59
}60
}61
62
-static void do_timing_hacks_as(struct PicoVideo *pv, int vdp_slots)63
+static void do_timing_hacks_end(struct PicoVideo *pv)64
{65
- pv->lwrite_cnt += vdp_slots - Pico.m.dma_xfers * 2; // wrong *266
- if (pv->lwrite_cnt > vdp_slots)67
- pv->lwrite_cnt = vdp_slots;68
- else if (pv->lwrite_cnt < 0)69
- pv->lwrite_cnt = 0;70
- if (Pico.m.dma_xfers)71
- SekCyclesBurn(CheckDMA());72
+ PicoVideoFIFOSync(488);73
}74
75
-static void do_timing_hacks_vb(void)76
+static void do_timing_hacks_start(struct PicoVideo *pv)77
{78
- if (unlikely(Pico.m.dma_xfers))79
- SekCyclesBurn(CheckDMA());80
+ SekCyclesBurn(PicoVideoFIFOHint()); // prolong cpu HOLD if necessary81
}82
83
static int PicoFrameHints(void)84
{85
struct PicoVideo *pv = &Pico.video;86
- int line_sample = Pico.m.pal ? 68 : 93;87
- int vdp_slots = (Pico.video.reg[12] & 1) ? 18 : 16;88
int lines, y, lines_vis, skip;89
int vcnt_wrap, vcnt_adj;90
unsigned int cycles;91
92
}93
}94
95
- // get samples from sound chips96
- if ((y == 224 || y == line_sample) && PicoIn.sndOut)97
- {98
- cycles = SekCyclesDone();99
-100
- if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80))101
- PicoSyncZ80(cycles);102
-#ifdef PICO_CD103
- if (PicoIn.AHW & PAHW_MCD)104
- pcd_sync_s68k(cycles, 0);105
-#endif106
-#ifdef PICO_32X107
- p32x_sync_sh2s(cycles);108
-#endif109
- PsndGetSamples(y);110
- }111
-112
// Run scanline:113
Pico.t.m68c_line_start = Pico.t.m68c_aim;114
- do_timing_hacks_as(pv, vdp_slots);115
+ do_timing_hacks_start(pv);116
CPUS_RUN(CYCLES_M68K_LINE);117
+ do_timing_hacks_end(pv);118
119
if (PicoLineHook) PicoLineHook();120
pevt_log_m68k_o(EVT_NEXT_LINE);121
122
#endif123
}124
125
- // VDP FIFO126
- pv->lwrite_cnt = 0;127
- Pico.video.status |= SR_EMPT;128
-129
memcpy(PicoIn.padInt, PicoIn.pad, sizeof(PicoIn.padInt));130
PAD_DELAY();131
132
133
}134
135
pv->status |= SR_VB | PVS_VB2; // go into vblank136
+ PicoVideoFIFOMode(pv->reg[1]&0x40, pv->reg[12]&1);137
138
// the following SekRun is there for several reasons:139
// there must be a delay after vblank bit is set and irq is asserted (Mazin Saga)140
// also delay between F bit (bit 7) is set in SR and IRQ happens (Ex-Mutants)141
// also delay between last H-int and V-int (Golden Axe 3)142
Pico.t.m68c_line_start = Pico.t.m68c_aim;143
- do_timing_hacks_vb();144
+ do_timing_hacks_start(pv);145
CPUS_RUN(CYCLES_M68K_VINT_LAG);146
147
pv->status |= SR_F;148
pv->pending_ints |= 0x20;149
if (pv->reg[1] & 0x20) {150
- Pico.t.m68c_aim = Pico.t.m68c_cnt + 11; // HACK151
- SekSyncM68k();152
+ if (Pico.t.m68c_cnt - Pico.t.m68c_aim < 60) // CPU blocked?153
+ SekExecM68k(11); // HACK154
elprintf(EL_INTS, "vint: @ %06x [%u]", SekPc, SekCyclesDone());155
SekInterrupt(6);156
}157
158
- cycles = SekCyclesDone();159
+ cycles = Pico.t.m68c_aim;160
if (Pico.m.z80Run && !Pico.m.z80_reset && (PicoIn.opt&POPT_EN_Z80)) {161
PicoSyncZ80(cycles);162
elprintf(EL_INTS, "zint");163
164
p32x_start_blank();165
#endif166
167
- // get samples from sound chips168
- if (y == 224 && PicoIn.sndOut)169
- PsndGetSamples(y);170
-171
// Run scanline:172
CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG);173
+ do_timing_hacks_end(pv);174
175
if (PicoLineHook) PicoLineHook();176
pevt_log_m68k_o(EVT_NEXT_LINE);177
178
179
// Run scanline:180
Pico.t.m68c_line_start = Pico.t.m68c_aim;181
- do_timing_hacks_vb();182
+ do_timing_hacks_start(pv);183
CPUS_RUN(CYCLES_M68K_LINE);184
+ do_timing_hacks_end(pv);185
186
if (PicoLineHook) PicoLineHook();187
pevt_log_m68k_o(EVT_NEXT_LINE);188
189
unsigned int l = PicoIn.overclockM68k * lines / 100;190
while (l-- > 0) {191
Pico.t.m68c_cnt -= CYCLES_M68K_LINE;192
- do_timing_hacks_vb();193
+ do_timing_hacks_start(pv);194
SekSyncM68k();195
+ do_timing_hacks_end(pv);196
}197
}198
199
pv->status &= ~(SR_VB | PVS_VB2);200
pv->status |= ((pv->reg[1] >> 3) ^ SR_VB) & SR_VB; // forced blanking201
libretro-picodrive-0~git20200112.tar.xz/pico/pico_int.h -> libretro-picodrive-0~git20200716.tar.xz/pico/pico_int.h
Changed
201
1
2
3
#ifndef PICO_INTERNAL_INCLUDED4
#define PICO_INTERNAL_INCLUDED5
-6
#include <stdio.h>7
#include <string.h>8
#include "pico_port.h"9
10
extern "C" {11
#endif12
13
+#include "pico_types.h"14
15
// ----------------------- 68000 CPU -----------------------16
#ifdef EMU_C68K17
18
19
// burn cycles while not in SekRun() and while in20
#define SekCyclesBurn(c) Pico.t.m68c_cnt += c21
-#define SekCyclesBurnRun(c) { \22
- SekCyclesLeft -= c; \23
-}24
+#define SekCyclesBurnRun(c) SekCyclesLeft -= c25
26
// note: sometimes may extend timeslice to delay an irq27
#define SekEndRun(after) { \28
29
#define z80_int_assert(a) Cz80_Set_IRQ(&CZ80, 0, (a) ? ASSERT_LINE : CLEAR_LINE)30
#define z80_nmi() Cz80_Set_IRQ(&CZ80, IRQ_LINE_NMI, 0)31
32
-#define z80_cyclesLeft (CZ80.ICount - CZ80.ExtraCycles)33
+#define z80_cyclesLeft CZ80.ICount34
#define z80_subCLeft(c) CZ80.ICount -= c35
#define z80_pc() Cz80_Get_Reg(&CZ80, CZ80_PC)36
37
38
#define z80_cyclesDone() \39
(Pico.t.z80c_aim - z80_cyclesLeft)40
41
-#define cycles_68k_to_z80(x) ((x) * 3823 >> 13)42
+#define cycles_68k_to_z80(x) ((x) * 3822 >> 13)43
44
// ----------------------- SH2 CPU -----------------------45
46
47
# define sh2_pc(sh2) (sh2)->ppc48
#else49
# define sh2_end_run(sh2, after_) do { \50
- int left_ = (signed int)(sh2)->sr >> 12; \51
- if (left_ > (after_)) { \52
- (sh2)->cycles_timeslice -= left_ - (after_); \53
- (sh2)->sr &= 0xfff; \54
- (sh2)->sr |= (after_) << 12; \55
+ int left_ = ((signed int)(sh2)->sr >> 12) - (after_); \56
+ if (left_ > 0) { \57
+ (sh2)->cycles_timeslice -= left_; \58
+ (sh2)->sr -= (left_ << 12); \59
} \60
} while (0)61
# define sh2_cycles_left(sh2) ((signed int)(sh2)->sr >> 12)62
63
# define sh2_pc(sh2) (sh2)->pc64
#endif65
66
-#define sh2_cycles_done(sh2) ((int)(sh2)->cycles_timeslice - sh2_cycles_left(sh2))67
+#define sh2_cycles_done(sh2) (unsigned)((int)(sh2)->cycles_timeslice - sh2_cycles_left(sh2))68
#define sh2_cycles_done_t(sh2) \69
- ((sh2)->m68krcycles_done * 3 + sh2_cycles_done(sh2))70
+ (unsigned)(C_M68K_TO_SH2(sh2, (sh2)->m68krcycles_done) + sh2_cycles_done(sh2))71
#define sh2_cycles_done_m68k(sh2) \72
- ((sh2)->m68krcycles_done + (sh2_cycles_done(sh2) / 3))73
+ (unsigned)((sh2)->m68krcycles_done + C_SH2_TO_M68K(sh2, sh2_cycles_done(sh2)))74
75
#define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]76
#define sh2_gbr(c) (c) ? ssh2.gbr : msh2.gbr77
78
// not part of real SR79
#define PVS_ACTIVE (1 << 16)80
#define PVS_VB2 (1 << 17) // ignores forced blanking81
+#define PVS_CPUWR (1 << 18) // CPU write blocked by FIFO full82
+#define PVS_CPURD (1 << 19) // CPU read blocked by FIFO not empty83
+#define PVS_DMAFILL (1 << 20) // DMA fill is waiting for fill data84
+#define PVS_DMABG (1 << 21) // background DMA operation is running85
+#define PVS_FIFORUN (1 << 22) // FIFO is processing86
87
struct PicoVideo88
{89
90
unsigned short addr; // Read/Write address91
unsigned int status; // Status bits (SR) and extra flags92
unsigned char pending_ints; // pending interrupts: ??VH????93
- signed char lwrite_cnt; // VDP write count during active display line94
+ signed char pad1; // was VDP write count95
unsigned short v_counter; // V-counter96
unsigned short debug; // raw debug register97
unsigned char debug_p; // ... parsed: PVD_*98
unsigned char addr_u; // bit16 of .addr99
unsigned char hint_cnt;100
- unsigned char pad[0x0b];101
+ unsigned char pad2;102
+ unsigned short hv_latch; // latched hvcounter value103
+ signed int fifo_cnt; // pending xfers for current FIFO queue entry104
+ unsigned char pad[0x04];105
};106
107
struct PicoMisc108
109
unsigned char eeprom_cycle; // EEPROM cycle number110
unsigned char eeprom_slave; // EEPROM slave word for X24C02 and better SRAMs111
unsigned char eeprom_status;112
- unsigned char status; // rapid_ym2612, multi_ym_updates113
- unsigned short dma_xfers; // 18114
+ unsigned char pad1; // was ym2612 status115
+ unsigned short dma_xfers; // 18 unused (was VDP DMA transfer count)116
unsigned char eeprom_wb[2]; // EEPROM latch/write buffer117
unsigned int frame_count; // 1c for movies and idle det118
};119
120
unsigned int *PicoOpt;121
unsigned char *Draw2FB;122
unsigned short HighPal[0x100];123
+ unsigned short SonicPal[0x100];124
+ int SonicPalCount;125
};126
127
struct PicoMem128
129
short len_use; // adjusted130
int len_e_add; // for non-int samples/frame131
int len_e_cnt;132
- short dac_line;133
- short psg_line;134
+ unsigned int clkl_mult; // z80 clocks per line in Q20135
+ unsigned int smpl_mult; // samples per line in Q16136
+ short dac_val, dac_val2; // last DAC sample137
+ unsigned int dac_pos; // last DAC position in Q20138
+ unsigned int fm_pos; // last FM position in Q20139
+ unsigned int psg_pos; // last PSG position in Q16140
};141
142
-// run tools/mkoffsets pico/pico_int_o32.h if you change these143
+// run tools/mkoffsets pico/pico_int_offs.h if you change these144
// careful with savestate compat145
struct Pico146
{147
148
{149
unsigned char sdram[0x40000];150
#ifdef DRC_SH2151
- unsigned short drcblk_ram[1 << (18 - SH2_DRCBLK_RAM_SHIFT)];152
+ unsigned char drcblk_ram[1 << (18 - SH2_DRCBLK_RAM_SHIFT)];153
+ unsigned char drclit_ram[1 << (18 - SH2_DRCBLK_RAM_SHIFT)];154
#endif155
unsigned short dram[2][0x20000/2]; // AKA fb156
union {157
158
unsigned char m68k_rom_bank[0x10000]; // M68K_BANK_SIZE159
};160
#ifdef DRC_SH2161
- unsigned short drcblk_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)];162
+ unsigned char drcblk_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)];163
+ unsigned char drclit_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)];164
#endif165
union {166
unsigned char b[0x800];167
168
unsigned short pal[0x100];169
unsigned short pal_native[0x100]; // converted to native (for renderer)170
signed short pwm[2*PWM_BUFF_LEN]; // PWM buffer for current frame171
- signed short pwm_current[2]; // current converted samples172
unsigned short pwm_fifo[2][4]; // [0] - current raw, others - fifo entries173
+ unsigned pwm_index[2]; // ringbuffer index for pwm_fifo174
};175
176
// area.c177
178
void PicoDrawSync(int to, int blank_last_line);179
void BackFill(int reg7, int sh, struct PicoEState *est);180
void FinalizeLine555(int sh, int line, struct PicoEState *est);181
+void PicoDrawSetOutBufMD(void *dest, int increment);182
extern int (*PicoScanBegin)(unsigned int num);183
extern int (*PicoScanEnd)(unsigned int num);184
-#define MAX_LINE_SPRITES 29185
-extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];186
+#define MAX_LINE_SPRITES 27 // +1 last sprite width, +4 hdr; total 32187
+extern unsigned char HighLnSpr[240][4+MAX_LINE_SPRITES+1];188
extern void *DrawLineDestBase;189
extern int DrawLineDestIncrement;190
+extern unsigned int VdpSATCache[128];191
192
// draw2.c193
void PicoDraw2Init(void);194
195
extern struct PicoMem PicoMem;196
extern void (*PicoResetHook)(void);197
extern void (*PicoLineHook)(void);198
-PICO_INTERNAL int CheckDMA(void);199
+PICO_INTERNAL int CheckDMA(int cycles);200
PICO_INTERNAL void PicoDetectRegion(void);201
libretro-picodrive-0~git20200112.tar.xz/pico/pico_port.h -> libretro-picodrive-0~git20200716.tar.xz/pico/pico_port.h
Changed
14
1
2
#define NOINLINE __attribute__((noinline))3
#define ALIGNED(n) __attribute__((aligned(n)))4
#define unlikely(x) __builtin_expect((x), 0)5
+#define likely(x) __builtin_expect(!!(x), 1)6
#else7
#define NOINLINE8
#define ALIGNED(n)9
#define unlikely(x) (x)10
+#define likely(x) (x)11
#endif12
13
#ifdef _MSC_VER14
libretro-picodrive-0~git20200716.tar.xz/pico/pico_types.h
Added
21
1
2
+#ifndef PICO_TYPES3
+#define PICO_TYPES4
+5
+#include <stdint.h>6
+7
+#ifndef __TAMTYPES_H__8
+#ifndef UTYPES_DEFINED9
+typedef uint8_t u8;10
+typedef int8_t s8;11
+typedef uint16_t u16;12
+typedef int16_t s16;13
+typedef uint32_t u32;14
+typedef int32_t s32;15
+#endif16
+#endif17
+18
+typedef uintptr_t uptr; /* unsigned pointer-sized int */19
+20
+#endif21
libretro-picodrive-0~git20200112.tar.xz/pico/sms.c -> libretro-picodrive-0~git20200716.tar.xz/pico/sms.c
Changed
39
1
2
struct PicoVideo *pv = &Pico.video;3
4
if (pv->type == 3) {5
+ if (PicoMem.cram[pv->addr & 0x1f] != d) Pico.m.dirtyPal = 1;6
PicoMem.cram[pv->addr & 0x1f] = d;7
- Pico.m.dirtyPal = 1;8
} else {9
PicoMem.vramb[pv->addr] = d;10
}11
12
13
case 0x40:14
case 0x41:15
- if ((d & 0x90) == 0x90 && Pico.snd.psg_line < Pico.m.scanline)16
+ if ((d & 0x90) == 0x90)17
PsndDoPSG(Pico.m.scanline);18
SN76496Write(d);19
break;20
21
}22
}23
24
- // 224 because of how it's done for MD...25
- if (y == 224 && PicoIn.sndOut)26
- PsndGetSamplesMS();27
-28
cycles_aim += cycles_line;29
cycles_done += z80_run((cycles_aim - cycles_done) >> 8) << 8;30
}31
32
- if (PicoIn.sndOut && Pico.snd.psg_line < lines)33
- PsndDoPSG(lines - 1);34
+ if (PicoIn.sndOut)35
+ PsndGetSamplesMS(lines);36
}37
38
void PicoFrameDrawOnlyMS(void)39
libretro-picodrive-0~git20200112.tar.xz/pico/sound/mix.c -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/mix.c
Changed
109
1
2
* See COPYING file in the top-level directory.3
*/4
5
+#include "string.h"6
+7
#define MAXOUT (+32767)8
#define MINOUT (-32768)9
10
/* limitter */11
-#define Limit(val, max,min) { \12
- if ( val > max ) val = max; \13
- else if ( val < min ) val = min; \14
-}15
+#define Limit16(val) \16
+ if ((short)val != val) val = (val < 0 ? MINOUT : MAXOUT)17
18
+int mix_32_to_16l_level;19
20
-void mix_32_to_16l_stereo(short *dest, int *src, int count)21
+static struct iir2 { // 2-pole IIR22
+ int x[2]; // sample buffer23
+ int y[2]; // filter intermediates24
+ int i;25
+} lfi2, rfi2;26
+27
+// NB ">>" rounds to -infinity, "/" to 0. To compensate the effect possibly use28
+// "-(-y>>n)" (round to +infinity) instead of "y>>n" in places.29
+30
+// NB uses Q12 fixpoint; samples mustn't have more than 20 bits for this.31
+#define QB 1232
+33
+34
+// exponential moving average filter for DC filtering35
+// y[n] = (x[n]-y[n-1])*(1/8192) (corner approx. 20Hz, gain 1)36
+static inline int filter_exp(struct iir2 *fi2, int x)37
{38
- int l, r;39
+ int xf = (x<<QB) - fi2->y[0];40
+ fi2->y[0] += xf >> 13;41
+ xf -= xf >> 2; // level reduction to avoid clipping from overshoot42
+ return xf>>QB;43
+}44
45
- for (; count > 0; count--)46
- {47
- l = r = *dest;48
- l += *src++;49
- r += *src++;50
- Limit( l, MAXOUT, MINOUT );51
- Limit( r, MAXOUT, MINOUT );52
- *dest++ = l;53
- *dest++ = r;54
- }55
+// unfiltered (for testing)56
+static inline int filter_null(struct iir2 *fi2, int x)57
+{58
+ return x;59
+}60
+61
+#define mix_32_to_16l_stereo_core(dest, src, count, lv, fl) { \62
+ int l, r; \63
+ \64
+ for (; count > 0; count--) \65
+ { \66
+ l = r = *dest; \67
+ l += *src++ >> lv; \68
+ r += *src++ >> lv; \69
+ l = fl(&lfi2, l); \70
+ r = fl(&rfi2, r); \71
+ Limit16(l); \72
+ Limit16(r); \73
+ *dest++ = l; \74
+ *dest++ = r; \75
+ } \76
+}77
+78
+void mix_32_to_16l_stereo_lvl(short *dest, int *src, int count)79
+{80
+ mix_32_to_16l_stereo_core(dest, src, count, mix_32_to_16l_level, filter_exp);81
}82
83
+void mix_32_to_16l_stereo(short *dest, int *src, int count)84
+{85
+ mix_32_to_16l_stereo_core(dest, src, count, 0, filter_exp);86
+}87
88
void mix_32_to_16_mono(short *dest, int *src, int count)89
{90
91
{92
l = *dest;93
l += *src++;94
- Limit( l, MAXOUT, MINOUT );95
+ l = filter_exp(&lfi2, l);96
+ Limit16(l);97
*dest++ = l;98
}99
}100
101
}102
}103
104
+void mix_reset(void)105
+{106
+ memset(&lfi2, 0, sizeof(lfi2));107
+ memset(&rfi2, 0, sizeof(rfi2));108
+}109
libretro-picodrive-0~git20200112.tar.xz/pico/sound/mix.h -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/mix.h
Changed
6
1
2
3
extern int mix_32_to_16l_level;4
void mix_32_to_16l_stereo_lvl(short *dest, int *src, int count);5
+void mix_reset(void);6
libretro-picodrive-0~git20200112.tar.xz/pico/sound/mix_arm.S -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/mix_arm.S
Changed
192
1
2
@ limit and shift up by 163
@ reg=int_sample, lr=1, r3=tmp, kills flags4
.macro Limitsh reg5
-@ movs r4, r3, asr #166
-@ cmnne r4, #17
-@ beq c32_16_no_overflow8
-@ tst r4, r49
-@ mov r3, #0x800010
-@ subpl r3, r3, #111
-12
add r3, lr, \reg, asr #1513
bics r3, r3, #1 @ in non-overflow conditions r3 is 0 or 114
moveq \reg, \reg, lsl #1615
16
subpl \reg, \reg, #0x0001000017
.endm18
19
+@ filter out DC offset20
+@ in=int_sample (max 20 bit), y=filter memory, r3=tmp21
+.macro DCfilt in y22
+ rsb r3, \y, \in, lsl #12 @ fixpoint 20.1223
+ add \y, \y, r3, asr #1324
+ sub r3, r3, r3, asr #2 @ reduce audio lvl some25
+ asr \in, r3, #1226
+.endm27
28
@ mix 32bit audio (with 16bits really used, upper bits indicate overflow) with normal 16 bit audio with left channel only29
@ warning: this function assumes dest is word aligned30
.global mix_32_to_16l_stereo @ short *dest, int *src, int count31
32
mix_32_to_16l_stereo:33
- stmfd sp!, {r4-r8,lr}34
-35
- mov lr, #136
+ stmfd sp!, {r4-r8,r10-r11,lr}37
38
mov r2, r2, lsl #139
subs r2, r2, #440
bmi m32_16l_st_end41
42
+ mov lr, #143
+ ldr r12, =filter44
+ ldmia r12, {r10-r11}45
+46
m32_16l_st_loop:47
ldmia r0, {r8,r12}48
ldmia r1!, {r4-r7}49
50
add r5, r5, r8, asr #1651
add r6, r6, r12,asr #1652
add r7, r7, r12,asr #1653
+ DCfilt r4, r1054
+ DCfilt r5, r1155
+ DCfilt r6, r1056
+ DCfilt r7, r1157
Limitsh r458
Limitsh r559
Limitsh r660
61
ldmia r1!,{r4,r5}62
add r4, r4, r663
add r5, r5, r664
+ DCfilt r4, r1065
+ DCfilt r5, r1166
Limitsh r467
Limitsh r568
orr r4, r5, r4, lsr #1669
str r4, [r0], #470
71
m32_16l_st_no_unal2:72
- ldmfd sp!, {r4-r8,lr}73
+ ldr r12, =filter74
+ stmia r12, {r10-r11}75
+ ldmfd sp!, {r4-r8,r10-r11,lr}76
bx lr77
78
79
80
.global mix_32_to_16_mono @ short *dest, int *src, int count81
82
mix_32_to_16_mono:83
- stmfd sp!, {r4-r8,lr}84
+ stmfd sp!, {r4-r8,r10-r11,lr}85
86
mov lr, #187
+ ldr r12, =filter88
+ ldr r10, [r12]89
90
@ check if dest is word aligned91
tst r0, #292
93
add r7, r7, r12,asr #1694
mov r12,r12,lsl #1695
add r6, r6, r12,asr #1696
+ DCfilt r4, r1097
+ DCfilt r5, r1098
+ DCfilt r6, r1099
+ DCfilt r7, r10100
Limitsh r4101
Limitsh r5102
Limitsh r6103
104
add r5, r5, r6, asr #16105
mov r6, r6, lsl #16106
add r4, r4, r6, asr #16107
+ DCfilt r4, r10108
+ DCfilt r5, r10109
Limitsh r4110
Limitsh r5111
orr r4, r5, r4, lsr #16112
113
114
m32_16_mo_no_unal2:115
tst r2, #1116
- ldmeqfd sp!, {r4-r8,pc}117
+ beq m32_16_mo_no_unal118
ldrsh r5, [r0]119
ldr r4, [r1], #4120
add r4, r4, r5121
+ DCfilt r4, r10122
Limit r4123
strh r4, [r0], #2124
125
- ldmfd sp!, {r4-r8,lr}126
+m32_16_mo_no_unal:127
+ ldr r12, =filter128
+ str r10, [r12]129
+ ldmfd sp!, {r4-r8,r10-r11,lr}130
bx lr131
132
133
134
.global mix_32_to_16l_stereo_lvl @ short *dest, int *src, int count135
136
mix_32_to_16l_stereo_lvl:137
- stmfd sp!, {r4-r9,lr}138
+ stmfd sp!, {r4-r11,lr}139
140
ldr r9, =mix_32_to_16l_level141
mov lr, #1142
ldr r9, [r9]143
+ ldr r12, =filter144
+ ldm r12, {r10-r11}145
146
mov r2, r2, lsl #1147
subs r2, r2, #4148
149
mov r5, r5, asr r9150
mov r6, r6, asr r9151
mov r7, r7, asr r9152
+ DCfilt r4, r10153
+ DCfilt r5, r11154
+ DCfilt r6, r10155
+ DCfilt r7, r11156
Limitsh r4157
Limitsh r5158
Limitsh r6159
160
add r5, r5, r6161
mov r4, r4, asr r9162
mov r5, r5, asr r9163
+ DCfilt r4, r10164
+ DCfilt r5, r11165
Limitsh r4166
Limitsh r5167
orr r4, r5, r4, lsr #16168
str r4, [r0], #4169
170
m32_16l_st_l_no_unal2:171
- ldmfd sp!, {r4-r9,lr}172
+ ldr r12, =filter173
+ stmia r12, {r10-r11}174
+ ldmfd sp!, {r4-r11,lr}175
bx lr176
177
#endif /* __GP2X__ */178
179
+.global mix_reset @ void180
+mix_reset:181
+ ldr r0, =filter182
+ mov r1, #0183
+ str r1, [r0]184
+ str r1, [r0, #4]185
+ bx lr186
+187
+.data188
+filter:189
+ .ds 8190
+191
@ vim:filetype=armasm192
libretro-picodrive-0~git20200112.tar.xz/pico/sound/sn76496.c -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/sn76496.c
Changed
25
1
2
/* If we exit the loop in the middle, Output[i] has to be inverted */3
/* and vol[i] incremented only if the exit status of the square */4
/* wave is 1. */5
+ left = 0;6
while (R->Count[i] <= 0)7
{8
- R->Count[i] += R->Period[i];9
+ if (R->Count[i] + R->Period[i]*4 < R->Period[i])10
+ left+= 4, R->Count[i] += R->Period[i]*4;11
+ else left++, R->Count[i] += R->Period[i];12
if (R->Count[i] > 0)13
{14
R->Output[i] ^= 1;15
16
vol[i] += R->Period[i];17
}18
if (R->Output[i]) vol[i] -= R->Count[i];19
+ /* Cut of anything above the sample freqency. It will only create */20
+ /* aliasing and hearable distortions anyway. */21
+ if (left > 1) vol[i] = STEP/2;22
}23
24
left = STEP;25
libretro-picodrive-0~git20200112.tar.xz/pico/sound/sound.c -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/sound.c
Changed
201
1
2
// master int buffer to mix to3
static int PsndBuffer[2*(44100+100)/50];4
5
-// dac, psg6
-static unsigned short dac_info[312+4]; // pos in sample buffer7
-8
// cdda output buffer9
short cdda_out_buffer[2*1152];10
11
12
13
void (*low_pass_filter)(int *buf32, int length) = low_pass_filter_stereo;14
15
-static void dac_recalculate(void)16
-{17
- int lines = Pico.m.pal ? 313 : 262;18
- int mid = Pico.m.pal ? 68 : 93;19
- int i, dac_cnt, pos, len;20
-21
- if (Pico.snd.len <= lines)22
- {23
- // shrinking algo24
- dac_cnt = -Pico.snd.len;25
- len=1; pos=0;26
- dac_info[225] = 1;27
-28
- for(i=226; i != 225; i++)29
- {30
- if (i >= lines) i = 0;31
- if(dac_cnt < 0) {32
- pos++;33
- dac_cnt += lines;34
- }35
- dac_cnt -= Pico.snd.len;36
- dac_info[i] = pos;37
- }38
- }39
- else40
- {41
- // stretching42
- dac_cnt = Pico.snd.len;43
- pos=0;44
- for(i = 225; i != 224; i++)45
- {46
- if (i >= lines) i = 0;47
- len=0;48
- while(dac_cnt >= 0) {49
- dac_cnt -= lines;50
- len++;51
- }52
- if (i == mid) // midpoint53
- while(pos+len < Pico.snd.len/2) {54
- dac_cnt -= lines;55
- len++;56
- }57
- dac_cnt += Pico.snd.len;58
- pos += len;59
- dac_info[i] = pos;60
- }61
- }62
- for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)63
- dac_info[i] = dac_info[0];64
-}65
-66
-67
PICO_INTERNAL void PsndReset(void)68
{69
// PsndRerate calls YM2612Init, which also resets70
71
// Reset low pass filter72
lpf_lp = 0;73
lpf_rp = 0;74
+75
+ mix_reset();76
}77
78
79
80
{81
void *state = NULL;82
int target_fps = Pico.m.pal ? 50 : 60;83
+ int target_lines = Pico.m.pal ? 313 : 262;84
85
if (preserve_state) {86
state = malloc(0x204);87
88
ym2612_pack_state();89
memcpy(state, YM2612GetRegs(), 0x204);90
}91
- YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PicoIn.sndRate);92
+ YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PicoIn.sndRate, !(PicoIn.opt&POPT_DIS_FM_SSGEG));93
if (preserve_state) {94
// feed it back it's own registers, just like after loading state95
memcpy(YM2612GetRegs(), state, 0x204);96
97
// calculate Pico.snd.len98
Pico.snd.len = PicoIn.sndRate / target_fps;99
Pico.snd.len_e_add = ((PicoIn.sndRate - Pico.snd.len * target_fps) << 16) / target_fps;100
- Pico.snd.len_e_cnt = 0;101
+ Pico.snd.len_e_cnt = 0; // Q16102
103
- // recalculate dac info104
- dac_recalculate();105
+ // samples per line (Q16)106
+ Pico.snd.smpl_mult = 65536LL * PicoIn.sndRate / (target_fps*target_lines);107
+ // samples per z80 clock (Q20)108
+ Pico.snd.clkl_mult = 16 * Pico.snd.smpl_mult * 15/7 / 488;109
110
// clear all buffers111
memset32(PsndBuffer, 0, sizeof(PsndBuffer)/4);112
113
Pico.snd.len_e_cnt -= 0x10000;114
Pico.snd.len_use++;115
}116
-117
- Pico.snd.dac_line = Pico.snd.psg_line = 0;118
- Pico.m.status &= ~1;119
- dac_info[224] = Pico.snd.len_use;120
}121
122
-PICO_INTERNAL void PsndDoDAC(int line_to)123
+PICO_INTERNAL void PsndDoDAC(int cyc_to)124
{125
- int pos, pos1, len;126
+ int pos, len;127
int dout = ym2612.dacout;128
- int line_from = Pico.snd.dac_line;129
130
- if (line_to >= 313)131
- line_to = 312;132
+ // number of samples to fill in buffer (Q20)133
+ len = (cyc_to * Pico.snd.clkl_mult) - Pico.snd.dac_pos;134
135
- pos = dac_info[line_from];136
- pos1 = dac_info[line_to + 1];137
- len = pos1 - pos;138
+ // update position and calculate buffer offset and length139
+ pos = (Pico.snd.dac_pos+0x80000) >> 20;140
+ Pico.snd.dac_pos += len;141
+ len = ((Pico.snd.dac_pos+0x80000) >> 20) - pos;142
+143
+ // avoid loss of the 1st sample of a new block (Q rounding issues)144
+ if (pos+len == 0)145
+ len = 1, Pico.snd.dac_pos += 0x80000;146
if (len <= 0)147
return;148
149
- Pico.snd.dac_line = line_to + 1;150
-151
if (!PicoIn.sndOut)152
return;153
154
+ // fill buffer, applying a rather weak order 1 bessel IIR on the way155
+ // y[n] = (x[n] + x[n-1])*(1/2) (3dB cutoff at 11025 Hz, no gain)156
+ // 1 sample delay for correct IIR filtering over audio frame boundaries157
if (PicoIn.opt & POPT_EN_STEREO) {158
short *d = PicoIn.sndOut + pos*2;159
- for (; len > 0; len--, d+=2) *d += dout;160
+ // left channel only, mixed ro right channel in mixing phase161
+ *d++ += Pico.snd.dac_val2; d++;162
+ while (--len) *d++ += Pico.snd.dac_val, d++;163
} else {164
short *d = PicoIn.sndOut + pos;165
- for (; len > 0; len--, d++) *d += dout;166
+ *d++ += Pico.snd.dac_val2;167
+ while (--len) *d++ += Pico.snd.dac_val;168
}169
+ Pico.snd.dac_val2 = (Pico.snd.dac_val + dout) >> 1;170
+ Pico.snd.dac_val = dout;171
}172
173
PICO_INTERNAL void PsndDoPSG(int line_to)174
{175
- int line_from = Pico.snd.psg_line;176
- int pos, pos1, len;177
+ int pos, len;178
int stereo = 0;179
180
- if (line_to >= 313)181
- line_to = 312;182
-183
- pos = dac_info[line_from];184
- pos1 = dac_info[line_to + 1];185
- len = pos1 - pos;186
- //elprintf(EL_STATUS, "%3d %3d %3d %3d %3d",187
- // pos, pos1, len, line_from, line_to);188
+ // Q16, number of samples since last call189
+ len = ((line_to+1) * Pico.snd.smpl_mult) - Pico.snd.psg_pos;190
if (len <= 0)191
return;192
193
- Pico.snd.psg_line = line_to + 1;194
+ // update position and calculate buffer offset and length195
+ pos = (Pico.snd.psg_pos+0x8000) >> 16;196
+ Pico.snd.psg_pos += len;197
+ len = ((Pico.snd.psg_pos+0x8000) >> 16) - pos;198
199
if (!PicoIn.sndOut || !(PicoIn.opt & POPT_EN_PSG))200
return;201
libretro-picodrive-0~git20200112.tar.xz/pico/sound/ym2612.c -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/ym2612.c
Changed
201
1
2
**3
** SSG-EG was also removed, because it's rarely used, Sega2.doc even does not4
** document it ("proprietary") and tells to write 0 to SSG-EG control register.5
+**6
+** updated with fixes from mame 0.216 (file version 1.5.1) (kub)7
+** SSG-EG readded from GenPlus (kub)8
+** linear sample interpolation for chip to output rate adaption (kub)9
*/10
11
/*12
13
14
#endif15
16
-void memset32(int *dest, int c, int count);17
+void memset32(void *dest, int c, int count);18
19
20
#ifndef __GNUC__21
22
23
#define FREQ_SH 16 /* 16.16 fixed point (frequency calculations) */24
#define EG_SH 16 /* 16.16 fixed point (envelope generator timing) */25
-#define LFO_SH 25 /* 7.25 fixed point (LFO calculations) */26
+#define LFO_SH 24 /* 8.24 fixed point (LFO calculations) */27
#define TIMER_SH 16 /* 16.16 fixed point (timers calculations) */28
29
#define ENV_BITS 1030
31
32
#define EG_TIMER_OVERFLOW (3*(1<<EG_SH)) /* envelope generator timer overflows every 3 samples (on real chip) */33
34
-#define MAXOUT (+32767)35
-#define MINOUT (-32768)36
-37
-/* limitter */38
-#define Limit(val, max,min) { \39
- if ( val > max ) val = max; \40
- else if ( val < min ) val = min; \41
-}42
-43
-44
/* TL_TAB_LEN is calculated as:45
* 13 - sinus amplitude bits (Y axis)46
* 2 - sinus sign bit (Y axis)47
48
O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),49
50
/* rates 00-11 */51
-O( 0),O( 1),O( 2),O( 3),52
+O(18),O(18),O( 2),O( 3),53
O( 0),O( 1),O( 2),O( 3),54
O( 0),O( 1),O( 2),O( 3),55
O( 0),O( 1),O( 2),O( 3),56
57
#define O(a) (a*1)58
static const UINT8 eg_rate_shift[32+64+32]={ /* Envelope Generator counter shifts (32 + 64 rates + 32 RKS) */59
/* 32 infinite time rates */60
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),61
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),62
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),63
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),64
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),65
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),66
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),67
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),68
69
/* rates 00-11 */70
O(11),O(11),O(11),O(11),71
72
but LFO works with one more bit of a precision so we really need 4096 elements */73
static UINT32 fn_table[4096]; /* fnumber->increment counter */74
75
-static int g_lfo_ampm = 0;76
+static int g_lfo_ampm;77
78
/* register number to channel number , slot offset */79
#define OPN_CHAN(N) (N&3)80
81
ym2612.OPN.ST.status &= ~1;82
}83
84
+INLINE void recalc_volout(FM_SLOT *SLOT)85
+{86
+ INT16 vol_out = SLOT->volume;87
+ if ((SLOT->ssg&0x0c) == 0x0c)88
+ vol_out = (0x200 - SLOT->volume) & MAX_ATT_INDEX;89
+ SLOT->vol_out = vol_out + SLOT->tl;90
+}91
92
INLINE void FM_KEYON(int c , int s )93
{94
95
{96
SLOT->key = 1;97
SLOT->phase = 0; /* restart Phase Generator */98
- SLOT->state = EG_ATT; /* phase -> Attack */99
+ SLOT->ssg ^= SLOT->ssgn;100
+ SLOT->ssgn = 0;101
+ SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;102
+ if (SLOT->ar_ksr < 32+62) {103
+ if (SLOT->volume > MIN_ATT_INDEX) SLOT->state = EG_ATT;104
+ } else {105
+ SLOT->volume = MIN_ATT_INDEX;106
+ }107
+// recalc_volout(SLOT);108
ym2612.slot_mask |= (1<<s) << (c*4);109
}110
}111
112
if( SLOT->key )113
{114
SLOT->key = 0;115
- if (SLOT->state>EG_REL)116
+ if (SLOT->state>EG_REL) {117
SLOT->state = EG_REL;/* phase -> Release */118
+ if (SLOT->ssg&0x08) {119
+ if (SLOT->ssg&0x04)120
+ SLOT->volume = (0x200 - SLOT->volume);121
+ if (SLOT->volume >= 0x200) {122
+ SLOT->volume = MAX_ATT_INDEX;123
+ SLOT->state = EG_OFF;124
+ }125
+ }126
+ }127
+ SLOT->vol_out = SLOT->volume + SLOT->tl;128
}129
}130
131
132
INLINE void set_tl(FM_SLOT *SLOT, int v)133
{134
SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */135
+// if (SLOT->state > EG_REL)136
+// recalc_volout(SLOT);137
}138
139
/* set attack rate & key scale */140
INLINE void set_ar_ksr(FM_CH *CH, FM_SLOT *SLOT, int v)141
{142
UINT8 old_KSR = SLOT->KSR;143
+ int eg_sh_ar, eg_sel_ar;144
145
SLOT->ar = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;146
+ SLOT->ar_ksr = SLOT->ar + SLOT->ksr;147
148
SLOT->KSR = 3-(v>>6);149
if (SLOT->KSR != old_KSR)150
{151
CH->SLOT[SLOT1].Incr=-1;152
}153
+154
+ /* refresh Attack rate */155
+ if ((SLOT->ar_ksr) < 32+62)156
+ {157
+ eg_sh_ar = eg_rate_shift [SLOT->ar_ksr];158
+ eg_sel_ar = eg_rate_select[SLOT->ar_ksr];159
+ }160
else161
{162
- int eg_sh_ar, eg_sel_ar;163
-164
- /* refresh Attack rate */165
- if ((SLOT->ar + SLOT->ksr) < 32+62)166
- {167
- eg_sh_ar = eg_rate_shift [SLOT->ar + SLOT->ksr ];168
- eg_sel_ar = eg_rate_select[SLOT->ar + SLOT->ksr ];169
- }170
- else171
- {172
- eg_sh_ar = 0;173
- eg_sel_ar = 17;174
- }175
-176
- SLOT->eg_pack_ar = eg_inc_pack[eg_sel_ar] | (eg_sh_ar<<24);177
+ eg_sh_ar = 0;178
+ eg_sel_ar = 18;179
}180
+181
+ SLOT->eg_pack_ar = eg_inc_pack[eg_sel_ar] | (eg_sh_ar<<24);182
}183
184
/* set decay rate */185
186
187
SLOT->sl = sl_table[ v>>4 ];188
189
+ if (SLOT->state == EG_DEC && (SLOT->volume >= (INT32)(SLOT->sl)))190
+ SLOT->state = EG_SUS;191
+192
SLOT->rr = 34 + ((v&0x0f)<<2);193
194
eg_sh_rr = eg_rate_shift [SLOT->rr + SLOT->ksr];195
196
if (prev_pos != pos)197
{198
lfo_ampm &= 0xff;199
- /* triangle */200
+ /* triangle (inverted) */201
libretro-picodrive-0~git20200112.tar.xz/pico/sound/ym2612.h -> libretro-picodrive-0~git20200716.tar.xz/pico/sound/ym2612.h
Changed
77
1
2
};3
UINT32 eg_pack[4];4
};5
+6
+ UINT8 ssg; /* 0x30 SSG-EG waveform */7
+ UINT8 ssgn;8
+ UINT16 ar_ksr; /* 0x32 ar+ksr */9
+ UINT16 vol_out; /* 0x34 current output from EG (without LFO) */10
+ UINT16 vol_ipol; /* 0x36 interpolator memory */11
} FM_SLOT;12
13
14
15
UINT8 address; /* 10 address register | need_save */16
UINT8 status; /* 11 status flag | need_save */17
UINT8 mode; /* mode CSM / 3SLOT */18
- UINT8 pad;19
+ UINT8 flags; /* operational flags */20
int TA; /* timer a */21
int TAC; /* timer a maxval */22
int TAT; /* timer a ticker | need_save */23
24
FM_OPN OPN; /* OPN state */25
26
UINT32 slot_mask; /* active slot mask (performance hack) */27
+ UINT32 ssg_mask; /* active ssg mask (performance hack) */28
} YM2612;29
#endif30
31
32
extern YM2612 ym2612;33
#endif34
35
-void YM2612Init_(int baseclock, int rate);36
+void YM2612Init_(int baseclock, int rate, int ssg);37
void YM2612ResetChip_(void);38
int YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty);39
40
41
#else42
/* GP2X specific */43
#include "../../platform/gp2x/940ctl.h"44
-extern int PicoIn.opt;45
-#define YM2612Init(baseclock,rate) { \46
- if (PicoIn.opt&0x200) YM2612Init_940(baseclock, rate); \47
- else YM2612Init_(baseclock, rate); \48
-}49
-#define YM2612ResetChip() { \50
- if (PicoIn.opt&0x200) YM2612ResetChip_940(); \51
+#define YM2612Init(baseclock,rate,ssg) do { \52
+ if (PicoIn.opt&POPT_EXT_FM) YM2612Init_940(baseclock, rate, ssg); \53
+ else YM2612Init_(baseclock, rate, ssg); \54
+} while (0)55
+#define YM2612ResetChip() do { \56
+ if (PicoIn.opt&POPT_EXT_FM) YM2612ResetChip_940(); \57
else YM2612ResetChip_(); \58
-}59
-#define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) \60
- (PicoIn.opt&0x200) ? YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty) : \61
- YM2612UpdateOne_(buffer, length, stereo, is_buf_empty);62
-#define YM2612PicoStateLoad() { \63
- if (PicoIn.opt&0x200) YM2612PicoStateLoad_940(); \64
+} while (0)65
+#define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) do { \66
+ (PicoIn.opt&POPT_EXT_FM) ? YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty) : \67
+ YM2612UpdateOne_(buffer, length, stereo, is_buf_empty); \68
+} while (0)69
+#define YM2612PicoStateLoad() do { \70
+ if (PicoIn.opt&POPT_EXT_FM) YM2612PicoStateLoad_940(); \71
else YM2612PicoStateLoad_(); \72
-}73
+} while (0)74
#endif /* __GP2X__ */75
76
77
libretro-picodrive-0~git20200716.tar.xz/pico/sound/ym2612_arm.S
Added
201
1
2
+/*3
+ * PicoDrive4
+ * (C) notaz, 20065
+ * (C) kub, 2020 added SSG-EG and simple output rate interpolation6
+ *7
+ * This work is licensed under the terms of MAME license.8
+ * See COPYING file in the top-level directory.9
+ */10
+11
+@ this is a rewrite of MAME's ym2612 code, in particular this is only the main sample-generatin loop.12
+@ it does not seem to give much performance increase (if any at all), so don't use it if it causes trouble.13
+@ - notaz, 200614
+15
+@ vim:filetype=armasm16
+17
+#include "../arm_features.h"18
+19
+@ very simple YM2612 output rate to sample rate adaption (~500k cycles @44100)20
+#define INTERPOL21
+#define SSG_EG22
+23
+.equiv SLOT1, 024
+.equiv SLOT2, 225
+.equiv SLOT3, 126
+.equiv SLOT4, 327
+.equiv SLOT_STRUCT_SIZE, 0x3828
+29
+.equiv TL_TAB_LEN, 0x1A0030
+31
+.equiv EG_ATT, 432
+.equiv EG_DEC, 333
+.equiv EG_SUS, 234
+.equiv EG_REL, 135
+.equiv EG_OFF, 036
+37
+.equiv EG_SH, 16 @ 16.16 fixed point (envelope generator timing)38
+.equiv EG_TIMER_OVERFLOW, (3*(1<<EG_SH)) @ envelope generator timer overflows every 3 samples (on real chip)39
+.equiv LFO_SH, 24 /* 8.24 fixed point (LFO calculations) */40
+41
+.equiv ENV_QUIET, (2*13*256/8)42
+43
+.text44
+.align 245
+ PIC_LDR_INIT()46
+47
+@ r5=slot, r1=eg_cnt, trashes: r0,r2,r348
+@ writes output to routp, but only if vol_out changes49
+.macro update_eg_phase_slot50
+#if defined(INTERPOL)51
+ ldrh r0, [r5,#0x34] @ vol_out52
+#endif53
+ ldrb r2, [r5,#0x17] @ state54
+ add r3, r5, #0x1c55
+#if defined(INTERPOL)56
+ strh r0, [r5,#0x36] @ vol_ipol57
+#endif58
+ tst r2, r259
+ beq 0f @ EG_OFF60
+61
+ ldr r2, [r3, r2, lsl #2] @ pack62
+ mov r3, #163
+ mov r0, r2, lsr #24 @ shift64
+ mov r3, r3, lsl r065
+ sub r3, r3, #166
+67
+ tst r1, r368
+ bne 0f @ no volume change69
+70
+ mov r3, r1, lsr r071
+ ldrb r0, [r5,#0x30] @ ssg72
+ and r3, r3, #773
+ add r3, r3, r3, lsl #174
+ mov r3, r2, lsr r375
+ and r3, r3, #7 @ eg_inc_val shift, may be 076
+ ldrb r2, [r5,#0x17] @ state77
+78
+#if defined(SSG_EG)79
+ tst r0, #0x08 @ ssg enabled?80
+ tstne r12, #0x0281
+ bne 9f82
+#endif83
+84
+ @ non-SSG-EG mode85
+ cmp r2, #4 @ EG_ATT86
+ ldrh r0, [r5,#0x1a] @ volume, unsigned (0-1023)87
+ beq 4f88
+89
+ cmp r2, #290
+ mov r2, #191
+ mov r2, r2, lsl r392
+ mov r2, r2, lsr #1 @ eg_inc_val93
+ add r0, r0, r294
+ blt 1f @ EG_REL95
+ beq 2f @ EG_SUS96
+97
+3: @ EG_DEC98
+ ldr r2, [r5,#0x1c] @ sl (can be 16bit?)99
+ mov r3, #EG_SUS100
+ cmp r0, r2 @ if ( volume >= (INT32) SLOT->sl )101
+ strgeb r3, [r5,#0x17] @ state102
+ b 10f103
+104
+4: @ EG_ATT105
+ subs r3, r3, #1 @ eg_inc_val_shift - 1106
+ mvnpl r2, r0107
+ movpl r2, r2, lsl r3108
+ addpl r0, r0, r2, asr #4109
+ cmp r0, #0 @ if (volume <= MIN_ATT_INDEX)110
+ bgt 10f111
+ ldr r2, [r5,#0x1c]112
+ mov r0, #0113
+ cmp r2, #0114
+ movne r3, #EG_DEC115
+ moveq r3, #EG_SUS116
+ strb r3, [r5,#0x17] @ state117
+ b 10f118
+119
+2: @ EG_SUS120
+ mov r2, #1024121
+ sub r2, r2, #1 @ r2 = MAX_ATT_INDEX122
+ cmp r0, r2 @ if ( volume >= MAX_ATT_INDEX )123
+ movge r0, r2124
+ b 10f125
+126
+1: @ EG_REL127
+ mov r2, #1024128
+ sub r2, r2, #1 @ r2 = MAX_ATT_INDEX129
+ cmp r0, r2 @ if ( volume >= MAX_ATT_INDEX )130
+ movge r0, r2131
+ movge r3, #EG_OFF132
+ strgeb r3, [r5,#0x17] @ state133
+134
+10: @ finish135
+ ldrh r3, [r5,#0x18] @ tl136
+ strh r0, [r5,#0x1a] @ volume137
+#if defined(SSG_EG)138
+ b 11f139
+140
+9: @ SSG-EG mode141
+ ldrh r0, [r5,#0x1a] @ volume, unsigned (0-1023)142
+ cmp r2, #4 @ EG_ATT143
+ beq 4f144
+145
+ cmp r0, #0x200 @ if ( volume < 0x200 )146
+ movlt r0, #1147
+ movlt r3, r0, lsl r3148
+ ldrlth r0, [r5,#0x1a] @ volume, unsigned (0-1023)149
+ movlt r3, r3, lsr #1 @ eg_inc_val150
+ addlt r0, r0, r3, lsl #2151
+152
+ cmp r2, #2153
+ blt 1f @ EG_REL154
+ beq 10f @ EG_SUS - nothing more to do155
+156
+3: @ EG_DEC157
+ ldr r2, [r5,#0x1c] @ sl (can be 16bit?)158
+ mov r3, #EG_SUS159
+ cmp r0, r2 @ if ( volume >= (INT32) SLOT->sl )160
+ strgeb r3, [r5,#0x17] @ state161
+ b 10f162
+163
+4: @ EG_ATT164
+ subs r3, r3, #1 @ eg_inc_val_shift - 1165
+ mvnpl r2, r0166
+ movpl r2, r2, lsl r3167
+ addpl r0, r0, r2, asr #4168
+ cmp r0, #0 @ if (volume <= MIN_ATT_INDEX)169
+ bgt 10f170
+ ldr r2, [r5,#0x1c]171
+ mov r0, #0172
+ cmp r2, #0173
+ movne r3, #EG_DEC174
+ moveq r3, #EG_SUS175
+ strb r3, [r5,#0x17] @ state176
+ b 10f177
+178
+1: @ EG_REL179
+ mov r2, #0x200180
+ cmp r0, r2 @ if ( volume >= 0x200 )181
+ movge r0, #1024182
+ subge r0, #1183
+ movge r3, #EG_OFF184
+ strgeb r3, [r5,#0x17] @ state185
+186
+10: @ finish187
+ ldrb r2, [r5,#0x30] @ ssg188
+ ldrb r3, [r5,#0x17] @ state189
+ strh r0, [r5,#0x1a] @ volume190
+ cmp r2, #0x0c @ if ( ssg&0x04 && state > EG_REL )191
+ cmpge r3, #EG_REL+1192
+ ldrh r3, [r5,#0x18] @ tl193
+ rsbge r0, r0, #0x200 @ volume = (0x200-volume) & MAX_ATT194
+ lslge r0, r0, #22195
+ lsrge r0, r0, #22196
+197
+11:198
+#endif199
+ add r0, r0, r3 @ volume += tl200
+ strh r0, [r5,#0x34] @ vol_out201
libretro-picodrive-0~git20200112.tar.xz/pico/state.c -> libretro-picodrive-0~git20200716.tar.xz/pico/state.c
Changed
32
1
2
CHECKED_WRITE_BUFF(CHUNK_ZRAM, PicoMem.zram);3
CHECKED_WRITE_BUFF(CHUNK_CRAM, PicoMem.cram);4
CHECKED_WRITE_BUFF(CHUNK_MISC, Pico.m);5
+6
+ PicoVideoSave();7
CHECKED_WRITE_BUFF(CHUNK_VIDEO, Pico.video);8
9
z80_pack(buff_z80);10
11
case CHUNK_CRAM: CHECKED_READ_BUFF(PicoMem.cram); break;12
case CHUNK_VSRAM: CHECKED_READ_BUFF(PicoMem.vsram); break;13
case CHUNK_MISC: CHECKED_READ_BUFF(Pico.m); break;14
- case CHUNK_VIDEO: CHECKED_READ_BUFF(Pico.video); break;15
+ case CHUNK_VIDEO:16
+ CHECKED_READ_BUFF(Pico.video);17
+ PicoVideoLoad();18
+ break;19
+20
case CHUNK_IOPORTS: CHECKED_READ_BUFF(PicoMem.ioports); break;21
case CHUNK_PSG: CHECKED_READ2(28*4, sn76496_regs); break;22
case CHUNK_FM:23
24
z80_unpack(buff_z80);25
26
// due to dep from 68k cycles..27
- Pico.t.m68c_aim = Pico.t.m68c_cnt;28
+ Pico.t.m68c_frame_start = Pico.t.m68c_aim = Pico.t.m68c_cnt;29
if (PicoIn.AHW & PAHW_32X)30
Pico32xStateLoaded(0);31
if (PicoIn.AHW & PAHW_MCD)32
libretro-picodrive-0~git20200112.tar.xz/pico/videoport.c -> libretro-picodrive-0~git20200716.tar.xz/pico/videoport.c
Changed
201
1
2
* PicoDrive3
* (c) Copyright Dave, 20044
* (C) notaz, 2006-20095
+ * (C) kub, 20206
*7
* This work is licensed under the terms of MAME license.8
* See COPYING file in the top-level directory.9
10
#define NEED_DMA_SOURCE11
#include "memory.h"12
13
-extern const unsigned char hcounts_32[];14
-extern const unsigned char hcounts_40[];15
+extern const unsigned char hcounts_32[], hcounts_40[];16
+extern const unsigned char vdpcyc2sl_32_bl[], vdpcyc2sl_40_bl[];17
+extern const unsigned char vdpcyc2sl_32[], vdpcyc2sl_40[];18
+extern const unsigned short vdpsl2cyc_32_bl[], vdpsl2cyc_40_bl[];19
+extern const unsigned short vdpsl2cyc_32[], vdpsl2cyc_40[];20
21
-#ifndef UTYPES_DEFINED22
-typedef unsigned char u8;23
-typedef unsigned short u16;24
-typedef unsigned int u32;25
-#define UTYPES_DEFINED26
-#endif27
+static int blankline; // display disabled for this line28
+29
+unsigned SATaddr, SATmask; // VRAM addr of sprite attribute table30
31
int (*PicoDmaHook)(unsigned int source, int len, unsigned short **base, unsigned int *mask) = NULL;32
33
+34
+/* VDP FIFO implementation35
+ * 36
+ * fifo_slot: last slot executed in this scanline37
+ * fifo_cnt: #slots remaining for active FIFO write (#writes<<#bytep)38
+ * fifo_total: #total FIFO entries pending39
+ * fifo_data: last values transferred through fifo40
+ * fifo_queue: fifo transfer queue (#writes, flags)41
+ *42
+ * FIFO states: empty total=043
+ * inuse total>0 && total<444
+ * full total==445
+ * wait total>446
+ * Conditions:47
+ * fifo_slot is always behind slot2cyc[cycles]. Advancing it beyond cycles48
+ * implies blocking the 68k up to that slot.49
+ *50
+ * A FIFO write goes to the end of the FIFO queue, but DMA running in background51
+ * is always the last queue entry (transfers by CPU intervene and come 1st).52
+ * There can be more pending writes than FIFO slots, but the CPU will be blocked53
+ * until FIFO level (without background DMA) <= 4.54
+ * This is only about correct timing, data xfer must be handled by the caller.55
+ * Blocking the CPU means burning cycles via SekCyclesBurn*(), which is to be56
+ * executed by the caller.57
+ *58
+ * FIFOSync "executes" FIFO write slots up to the given cycle in the current59
+ * scanline. A queue entry completely executed is removed from the queue.60
+ * FIFOWrite pushes writes to the transfer queue. If it's a blocking write, 68k61
+ * is blocked if more than 4 FIFO writes are pending.62
+ * FIFORead executes a 68k read. 68k is blocked until the next transfer slot.63
+ */64
+65
+// NB code assumes fifo_* arrays have size 2^n66
+static struct VdpFIFO { // XXX this must go into save file!67
+ // last transferred FIFO data, ...x = index XXX currently only CPU68
+ unsigned short fifo_data[4], fifo_dx;69
+70
+ // queued FIFO transfers, ...x = index, ...l = queue length71
+ // each entry has 2 values: [n]>>3 = #writes, [n]&7 = flags (FQ_*)72
+ unsigned int fifo_queue[8], fifo_qx, fifo_ql;73
+ unsigned int fifo_total; // total# of pending FIFO entries (w/o BGDMA)74
+75
+ unsigned short fifo_slot; // last executed slot in current scanline76
+ unsigned short fifo_maxslot;// #slots in scanline77
+78
+ const unsigned char *fifo_cyc2sl;79
+ const unsigned short *fifo_sl2cyc;80
+} VdpFIFO;81
+82
+enum { FQ_BYTE = 1, FQ_BGDMA = 2, FQ_FGDMA = 4 }; // queue flags, NB: BYTE = 1!83
+84
+// do the FIFO math85
+static __inline int AdvanceFIFOEntry(struct VdpFIFO *vf, struct PicoVideo *pv, int slots)86
+{87
+ int l = slots, b = vf->fifo_queue[vf->fifo_qx] & FQ_BYTE;88
+ int cnt = pv->fifo_cnt;89
+90
+ // advance currently active FIFO entry91
+ if (l > cnt)92
+ l = cnt;93
+ if (!(vf->fifo_queue[vf->fifo_qx] & FQ_BGDMA))94
+ vf->fifo_total -= ((cnt & b) + l) >> b;95
+ cnt -= l;96
+97
+ // if entry has been processed...98
+ if (cnt == 0) {99
+ // remove entry from FIFO100
+ if (vf->fifo_ql) {101
+ vf->fifo_queue[vf->fifo_qx] = 0;102
+ vf->fifo_qx = (vf->fifo_qx+1) & 7, vf->fifo_ql --;103
+ }104
+ // start processing for next entry if there is one105
+ if (vf->fifo_ql) {106
+ b = vf->fifo_queue[vf->fifo_qx] & FQ_BYTE;107
+ cnt = (vf->fifo_queue[vf->fifo_qx] >> 3) << b;108
+ } else { // FIFO empty109
+ pv->status &= ~PVS_FIFORUN;110
+ vf->fifo_total = 0;111
+ }112
+ }113
+114
+ pv->fifo_cnt = cnt;115
+ return l;116
+}117
+118
+static __inline void SetFIFOState(struct VdpFIFO *vf, struct PicoVideo *pv)119
+{120
+ unsigned int st = pv->status, cmd = pv->command;121
+ // release CPU and terminate DMA if FIFO isn't blocking the 68k anymore122
+ if (vf->fifo_total <= 4) {123
+ st &= ~PVS_CPUWR;124
+ if (!(st & (PVS_DMABG|PVS_DMAFILL))) {125
+ st &= ~SR_DMA;126
+ cmd &= ~0x80;127
+ }128
+ }129
+ if (pv->fifo_cnt == 0) {130
+ st &= ~PVS_CPURD;131
+ // terminate DMA if applicable132
+ if (!(st & (PVS_FIFORUN|PVS_DMAFILL))) {133
+ st &= ~(SR_DMA|PVS_DMABG);134
+ cmd &= ~0x80;135
+ }136
+ }137
+ pv->status = st;138
+ pv->command = cmd;139
+}140
+141
+// sync FIFO to cycles142
+void PicoVideoFIFOSync(int cycles)143
+{144
+ struct VdpFIFO *vf = &VdpFIFO;145
+ struct PicoVideo *pv = &Pico.video;146
+ int slots, done;147
+148
+ // calculate #slots since last executed slot149
+ slots = vf->fifo_cyc2sl[cycles>>1] - vf->fifo_slot;150
+151
+ // advance FIFO queue by #done slots152
+ done = slots;153
+ while (done > 0 && pv->fifo_cnt) {154
+ int l = AdvanceFIFOEntry(vf, pv, done);155
+ vf->fifo_slot += l;156
+ done -= l;157
+ }158
+159
+ if (done != slots)160
+ SetFIFOState(vf, pv);161
+}162
+163
+// drain FIFO, blocking 68k on the way. FIFO must be synced prior to drain.164
+static int PicoVideoFIFODrain(int level, int cycles, int bgdma)165
+{166
+ struct VdpFIFO *vf = &VdpFIFO;167
+ struct PicoVideo *pv = &Pico.video;168
+ unsigned ocyc = cycles;169
+ int burn = 0;170
+//int osl = fifo_slot;171
+172
+ // process FIFO entries until low level is reached173
+ while (vf->fifo_slot <= vf->fifo_maxslot && cycles < 488 &&174
+ ((vf->fifo_total > level) | (vf->fifo_queue[vf->fifo_qx] & bgdma))) {175
+ int b = vf->fifo_queue[vf->fifo_qx] & FQ_BYTE;176
+ int cnt = bgdma ? pv->fifo_cnt : ((vf->fifo_total-level)<<b) - (pv->fifo_cnt&b);177
+ int slot = (pv->fifo_cnt<cnt ? pv->fifo_cnt:cnt) + vf->fifo_slot;178
+179
+ if (slot > vf->fifo_maxslot) {180
+ // target slot in later scanline, advance to eol181
+ slot = vf->fifo_maxslot;182
+ cycles = 488;183
+ } else {184
+ // advance FIFO to target slot and CPU to cycles at that slot185
+ cycles = vf->fifo_sl2cyc[slot]<<1;186
+ }187
+ if (slot > vf->fifo_slot) {188
+ AdvanceFIFOEntry(vf, pv, slot - vf->fifo_slot);189
+ vf->fifo_slot = slot;190
+ }191
+ }192
+ if (cycles > ocyc)193
+ burn = cycles - ocyc;194
+195
+ SetFIFOState(vf, pv);196
+197
+ return burn;198
+}199
+200
+// read VDP data port201
libretro-picodrive-0~git20200112.tar.xz/platform/common/arm_utils.s -> libretro-picodrive-0~git20200716.tar.xz/platform/common/arm_utils.s
Changed
9
1
2
movne lr, #643
tstne r3, r34
addne r0, r0, #325
+ addne r1, r1, #326
7
vidCpyM2_loop_out:8
mov r6, #109
libretro-picodrive-0~git20200112.tar.xz/platform/common/common.mak -> libretro-picodrive-0~git20200716.tar.xz/platform/common/common.mak
Changed
80
1
2
asm_ym2612 = 03
asm_misc = 04
asm_cdmemory = 05
+asm_32xdraw = 06
+asm_32xmemory = 07
asm_mix = 08
endif9
10
11
DEFINES += PPROF12
SRCS_COMMON += $(R)platform/linux/pprof.c13
endif14
+ifeq "$(gperf)" "1"15
+DEFINES += GPERF16
+LDFLAGS += -lprofiler -lstdc++17
+endif18
19
# ARM asm stuff20
ifeq "$(ARCH)" "arm"21
22
endif23
ifeq "$(asm_ym2612)" "1"24
DEFINES += _ASM_YM2612_C25
-SRCS_COMMON += $(R)pico/sound/ym2612_arm.s26
+SRCS_COMMON += $(R)pico/sound/ym2612_arm.S27
endif28
ifeq "$(asm_misc)" "1"29
DEFINES += _ASM_MISC_C30
31
endif32
ifeq "$(asm_32xdraw)" "1"33
DEFINES += _ASM_32X_DRAW34
-SRCS_COMMON += $(R)pico/32x/draw_arm.s35
+SRCS_COMMON += $(R)pico/32x/draw_arm.S36
+endif37
+ifeq "$(asm_32xmemory)" "1"38
+DEFINES += _ASM_32X_MEMORY_C39
+SRCS_COMMON += $(R)pico/32x/memory_arm.S40
endif41
ifeq "$(asm_mix)" "1"42
SRCS_COMMON += $(R)pico/sound/mix_arm.S43
44
# --- Z80 ---45
ifeq "$(use_drz80)" "1"46
DEFINES += _USE_DRZ8047
-SRCS_COMMON += $(R)cpu/DrZ80/drz80.s48
+SRCS_COMMON += $(R)cpu/DrZ80/drz80.S49
endif50
#51
ifeq "$(use_cz80)" "1"52
53
ifdef drc_debug54
DEFINES += DRC_DEBUG=$(drc_debug)55
SRCS_COMMON += $(R)cpu/sh2/mame/sh2dasm.c56
-SRCS_COMMON += $(R)platform/libpicofe/linux/host_dasm.c57
-LDFLAGS += -lbfd -lopcodes -liberty58
+DASM = $(R)platform/libpicofe/linux/host_dasm.c59
+DASMLIBS = -lbfd -lopcodes -liberty60
+ifeq ("$(ARCH)",$(filter "$(ARCH)","arm" "mipsel"))61
+ifeq ($(filter_out $(shell $(CC) --print-file-name=libbfd.so),"/"),)62
+DASM = $(R)platform/common/host_dasm.c63
+DASMLIBS =64
+endif65
+endif66
+SRCS_COMMON += $(DASM)67
+LDFLAGS += $(DASMLIBS)68
endif69
endif # use_sh2drc70
SRCS_COMMON += $(R)cpu/sh2/mame/sh2pico.c71
72
73
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)74
@echo building Cyclone...75
- @make CC=$(CYCLONE_CC) CXX=$(CYCLONE_CXX) -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG)76
+ @make CC=$(CYCLONE_CC) CXX=$(CYCLONE_CXX) -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) HAVE_ARMv6=$(HAVE_ARMv6)77
78
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h79
80
libretro-picodrive-0~git20200112.tar.xz/platform/common/config_file.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/config_file.c
Changed
57
1
2
3
static int seek_sect(FILE *f, const char *section)4
{5
- char line[128], *tmp;6
+ char line[640], *tmp;7
int len;8
9
len = strlen(section);10
11
FILE *fn = NULL;12
menu_entry *me;13
int t;14
- char line[128];15
+ char line[640];16
17
fn = fopen(fname, "w");18
if (fn == NULL)19
20
21
int config_writelrom(const char *fname)22
{23
- char line[128], *tmp, *optr = NULL;24
+ char line[640], *tmp, *optr = NULL;25
char *old_data = NULL;26
int size;27
FILE *f;28
29
30
int config_readlrom(const char *fname)31
{32
- char line[128], *tmp;33
+ char line[640], *tmp;34
int i, len, ret = -1;35
FILE *f;36
37
38
currentConfig.gamma = atoi(val);39
return 1;40
41
+ case MA_OPT2_MAX_FRAMESKIP:42
+ currentConfig.max_skip = atoi(val);43
+ return 1;44
+45
/* PSP */46
case MA_OPT3_SCALE:47
if (strcasecmp(var, "Scale factor") != 0) return 0;48
49
50
int config_readsect(const char *fname, const char *section)51
{52
- char line[128], *var, *val;53
+ char line[640], *var, *val;54
int keys_encountered = 0;55
FILE *f;56
int ret;57
libretro-picodrive-0~git20200716.tar.xz/platform/common/disarm.c
Added
201
1
2
+/*3
+ * Copyright (c) 2012 Wojtek Kaniewski <wojtekka@toxygen.net>4
+ *5
+ * Permission is hereby granted, free of charge, to any person obtaining a copy6
+ * of this software and associated documentation files (the "Software"), to7
+ * deal in the Software without restriction, including without limitation the8
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or9
+ * sell copies of the Software, and to permit persons to whom the Software is10
+ * furnished to do so, subject to the following conditions:11
+ *12
+ * The above copyright notice and this permission notice shall be included in13
+ * all copies or substantial portions of the Software.14
+ *15
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR16
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,17
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE18
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER19
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING20
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS21
+ * IN THE SOFTWARE.22
+ */23
+24
+#include <stdio.h>25
+#include <string.h>26
+27
+#define IMM_FORMAT "0x%x"28
+//#define IMM_FORMAT "%d"29
+#define ADDR_FORMAT "0x%x"30
+31
+static inline unsigned int rol(unsigned int value, unsigned int shift)32
+{33
+ shift &= 31;34
+35
+ return (value >> shift) | (value << (32 - shift));36
+}37
+38
+static inline const char *condition(unsigned int insn)39
+{40
+ const char *conditions[16] = { "eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", "hi", "ls", "ge", "lt", "gt", "le", "", "nv" };41
+ return conditions[(insn >> 28) & 0x0f];42
+}43
+44
+static inline const char *register_name(unsigned int reg)45
+{46
+ const char *register_names[16] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "sp", "lr", "pc" };47
+ return register_names[reg & 0x0f];48
+}49
+50
+static const char *register_list(unsigned int list, char *buf, size_t buf_len)51
+{52
+ int i;53
+54
+ buf[0] = 0;55
+56
+ for (i = 0; i < 16; i++)57
+ {58
+ if ((list >> i) & 1)59
+ {60
+ snprintf(buf + strlen(buf), buf_len - strlen(buf), "%s%s", (buf[0] == 0) ? "" : ",", register_name(i));61
+ }62
+ }63
+64
+ return buf;65
+}66
+67
+static const char *shift(unsigned int insn, char *buf, size_t buf_len)68
+{69
+ unsigned int imm = (insn >> 7) & 0x1f;70
+ const char *rn = register_name(insn >> 8);71
+ unsigned int type = (insn >> 4) & 0x07;72
+73
+ switch (type)74
+ {75
+ case 0:76
+ snprintf(buf, buf_len, (imm != 0) ? ",lsl #%d" : "", imm);77
+ break;78
+ case 1:79
+ snprintf(buf, buf_len, ",lsl %s", rn);80
+ break;81
+ case 2:82
+ snprintf(buf, buf_len, ",lsr #%d", imm ? imm : 32);83
+ break;84
+ case 3:85
+ snprintf(buf, buf_len, ",lsr %s", rn);86
+ break;87
+ case 4:88
+ snprintf(buf, buf_len, ",asr #%d", imm ? imm : 32);89
+ break;90
+ case 5:91
+ snprintf(buf, buf_len, ",asr %s", rn);92
+ break;93
+ case 6:94
+ snprintf(buf, buf_len, (imm != 0) ? ",ror #%d" : ",rrx", imm);95
+ break;96
+ case 7:97
+ snprintf(buf, buf_len, ",ror %s", rn);98
+ break;99
+ }100
+101
+ return buf;102
+}103
+104
+static const char *immediate(unsigned int imm, int negative, int show_if_zero, char *buf, size_t buf_len)105
+{106
+ if (imm || show_if_zero)107
+ {108
+ snprintf(buf, buf_len, ",#%s" IMM_FORMAT, (negative) ? "-" : "", imm);109
+ return buf;110
+ }111
+112
+ return "";113
+}114
+115
+static int data_processing(unsigned int pc, unsigned int insn, char *buf, size_t buf_len)116
+{117
+ unsigned int oper = (insn >> 21) & 15;118
+ const char *names[16] = { "and", "eor", "sub", "rsb", "add", "adc", "sbc", "rsc", "tst", "teq", "cmp", "cmn", "orr", "mov", "bic", "mvn" };119
+ const char *name;120
+ const char *s;121
+ unsigned int rd;122
+ unsigned int rn;123
+ int is_move = ((oper == 13) || (oper == 15));124
+ int is_test = ((oper >= 8) && (oper <= 11));125
+ char tmp_buf[64];126
+127
+ name = names[oper];128
+ s = ((insn >> 20) & 1) ? "s" : "";129
+ rn = (insn >> 16) & 15;130
+ rd = (insn >> 12) & 15;131
+132
+ /* mov r0,r0,r0 is a nop */133
+ if (insn == 0xe1a00000)134
+ {135
+ snprintf(buf, buf_len, "nop");136
+ return 1;137
+ }138
+139
+ /* mrs */140
+ if ((insn & 0x0fbf0fff) == 0x010f0000)141
+ {142
+ const char *psr = ((insn >> 22) & 1) ? "spsr" : "cpsr";143
+ const char *rd = register_name(insn >> 12);144
+145
+ snprintf(buf, buf_len, "mrs%s %s,%s", condition(insn), rd, psr);146
+147
+ return 1;148
+ }149
+150
+ /* msr flag only*/151
+ if ((insn & 0x0db0f000) == 0x0120f000)152
+ {153
+ const char *psr = ((insn >> 22) & 1) ? "spsr" : "cpsr";154
+ const char *suffix;155
+156
+ switch ((insn >> 16) & 15)157
+ {158
+ case 9:159
+ suffix = "";160
+ break;161
+ case 8:162
+ suffix = "_f";163
+ break;164
+ case 1:165
+ suffix = "_c";166
+ break;167
+ default:168
+ return 0;169
+ }170
+171
+ if ((insn >> 25) & 1)172
+ {173
+ unsigned int imm = rol(insn & 0x000000ff, ((insn >> 8) & 15) * 2);174
+175
+ snprintf(buf, buf_len, "msr%s %s%s,#" IMM_FORMAT, condition(insn), psr, suffix, imm);176
+ }177
+ else178
+ {179
+ const char *rm = register_name(insn >> 0);180
+181
+ if (((insn >> 4) & 255) != 0)182
+ {183
+ return 0;184
+ }185
+186
+ snprintf(buf, buf_len, "msr%s %s%s,%s", condition(insn), psr, suffix, rm);187
+ }188
+189
+ return 1;190
+ }191
+192
+ if (((insn >> 25) & 1) == 0)193
+ {194
+ unsigned int rm;195
+196
+ rm = (insn & 15);197
+198
+ if (is_move)199
+ {200
+ snprintf(buf, buf_len, "%s%s%s %s,%s%s", name, condition(insn), s, register_name(rd), register_name(rm), shift(insn, tmp_buf, sizeof(tmp_buf)));201
libretro-picodrive-0~git20200716.tar.xz/platform/common/disarm.h
Added
30
1
2
+/*3
+ * Copyright (C) 2012 Wojtek Kaniewski <wojtekka@toxygen.net>4
+ *5
+ * Permission is hereby granted, free of charge, to any person obtaining a copy6
+ * of this software and associated documentation files (the "Software"), to7
+ * deal in the Software without restriction, including without limitation the8
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or9
+ * sell copies of the Software, and to permit persons to whom the Software is10
+ * furnished to do so, subject to the following conditions:11
+ *12
+ * The above copyright notice and this permission notice shall be included in13
+ * all copies or substantial portions of the Software.14
+ *15
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR16
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,17
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE18
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER19
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING20
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS21
+ * IN THE SOFTWARE.22
+ */23
+ 24
+#ifndef DISARM_H25
+#define DISARM_H26
+27
+int disarm(uintptr_t pc, uint32_t insn, char *buf, size_t buf_len, unsigned long *sym);28
+29
+#endif /* DISARM_H */30
libretro-picodrive-0~git20200716.tar.xz/platform/common/dismips.c
Added
201
1
2
+/*3
+ * very basic mips disassembler for MIPS32/MIPS64 Release 2, only for picodrive4
+ * Copyright (C) 2019 kub5
+ *6
+ * This work is licensed under the terms of MAME license.7
+ * See COPYING file in the top-level directory.8
+ */9
+10
+// unimplemented insns: MOV[FT], SYSCALL, BREAK, SYNC, SYNCI, T*, SDBBP, RDHWR,11
+// CACHE, PREF, LWC*/LDC*, SWC*/SDC*, and all of COP* (fpu, mmu, irq, exc, ...)12
+// unimplemented variants of insns: EHB, SSNOP (both SLL zero), JALR.HB, JR.HB13
+// however, it's certainly good enough for anything picodrive DRC throws at it.14
+15
+#include <stdio.h>16
+#include <stdlib.h>17
+#include <stdint.h>18
+#include <string.h>19
+20
+#include "dismips.h"21
+22
+23
+static char *const register_names[32] = {24
+ "$zero",25
+ "$at",26
+ "$v0",27
+ "$v1",28
+ "$a0",29
+ "$a1",30
+ "$a2",31
+ "$a3",32
+ "$t0",33
+ "$t1",34
+ "$t2",35
+ "$t3",36
+ "$t4",37
+ "$t5",38
+ "$t6",39
+ "$t7",40
+ "$s0",41
+ "$s1",42
+ "$s2",43
+ "$s3",44
+ "$s4",45
+ "$s5",46
+ "$s6",47
+ "$s7",48
+ "$t8",49
+ "$t9",50
+ "$k0",51
+ "$k1",52
+ "$gp",53
+ "$sp",54
+ "$fp",55
+ "$ra"56
+};57
+58
+59
+enum insn_type {60
+ REG_DTS, REG_TS, // 3, 2, or 1 regs61
+ REG_DS, REG_DT, REG_D, REG_S,62
+ S_IMM_DT, // 2 regs with shift amount63
+ F_IMM_TS, // 2 regs with bitfield spec64
+ B_IMM_S, B_IMM_TS, // pc-relative branches with 1 or 2 regs65
+ J_IMM, // region-relative jump66
+ A_IMM_TS, // arithmetic immediate with 2 regs67
+ L_IMM_T, L_IMM_TS, // logical immediate with 1 or 2 regs68
+ M_IMM_TS, // memory indexed with 2 regs69
+ SR_BIT = 0x80 // shift right with R-bit70
+};71
+72
+struct insn {73
+ unsigned char op;74
+ enum insn_type type;75
+ char *name;76
+};77
+78
+// ATTN: these array MUST be sorted by op (decode relies on it)79
+80
+// instructions with opcode SPECIAL (R-type)81
+#define OP_SPECIAL 0x0082
+static const struct insn special_insns[] = {83
+ {0x00, S_IMM_DT, "sll"},84
+// {0x01, , "movf\0movt"},85
+ {0x02, S_IMM_DT|SR_BIT, "srl\0rotr"},86
+ {0x03, S_IMM_DT, "sra"},87
+ {0x04, REG_DTS, "sllv"},88
+ {0x06, REG_DTS|SR_BIT, "srlv\0rotrv"},89
+ {0x07, REG_DTS, "srav"},90
+ {0x08, REG_S, "jr"},91
+ {0x09, REG_DS, "jalr"},92
+ {0x0a, REG_DTS, "movz"},93
+ {0x0b, REG_DTS, "movn"},94
+// {0x0c, , "syscall"},95
+// {0x0d, , "break"},96
+// {0x0f, , "sync"},97
+ {0x10, REG_D, "mfhi"},98
+ {0x11, REG_S, "mthi"},99
+ {0x12, REG_D, "mflo"},100
+ {0x13, REG_S, "mtlo"},101
+ {0x14, REG_DTS, "dsllv"},102
+ {0x16, REG_DTS|SR_BIT, "dsrlv\0drotrv"},103
+ {0x17, REG_DTS, "dsrav"},104
+ {0x18, REG_TS, "mult"},105
+ {0x19, REG_TS, "multu"},106
+ {0x1A, REG_TS, "div"},107
+ {0x1B, REG_TS, "divu"},108
+ {0x1C, REG_TS, "dmult"},109
+ {0x1D, REG_TS, "dmultu"},110
+ {0x1E, REG_TS, "ddiv"},111
+ {0x1F, REG_TS, "ddivu"},112
+ {0x20, REG_DTS, "add"},113
+ {0x21, REG_DTS, "addu"},114
+ {0x22, REG_DTS, "sub"},115
+ {0x23, REG_DTS, "subu"},116
+ {0x24, REG_DTS, "and"},117
+ {0x25, REG_DTS, "or"},118
+ {0x26, REG_DTS, "xor"},119
+ {0x27, REG_DTS, "nor"},120
+ {0x2A, REG_DTS, "slt"},121
+ {0x2B, REG_DTS, "sltu"},122
+ {0x2C, REG_DTS, "dadd"},123
+ {0x2D, REG_DTS, "daddu"},124
+ {0x2E, REG_DTS, "dsub"},125
+ {0x2F, REG_DTS, "dsubu"},126
+// {0x30, REG_TS, "tge" },127
+// {0x31, REG_TS, "tgeu" },128
+// {0x32, REG_TS, "tlt" },129
+// {0x33, REG_TS, "tltu" },130
+// {0x34, REG_TS, "teq" },131
+// {0x36, REG_TS, "tne" },132
+ {0x38, S_IMM_DT, "dsll"},133
+ {0x3A, S_IMM_DT|SR_BIT, "dsrl\0drotrv"},134
+ {0x3B, S_IMM_DT, "dsra"},135
+ {0x3C, S_IMM_DT, "dsll32"},136
+ {0x3E, S_IMM_DT|SR_BIT, "dsrl32\0drotr32"},137
+ {0x3F, S_IMM_DT, "dsra32"},138
+};139
+140
+// instructions with opcode SPECIAL2 (R-type)141
+#define OP_SPECIAL2 0x1C142
+static const struct insn special2_insns[] = {143
+ {0x00, REG_TS, "madd" },144
+ {0x01, REG_TS, "maddu" },145
+ {0x02, REG_TS, "mul" },146
+ {0x04, REG_TS, "msub" },147
+ {0x05, REG_TS, "msubu" },148
+ {0x20, REG_DS, "clz" },149
+ {0x21, REG_DS, "clo" },150
+ {0x24, REG_DS, "dclz" },151
+ {0x25, REG_DS, "dclo" },152
+// {0x37, , "sdbbp" },153
+};154
+155
+// instructions with opcode SPECIAL3 (R-type)156
+#define OP_SPECIAL3 0x1F157
+static const struct insn special3_insns[] = {158
+ {0x00, F_IMM_TS, "ext" },159
+ {0x01, F_IMM_TS, "dextm" },160
+ {0x02, F_IMM_TS, "dextu" },161
+ {0x03, F_IMM_TS, "dext" },162
+ {0x04, F_IMM_TS, "ins" },163
+ {0x05, F_IMM_TS, "dinsm" },164
+ {0x06, F_IMM_TS, "dinsu" },165
+ {0x07, F_IMM_TS, "dins" },166
+// {0x3b, , "rdhwr" },167
+};168
+169
+// instruction with opcode SPECIAL3 and function *BSHFL170
+#define FN_BSHFL 0x20171
+static const struct insn bshfl_insns[] = {172
+ {0x02, REG_DT, "wsbh" },173
+ {0x10, REG_DT, "seb" },174
+ {0x18, REG_DT, "seh" },175
+};176
+#define FN_DBSHFL 0x24177
+static const struct insn dbshfl_insns[] = {178
+ {0x02, REG_DT, "dsbh" },179
+ {0x05, REG_DT, "dshd" },180
+};181
+182
+// instructions with opcode REGIMM (I-type)183
+#define OP_REGIMM 0x01184
+static const struct insn regimm_insns[] = {185
+ {0x00, B_IMM_S, "bltz"},186
+ {0x01, B_IMM_S, "bgez"},187
+ {0x02, B_IMM_S, "bltzl"},188
+ {0x03, B_IMM_S, "bgezl"},189
+// {0x08, , "tgei"},190
+// {0x09, , "tgeiu"},191
+// {0x0a, , "tlti"},192
+// {0x0b, , "tltiu"},193
+// {0x0c, , "teqi"},194
+// {0x0e, , "tnei"},195
+ {0x10, B_IMM_S, "bltzal"},196
+ {0x11, B_IMM_S, "bgezal"},197
+ {0x12, B_IMM_S, "bltzall"},198
+ {0x13, B_IMM_S, "bgezall"},199
+ {0x13, B_IMM_S, "bgezall"},200
+// {0x1f, , "synci" },201
libretro-picodrive-0~git20200716.tar.xz/platform/common/dismips.h
Added
8
1
2
+#ifndef DISMIPS_H3
+#define DISMIPS_H4
+5
+int dismips(uintptr_t pc, uint32_t insn, char *buf, size_t buf_len, unsigned long *sym);6
+7
+#endif /* DISMIPS_H */8
libretro-picodrive-0~git20200112.tar.xz/platform/common/emu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/emu.c
Changed
40
1
2
defaultConfig.turbo_rate = 15;3
defaultConfig.msh2_khz = PICO_MSH2_HZ / 1000;4
defaultConfig.ssh2_khz = PICO_SSH2_HZ / 1000;5
+ defaultConfig.max_skip = 4;6
7
// platform specific overrides8
pemu_prep_defconfig();9
10
{11
notice_msg_time = 0;12
plat_status_msg_clear();13
+#ifndef __GP2X__14
plat_video_flip();15
plat_status_msg_clear(); /* Do it again in case of double buffering */16
+#endif17
notice_msg = NULL;18
}19
else {20
21
else if (diff < -target_frametime_x3)22
{23
/* no time left for this frame - skip */24
- /* limit auto frameskip to 8 */25
- if (frames_done / 8 <= frames_shown)26
+ /* limit auto frameskip to max_skip */27
+ if (fskip_cnt < currentConfig.max_skip) {28
+ fskip_cnt++;29
skip = 1;30
- }31
+ }32
+ else {33
+ fskip_cnt = 0;34
+ }35
+ } else36
+ fskip_cnt = 0;37
38
// don't go in debt too much39
while (diff < -target_frametime_x3 * 3) {40
libretro-picodrive-0~git20200112.tar.xz/platform/common/emu.h -> libretro-picodrive-0~git20200716.tar.xz/platform/common/emu.h
Changed
9
1
2
int msh2_khz;3
int ssh2_khz;4
int overclock_68k;5
+ int max_skip;6
} currentConfig_t;7
8
extern currentConfig_t currentConfig, defaultConfig;9
libretro-picodrive-0~git20200716.tar.xz/platform/common/helix
Added
2
1
+(directory)2
libretro-picodrive-0~git20200716.tar.xz/platform/common/helix/Makefile
Added
45
1
2
+CROSS ?= arm-linux-gnueabi-3
+4
+CC = $(CROSS)gcc5
+AS = $(CROSS)as6
+AR = $(CROSS)ar7
+TOOLCHAIN = $(notdir $(CROSS))8
+LIBGCC ?= ${HOME}/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/libgcc.a9
+10
+CFLAGS += -Ipub -O2 -Wall -fstrict-aliasing -ffast-math11
+ifneq ($(findstring arm-,$(TOOLCHAIN)),)12
+CFLAGS += -mcpu=arm940t -mtune=arm940t -mfloat-abi=soft -mfpu=fpa -mabi=apcs-gnu -mno-thumb-interwork13
+ASFLAGS = -mcpu=arm940t -mfloat-abi=soft -mfpu=fpa -mabi=apcs-gnu14
+OBJS += real/arm/asmpoly_gcc.o15
+else16
+CFLAGS += -m3217
+ASFLAGS += -m3218
+OBJS += real/polyphase.o19
+endif20
+21
+LIB = $(TOOLCHAIN)helix_mp3.a22
+SHLIB = $(TOOLCHAIN)helix_mp3.so23
+24
+all: $(LIB) $(SHLIB)25
+26
+27
+OBJS += mp3dec.o mp3tabs.o28
+#OBJS += ipp/bitstream.o ipp/buffers.o ipp/dequant.o ipp/huffman.o ipp/imdct.o ipp/subband.o29
+OBJS += real/bitstream.o real/buffers.o real/dct32.o real/dequant.o real/dqchan.o real/huffman.o30
+OBJS += real/hufftabs.o real/imdct.o real/scalfact.o real/stproc.o real/subband.o real/trigtabs.o31
+32
+OBJS += lib.o33
+34
+real/arm/asmpoly_gcc.o: real/arm/asmpoly_gcc.s35
+ $(CC) -o $@ $(ASFLAGS) -c $<36
+37
+$(LIB) : $(OBJS)38
+ $(AR) r $@ $^39
+$(SHLIB) : $(OBJS) $(LIBGCC)40
+ $(CC) -o $@ -nostdlib -shared $(CFLAGS) $^41
+42
+clean:43
+ $(RM) -f $(OBJS)44
+45
libretro-picodrive-0~git20200716.tar.xz/platform/common/helix/lib.c
Added
59
1
2
+#include <stdlib.h>3
+#include <stdint.h>4
+5
+// libgcc has this with gcc 4.x6
+void raise(int sig)7
+{8
+}9
+10
+// very limited heap functions for helix decoder11
+12
+static char heap[65000] __attribute__((aligned(16)));13
+static long heap_offs;14
+15
+void __malloc_init(void)16
+{17
+ heap_offs = 0;18
+}19
+20
+void *malloc(size_t size)21
+{22
+ void *chunk = heap + heap_offs;23
+ size = (size+15) & ~15;24
+ if (heap_offs + size > sizeof(heap))25
+ return NULL;26
+ else {27
+ heap_offs += size;28
+ return chunk;29
+ }30
+}31
+32
+void free(void *chunk)33
+{34
+ if (chunk == heap)35
+ heap_offs = 0;36
+}37
+38
+#if 039
+void *memcpy (void *dest, const void *src, size_t n)40
+{41
+ char *_dest = dest;42
+ const char *_src = src;43
+ while (n--) *_dest++ = *_src++;44
+ return dest;45
+}46
+47
+void *memmove (void *dest, const void *src, size_t n)48
+{49
+ char *_dest = dest+n;50
+ const char *_src = src+n;51
+ if (dest <= src || dest >= _src)52
+ return memcpy(dest, src, n);53
+ while (n--) *--_dest = *--_src;54
+ return dest;55
+}56
+#else57
+#include "../memcpy.c"58
+#endif59
libretro-picodrive-0~git20200716.tar.xz/platform/common/host_dasm.c
Added
95
1
2
+/*3
+ * DRC host disassembler interface for MIPS/ARM32 for use without binutils4
+ * (C) kub, 2018,20195
+ */6
+#include <stdio.h>7
+#include <stdlib.h>8
+#include <stdint.h>9
+#include <string.h>10
+11
+#ifdef __mips__12
+#include "dismips.c"13
+#define disasm dismips14
+#else15
+#include "disarm.c"16
+#define disasm disarm17
+#endif18
+19
+/* symbols */20
+typedef struct { const char *name; void *value; } asymbol;21
+22
+static asymbol **symbols;23
+static long symcount, symstorage = 8;24
+25
+static const char *lookup_name(void *addr)26
+{27
+ asymbol **sptr = symbols;28
+ int i;29
+30
+ for (i = 0; i < symcount; i++) {31
+ asymbol *sym = *sptr++;32
+33
+ if (addr == sym->value)34
+ return sym->name;35
+ }36
+37
+ return NULL;38
+}39
+40
+void host_dasm(void *addr, int len)41
+{42
+ void *end = (char *)addr + len;43
+ const char *name;44
+ char buf[64];45
+ unsigned long insn, symaddr;46
+47
+ while (addr < end) {48
+ name = lookup_name(addr);49
+ if (name != NULL)50
+ printf("%s:\n", name);51
+52
+ insn = *(unsigned long *)addr;53
+ printf(" %08lx %08lx ", (long)addr, insn);54
+ if(disasm((unsigned)addr, insn, buf, sizeof(buf), &symaddr))55
+ {56
+ if (symaddr)57
+ name = lookup_name((void *)symaddr);58
+ if (symaddr && name)59
+ printf("%s <%s>\n", buf, name);60
+ else if (symaddr && !name)61
+ printf("%s <unknown>\n", buf);62
+ else63
+ printf("%s\n", buf);64
+ } else65
+ printf("unknown (0x%08lx)\n", insn);66
+ addr = (char *)addr + sizeof(long);67
+ }68
+}69
+70
+void host_dasm_new_symbol_(void *addr, const char *name)71
+{72
+ asymbol *sym, **tmp;73
+74
+ if (symbols == NULL)75
+ symbols = malloc(symstorage);76
+ if (symstorage <= symcount * sizeof(symbols[0])) {77
+ tmp = realloc(symbols, symstorage * 2);78
+ if (tmp == NULL)79
+ return;80
+ symstorage *= 2;81
+ symbols = tmp;82
+ }83
+84
+ symbols[symcount] = calloc(sizeof(*symbols[0]), 1);85
+ if (symbols[symcount] == NULL)86
+ return;87
+88
+ // a HACK (should use correct section), but ohwell89
+ sym = symbols[symcount];90
+ sym->value = addr;91
+ sym->name = name;92
+ symcount++;93
+}94
+95
libretro-picodrive-0~git20200112.tar.xz/platform/common/main.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/main.c
Changed
22
1
2
emu_init();3
menu_init();4
5
+#ifdef GPERF6
+ ProfilerStart("gperf.out");7
+#endif8
+9
engineState = PGS_Menu;10
11
if (argc > 1)12
13
}14
15
endloop:16
+#ifdef GPERF17
+ ProfilerStop();18
+#endif19
20
emu_finish();21
plat_finish();22
libretro-picodrive-0~git20200716.tar.xz/platform/common/memcpy.c
Added
136
1
2
+/*3
+ * (C) 2018 Kai-Uwe Bloem <derkub@gmail.com>4
+ *5
+ * 32bit ARM/MIPS optimized C implementation of memcpy and memove, designed for6
+ * good performance with gcc.7
+ * - if src and dest have the same alignment, 4-word copy is used.8
+ * - if src and dest are unaligned to each other, still loads word data and9
+ * stores correctly shifted word data (for all but the first and last bytes10
+ * to avoid under/overstepping the src region).11
+ *12
+ * ATTN does dirty aliasing tricks with undefined behaviour by standard.13
+ * (however, this improved the generated code).14
+ * ATTN uses struct assignment, which only works if the compiler is inlining15
+ * this (else it would probably call memcpy :-)).16
+ */17
+#include <stdlib.h>18
+#include <stdint.h>19
+20
+#include <endian.h>21
+#if __BYTE_ORDER == __LITTLE_ENDIAN22
+#define _L_ >>23
+#define _U_ <<24
+#else25
+#define _L_ <<26
+#define _U_ >>27
+#endif28
+29
+void *memcpy(void *dest, const void *src, size_t n)30
+{31
+ struct _16 { uint32_t a[4]; };32
+ union { const void *v; uint8_t *c; uint32_t *i; uint64_t *l; struct _16 *s; }33
+ ss = { src }, ds = { dest };34
+ const int lm = sizeof(uint32_t)-1;35
+36
+ /* align src to word */37
+ while (((uintptr_t)ss.c & lm) && n > 0)38
+ *ds.c++ = *ss.c++, n--;39
+ if (((uintptr_t)ds.c & lm) == 0) {40
+ /* fast copy if pointers have the same aligment */41
+ while (n >= sizeof(struct _16)) /* copy 16 byte blocks */42
+ *ds.s++ = *ss.s++, n -= sizeof(struct _16);43
+ if (n >= sizeof(uint64_t)) /* copy leftover 8 byte block */44
+ *ds.l++ = *ss.l++, n -= sizeof(uint64_t);45
+// if (n >= sizeof(uint32_t)) /* copy leftover 4 byte block */46
+// *ds.i++ = *ss.i++, n -= sizeof(uint32_t);47
+ } else if (n >= 2*sizeof(uint32_t)) {48
+ /* unaligned data big enough to avoid overstepping src */49
+ uint32_t v1, v2, b, s;50
+ /* align dest to word */51
+ while (((uintptr_t)ds.c & lm) && n > 0)52
+ *ds.c++ = *ss.c++, n--;53
+ /* copy loop: load aligned words and store shifted words */54
+ b = (uintptr_t)ss.c & lm, s = b*8; ss.c -= b;55
+ v1 = *ss.i++, v2 = *ss.i++;56
+ while (n >= 3*sizeof(uint32_t)) {57
+ *ds.i++ = (v1 _L_ s) | (v2 _U_ (32-s)); v1 = *ss.i++;58
+ *ds.i++ = (v2 _L_ s) | (v1 _U_ (32-s)); v2 = *ss.i++;59
+ n -= 2*sizeof(uint32_t);60
+ }61
+ /* data for one more store is already loaded */62
+ if (n >= sizeof(uint32_t)) {63
+ *ds.i++ = (v1 _L_ s) | (v2 _U_ (32-s));64
+ n -= sizeof(uint32_t);65
+ ss.c += sizeof(uint32_t);66
+ }67
+ ss.c += b - 2*sizeof(uint32_t);68
+ }69
+ /* copy 0-7 leftover bytes */70
+ while (n >= 4) {71
+ *ds.c++ = *ss.c++, n--; *ds.c++ = *ss.c++, n--;72
+ *ds.c++ = *ss.c++, n--; *ds.c++ = *ss.c++, n--;73
+ }74
+ while (n > 0)75
+ *ds.c++ = *ss.c++, n--;76
+ return dest;77
+}78
+79
+void *memmove (void *dest, const void *src, size_t n)80
+{81
+ struct _16 { uint32_t a[4]; };82
+ union { const void *v; uint8_t *c; uint32_t *i; uint64_t *l; struct _16 *s; }83
+ ss = { src+n }, ds = { dest+n };84
+ size_t pd = dest > src ? dest - src : src - dest;85
+ const int lm = sizeof(uint32_t)-1;86
+87
+ if (dest <= src || dest >= src+n)88
+ return memcpy(dest, src, n);89
+90
+ /* align src to word */91
+ while (((uintptr_t)ss.c & lm) && n > 0)92
+ *--ds.c = *--ss.c, n--;93
+ /* take care not to copy multi-byte data if it overlaps */94
+ if (((uintptr_t)ds.c & lm) == 0) {95
+ /* fast copy if pointers have the same aligment */96
+ while (n >= sizeof(struct _16) && pd >= sizeof(struct _16))97
+ /* copy 16 bytes blocks if no overlap */98
+ *--ds.s = *--ss.s, n -= sizeof(struct _16);99
+ while (n >= sizeof(uint64_t) && pd >= sizeof(uint64_t))100
+ /* copy leftover 8 byte blocks if no overlap */101
+ *--ds.l = *--ss.l, n -= sizeof(uint64_t);102
+ while (n >= sizeof(uint32_t) && pd >= sizeof(uint32_t))103
+ /* copy leftover 4 byte blocks if no overlap */104
+ *--ds.i = *--ss.i, n -= sizeof(uint32_t);105
+ } else if (n >= 2*sizeof(uint32_t) && pd >= 2*sizeof(uint32_t)) {106
+ /* unaligned data big enough to avoid understepping src */107
+ uint32_t v1, v2, b, s;108
+ /* align dest to word */109
+ while (((uintptr_t)ds.c & lm) && n > 0)110
+ *--ds.c = *--ss.c, n--;111
+ /* copy loop: load aligned words and store shifted words */112
+ b = (uintptr_t)ss.c & lm, s = b*8; ss.c += b;113
+ v1 = *--ss.i, v2 = *--ss.i;114
+ while (n >= 3*sizeof(uint32_t)) {115
+ *--ds.i = (v1 _U_ s) | (v2 _L_ (32-s)); v1 = *--ss.i;116
+ *--ds.i = (v2 _U_ s) | (v1 _L_ (32-s)); v2 = *--ss.i;117
+ n -= 2*sizeof(uint32_t);118
+ }119
+ /* data for one more store is already loaded */120
+ if (n >= sizeof(uint32_t)) {121
+ *--ds.i = (v1 _U_ s) | (v2 _L_ (32-s));122
+ n -= sizeof(uint32_t);123
+ ss.c -= sizeof(uint32_t);124
+ }125
+ ss.c -= b - 2*sizeof(uint32_t);126
+ }127
+ /* copy 0-7 leftover bytes (or upto everything if ptrs are too close) */128
+ while (n >= 4) {129
+ *--ds.c = *--ss.c, n--; *--ds.c = *--ss.c, n--;130
+ *--ds.c = *--ss.c, n--; *--ds.c = *--ss.c, n--;131
+ }132
+ while (n > 0)133
+ *--ds.c = *--ss.c, n--;134
+ return dest;135
+}136
libretro-picodrive-0~git20200112.tar.xz/platform/common/menu_pico.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/menu_pico.c
Changed
36
1
2
mee_range_h ("Overclock M68k (%)", MA_OPT2_OVERCLOCK_M68K,currentConfig.overclock_68k, 0, 1000, h_ovrclk),3
mee_onoff ("Emulate Z80", MA_OPT2_ENABLE_Z80, PicoIn.opt, POPT_EN_Z80),4
mee_onoff ("Emulate YM2612 (FM)", MA_OPT2_ENABLE_YM2612, PicoIn.opt, POPT_EN_FM),5
+ mee_onoff ("Disable YM2612 SSG-EG", MA_OPT2_DISABLE_YM_SSG,PicoIn.opt, POPT_DIS_FM_SSGEG),6
mee_onoff ("Emulate SN76496 (PSG)", MA_OPT2_ENABLE_SN76496,PicoIn.opt, POPT_EN_PSG),7
mee_onoff ("gzip savestates", MA_OPT2_GZIP_STATES, currentConfig.EmuOpt, EOPT_GZIP_SAVES),8
mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),9
10
mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),11
mee_onoff ("Enable dynarecs", MA_OPT2_DYNARECS, PicoIn.opt, POPT_EN_DRC),12
mee_onoff ("Status line in main menu", MA_OPT2_STATUS_LINE, currentConfig.EmuOpt, EOPT_SHOW_RTC),13
+ mee_range ("Max auto frameskip", MA_OPT2_MAX_FRAMESKIP, currentConfig.max_skip, 1, 10),14
+ mee_onoff ("PWM IRQ optimization", MA_OPT2_PWM_IRQ_OPT, PicoIn.opt, POPT_PWM_IRQ_OPT),15
MENU_OPTIONS_ADV16
mee_end,17
};18
19
}20
21
static const char credits[] =22
- "PicoDrive v" VERSION " (c) notaz, 2006-2013\n\n\n"23
+ "PicoDrive v" VERSION "\n"24
+ "(c) notaz, 2006-2013; irixxxx, 2018-2020\n\n"25
"Credits:\n"26
"fDave: initial code\n"27
#ifdef EMU_C68K28
29
"MAME devs: SH2, YM2612 and SN76496 cores\n"30
"Eke, Stef: some Sega CD code\n"31
"Inder, ketchupgun: graphics\n"32
+ "Irixxxx: SH2 drc improvements\n"33
#ifdef __GP2X__34
"Squidge: mmuhack\n"35
"Dzz: ARM940 sample\n"36
libretro-picodrive-0~git20200112.tar.xz/platform/common/menu_pico.h -> libretro-picodrive-0~git20200716.tar.xz/platform/common/menu_pico.h
Changed
18
1
2
MA_OPT2_VSYNC,3
MA_OPT2_ENABLE_Z80,4
MA_OPT2_ENABLE_YM2612,5
+ MA_OPT2_DISABLE_YM_SSG,6
MA_OPT2_ENABLE_SN76496,7
MA_OPT2_GZIP_STATES,8
MA_OPT2_NO_LAST_ROM,9
10
MA_OPT2_NO_SPRITE_LIM,11
MA_OPT2_NO_IDLE_LOOPS,12
MA_OPT2_OVERCLOCK_M68K,13
+ MA_OPT2_MAX_FRAMESKIP,14
+ MA_OPT2_PWM_IRQ_OPT,15
MA_OPT2_DONE,16
MA_OPT3_SCALE, /* psp (all OPT3) */17
MA_OPT3_HSCALE32,18
libretro-picodrive-0~git20200112.tar.xz/platform/common/mp3.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/mp3.c
Changed
35
1
2
0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 3203
};4
5
-int mp3_find_sync_word(const unsigned char *buf, int size)6
-{7
- const unsigned char *p, *pe;8
-9
- /* find byte-aligned syncword - need 12 (MPEG 1,2) or 11 (MPEG 2.5) matching bits */10
- for (p = buf, pe = buf + size - 3; p <= pe; p++)11
- {12
- int pn;13
- if (p[0] != 0xff)14
- continue;15
- pn = p[1];16
- if ((pn & 0xf8) != 0xf8 || // currently must be MPEG117
- (pn & 6) == 0) { // invalid layer18
- p++; continue;19
- }20
- pn = p[2];21
- if ((pn & 0xf0) < 0x20 || (pn & 0xf0) == 0xf0 || // bitrates22
- (pn & 0x0c) != 0) { // not 44kHz23
- continue;24
- }25
-26
- return p - buf;27
- }28
-29
- return -1;30
-}31
-32
static int try_get_bitrate(unsigned char *buf, int buf_size)33
{34
int offs1, offs = 0;35
libretro-picodrive-0~git20200112.tar.xz/platform/common/mp3.h -> libretro-picodrive-0~git20200716.tar.xz/platform/common/mp3.h
Changed
12
1
2
extern unsigned short mpeg1_l3_bitrates[16];3
4
#ifdef __GP2X__5
-void mp3_update_local(int *buffer, int length, int stereo);6
-void mp3_start_play_local(void *f, int pos);7
+int _mp3dec_start(FILE *f, int fpos_start);8
+int _mp3dec_decode(FILE *f, int *file_pos, int file_len);9
#endif10
11
#endif // __COMMON_MP3_H__12
libretro-picodrive-0~git20200112.tar.xz/platform/common/mp3_helix.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/mp3_helix.c
Changed
70
1
2
3
#include <stdio.h>4
#include <string.h>5
+#include <dlfcn.h>6
7
#include <pico/pico_int.h>8
#include <pico/sound/mix.h>9
10
static unsigned char mp3_input_buffer[2 * 1024];11
12
#ifdef __GP2X__13
-#define mp3_update mp3_update_local14
-#define mp3_start_play mp3_start_play_local15
+#define mp3dec_decode _mp3dec_decode16
+#define mp3dec_start _mp3dec_start17
#endif18
19
+static void *libhelix;20
+HMP3Decoder (*p_MP3InitDecoder)(void);21
+void (*p_MP3FreeDecoder)(HMP3Decoder);22
+int (*p_MP3Decode)(HMP3Decoder, unsigned char **, int *, short *, int);23
+24
int mp3dec_decode(FILE *f, int *file_pos, int file_len)25
{26
unsigned char *readPtr;27
28
bytesLeft -= offset;29
30
had_err = err;31
- err = MP3Decode(mp3dec, &readPtr, &bytesLeft, cdda_out_buffer, 0);32
+ err = p_MP3Decode(mp3dec, &readPtr, &bytesLeft, cdda_out_buffer, 0);33
if (err) {34
if (err == ERR_MP3_MAINDATA_UNDERFLOW && !had_err) {35
// just need another frame36
37
38
int mp3dec_start(FILE *f, int fpos_start)39
{40
+ if (libhelix == NULL) {41
+ libhelix = dlopen("./libhelix.so", RTLD_NOW);42
+ if (libhelix == NULL) {43
+ lprintf("mp3dec: load libhelix.so: %s\n", dlerror());44
+ return -1;45
+ }46
+47
+ p_MP3InitDecoder = dlsym(libhelix, "MP3InitDecoder");48
+ p_MP3FreeDecoder = dlsym(libhelix, "MP3FreeDecoder");49
+ p_MP3Decode = dlsym(libhelix, "MP3Decode");50
+51
+ if (p_MP3InitDecoder == NULL || p_MP3FreeDecoder == NULL52
+ || p_MP3Decode == NULL)53
+ {54
+ lprintf("mp3dec: missing symbol(s) in libhelix.so\n");55
+ dlclose(libhelix);56
+ libhelix = NULL;57
+ return -1;58
+ }59
+ }60
+61
// must re-init decoder for new track62
if (mp3dec)63
- MP3FreeDecoder(mp3dec);64
- mp3dec = MP3InitDecoder();65
+ p_MP3FreeDecoder(mp3dec);66
+ mp3dec = p_MP3InitDecoder();67
68
return (mp3dec == 0) ? -1 : 0;69
}70
libretro-picodrive-0~git20200716.tar.xz/platform/common/mp3_sync.c
Added
29
1
2
+3
+int mp3_find_sync_word(const unsigned char *buf, int size)4
+{5
+ const unsigned char *p, *pe;6
+7
+ /* find byte-aligned syncword - need 12 (MPEG 1,2) or 11 (MPEG 2.5) matching bits */8
+ for (p = buf, pe = buf + size - 3; p <= pe; p++)9
+ {10
+ int pn;11
+ if (p[0] != 0xff)12
+ continue;13
+ pn = p[1];14
+ if ((pn & 0xf8) != 0xf8 || // currently must be MPEG115
+ (pn & 6) == 0) { // invalid layer16
+ p++; continue;17
+ }18
+ pn = p[2];19
+ if ((pn & 0xf0) < 0x20 || (pn & 0xf0) == 0xf0 || // bitrates20
+ (pn & 0x0c) != 0) { // not 44kHz21
+ continue;22
+ }23
+24
+ return p - buf;25
+ }26
+27
+ return -1;28
+}29
libretro-picodrive-0~git20200112.tar.xz/platform/common/plat_sdl.c -> libretro-picodrive-0~git20200716.tar.xz/platform/common/plat_sdl.c
Changed
83
1
2
/* YUV stuff */3
static int yuv_ry[32], yuv_gy[32], yuv_by[32];4
static unsigned char yuv_u[32 * 2], yuv_v[32 * 2];5
+static unsigned char yuv_y[256];6
+static struct uyvy { unsigned int y:8; unsigned int vyu:24; } yuv_uyvy[65536];7
8
void bgr_to_uyvy_init(void)9
{10
11
v = 255;12
yuv_v[i + 32] = v;13
}14
+ // valid Y range seems to be 16..23515
+ for (i = 0; i < 256; i++) {16
+ yuv_y[i] = 16 + 219 * i / 32;17
+ }18
+ // everything combined into one large array for speed19
+ for (i = 0; i < 65536; i++) {20
+ int r = (i >> 11) & 0x1f, g = (i >> 6) & 0x1f, b = (i >> 0) & 0x1f;21
+ int y = (yuv_ry[r] + yuv_gy[g] + yuv_by[b]) >> 16;22
+ yuv_uyvy[i].y = yuv_y[y];23
+ yuv_uyvy[i].vyu = (yuv_v[r-y + 32] << 16) | (yuv_y[y] << 8) | yuv_u[b-y + 32];24
+ }25
}26
27
void rgb565_to_uyvy(void *d, const void *s, int pixels)28
{29
- unsigned int *dst = d;30
- const unsigned short *src = s;31
- const unsigned char *yu = yuv_u + 32;32
- const unsigned char *yv = yuv_v + 32;33
- int r0, g0, b0, r1, g1, b1;34
- int y0, y1, u, v;35
-36
- for (; pixels > 0; src += 2, dst++, pixels -= 2)37
+ uint32_t *dst = d;38
+ const uint16_t *src = s;39
+40
+ if (plat_sdl_overlay->w > 2*plat_sdl_overlay->h)41
+ for (; pixels > 0; src += 4, dst += 4, pixels -= 4)42
+ {43
+ struct uyvy *uyvy0 = yuv_uyvy + src[0], *uyvy1 = yuv_uyvy + src[1];44
+ struct uyvy *uyvy2 = yuv_uyvy + src[2], *uyvy3 = yuv_uyvy + src[3];45
+ dst[0] = (uyvy0->y << 24) | uyvy0->vyu;46
+ dst[1] = (uyvy1->y << 24) | uyvy1->vyu;47
+ dst[2] = (uyvy2->y << 24) | uyvy2->vyu;48
+ dst[3] = (uyvy3->y << 24) | uyvy3->vyu;49
+ } else 50
+ for (; pixels > 0; src += 4, dst += 2, pixels -= 4)51
{52
- r0 = (src[0] >> 11) & 0x1f;53
- g0 = (src[0] >> 6) & 0x1f;54
- b0 = src[0] & 0x1f;55
- r1 = (src[1] >> 11) & 0x1f;56
- g1 = (src[1] >> 6) & 0x1f;57
- b1 = src[1] & 0x1f;58
- y0 = (yuv_ry[r0] + yuv_gy[g0] + yuv_by[b0]) >> 16;59
- y1 = (yuv_ry[r1] + yuv_gy[g1] + yuv_by[b1]) >> 16;60
- u = yu[b0 - y0];61
- v = yv[r0 - y0];62
- // valid Y range seems to be 16..23563
- y0 = 16 + 219 * y0 / 31;64
- y1 = 16 + 219 * y1 / 31;65
-66
- *dst = (y1 << 24) | (v << 16) | (y0 << 8) | u;67
+ struct uyvy *uyvy0 = yuv_uyvy + src[0], *uyvy1 = yuv_uyvy + src[1];68
+ struct uyvy *uyvy2 = yuv_uyvy + src[2], *uyvy3 = yuv_uyvy + src[3];69
+ dst[0] = (uyvy1->y << 24) | uyvy0->vyu;70
+ dst[1] = (uyvy3->y << 24) | uyvy2->vyu;71
}72
}73
74
75
if (shadow_size < 320 * 480 * 2)76
shadow_size = 320 * 480 * 2;77
78
- shadow_fb = malloc(shadow_size);79
+ shadow_fb = calloc(1, shadow_size);80
g_menubg_ptr = calloc(1, shadow_size);81
if (shadow_fb == NULL || g_menubg_ptr == NULL) {82
fprintf(stderr, "OOM\n");83
libretro-picodrive-0~git20200112.tar.xz/platform/common/version.h -> libretro-picodrive-0~git20200716.tar.xz/platform/common/version.h
Changed
4
1
2
-#define VERSION "1.92"3
+#define VERSION "1.96"4
libretro-picodrive-0~git20200112.tar.xz/platform/gizmondo/Makefile -> libretro-picodrive-0~git20200716.tar.xz/platform/gizmondo/Makefile
Changed
11
1
2
endif3
4
5
+../../tools/textfilter: ../../tools/textfilter.c6
+ make -C ../../tools/ textfilter7
+8
readme.txt: ../../tools/textfilter ../base_readme.txt9
../../tools/textfilter ../base_readme.txt $@ GIZ10
11
libretro-picodrive-0~git20200112.tar.xz/platform/gizmondo/emu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gizmondo/emu.c
Changed
46
1
2
}3
// a hack for VR4
if (PicoIn.AHW & PAHW_SVP)5
- memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);6
+ memset((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328*4);7
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;8
if (currentConfig.EmuOpt&0x4000)9
lines_flags|=0x40000; // (Pico.m.frame_count&1)?0x20000:0x40000;10
11
int lines_flags;12
// 8bit accurate renderer13
if (Pico.m.dirtyPal) {14
- Pico.m.dirtyPal = 0;15
- vidConvCpyRGB565(localPal, Pico.cram, 0x40);16
+ if (Pico.m.dirtyPal == 2)17
+ Pico.m.dirtyPal = 0;18
+ /* no support19
+ switch (Pico.est.SonicPalCount) {20
+ case 3: vidConvCpyRGB565(localPal+0xc0, Pico.est.SonicPal+0xc0, 0x40);21
+ case 2: vidConvCpyRGB565(localPal+0x80, Pico.est.SonicPal+0x80, 0x40);22
+ case 1: vidConvCpyRGB565(localPal+0x40, Pico.est.SonicPal+0x40, 0x40);23
+ default://vidConvCpyRGB565(localPal, Pico.est.SonicPal, 0x40);24
+ } */25
+ vidConvCpyRGB565(localPal, Pico.est.SonicPal, 0x40);26
if (Pico.video.reg[0xC]&8) { // shadow/hilight mode27
- //vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);28
- //vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO?29
- memcpy32((void *)(localPal+0xc0), (void *)(localPal+0x40), 0x40*2/4);30
+ //vidConvCpyRGB32sh(localPal+0x40, Pico.est.SonicPal, 0x40);31
+ //vidConvCpyRGB32hi(localPal+0x80, Pico.est.SonicPal, 0x40); // TODO?32
+ memcpy((void *)(localPal+0xc0), (void *)(localPal+0x40), 0x40*2);33
localPal[0xc0] = 0x0600;34
localPal[0xd0] = 0xc000;35
localPal[0xe0] = 0x0000; // reserved pixels for OSD36
localPal[0xf0] = 0xffff;37
}38
- /* no support39
- else if (rendstatus & 0x20) { // mid-frame palette changes40
- vidConvCpyRGB565(localPal+0x40, HighPal, 0x40);41
- vidConvCpyRGB565(localPal+0x80, HighPal+0x40, 0x40);42
- } */43
}44
lines_flags = (Pico.video.reg[1]&8) ? 240 : 224;45
if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;46
libretro-picodrive-0~git20200112.tar.xz/platform/gizmondo/menu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gizmondo/menu.c
Changed
19
1
2
void menu_draw_begin(int use_bgbuff)3
{4
if (use_bgbuff)5
- memcpy32((int *)menu_screen, (int *)bg_buffer, 321*240*2/4);6
+ memcpy((int *)menu_screen, (int *)bg_buffer, 321*240*2);7
}8
9
10
11
lprintf("%s: Framework2D_LockBuffer() returned NULL\n", __FUNCTION__);12
return;13
}14
- memcpy32(giz_screen, (int *)menu_screen, 321*240*2/4);15
+ memcpy(giz_screen, (int *)menu_screen, 321*240*2);16
fb_unlock();17
giz_screen = NULL;18
fb_flip();19
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/940ctl.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/940ctl.c
Changed
53
1
2
UINT16 *writebuff = shared_ctl->writebuffsel ? shared_ctl->writebuff0 : shared_ctl->writebuff1;3
4
/* detect rapid ym updates */5
- if (upd && !(writebuff_ptr & 0x80000000) && scanline < 224)6
+ if (upd && !(writebuff_ptr & 0x80000000))7
{8
- int mid = Pico.m.pal ? 68 : 93;9
- if (scanline > mid) {10
+ int mid = (Pico.m.pal ? 313 : 262) / 2;11
+ if (scanline >= mid) {12
//printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, scanline);13
writebuff[writebuff_ptr++ & 0xffff] = 0xfffe;14
writebuff_ptr |= 0x80000000;15
16
}17
18
19
-void YM2612Init_940(int baseclock, int rate)20
+void YM2612Init_940(int baseclock, int rate, int ssg)21
{22
static int oldrate;23
24
25
memset(shared_ctl, 0, sizeof(*shared_ctl));26
27
/* cause local ym2612 to init REGS */28
- YM2612Init_(baseclock, rate);29
+ YM2612Init_(baseclock, rate, ssg);30
31
internal_reset();32
33
34
int mp3dec_decode(FILE *f, int *file_pos, int file_len)35
{36
if (!(PicoIn.opt & POPT_EXT_FM)) {37
- //mp3_update_local(buffer, length, stereo);38
- return 0;39
+ return _mp3dec_decode(f, file_pos, file_len);40
}41
42
// check if playback was started, track not ended43
44
int mp3dec_start(FILE *f, int fpos_start)45
{46
if (!(PicoIn.opt & POPT_EXT_FM)) {47
- //mp3_start_play_local(f, pos);48
- return -1;49
+ return _mp3dec_start(f, fpos_start);50
}51
52
if (loaded_mp3 != f)53
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/940ctl.h -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/940ctl.h
Changed
10
1
2
void sharedmem940_init(void);3
void sharedmem940_finish(void);4
5
-void YM2612Init_940(int baseclock, int rate);6
+void YM2612Init_940(int baseclock, int rate, int ssg);7
void YM2612ResetChip_940(void);8
int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty);9
10
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/Makefile -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/Makefile
Changed
10
1
2
all: rel3
4
../../tools/textfilter: ../../tools/textfilter.c5
- make -C ../../tools/6
+ make -C ../../tools/ textfilter7
8
readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog9
../../tools/textfilter ../base_readme.txt $@ GP2X10
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/PicoDrive.gpe -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/PicoDrive.gpe
Changed
10
1
2
export POLLUX_RAM_TIMINGS='ram_timings=2,9,4,1,1,1,1'3
export POLLUX_LCD_TIMINGS_NTSC='lcd_timings=397,1,37,277,341,0,17,337;clkdiv0=9'4
export POLLUX_LCD_TIMINGS_PAL='lcd_timings=428,1,37,277,341,0,17,337;clkdiv0=10'5
+else6
+ export POLLUX_RAM_TIMINGS='ram_timings=3,9,4,1,1,1,1'7
fi8
9
./PicoDrive "$@"10
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/code940/940.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/code940/940.c
Changed
70
1
2
// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas3
4
#include "940shared.h"5
-#include "../../common/mp3.h"6
+#include "../../common/helix/pub/mp3dec.h"7
8
static _940_data_t *shared_data = (_940_data_t *) 0x00100000;9
static _940_ctl_t *shared_ctl = (_940_ctl_t *) 0x00200000;10
11
// is changed by other core just before we update it12
void set_if_not_changed(int *val, int oldval, int newval);13
14
-void _memcpy(void *dst, const void *src, int count);15
+extern void *memcpy(void *dest, const void *src, unsigned long n);16
17
// asm volatile ("mov r0, #0" ::: "r0");18
// asm volatile ("mcr p15, 0, r0, c7, c6, 0" ::: "r0"); /* flush dcache */19
20
int job = 0;21
ym2612_940 = &shared_data->ym2612;22
23
+// extern unsigned __bss_start__, __bss_end__;24
+// memset(&__bss_start__, 0, &__bss_end__ - &__bss_start__);25
26
for (;;)27
{28
29
case JOB940_INITALL:30
/* ym2612 */31
shared_ctl->writebuff0[0] = shared_ctl->writebuff1[0] = 0xffff;32
- YM2612Init_(shared_ctl->baseclock, shared_ctl->rate);33
+ YM2612Init_(shared_ctl->baseclock, shared_ctl->rate, 0);34
/* Helix mp3 decoder */35
+ __malloc_init();36
shared_data->mp3dec = MP3InitDecoder();37
break;38
39
40
41
case JOB940_PICOSTATESAVE2:42
YM2612PicoStateSave2(0, 0);43
- _memcpy(shared_ctl->writebuff0, ym2612_940->REGS, 0x200);44
+ memcpy(shared_ctl->writebuff0, ym2612_940->REGS, 0x200);45
break;46
47
case JOB940_PICOSTATELOAD2_PREP:48
49
break;50
51
case JOB940_PICOSTATELOAD2:52
- _memcpy(ym2612_940->REGS, shared_ctl->writebuff0, 0x200);53
+ memcpy(ym2612_940->REGS, shared_ctl->writebuff0, 0x200);54
YM2612PicoStateLoad2(0, 0);55
break;56
57
58
59
case JOB940_MP3RESET:60
if (shared_data->mp3dec) MP3FreeDecoder(shared_data->mp3dec);61
+ __malloc_init();62
shared_data->mp3dec = MP3InitDecoder();63
break;64
}65
66
dcache_clean();67
}68
}69
-70
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/code940/Makefile -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/code940/Makefile
Changed
83
1
2
# you may or may not need to change this3
-#devkit_path = x:/stuff/dev/devkitgp2x/4
-devkit_path ?= $(HOME)/opt/devkitGP2X/5
-lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/6
-CROSS = arm-linux-7
+#devkit_path ?= $(HOME)/opt/devkitGP2X/8
+#lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/9
#CROSS = $(devkit_path)bin/arm-linux-10
+#devkit_path ?= $(HOME)/opt/open2x11
+#lgcc_path = $(devkit_path)/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/12
+#CROSS ?= $(devkit_path)/gcc-4.1.1-glibc-2.3.6/bin/arm-open2x-linux-13
+#devkit_path ?= $(HOME)/opt/arm-unknown-linux-gnu14
+#lgcc_path = $(HOME)/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/15
+#CROSS ?= $(devkit_path)/bin/arm-unknown-linux-gnu-16
+lgcc_path = $(HOME)/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/17
+CROSS ?= arm-linux-gnueabi-18
19
# settings20
#up = 121
22
-CFLAGS += -O2 -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math23
-CFLAGS += -I../.. -I. -D__GP2X__ -DARM24
-CFLAGS += -mcpu=arm940t -mtune=arm940t25
-LDFLAGS = -static -s -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc26
+CFLAGS += -O2 -Wall -mno-thumb-interwork -fstrict-aliasing -ffast-math27
+CFLAGS += -I../../common/helix/pub -I../../.. -I. -D__GP2X__ -DARM28
+CFLAGS += -mcpu=arm940t -mtune=arm940t -mabi=apcs-gnu -mfloat-abi=soft -mfpu=fpa29
+LDFLAGS = -static -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc30
31
GCC = $(CROSS)gcc32
STRIP = $(CROSS)strip33
34
# stuff for 940 core35
36
# init, emu_control, emu37
-OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o mp3.o38
+OBJS940 += 940init.o 940.o 940ym2612.o misc_arm.o mp3_sync.o39
+# the asm memcpy code crashes job LOAD2 on 940. Possibly a globbered reg?40
+# OBJS940 += memcpy.o41
# the asm code seems to be faster when run on 920, but not on 940 for some reason42
# OBJS940 += ../../Pico/sound/ym2612_asm.o43
44
45
OBJS940 += uClibc/memset.o uClibc/s_floor.o uClibc/e_pow.o uClibc/e_sqrt.o uClibc/s_fabs.o46
OBJS940 += uClibc/s_scalbn.o uClibc/s_copysign.o uClibc/k_sin.o uClibc/k_cos.o uClibc/s_sin.o47
OBJS940 += uClibc/e_rem_pio2.o uClibc/k_rem_pio2.o uClibc/e_log.o uClibc/wrappers.o48
+LIBHELIX ?= ../../common/helix/$(notdir $(CROSS))helix_mp3.a49
50
$(BIN) : code940.elf51
@echo ">>>" $@52
$(OBJCOPY) -O binary $< $@53
54
-code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a55
+code940.elf : $(OBJS940) $(LIBHELIX)56
@echo ">>>" $@57
$(LD) $^ $(LDFLAGS) -o $@ -Map code940.map58
59
60
@echo ">>>" $@61
$(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@62
63
-../../common/helix/helix_mp3.a:64
- @make -C ../../common/helix/65
+mp3_sync.o: ../../common/mp3_sync.c66
+ @echo ">>>" $@67
+ $(GCC) $(CFLAGS) -Os -DCODE940 -c $< -o $@68
+69
+$(LIBHELIX):70
+ @$(MAKE) -C ../../common/helix/ CROSS=$(CROSS)71
72
73
up: $(BIN)74
75
##76
OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o77
78
-mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a79
+mp3test.gpe : $(OBJSMP3T) $(LIBHELIX)80
$(GCC) -static -o $@ $^81
$(STRIP) $@82
@cp -v $@ /mnt/gp2x/mnt/sd83
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/code940/memcpy.s -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/code940/memcpy.s
Changed
35
1
2
blt Lmemcpy_fl32 /* less than 32 bytes (12 from above) */3
stmdb sp!, {r4, r7, r8, r9, r10} /* borrow r4 */4
5
-/* blat 64 bytes at a time */6
+/* blat 32 bytes at a time */7
/* XXX for really big copies perhaps we should use more registers */8
Lmemcpy_floop32:9
ldmia r1!, {r3, r4, r7, r8, r9, r10, r12, lr}10
stmia r0!, {r3, r4, r7, r8, r9, r10, r12, lr}11
-ldmia r1!, {r3, r4, r7, r8, r9, r10, r12, lr}12
-stmia r0!, {r3, r4, r7, r8, r9, r10, r12, lr}13
-subs r2, r2, #0x40 14
+subs r2, r2, #0x20 15
bge Lmemcpy_floop3216
17
cmn r2, #0x1018
19
subs r2, r2, #0x14 /* less than 32 bytes (12 from above) */20
blt Lmemcpy_bl3221
22
-/* blat 64 bytes at a time */23
+/* blat 32 bytes at a time */24
/* XXX for really big copies perhaps we should use more registers */25
Lmemcpy_bloop32:26
ldmdb r1!, {r3, r4, r7, r8, r9, r10, r12, lr}27
stmdb r0!, {r3, r4, r7, r8, r9, r10, r12, lr}28
-ldmdb r1!, {r3, r4, r7, r8, r9, r10, r12, lr}29
-stmdb r0!, {r3, r4, r7, r8, r9, r10, r12, lr}30
-subs r2, r2, #0x40 31
+subs r2, r2, #0x20 32
bge Lmemcpy_bloop3233
34
Lmemcpy_bl32:35
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/code940/mp3test.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/code940/mp3test.c
Changed
10
1
2
//#include "emu.h"3
//#include "menu.h"4
#include "../asmutils.h"5
-#include "../helix/pub/mp3dec.h"6
+#include "../../helix/pub/mp3dec.h"7
8
/* we will need some gp2x internals here */9
extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */10
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/code940/uClibc/memset.s -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/code940/uClibc/memset.s
Changed
10
1
2
.text3
.global memset4
.type memset,%function5
- .align 46
+ .align 27
8
memset:9
mov a4, a110
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/code940/uClibc/wrappers.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/code940/uClibc/wrappers.c
Changed
19
1
2
{3
return __ieee754_pow(x, y);4
}5
+double __pow_finite(double x, double y)6
+{7
+ return __ieee754_pow(x, y);8
+}9
10
11
double log(double x)12
{13
return __ieee754_log(x);14
}15
+double __log_finite(double x)16
+{17
+ return __ieee754_log(x);18
+}19
libretro-picodrive-0~git20200112.tar.xz/platform/gp2x/emu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/gp2x/emu.c
Changed
165
1
2
gp2x_soc_t soc;3
4
defaultConfig.CPUclock = default_cpu_clock;5
- defaultConfig.renderer32x = RT_8BIT_FAST;6
+ defaultConfig.renderer32x = RT_8BIT_ACC;7
defaultConfig.analog_deadzone = 50;8
9
soc = soc_detect();10
11
}12
13
static int localPal[0x100];14
+static int localPalSize;15
+16
static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border);17
static int (*make_local_pal)(int fast_mode);18
19
static int make_local_pal_md(int fast_mode)20
{21
- int pallen = 0xc0;22
-23
- bgr444_to_rgb32(localPal, Pico.cram);24
- if (fast_mode)25
- return 0x40;26
+ int pallen = 0x100;27
28
- if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode29
- bgr444_to_rgb32_sh(localPal, Pico.cram);30
- localPal[0xc0] = 0x0000c000;31
- localPal[0xd0] = 0x00c00000;32
- localPal[0xe0] = 0x00000000; // reserved pixels for OSD33
- localPal[0xf0] = 0x00ffffff;34
- pallen = 0x100;35
+ if (fast_mode) {36
+ bgr444_to_rgb32(localPal, PicoMem.cram);37
+ pallen = 0x40;38
+ Pico.m.dirtyPal = 0;39
}40
else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes41
- bgr444_to_rgb32(localPal+0x40, Pico.est.HighPal);42
- bgr444_to_rgb32(localPal+0x80, Pico.est.HighPal+0x40);43
+ switch (Pico.est.SonicPalCount) {44
+ case 3: bgr444_to_rgb32(localPal+0xc0, Pico.est.SonicPal+0xc0);45
+ case 2: bgr444_to_rgb32(localPal+0x80, Pico.est.SonicPal+0x80);46
+ case 1: bgr444_to_rgb32(localPal+0x40, Pico.est.SonicPal+0x40);47
+ default:bgr444_to_rgb32(localPal, Pico.est.SonicPal);48
+ }49
+ pallen = (Pico.est.SonicPalCount+1)*0x40;50
}51
- else52
- memcpy(localPal + 0x80, localPal, 0x40 * 4); // for spr prio mess53
+ else if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode54
+ bgr444_to_rgb32(localPal, Pico.est.SonicPal);55
+ bgr444_to_rgb32_sh(localPal, Pico.est.SonicPal);56
+ }57
+ else {58
+ bgr444_to_rgb32(localPal, Pico.est.SonicPal);59
+ memcpy(localPal+0x40, localPal, 0x40*4); // for spr prio mess60
+ memcpy(localPal+0x80, localPal, 0x80*4); // for spr prio mess61
+ }62
+ localPal[0xc0] = 0x0000c000;63
+ localPal[0xd0] = 0x00c00000;64
+ localPal[0xe0] = 0x00000000; // reserved pixels for OSD65
+ localPal[0xf0] = 0x00ffffff;66
67
+ if (Pico.m.dirtyPal == 2)68
+ Pico.m.dirtyPal = 0;69
return pallen;70
}71
72
static int make_local_pal_sms(int fast_mode)73
{74
- unsigned short *spal = Pico.cram;75
+ unsigned short *spal = PicoMem.cram;76
unsigned int *dpal = (void *)localPal;77
unsigned int i, t;78
79
80
*dpal++ = t;81
}82
83
+ Pico.m.dirtyPal = 0;84
return 0x40;85
}86
87
void pemu_finalize_frame(const char *fps, const char *notice)88
{89
int emu_opt = currentConfig.EmuOpt;90
- int ret;91
92
if (PicoIn.AHW & PAHW_32X)93
- ; // nothing to do94
+ localPalSize = 0; // nothing to do95
else if (get_renderer() == RT_8BIT_FAST)96
{97
// 8bit fast renderer98
- if (Pico.m.dirtyPal) {99
- Pico.m.dirtyPal = 0;100
- ret = make_local_pal(1);101
- // feed new palette to our device102
- gp2x_video_setpalette(localPal, ret);103
- }104
+ if (Pico.m.dirtyPal)105
+ localPalSize = make_local_pal(1);106
// a hack for VR107
if (PicoIn.AHW & PAHW_SVP)108
memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);109
110
{111
// 8bit accurate renderer112
if (Pico.m.dirtyPal)113
- {114
- Pico.m.dirtyPal = 0;115
- ret = make_local_pal(0);116
- gp2x_video_setpalette(localPal, ret);117
- }118
+ localPalSize = make_local_pal(0);119
}120
+ else localPalSize = 0; // no palette in 16bit mode121
122
if (notice)123
osd_text(4, osd_y, notice);124
125
{126
int stride = g_screen_width;127
gp2x_video_flip();128
+ // switching the palette takes immediate effect, whilst flipping only129
+ // takes effect with the next vsync; unavoidable flicker may occur!130
+ if (localPalSize)131
+ gp2x_video_setpalette(localPal, localPalSize);132
133
if (is_16bit_mode())134
stride *= 2;135
136
if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {137
PicoDrawSetOutFormat(PDF_RGB555, 1);138
}139
- else {140
- PicoDrawSetOutFormat(PDF_NONE, 0);141
- }142
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);143
gp2x_mode = 16;144
}145
146
localPal[0xe0] = 0x00000000; // reserved pixels for OSD147
localPal[0xf0] = 0x00ffffff;148
gp2x_video_setpalette(localPal, 0x100);149
- gp2x_memset_all_buffers(0, 0xe0, 320*240);150
}151
- else152
- gp2x_memset_all_buffers(0, 0, 320*240*2);153
154
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)155
gp2x_mode = -gp2x_mode;156
157
PicoDrawSetCallbacks(NULL, NULL);158
Pico.m.dirtyPal = 1;159
160
+ if (!no_scale)161
+ no_scale = currentConfig.scaling == EOPT_SCALE_NONE;162
emu_cmn_forced_frame(no_scale, do_emu);163
164
g_menubg_src_ptr = g_screen_ptr;165
libretro-picodrive-0~git20200112.tar.xz/platform/libpicofe/fonts.h -> libretro-picodrive-0~git20200716.tar.xz/platform/libpicofe/fonts.h
Changed
9
1
2
3
extern unsigned char fontdata8x8[64*16];4
-extern unsigned char fontdata6x8[256-32][8];5
+extern unsigned char fontdata6x8[256][8];6
7
void basic_text_out16_nf(void *fb, int w, int x, int y, const char *text);8
void basic_text_out16(void *fb, int w, int x, int y, const char *texto, ...);9
libretro-picodrive-0~git20200112.tar.xz/platform/libpicofe/linux/host_dasm.c -> libretro-picodrive-0~git20200716.tar.xz/platform/libpicofe/linux/host_dasm.c
Changed
34
1
2
3
static struct disassemble_info di;4
5
-#ifdef __arm__6
+#if defined __arm__7
#define print_insn_func print_insn_little_arm8
#define BFD_ARCH bfd_arch_arm9
#define BFD_MACH bfd_mach_arm_unknown10
#define DASM_OPTS "reg-names-std"11
+#elif defined __aarch64__12
+#define print_insn_func print_insn_aarch6413
+#define BFD_ARCH bfd_arch_aarch6414
+#define BFD_MACH bfd_mach_aarch6415
+#define DASM_OPTS NULL16
+#elif defined __mips__17
+#define print_insn_func print_insn_little_mips18
+#define BFD_ARCH bfd_arch_mips19
+#define BFD_MACH bfd_mach_mipsisa3220
+#define DASM_OPTS NULL21
+#elif defined __riscv22
+#define print_insn_func print_insn_riscv23
+#define BFD_ARCH bfd_arch_riscv24
+#define BFD_MACH bfd_mach_riscv6425
+#define DASM_OPTS NULL26
+#elif defined __powerpc__27
+#define print_insn_func print_insn_little_powerpc28
+#define BFD_ARCH bfd_arch_powerpc29
+#define BFD_MACH bfd_mach_ppc6430
+#define DASM_OPTS NULL31
#elif defined(__x86_64__) || defined(__i386__)32
#define print_insn_func print_insn_i386_intel33
#define BFD_ARCH bfd_arch_i38634
libretro-picodrive-0~git20200112.tar.xz/platform/libpicofe/plat_sdl.c -> libretro-picodrive-0~git20200716.tar.xz/platform/libpicofe/plat_sdl.c
Changed
51
1
2
static int window_w, window_h;3
static int fs_w, fs_h;4
static int old_fullscreen;5
-static int vout_mode_overlay = -1, vout_mode_gl = -1;6
+static int vout_mode_overlay = -1, vout_mode_overlay2x = -1, vout_mode_gl = -1;7
static void *display, *window;8
static int gl_quirks;9
10
11
// invalid method might come from config..12
if (plat_target.vout_method != 013
&& plat_target.vout_method != vout_mode_overlay14
+ && plat_target.vout_method != vout_mode_overlay2x15
&& plat_target.vout_method != vout_mode_gl)16
{17
fprintf(stderr, "invalid vout_method: %d\n", plat_target.vout_method);18
19
}20
}21
22
- if (plat_target.vout_method == vout_mode_overlay) {23
- plat_sdl_overlay = SDL_CreateYUVOverlay(w, h, SDL_UYVY_OVERLAY, plat_sdl_screen);24
+ if (plat_target.vout_method == vout_mode_overlay25
+ || plat_target.vout_method == vout_mode_overlay2x) {26
+ int W = plat_target.vout_method == vout_mode_overlay2x && w == 320 ? 2*w : w;27
+ plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);28
if (plat_sdl_overlay != NULL) {29
if ((long)plat_sdl_overlay->pixels[0] & 3)30
fprintf(stderr, "warning: overlay pointer is unaligned\n");31
32
33
int plat_sdl_init(void)34
{35
- static const char *vout_list[] = { NULL, NULL, NULL, NULL };36
+ static const char *vout_list[] = { NULL, NULL, NULL, NULL, NULL };37
const SDL_VideoInfo *info;38
SDL_SysWMinfo wminfo;39
int overlay_works = 0;40
41
if (overlay_works) {42
plat_target.vout_method = vout_mode_overlay = i;43
vout_list[i++] = "Video Overlay";44
+#ifdef SDL_OVERLAY_2X45
+ vout_mode_overlay2x = i;46
+ vout_list[i++] = "Video Overlay 2x";47
+#endif48
}49
if (gl_works) {50
plat_target.vout_method = vout_mode_gl = i;51
libretro-picodrive-0~git20200112.tar.xz/platform/libretro/libretro-common/include/libretro_gskit_ps2.h -> libretro-picodrive-0~git20200716.tar.xz/platform/libretro/libretro-common/include/libretro_gskit_ps2.h
Changed
25
1
2
-/* Copyright (C) 2010-2018 The RetroArch team3
+/* Copyright (C) 2010-2020 The RetroArch team4
*5
* ---------------------------------------------------------------------------------------------6
* The following license statement only applies to this libretro API header (libretro_d3d.h)7
8
9
#include <gsKit.h>10
11
-#define RETRO_HW_RENDER_INTERFACE_GSKIT_PS2_VERSION 112
+#define RETRO_HW_RENDER_INTERFACE_GSKIT_PS2_VERSION 213
14
struct retro_hw_ps2_insets15
{16
17
* in this interface.18
*/19
GSTEXTURE *coreTexture;20
- bool clearTexture;21
- bool updatedPalette;22
struct retro_hw_ps2_insets padding;23
};24
typedef struct retro_hw_render_interface_gskit_ps2 RETRO_HW_RENDER_INTEFACE_GSKIT_PS2;25
libretro-picodrive-0~git20200112.tar.xz/platform/libretro/libretro.c -> libretro-picodrive-0~git20200716.tar.xz/platform/libretro/libretro.c
Changed
140
1
2
#define VOUT_32BIT_WIDTH 2563
#endif4
#define VOUT_MAX_HEIGHT 2405
-#define SND_RATE 441006
+#define INITIAL_SND_RATE 441007
8
static const float VOUT_PAR = 0.0;9
static const float VOUT_4_3 = (224.0f * (4.0f / 3.0f));10
11
static struct retro_hw_ps2_insets padding;12
#endif13
14
-static short ALIGNED(4) sndBuffer[2*SND_RATE/50];15
+static short ALIGNED(4) sndBuffer[2*INITIAL_SND_RATE/50];16
17
static void snd_write(int len);18
19
+char **g_argv;20
+21
#ifdef _WIN3222
#define SLASH '\\'23
#else24
25
memset(vout_buf, 0, vout_width * VOUT_MAX_HEIGHT);26
memset(retro_palette, 0, gsKit_texture_size_ee(16, 16, GS_PSM_CT16));27
PicoDrawSetOutBuf(vout_buf, vout_width);28
-29
- if (ps2) {30
- ps2->clearTexture = true;31
- }32
#else33
vout_width = is_32cols ? VOUT_32BIT_WIDTH : VOUT_MAX_WIDTH;34
memset(vout_buf, 0, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2); 35
36
37
void emu_32x_startup(void)38
{39
+ PicoDrawSetOutFormat(PDF_RGB555, 0);40
+ PicoDrawSetOutBuf(vout_buf, vout_width * 2);41
}42
43
void lprintf(const char *fmt, ...)44
45
46
memset(info, 0, sizeof(*info));47
info->timing.fps = Pico.m.pal ? 50 : 60;48
- info->timing.sample_rate = SND_RATE;49
+ info->timing.sample_rate = PicoIn.sndRate;50
info->geometry.base_width = vout_width;51
info->geometry.base_height = vout_height;52
info->geometry.max_width = vout_width;53
54
struct retro_variable var;55
int OldPicoRegionOverride;56
float old_user_vout_width;57
+ double new_sound_rate;58
59
var.value = NULL;60
var.key = "picodrive_input1";61
62
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {63
PicoIn.sndFilterRange = (atoi(var.value) * 65536) / 100;64
}65
+66
+ var.value = NULL;67
+ var.key = "picodrive_renderer";68
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {69
+ if (strcmp(var.value, "fast") == 0)70
+ PicoIn.opt |= POPT_ALT_RENDERER;71
+ else72
+ PicoIn.opt &= ~POPT_ALT_RENDERER;73
+ }74
+75
+ var.value = NULL;76
+ var.key = "picodrive_sound_rate";77
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {78
+ new_sound_rate = atoi(var.value);79
+ if (new_sound_rate != PicoIn.sndRate) {80
+ /* Update the sound rate */81
+ PicoIn.sndRate = new_sound_rate;82
+ PsndRerate(1);83
+ struct retro_system_av_info av_info;84
+ retro_get_system_av_info(&av_info);85
+ environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &av_info);86
+ }87
+ }88
}89
90
void retro_run(void)91
92
}93
94
Pico.m.dirtyPal = 0;95
- ps2->updatedPalette = true;96
}97
98
if (PicoIn.AHW & PAHW_SMS) {99
100
ps2->padding = padding;101
102
#else103
+ if (PicoIn.opt & POPT_ALT_RENDERER) {104
+ /* In retro_init, PicoDrawSetOutBuf is called to make sure the output gets written to vout_buf, but this only105
+ * applies to the line renderer (pico/draw.c). The faster tile-based renderer (pico/draw2.c) enabled by106
+ * POPT_ALT_RENDERER writes to Pico.est.Draw2FB, so we need to manually copy that to vout_buf.107
+ */108
+ /* This section is mostly copied from pemu_finalize_frame in platform/linux/emu.c */109
+ unsigned short *pd = (unsigned short *)vout_buf;110
+ /* Skip the leftmost 8 columns (it seems to be used as some sort of caching or overscan area) */111
+ unsigned char *ps = Pico.est.Draw2FB + 8;112
+ unsigned short *pal = Pico.est.HighPal;113
+ int x;114
+ if (Pico.m.dirtyPal)115
+ PicoDrawUpdateHighPal();116
+ /* Copy up to the max height to include the overscan area, and skip the leftmost 8 columns again */117
+ for (i = 0; i < VOUT_MAX_HEIGHT; i++, ps += 8)118
+ for (x = 0; x < vout_width; x++)119
+ *pd++ = pal[*ps++];120
+ }121
+122
buff = (char*)vout_buf + vout_offset;123
#endif124
125
126
#endif127
PicoIn.opt |= POPT_EN_DRC;128
#endif129
- PicoIn.sndRate = SND_RATE;130
+131
+ struct retro_variable var = { .key = "picodrive_sound_rate" };132
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)133
+ PicoIn.sndRate = atoi(var.value);134
+ else135
+ PicoIn.sndRate = INITIAL_SND_RATE;136
+137
PicoIn.autoRgnOrder = 0x184; // US, EU, JP138
139
vout_width = VOUT_MAX_WIDTH;140
libretro-picodrive-0~git20200112.tar.xz/platform/libretro/libretro_core_options.h -> libretro-picodrive-0~git20200716.tar.xz/platform/libretro/libretro_core_options.h
Changed
34
1
2
},3
"60"4
},5
+#if !defined(RENDER_GSKIT_PS2)6
+ {7
+ "picodrive_renderer",8
+ "Renderer",9
+ "Fast renderer can't render any mid-frame image changes so it is useful only for some games.",10
+ {11
+ { "accurate", NULL },12
+ { "fast", NULL },13
+ { NULL, NULL },14
+ },15
+ "accurate"16
+ },17
+#endif18
+ {19
+ "picodrive_sound_rate",20
+ "Sound quality",21
+ "Sound quality (in Hz). A lower value may increase performance.",22
+ {23
+ { "16000", NULL },24
+ { "22050", NULL },25
+ { "32000", NULL },26
+ { "44100", NULL },27
+ { NULL, NULL },28
+ },29
+ "44100"30
+ },31
{ NULL, NULL, NULL, {{0}}, NULL },32
};33
34
libretro-picodrive-0~git20200112.tar.xz/platform/linux/blit.c -> libretro-picodrive-0~git20200716.tar.xz/platform/linux/blit.c
Changed
14
1
2
for (i = 0; i < 224; i++)3
{4
ps += 8;5
+ ps += 32;6
pd += 32;7
for (u = 0; u < 256; u++)8
*pd++ = *ps++;9
- ps += 64;10
+ ps += 32;11
pd += 32;12
}13
} else {14
libretro-picodrive-0~git20200112.tar.xz/platform/linux/emu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/linux/emu.c
Changed
66
1
2
3
void pemu_validate_config(void)4
{5
-#if !defined(__arm__) && !defined(__i386__) && !defined(__x86_64__)6
+#if !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__riscv__) && !defined(__riscv) && !defined(__powerpc__) && !defined(__i386__) && !defined(__x86_64__)7
PicoIn.opt &= ~POPT_EN_DRC;8
#endif9
}10
11
int led_reg, pitch, scr_offs, led_offs;12
led_reg = Pico_mcd->s68k_regs[0];13
14
- pitch = 320;15
+ pitch = g_screen_ppitch;16
led_offs = 4;17
scr_offs = pitch * 2 + 4;18
19
+#if 020
if (currentConfig.renderer != RT_16BIT) {21
#define p(x) px[(x) >> 2]22
// 8-bit modes23
24
p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;25
p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;26
#undef p27
- } else {28
+ } else29
+#endif30
+ {31
#define p(x) px[(x)*2 >> 2] = px[((x)*2 >> 2) + 1]32
// 16-bit modes33
unsigned int *px = (unsigned int *)((short *)g_screen_ptr + scr_offs);34
35
unsigned char *ps = Pico.est.Draw2FB + 328*8 + 8;36
unsigned short *pal = Pico.est.HighPal;37
int i, x;38
- if (Pico.m.dirtyPal)39
- PicoDrawUpdateHighPal();40
+41
+ PicoDrawUpdateHighPal();42
for (i = 0; i < 224; i++, ps += 8)43
for (x = 0; x < 320; x++)44
*pd++ = pal[*ps++];45
46
47
if (PicoIn.AHW & PAHW_32X)48
PicoDrawSetOutBuf(g_screen_ptr, g_screen_ppitch * 2);49
+50
+ Pico.m.dirtyPal = 1;51
}52
53
void plat_video_toggle_renderer(int change, int is_menu)54
55
void emu_video_mode_change(int start_line, int line_count, int is_32cols)56
{57
// clear whole screen in all buffers58
- memset32(g_screen_ptr, 0, g_screen_ppitch * g_screen_height * 2 / 4);59
+ if (currentConfig.renderer != RT_16BIT && !(PicoIn.AHW & PAHW_32X))60
+ memset32(Pico.est.Draw2FB, 0, (320+8) * (8+240+8) / 4);61
+ else62
+ memset32(g_screen_ptr, 0, g_screen_ppitch * g_screen_height * 2 / 4);63
}64
65
void pemu_loop_prep(void)66
libretro-picodrive-0~git20200112.tar.xz/platform/linux/pprof.c -> libretro-picodrive-0~git20200716.tar.xz/platform/linux/pprof.c
Changed
97
1
2
#include <stdio.h>3
#include <stdlib.h>4
#include <unistd.h>5
+#include <fcntl.h>6
#include <sys/types.h>7
#include <sys/ipc.h>8
#include <sys/shm.h>9
+#include <sys/mman.h>10
11
#include <pico/pico_int.h>12
13
+int rc_mem[pp_total_points];14
+15
struct pp_counters *pp_counters;16
+int *refcounts = rc_mem;17
static int shmemid;18
19
+static unsigned long devMem;20
+volatile unsigned long *gp2x_memregl;21
+volatile unsigned short *gp2x_memregs;22
+23
void pprof_init(void)24
{25
int this_is_new_shmem = 1;26
key_t shmemkey;27
void *shmem;28
29
+#if 030
+ devMem = open("/dev/mem", O_RDWR);31
+ if (devMem == -1)32
+ {33
+ perror("pprof: open failed");34
+ return;35
+ }36
+ gp2x_memregl = (unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, devMem, 0xc0000000);37
+ if (gp2x_memregl == (unsigned long *)-1)38
+ {39
+ perror("pprof: mmap failed");40
+ return;41
+ }42
+ gp2x_memregs = (unsigned short *)gp2x_memregl;43
+#endif44
+45
#ifndef PPROF_TOOL46
unsigned int tmp = pprof_get_one();47
printf("pprof: measured diff is %u\n", pprof_get_one() - tmp);48
49
return;50
}51
52
-#ifndef PPROF_TOOL53
+//#ifndef PPROF_TOOL54
shmemid = shmget(shmemkey, sizeof(*pp_counters),55
IPC_CREAT | IPC_EXCL | 0644);56
if (shmemid == -1)57
-#endif58
+//#endif59
{60
shmemid = shmget(shmemkey, sizeof(*pp_counters),61
0644);62
63
IT(draw),64
IT(sound),65
IT(m68k),66
+ IT(s68k),67
+ IT(mem68),68
IT(z80),69
IT(msh2),70
IT(ssh2),71
+ IT(memsh),72
IT(dummy),73
};74
75
int main(int argc, char *argv[])76
{77
- unsigned long long old[pp_total_points], new[pp_total_points];78
+ pp_type old[pp_total_points], new[pp_total_points];79
int base = 0;80
int l, i;81
82
83
memcpy(new, pp_counters->counter, sizeof(new));84
for (i = 0; i < ARRAY_SIZE(pp_tab); i++)85
{86
- unsigned long long idiff = new[i] - old[i];87
- unsigned long long bdiff = (new[base] - old[base]) | 1;88
+ pp_type idiff = new[i] - old[i];89
+ pp_type bdiff = (new[base] - old[base]) | 1;90
printf("%6.2f ", (double)idiff * 100.0 / bdiff);91
}92
printf("\n");93
+ fflush(stdout);94
memcpy(old, new, sizeof(old));95
96
if (argc < 3)97
libretro-picodrive-0~git20200112.tar.xz/platform/linux/pprof.h -> libretro-picodrive-0~git20200716.tar.xz/platform/linux/pprof.h
Changed
79
1
2
pp_draw,3
pp_sound,4
pp_m68k,5
+ pp_s68k,6
+ pp_mem68,7
pp_z80,8
pp_msh2,9
pp_ssh2,10
+ pp_memsh,11
pp_dummy,12
pp_total_points13
};14
15
-struct pp_counters16
-{17
- unsigned long long counter[pp_total_points];18
-};19
-20
extern struct pp_counters *pp_counters;21
+extern int *refcounts;22
23
#ifdef __i386__24
+typedef unsigned long long pp_type;25
+26
static __attribute__((always_inline)) inline unsigned int pprof_get_one(void)27
{28
unsigned long long ret;29
30
#define unglitch_timer(x)31
32
#elif defined(__GP2X__)33
+typedef unsigned long pp_type;34
+35
+#if 036
// XXX: MMSP2 only, timer sometimes seems to return lower vals?37
extern volatile unsigned long *gp2x_memregl;38
#define pprof_get_one() (unsigned int)gp2x_memregl[0x0a00 >> 2]39
#define unglitch_timer(di) \40
if ((signed int)(di) < 0) di = 041
+#else42
+extern unsigned int (*gp2x_get_ticks_us)(void);43
+#define pprof_get_one() gp2x_get_ticks_us()44
+#define unglitch_timer(di) \45
+ if ((signed int)(di) < 0) di = 046
+#endif47
48
#else49
#error no timer50
#endif51
52
+struct pp_counters53
+{54
+ pp_type counter[pp_total_points];55
+};56
+57
#define pprof_start(point) { \58
- unsigned int pp_start_##point = pprof_get_one()59
+ unsigned int pp_start_##point = pprof_get_one(); refcounts[pp_##point]++60
61
#define pprof_end(point) \62
{ \63
unsigned int di = pprof_get_one() - pp_start_##point; \64
unglitch_timer(di); \65
- pp_counters->counter[pp_##point] += di; \66
+ if (!--refcounts[pp_##point]) pp_counters->counter[pp_##point] += di; \67
} \68
}69
70
71
{ \72
unsigned int di = pprof_get_one() - pp_start_##point; \73
unglitch_timer(di); \74
- pp_counters->counter[pp_##point] -= di; \75
+ if (--refcounts[pp_##point]) pp_counters->counter[pp_##point] -= di; \76
} \77
}78
79
libretro-picodrive-0~git20200112.tar.xz/platform/pandora/Makefile -> libretro-picodrive-0~git20200716.tar.xz/platform/pandora/Makefile
Changed
10
1
2
all: rel3
4
../../tools/textfilter: ../../tools/textfilter.c5
- make -C ../../tools/6
+ make -C ../../tools/ textfilter7
8
#readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog9
# ../../tools/textfilter ../base_readme.txt $@ PANDORA10
libretro-picodrive-0~git20200112.tar.xz/platform/psp/emu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/psp/emu.c
Changed
56
1
2
3
//for (i = 0x3f/2; i >= 0; i--)4
// dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);5
- do_pal_convert(localPal, Pico.cram, currentConfig.gamma, currentConfig.gamma2);6
-7
- Pico.m.dirtyPal = 0;8
- need_pal_upload = 1;9
-10
- if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?11
+ if ((currentConfig.EmuOpt&0x80) || (PicoOpt&0x10)) {12
+ do_pal_convert(localPal, Pico.cram, currentConfig.gamma, currentConfig.gamma2);13
+ Pico.m.dirtyPal = 0;14
+ }15
+ else if (Pico.est.rendstatus&0x20)16
+ {17
+ switch (Pico.est.SonicPalCount) {18
+ case 3: do_pal_convert(localPal+0xc0, Pico.est.SonicPal+0xc0, currentConfig.gamma, currentConfig.gamma2);19
+ case 2: do_pal_convert(localPal+0x80, Pico.est.SonicPal+0x80, currentConfig.gamma, currentConfig.gamma2);20
+ case 1: do_pal_convert(localPal+0x40, Pico.est.SonicPal+0x40, currentConfig.gamma, currentConfig.gamma2);21
+ default:do_pal_convert(localPal, Pico.est.SonicPal, currentConfig.gamma, currentConfig.gamma2);22
+ }23
+ }24
+ else if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?25
{26
+ do_pal_convert(localPal, Pico.est.SonicPal, currentConfig.gamma, currentConfig.gamma2);27
// shadowed pixels28
for (i = 0x3f/2; i >= 0; i--)29
dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x7bcf7bcf;30
31
localPal[0xe0] = 0;32
localPal[0xf0] = 0x001f;33
}34
+ else if (allow_as)35
+ {36
+ do_pal_convert(localPal, Pico.est.SonicPal, currentConfig.gamma, currentConfig.gamma2);37
+ memcpy((int *)dpal+0x40/2, (void *)localPal, 0x40*2);38
+ memcpy((int *)dpal+0x80/2, (void *)localPal, 0x80*2);39
+ }40
+41
+ if (Pico.m.dirtyPal == 2)42
+ Pico.m.dirtyPal = 0;43
+ need_pal_upload = 1;44
}45
46
static void do_slowmode_lines(int line_to)47
48
49
PicoIn.sndOut += len / 2;50
/*if (PicoIn.sndOut > sndBuffer_endptr) {51
- memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PicoIn.sndOut - endptr + 1) / 2);52
+ memcpy((int *)(void *)sndBuffer, (int *)endptr, (PicoIn.sndOut - endptr + 1) * 2);53
PicoIn.sndOut = &sndBuffer[PicoIn.sndOut - endptr];54
lprintf("mov\n");55
}56
libretro-picodrive-0~git20200112.tar.xz/platform/psp/menu.c -> libretro-picodrive-0~git20200716.tar.xz/platform/psp/menu.c
Changed
10
1
2
// int i;3
4
// for (i = 272; i >= 0; i--, dst += 512, src += 480)5
- // memcpy32((int *)dst, (int *)src, 480*2/4);6
+ // memcpy((int *)dst, (int *)src, 480*2);7
8
sceGuSync(0,0); // sync with prev9
sceGuStart(GU_DIRECT, guCmdList);10
libretro-picodrive-0~git20200112.tar.xz/tools/Makefile -> libretro-picodrive-0~git20200716.tar.xz/tools/Makefile
Changed
25
1
2
-CFLAGS = -Wall -ggdb3
+TARGETS = amalgamate textfilter4
+HOSTCC ?= cc5
6
-TARGETS = amalgamate textfilter mkoffsets7
-OBJS = $(addsuffix .o,$(TARGETS))8
+all:9
+ if [ -f "offsets/$(XPLATFORM)-offsets.h" ]; then \10
+ ln -sf "../tools/offsets/$(XPLATFORM)-offsets.h" ../pico/pico_int_offs.h; \11
+ else \12
+ CC="$(XCC)" CFLAGS="$(XCFLAGS)" sh ./mkoffsets.sh ../pico; \13
+ fi14
15
-all: $(TARGETS)16
+$(TARGETS): $(addsuffix .c,$(TARGETS))17
+ $(HOSTCC) -o $@ -O $@.c18
19
clean:20
$(RM) $(TARGETS) $(OBJS)21
22
-mkoffsets: CFLAGS += -m32 -I..23
-24
.PHONY: clean all25
libretro-picodrive-0~git20200716.tar.xz/tools/mkoffsets.sh
Added
162
1
2
+# automatically compute structure offsets for gcc targets in ELF format3
+# (C) 2018 Kai-Uwe Bloem. This work is placed in the public domain.4
+#5
+# usage: mkoffsets <output dir>6
+7
+CC=${CC:-gcc}8
+9
+# endianess of target (automagically determined below)10
+ENDIAN=11
+12
+# check which object format to dissect13
+READELF=14
+OBJDUMP=15
+check_obj ()16
+{17
+ # prepare an object file; as side effect dtermine the endianess18
+ CROSS=$(echo $CC | sed 's/gcc.*//')19
+ echo '#include <stdint.h>' >/tmp/getoffs.c20
+ echo "const int32_t val = 1;" >>/tmp/getoffs.c21
+ $CC $CFLAGS -I .. -c /tmp/getoffs.c -o /tmp/getoffs.o || exit 122
+23
+ # check for readelf; readelf is the only toolchain tool not using bfd,24
+ # hence it works with ELF files for every target25
+ if file /tmp/getoffs.o | grep -q ELF; then26
+ if command -v readelf >/dev/null; then27
+ READELF=readelf28
+ elif command -v ${CROSS}readelf >/dev/null; then29
+ READELF=${CROSS}readelf30
+ fi31
+ fi32
+ if [ -n "$READELF" ]; then33
+ # find the the .rodata section (in case -fdata-sections is used)34
+ rosect=$($READELF -S /tmp/getoffs.o | grep '\.rodata\|\.sdata' |35
+ sed 's/^[^.]*././;s/ .*//')36
+ # read .rodata section as hex string (should be only 4 bytes)37
+ ro=$($READELF -x $rosect /tmp/getoffs.o | grep '0x' | cut -c14-48 |38
+ tr -d ' \n' | cut -c1-8)39
+ # if no output could be read readelf isn't working40
+ if [ -z "$ro" ]; then41
+ READELF=42
+ fi43
+ fi44
+ # if there is no working readelf try using objdump45
+ if [ -z "$READELF" ]; then46
+ # objdump is using bfd; try using the toolchain objdump first47
+ # since this is likely working with the toolchain objects48
+ if command -v ${CROSS}objdump >/dev/null; then49
+ OBJDUMP=${CROSS}objdump50
+ elif command -v objdump >/dev/null; then51
+ OBJDUMP=objdump52
+ fi53
+ # find the start line of the .rodata section; read the next line54
+ ro=$($OBJDUMP -s /tmp/getoffs.o | awk '\55
+ /Contents of section.*(__const|.r[o]?data|.sdata)/ {o=1; next} \56
+ {if(o) { gsub(/ .*/,""); $1=""; gsub(/ /,""); print; exit}}')57
+ # no working tool for extracting the ro data; stop here58
+ if [ -z "$ro" ]; then59
+ echo "/* mkoffset.sh: no readelf or not ELF, offset table not created */" >$fn60
+ echo "WARNING: no readelf or not ELF, offset table not created"61
+ exit62
+ fi63
+ fi64
+ # extract decimal value from ro65
+ rodata=$(printf "%d" 0x$ro)66
+ ENDIAN=$(if [ "$rodata" -eq 1 ]; then echo be; else echo le; fi)67
+}68
+69
+# compile with target C compiler and extract value from .rodata section70
+compile_rodata ()71
+{72
+ $CC $CFLAGS -I .. -c /tmp/getoffs.c -o /tmp/getoffs.o || exit 173
+ if [ -n "$READELF" ]; then74
+ # find the .rodata section (in case -fdata-sections is used)75
+ rosect=$(readelf -S /tmp/getoffs.o | grep '\.rodata\|\.sdata' |76
+ sed 's/^[^.]*././;s/ .*//')77
+ # read .rodata section as hex string (should be only 4 bytes)78
+ ro=$(readelf -x $rosect /tmp/getoffs.o | grep '0x' | cut -c14-48 |79
+ tr -d ' \n' | cut -c1-8)80
+ elif [ -n "$OBJDUMP" ]; then81
+ # find the start line of the .rodata section; read the next line82
+ ro=$($OBJDUMP -s /tmp/getoffs.o | awk '\83
+ /Contents of section.*(__const|.r[o]?data|.sdata)/ {o=1; next} \84
+ {if(o) { gsub(/ .*/,""); $1=""; gsub(/ /,""); print; exit}}')85
+ fi86
+ if [ "$ENDIAN" = "le" ]; then87
+ # swap needed for le target88
+ hex=""89
+ for b in $(echo $ro | sed 's/\([0-9a-f]\{2\}\)/\1 /g'); do90
+ hex=$b$hex;91
+ done92
+ else93
+ hex=$ro94
+ fi95
+ # extract decimal value from hex string96
+ rodata=$(printf "%d" 0x$hex)97
+}98
+99
+# determine member offset and create #define100
+get_define () # prefix struct member member...101
+{102
+ prefix=$1; shift103
+ struct=$1; shift104
+ field=$(echo $* | sed 's/ /./g')105
+ name=$(echo $* | sed 's/ /_/g')106
+ echo '#include <stdint.h>' > /tmp/getoffs.c107
+ echo '#include "pico/pico_int.h"' >> /tmp/getoffs.c108
+ echo "static struct $struct p;" >> /tmp/getoffs.c109
+ echo "const int32_t val = (char *)&p.$field - (char*)&p;" >>/tmp/getoffs.c110
+ compile_rodata111
+ line=$(printf "#define %-20s 0x%04x" $prefix$name $rodata)112
+}113
+114
+fn="${1:-.}/pico_int_offs.h"115
+if echo $CFLAGS | grep -qe -flto; then CFLAGS="$CFLAGS -fno-lto"; fi116
+117
+check_obj118
+# output header119
+echo "/* autogenerated by mkoffset.sh, do not edit */" >$fn120
+echo "/* target endianess: $ENDIAN, compiled with: $CC $CFLAGS */" >>$fn121
+# output offsets122
+get_define OFS_Pico_ Pico video reg ; echo "$line" >>$fn123
+get_define OFS_Pico_ Pico m rotate ; echo "$line" >>$fn124
+get_define OFS_Pico_ Pico m z80Run ; echo "$line" >>$fn125
+get_define OFS_Pico_ Pico m dirtyPal ; echo "$line" >>$fn126
+get_define OFS_Pico_ Pico m hardware ; echo "$line" >>$fn127
+get_define OFS_Pico_ Pico m z80_reset ; echo "$line" >>$fn128
+get_define OFS_Pico_ Pico m sram_reg ; echo "$line" >>$fn129
+get_define OFS_Pico_ Pico sv ; echo "$line" >>$fn130
+get_define OFS_Pico_ Pico sv data ; echo "$line" >>$fn131
+get_define OFS_Pico_ Pico sv start ; echo "$line" >>$fn132
+get_define OFS_Pico_ Pico sv end ; echo "$line" >>$fn133
+get_define OFS_Pico_ Pico sv flags ; echo "$line" >>$fn134
+get_define OFS_Pico_ Pico rom ; echo "$line" >>$fn135
+get_define OFS_Pico_ Pico romsize ; echo "$line" >>$fn136
+get_define OFS_Pico_ Pico est ; echo "$line" >>$fn137
+138
+get_define OFS_EST_ PicoEState DrawScanline ; echo "$line" >>$fn139
+get_define OFS_EST_ PicoEState rendstatus ; echo "$line" >>$fn140
+get_define OFS_EST_ PicoEState DrawLineDest ; echo "$line" >>$fn141
+get_define OFS_EST_ PicoEState HighCol ; echo "$line" >>$fn142
+get_define OFS_EST_ PicoEState HighPreSpr ; echo "$line" >>$fn143
+get_define OFS_EST_ PicoEState Pico ; echo "$line" >>$fn144
+get_define OFS_EST_ PicoEState PicoMem_vram ; echo "$line" >>$fn145
+get_define OFS_EST_ PicoEState PicoMem_cram ; echo "$line" >>$fn146
+get_define OFS_EST_ PicoEState PicoOpt ; echo "$line" >>$fn147
+get_define OFS_EST_ PicoEState Draw2FB ; echo "$line" >>$fn148
+get_define OFS_EST_ PicoEState HighPal ; echo "$line" >>$fn149
+150
+get_define OFS_PMEM_ PicoMem vram ; echo "$line" >>$fn151
+get_define OFS_PMEM_ PicoMem vsram ; echo "$line" >>$fn152
+get_define OFS_PMEM32x_ Pico32xMem pal_native ; echo "$line" >>$fn153
+154
+get_define OFS_SH2_ SH2_ is_slave ; echo "$line" >>$fn155
+get_define OFS_SH2_ SH2_ p_bios ; echo "$line" >>$fn156
+get_define OFS_SH2_ SH2_ p_da ; echo "$line" >>$fn157
+get_define OFS_SH2_ SH2_ p_sdram ; echo "$line" >>$fn158
+get_define OFS_SH2_ SH2_ p_rom ; echo "$line" >>$fn159
+get_define OFS_SH2_ SH2_ p_dram ; echo "$line" >>$fn160
+get_define OFS_SH2_ SH2_ p_drcblk_da ; echo "$line" >>$fn161
+get_define OFS_SH2_ SH2_ p_drcblk_ram ; echo "$line" >>$fn162
libretro-picodrive-0~git20200716.tar.xz/tools/offsets
Added
2
1
+(directory)2
libretro-picodrive-0~git20200716.tar.xz/tools/offsets/generic-ilp32-offsets.h
Added
41
1
2
+/* autogenerated by mkoffset.sh, do not edit */3
+/* target endianess: le, compiled with: mipsel-linux-gnu-gcc -mabi=32 */4
+#define OFS_Pico_video_reg 0x00005
+#define OFS_Pico_m_rotate 0x00406
+#define OFS_Pico_m_z80Run 0x00417
+#define OFS_Pico_m_dirtyPal 0x00468
+#define OFS_Pico_m_hardware 0x00479
+#define OFS_Pico_m_z80_reset 0x004f10
+#define OFS_Pico_m_sram_reg 0x004911
+#define OFS_Pico_sv 0x008c12
+#define OFS_Pico_sv_data 0x008c13
+#define OFS_Pico_sv_start 0x009014
+#define OFS_Pico_sv_end 0x009415
+#define OFS_Pico_sv_flags 0x009816
+#define OFS_Pico_rom 0x055417
+#define OFS_Pico_romsize 0x055818
+#define OFS_Pico_est 0x00c819
+#define OFS_EST_DrawScanline 0x000020
+#define OFS_EST_rendstatus 0x000421
+#define OFS_EST_DrawLineDest 0x000822
+#define OFS_EST_HighCol 0x000c23
+#define OFS_EST_HighPreSpr 0x001024
+#define OFS_EST_Pico 0x001425
+#define OFS_EST_PicoMem_vram 0x001826
+#define OFS_EST_PicoMem_cram 0x001c27
+#define OFS_EST_PicoOpt 0x002028
+#define OFS_EST_Draw2FB 0x002429
+#define OFS_EST_HighPal 0x002830
+#define OFS_PMEM_vram 0x1000031
+#define OFS_PMEM_vsram 0x2210032
+#define OFS_PMEM32x_pal_native 0x90e0033
+#define OFS_SH2_is_slave 0x055c34
+#define OFS_SH2_p_bios 0x008035
+#define OFS_SH2_p_da 0x008436
+#define OFS_SH2_p_sdram 0x008837
+#define OFS_SH2_p_rom 0x008c38
+#define OFS_SH2_p_dram 0x009039
+#define OFS_SH2_p_drcblk_da 0x009440
+#define OFS_SH2_p_drcblk_ram 0x009841
libretro-picodrive-0~git20200716.tar.xz/tools/offsets/generic-llp64-offsets.h
Added
41
1
2
+/* autogenerated by mkoffset.sh, do not edit */3
+/* target endianess: le, compiled with: x86_64-w64-mingw32-gcc */4
+#define OFS_Pico_video_reg 0x00005
+#define OFS_Pico_m_rotate 0x00406
+#define OFS_Pico_m_z80Run 0x00417
+#define OFS_Pico_m_dirtyPal 0x00468
+#define OFS_Pico_m_hardware 0x00479
+#define OFS_Pico_m_z80_reset 0x004f10
+#define OFS_Pico_m_sram_reg 0x004911
+#define OFS_Pico_sv 0x009012
+#define OFS_Pico_sv_data 0x009013
+#define OFS_Pico_sv_start 0x009814
+#define OFS_Pico_sv_end 0x009c15
+#define OFS_Pico_sv_flags 0x00a016
+#define OFS_Pico_rom 0x058817
+#define OFS_Pico_romsize 0x059018
+#define OFS_Pico_est 0x00d819
+#define OFS_EST_DrawScanline 0x000020
+#define OFS_EST_rendstatus 0x000421
+#define OFS_EST_DrawLineDest 0x000822
+#define OFS_EST_HighCol 0x001023
+#define OFS_EST_HighPreSpr 0x001824
+#define OFS_EST_Pico 0x002025
+#define OFS_EST_PicoMem_vram 0x002826
+#define OFS_EST_PicoMem_cram 0x003027
+#define OFS_EST_PicoOpt 0x003828
+#define OFS_EST_Draw2FB 0x004029
+#define OFS_EST_HighPal 0x004830
+#define OFS_PMEM_vram 0x1000031
+#define OFS_PMEM_vsram 0x2210032
+#define OFS_PMEM32x_pal_native 0x90e0033
+#define OFS_SH2_is_slave 0x0a1834
+#define OFS_SH2_p_bios 0x009835
+#define OFS_SH2_p_da 0x00a036
+#define OFS_SH2_p_sdram 0x00a837
+#define OFS_SH2_p_rom 0x00b038
+#define OFS_SH2_p_dram 0x00b839
+#define OFS_SH2_p_drcblk_da 0x00c040
+#define OFS_SH2_p_drcblk_ram 0x00c841
libretro-picodrive-0~git20200716.tar.xz/tools/offsets/generic-lp64-offsets.h
Added
41
1
2
+/* autogenerated by mkoffset.sh, do not edit */3
+/* target endianess: le, compiled with: mipsel-linux-gnu-gcc -mabi=64 */4
+#define OFS_Pico_video_reg 0x00005
+#define OFS_Pico_m_rotate 0x00406
+#define OFS_Pico_m_z80Run 0x00417
+#define OFS_Pico_m_dirtyPal 0x00468
+#define OFS_Pico_m_hardware 0x00479
+#define OFS_Pico_m_z80_reset 0x004f10
+#define OFS_Pico_m_sram_reg 0x004911
+#define OFS_Pico_sv 0x009012
+#define OFS_Pico_sv_data 0x009013
+#define OFS_Pico_sv_start 0x009814
+#define OFS_Pico_sv_end 0x009c15
+#define OFS_Pico_sv_flags 0x00a016
+#define OFS_Pico_rom 0x058817
+#define OFS_Pico_romsize 0x059018
+#define OFS_Pico_est 0x00d819
+#define OFS_EST_DrawScanline 0x000020
+#define OFS_EST_rendstatus 0x000421
+#define OFS_EST_DrawLineDest 0x000822
+#define OFS_EST_HighCol 0x001023
+#define OFS_EST_HighPreSpr 0x001824
+#define OFS_EST_Pico 0x002025
+#define OFS_EST_PicoMem_vram 0x002826
+#define OFS_EST_PicoMem_cram 0x003027
+#define OFS_EST_PicoOpt 0x003828
+#define OFS_EST_Draw2FB 0x004029
+#define OFS_EST_HighPal 0x004830
+#define OFS_PMEM_vram 0x1000031
+#define OFS_PMEM_vsram 0x2210032
+#define OFS_PMEM32x_pal_native 0x90e0033
+#define OFS_SH2_is_slave 0x0a1834
+#define OFS_SH2_p_bios 0x009835
+#define OFS_SH2_p_da 0x00a036
+#define OFS_SH2_p_sdram 0x00a837
+#define OFS_SH2_p_rom 0x00b038
+#define OFS_SH2_p_dram 0x00b839
+#define OFS_SH2_p_drcblk_da 0x00c040
+#define OFS_SH2_p_drcblk_ram 0x00c841