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

Merge pull request #116 from MoochMcGee/master

Browse Source 
Fix a bunch of Voodoo warnings
This commit is contained in:
waltje
2017-05-18 02:10:47 -04:00
committed by GitHub
parent 09ca09775c 52bf938a60
commit c5bb5db754
3 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/VIDEO/vid_voodoo.c
View File

@@ -1,5 +1,6 @@
#include <stdlib.h>
#include <stddef.h>
#include <math.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../mem.h"
@@ -1551,7 +1552,7 @@ typedef struct voodoo_state_t
int32_t ib, ig, ir, ia;
int32_t z;
int32_t new_depth;
int64_t new_depth;
int64_t tmu0_s, tmu0_t;
int64_t tmu0_w;
@@ -1562,7 +1563,7 @@ typedef struct voodoo_state_t
int pixel_count, texel_count;
int x, x2;
uint32_t w_depth;
uint64_t w_depth;
float log_temp;
uint32_t ebp_store;
@@ -2719,7 +2720,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood
uint16_t dat;
uint16_t aux_dat;
int sel;
int32_t new_depth, w_depth;
int64_t new_depth, w_depth;
if (state->w & 0xffff00000000)
w_depth = 0;
@@ -5255,7 +5256,7 @@ static void voodoo_fb_writew(uint32_t addr, uint16_t val, void *p)
if (params->fogMode & FOG_ENABLE)
{
int32_t z = new_depth << 12;
int32_t w_depth = new_depth;
int64_t w_depth = new_depth;
int32_t ia = alpha_data << 12;
APPLY_FOG(write_data.r, write_data.g, write_data.b, z, ia, w_depth);
@@ -5390,7 +5391,7 @@ static void voodoo_fb_writel(uint32_t addr, uint32_t val, void *p)
if (params->fogMode & FOG_ENABLE)
{
int32_t z = new_depth << 12;
int32_t w_depth = new_depth;
int64_t w_depth = new_depth;
int32_t ia = alpha_data[c] << 12;
APPLY_FOG(write_data.r, write_data.g, write_data.b, z, ia, w_depth);

26
src/VIDEO/vid_voodoo_codegen_x86-64.h
View File

@@ -42,26 +42,26 @@ static int last_block[2] = {0, 0};
static int next_block_to_write[2] = {0, 0};
#define addbyte(val) \
code_block[block_pos++] = val; \
code_block[block_pos++] = (uint8_t)val; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")
#define addword(val) \
*(uint16_t *)&code_block[block_pos] = val; \
block_pos += 2; \
if (block_pos >= BLOCK_SIZE) \
#define addword(val) \
*(uint16_t *)&code_block[block_pos] = (uint16_t)val; \
block_pos += 2; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")
#define addlong(val) \
*(uint32_t *)&code_block[block_pos] = val; \
block_pos += 4; \
if (block_pos >= BLOCK_SIZE) \
#define addlong(val) \
*(uint32_t *)&code_block[block_pos] = (uint32_t)val; \
block_pos += 4; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")
#define addquad(val) \
*(uint64_t *)&code_block[block_pos] = val; \
block_pos += 8; \
if (block_pos >= BLOCK_SIZE) \
#define addquad(val) \
*(uint64_t *)&code_block[block_pos] = (uint64_t)val; \
block_pos += 8; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")

26
src/VIDEO/vid_voodoo_codegen_x86.h
View File

@@ -40,26 +40,26 @@ static int last_block[2] = {0, 0};
static int next_block_to_write[2] = {0, 0};
#define addbyte(val) \
code_block[block_pos++] = val; \
code_block[block_pos++] = (uint8_t)val; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")
#define addword(val) \
*(uint16_t *)&code_block[block_pos] = val; \
block_pos += 2; \
if (block_pos >= BLOCK_SIZE) \
#define addword(val) \
*(uint16_t *)&code_block[block_pos] = (uint16_t)val; \
block_pos += 2; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")
#define addlong(val) \
*(uint32_t *)&code_block[block_pos] = val; \
block_pos += 4; \
if (block_pos >= BLOCK_SIZE) \
#define addlong(val) \
*(uint32_t *)&code_block[block_pos] = (uint32_t)val; \
block_pos += 4; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")
#define addquad(val) \
*(uint64_t *)&code_block[block_pos] = val; \
block_pos += 8; \
if (block_pos >= BLOCK_SIZE) \
#define addquad(val) \
*(uint64_t *)&code_block[block_pos] = (uint64_t)val; \
block_pos += 8; \
if (block_pos >= BLOCK_SIZE) \
fatal("Over!\n")