mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small coding style changes + warning fixes in voodoo code

Browse Source
This commit is contained in:
Stanislav Shwartsman 2012-09-15 09:47:31 +00:00
parent c7b33ec742
commit 4eaa72a32f
4 changed files with 60 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bochs/iodev/display/voodoo_data.h
View File

@ -357,7 +357,6 @@ static const Bit8u register_alias_map[0x40] =
};
/*************************************
*
* Table of per-register access rights
@ -367,7 +366,7 @@ static const Bit8u register_alias_map[0x40] =
static const Bit8u voodoo_register_access[0x100] =
{
/* 0x000 */
REG_RP, 0, REG_WPF, REG_WPF,
REG_RP, 0, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
@ -379,7 +378,7 @@ static const Bit8u voodoo_register_access[0x100] =
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
/* 0x080 */
REG_WPF, 0, REG_WPF, REG_WPF,
REG_WPF, 0, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
@ -394,7 +393,7 @@ static const Bit8u voodoo_register_access[0x100] =
REG_WPF, REG_RWPF, REG_RWPF, REG_RWPF,
REG_RWF, REG_RWF, REG_RWF, REG_RWF,
REG_WF, REG_WF, REG_WF, REG_WF,
REG_WF, REG_WF, 0, 0,
REG_WF, REG_WF, 0, 0,
/* 0x140 */
REG_RWF, REG_RWF, REG_RWF, REG_R,
@ -411,14 +410,14 @@ static const Bit8u voodoo_register_access[0x100] =
/* 0x1c0 */
REG_WF, REG_WF, REG_WF, REG_WF,
REG_WF, REG_WF, REG_WF, REG_WF,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
/* 0x200 */
REG_RW, REG_R, REG_RW, REG_RW,
REG_RW, REG_RW, REG_RW, REG_RW,
REG_W, REG_W, REG_W, REG_W,
REG_W, 0, 0, 0,
REG_W, 0, 0, 0,
/* 0x240 */
0, 0, 0, 0,
@ -513,15 +512,15 @@ static const Bit8u voodoo2_register_access[0x100] =
/* 0x240 */
REG_R, REG_RWT, REG_RWT, REG_RWT,
0, 0, REG_R, REG_R,
0, 0, REG_R, REG_R,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
/* 0x280 */
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, 0, 0,
0, 0, 0, 0,
REG_WPF, REG_WPF, 0, 0,
0, 0, 0, 0,
/* 0x2c0 */
REG_RWPF, REG_RWPF, REG_RWPF, REG_RWPF,
@ -593,17 +592,17 @@ static const Bit8u banshee_register_access[0x100] =
/* 0x1c0 */
REG_WF, REG_WF, REG_WF, REG_WF,
REG_WF, REG_WF, REG_WF, REG_WF,
0, 0, 0, REG_RWF,
0, 0, 0, REG_RWF,
REG_RWF, REG_RWF, REG_RWF, 0,
/* 0x200 */
REG_RWF, REG_RWF, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
REG_RWF, REG_RWF, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
/* 0x240 */
0, 0, 0, REG_WT,
0, 0, 0, REG_WT,
REG_RWF, REG_RWF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_R, REG_R,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
@ -611,8 +610,8 @@ static const Bit8u banshee_register_access[0x100] =
/* 0x280 */
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, REG_WPF, REG_WPF,
REG_WPF, REG_WPF, 0, 0,
0, 0, 0, 0,
REG_WPF, REG_WPF, 0, 0,
0, 0, 0, 0,
/* 0x2c0 */
0, 0, 0, 0,
@ -637,7 +636,6 @@ static const Bit8u banshee_register_access[0x100] =
};
/*************************************
*
* Register string table for debug

79
bochs/iodev/display/voodoo_func.h
View File

@ -727,7 +727,7 @@ void draw_line (int x1, int y1, int x2, int y2, Bit16u *buf)
deltay = abs(y2 - y1);
if (deltax >= deltay)
{
{
numpixels = deltax + 1;
d = (deltay<<1) - deltax;
dinc1 = deltay<<1;
@ -736,9 +736,9 @@ void draw_line (int x1, int y1, int x2, int y2, Bit16u *buf)
xinc2 = 1;
yinc1 = 0;
yinc2 = 1;
}
}
else
{
{
numpixels = deltay + 1;
d = (deltax<<1) - deltay;
dinc1 = deltax << 1;
@ -747,40 +747,40 @@ void draw_line (int x1, int y1, int x2, int y2, Bit16u *buf)
xinc2 = 1;
yinc1 = 1;
yinc2 = 1;
}
}
if (x1 > x2)
{
{
xinc1 = - xinc1;
xinc2 = - xinc2;
}
}
if (y1 > y2)
{
{
yinc1 = - yinc1;
yinc2 = - yinc2;
}
}
x = x1;
y = y1;
for (i=0; i < numpixels; i++)
{
if ((x>=0) && (x<XRes) && (y>=0) && (y<YRes) )
dest [x + y*XRes] = color;
{
if ((x>=0) && (x<XRes) && (y>=0) && (y<YRes))
dest [x + y*XRes] = color;
if (d < 0)
{
{
d = d + dinc1;
x = x + xinc1;
y = y + yinc1;
}
}
else
{
{
d = d + dinc2;
x = x + xinc2;
y = y + yinc2;
}
}
}
}
}
Bit32s triangle(voodoo_state *v)
@ -1010,7 +1010,6 @@ Bit32u poly_render_triangle_custom(/*poly_manager *poly, */void *dest, const rec
poly->unit_max = MAX(poly->unit_max, poly->unit_next);
#endif
/* enqueue the work items */
// if (poly->queue != NULL)
@ -1225,17 +1224,17 @@ Bit32s swapbuffer(voodoo_state *v, Bit32u data)
v->fbi.vblank_dont_swap = (data >> 9) & 1;
if (dump_lfb) {
FILE *f=fopen("e:/lfb.raw","wb");
fwrite(v->fbi.ram,4<<20,1,f);
fclose(f);
FILE *f=fopen("e:/lfb.raw","wb");
fwrite(v->fbi.ram,4<<20,1,f);
fclose(f);
}
if (dump_tmu) {
FILE*f=fopen("e:/tmu0.raw","wb");
fwrite(v->tmu[0].ram,4<<20,1,f);
fclose(f);
f=fopen("e:/tmu1.raw","wb");
fwrite(v->tmu[1].ram,4<<20,1,f);
fclose(f);
FILE*f=fopen("e:/tmu0.raw","wb");
fwrite(v->tmu[0].ram,4<<20,1,f);
fclose(f);
f=fopen("e:/tmu1.raw","wb");
fwrite(v->tmu[1].ram,4<<20,1,f);
fclose(f);
}
/* if we're not syncing to the retrace, process the command immediately */
@ -2057,13 +2056,10 @@ default_case:
if (chips & 8) v->reg[0x300 + regnum].u = data;
break;
}
}
Bit32s texture_w(Bit32u offset, Bit32u data) {
Bit32s texture_w(Bit32u offset, Bit32u data)
{
int tmunum = (offset >> 19) & 0x03;
LOG_VOODOO("V3D:write TMU%x offset %X value %X", tmunum, offset, data);
@ -2181,7 +2177,8 @@ Bit32s texture_w(Bit32u offset, Bit32u data) {
return 0;
}
Bit32u lfb_w(Bit32u offset, Bit32u data, Bit32u mem_mask) {
Bit32u lfb_w(Bit32u offset, Bit32u data, Bit32u mem_mask)
{
LOG_VOODOO("V3D:WR LFB offset %X value %08X", offset, data);
Bit16u *dest, *depth;
Bit32u destmax, depthmax;
@ -2475,7 +2472,6 @@ Bit32s texture_w(Bit32u offset, Bit32u data) {
mask >>= 4;
}
}
/* tricky case: run the full pixel pipeline on the pixel */
else
{
@ -2548,7 +2544,8 @@ nextpixel:
return 0;
}
Bit32u register_r(Bit32u offset) {
Bit32u register_r(Bit32u offset)
{
Bit32u regnum = (offset) & 0xff;
Bit32u chips = (offset>>8) & 0xf;
@ -2650,7 +2647,8 @@ Bit32u register_r(Bit32u offset) {
return result;
}
Bit32u lfb_r(Bit32u offset) {
Bit32u lfb_r(Bit32u offset)
{
LOG_VOODOO("Voodoo:read LFB offset %X", offset);
Bit16u *buffer;
Bit32u bufmax;
@ -2721,7 +2719,6 @@ Bit32u lfb_r(Bit32u offset) {
return data;
}
void voodoo_w(Bit32u offset, Bit32u data, Bit32u mask) {
if ((offset & (0xc00000/4)) == 0)
@ -2742,8 +2739,6 @@ Bit32u voodoo_r(Bit32u offset) {
return 0xffffffff;
}
void init_tmu(voodoo_state *v, tmu_state *t, voodoo_reg *reg, void *memory, int tmem)
{
/* allocate texture RAM */
@ -2795,7 +2790,6 @@ void init_tmu(voodoo_state *v, tmu_state *t, voodoo_reg *reg, void *memory, int
}
}
void init_tmu_shared(tmu_shared_state *s)
{
int val;
@ -2840,8 +2834,8 @@ void init_tmu_shared(tmu_shared_state *s)
}
}
void voodoo_init() {
void voodoo_init()
{
int pen;
int val;
const raster_info *info;
@ -2895,7 +2889,6 @@ void voodoo_init() {
}
}
/* init the pens */
v->fbi.clut_dirty = TRUE;
if (v->type <= VOODOO_2)
@ -2939,8 +2932,6 @@ void voodoo_init() {
soft_reset(v);
}
int voodoo_update(/*running_device *device, bitmap_t *bitmap, */const rectangle *cliprect)
{
// voodoo_state *v = get_safe_token(device);

3
bochs/iodev/display/voodoo_main.h
View File

@ -151,5 +151,4 @@ READ32_DEVICE_HANDLER( banshee_rom_r );
#define Voodoo_Output_Enable(x) theVoodooDevice->output_enable(x)
#define Voodoo_get_retrace() theVoodooDevice->get_retrace()
#endif
#endif

9
bochs/iodev/display/voodoo_types.h
View File

@ -50,9 +50,14 @@ struct _poly_extent
poly_param_extent param[MAX_VERTEX_PARAMS]; /* starting and dx values for each parameter */
};
#define U64(x) (x)
#define U64(x) BX_CONST64(x)
#ifndef TRUE
#define TRUE true
#endif
#ifndef FALSE
#define FALSE false
#endif
/* an rgb_t is a single combined R,G,B (and optionally alpha) value */
@ -302,4 +307,4 @@ struct _tri_work_unit
{
// work_unit_shared shared; /* shared data */
tri_extent extent[8]; /* array of scanline extents */
};
};