claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

vid_voodoo_common: All volatile variables are now atomic

Browse Source 
AArch32 and AArch64 has far lesser atomicity guarantees for simple load-store accesses unlike x86/x64. This should take care of the majority, if not all, of Voodoo crashes on Apple Silicon systems.
This commit is contained in:
Cacodemon345
2022-11-06 00:12:17 +06:00
parent fbc08ef961
commit 1f333724ac
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/include/86box/vid_voodoo_common.h
View File

@@ -32,6 +32,13 @@
#define TEX_CACHE_MAX 64 #define TEX_CACHE_MAX 64
#ifdef __cplusplus
#include <atomic>
using atomic_int = std::atomic<int>;
#else
#include <stdatomic.h>
#endif
enum { enum {
VOODOO_1 = 0, VOODOO_1 = 0,
VOODOO_SB50, VOODOO_SB50,
@@ -172,7 +179,7 @@ typedef struct voodoo_params_t {
typedef struct texture_t { typedef struct texture_t {
uint32_t base; uint32_t base;
uint32_t tLOD; uint32_t tLOD;
volatile int refcount, refcount_r[4]; atomic_int refcount, refcount_r[4];
int is16; int is16;
uint32_t palette_checksum; uint32_t palette_checksum;
uint32_t addr_start[4], addr_end[4]; uint32_t addr_start[4], addr_end[4];
@@ -299,17 +306,17 @@ typedef struct voodoo_t {
int type; int type;
fifo_entry_t fifo[FIFO_SIZE]; fifo_entry_t fifo[FIFO_SIZE];
volatile int fifo_read_idx, fifo_write_idx; atomic_int fifo_read_idx, fifo_write_idx;
volatile int cmd_read, cmd_written, cmd_written_fifo; atomic_int cmd_read, cmd_written, cmd_written_fifo;
voodoo_params_t params_buffer[PARAM_SIZE]; voodoo_params_t params_buffer[PARAM_SIZE];
volatile int params_read_idx[4], params_write_idx; atomic_int params_read_idx[4], params_write_idx;
uint32_t cmdfifo_base, cmdfifo_end, cmdfifo_size; uint32_t cmdfifo_base, cmdfifo_end, cmdfifo_size;
int cmdfifo_rp, cmdfifo_ret_addr; int cmdfifo_rp, cmdfifo_ret_addr;
int cmdfifo_in_sub; int cmdfifo_in_sub;
volatile int cmdfifo_depth_rd, cmdfifo_depth_wr; atomic_int cmdfifo_depth_rd, cmdfifo_depth_wr;
volatile int cmdfifo_enabled; atomic_int cmdfifo_enabled;
uint32_t cmdfifo_amin, cmdfifo_amax; uint32_t cmdfifo_amin, cmdfifo_amax;
int cmdfifo_holecount; int cmdfifo_holecount;