From 4a829b31ad6297e1951027f11584e1a1117b5e34 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 28 Dec 2017 20:42:45 +0100 Subject: [PATCH] Commented out a lot of excess logging; Updated Makefile.local to add comments about NCR 53C810 and Voodoo log enable flags. --- src/Makefile.local | 4 +- src/config.c | 6 +- src/intel_flash.c | 4 +- src/memregs.c | 6 +- src/sio_fdc37c93x.c | 16 ++-- src/sio_w83877f.c | 4 +- src/sound/midi_fluidsynth.c | 6 +- src/sound/midi_mt32.c | 10 +-- src/sound/sound.c | 10 +-- src/timer.c | 2 +- src/video/vid_cga.c | 4 +- src/video/vid_s3_virge.c | 8 +- src/video/vid_svga.c | 6 +- src/video/vid_voodoo.c | 168 ++++++++++++++++++++---------------- src/win/win.c | 4 +- src/win/win_dialog.c | 10 +-- src/win/win_ui.c | 12 +-- 17 files changed, 151 insertions(+), 129 deletions(-) diff --git a/src/Makefile.local b/src/Makefile.local index 31261d727..c02156f0f 100644 --- a/src/Makefile.local +++ b/src/Makefile.local @@ -10,7 +10,7 @@ # settings, so we can avoid changing the main one for all of # our local setups. # -# Version: @(#)Makefile.local 1.0.8 2017/12/15 +# Version: @(#)Makefile.local 1.0.9 2017/12/28 # # Author: Fred N. van Kempen, # @@ -50,8 +50,10 @@ STUFF := # -DENABLE_AHA154X_LOG=N sets logging level at N. # -DENABLE_BUSLOGIC_LOG=N sets logging level at N. # -DENABLE_NCR5380_LOG=N sets logging level at N. +# -DENABLE_NCR53C810_LOG=N sets logging level at N. # -DENABLE_AUDIOPCI_LOG=N sets logging level at N. # -DENABLE_EMU8K_LOG=N sets logging level at N. +# -DENABLE_VOODOO_LOG=N sets logging level at N. # -DENABLE_VRAM_DUMP=N sets logging level at N. # -DENABLE_SERIAL_LOG=N sets logging level at N. EXTRAS := diff --git a/src/config.c b/src/config.c index b0764f9b3..fa85591dc 100644 --- a/src/config.c +++ b/src/config.c @@ -8,7 +8,7 @@ * * Configuration file handler. * - * Version: @(#)config.c 1.0.35 2017/12/15 + * Version: @(#)config.c 1.0.36 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -979,8 +979,8 @@ load_removable_devices(void) #endif wcsncpy(floppyfns[c], wp, sizeof_w(floppyfns[c])); - if (*wp != L'\0') - pclog("Floppy%d: %ls\n", c, floppyfns[c]); + /* if (*wp != L'\0') + pclog("Floppy%d: %ls\n", c, floppyfns[c]); */ sprintf(temp, "fdd_%02i_writeprot", c+1); ui_writeprot[c] = !!config_get_int(cat, temp, 0); sprintf(temp, "fdd_%02i_turbo", c + 1); diff --git a/src/intel_flash.c b/src/intel_flash.c index 284413133..817da0f08 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 2 Mbit 8-bit flash devices. * - * Version: @(#)intel_flash.c 1.0.11 2017/11/04 + * Version: @(#)intel_flash.c 1.0.12 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -198,7 +198,7 @@ void *intel_flash_init(uint8_t type) wcscpy(flash_path, flash_name); - pclog("Flash path: %ls\n", flash_name); + /* pclog("Flash path: %ls\n", flash_name); */ flash->flash_id = (type & FLASH_IS_BXB) ? 0x95 : 0x94; flash->invert_high_pin = (type & FLASH_INVERT); diff --git a/src/memregs.c b/src/memregs.c index 85ce768f3..2c13aadbb 100644 --- a/src/memregs.c +++ b/src/memregs.c @@ -9,7 +9,7 @@ * Emulation of the memory I/O scratch registers on ports 0xE1 * and 0xE2, used by just about any emulated machine. * - * Version: @(#)memregs.c 1.0.4 2017/11/04 + * Version: @(#)memregs.c 1.0.5 2017/12/28 * * Author: Miran Grca, * @@ -51,14 +51,14 @@ uint8_t memregs_read(uint16_t port, void *priv) void memregs_init(void) { - pclog("Memory Registers Init\n"); + /* pclog("Memory Registers Init\n"); */ io_sethandler(0x00e1, 0x0002, memregs_read, NULL, NULL, memregs_write, NULL, NULL, NULL); } void powermate_memregs_init(void) { - pclog("Memory Registers Init\n"); + /* pclog("Memory Registers Init\n"); */ io_sethandler(0x00ed, 0x0002, memregs_read, NULL, NULL, memregs_write, NULL, NULL, NULL); io_sethandler(0xffff, 0x0001, memregs_read, NULL, NULL, memregs_write, NULL, NULL, NULL); diff --git a/src/sio_fdc37c93x.c b/src/sio_fdc37c93x.c index f0b9c1a80..83fb2a511 100644 --- a/src/sio_fdc37c93x.c +++ b/src/sio_fdc37c93x.c @@ -9,7 +9,7 @@ * Implementation of the SMC FDC37C932FR and FDC37C935 Super * I/O Chips. * - * Version: @(#)sio_fdc37c93x.c 1.0.8 2017/11/04 + * Version: @(#)sio_fdc37c93x.c 1.0.9 2017/12/28 * * Author: Miran Grca, * Copyright 2016,2017 Miran Grca. @@ -53,13 +53,13 @@ static uint16_t make_port(uint8_t ld) static uint8_t fdc37c93x_gpio_read(uint16_t port, void *priv) { - pclog("fdc37c93x: GPIO read: %02X\n", fdc37c93x_gpio_reg); + /* pclog("fdc37c93x: GPIO read: %02X\n", fdc37c93x_gpio_reg); */ return fdc37c93x_gpio_reg; } static void fdc37c93x_gpio_write(uint16_t port, uint8_t val, void *priv) { - pclog("fdc37c93x: GPIO write: %02X\n", val); + /* pclog("fdc37c93x: GPIO write: %02X\n", val); */ fdc37c93x_gpio_reg = val; } @@ -74,7 +74,7 @@ static void fdc37c93x_fdc_handler(void) if (global_enable && local_enable) { ld_port = make_port(0); - pclog("fdc37c93x: Setting FDC port to %04X\n", ld_port); + /* pclog("fdc37c93x: Setting FDC port to %04X\n", ld_port); */ if ((ld_port >= 0x0100) && (ld_port <= 0x0FF8)) { fdc_set_base(ld_port, 1); } @@ -92,7 +92,7 @@ static void fdc37c93x_lpt_handler(void) if (global_enable && local_enable) { ld_port = make_port(3); - pclog("fdc37c93x: Setting LPT1 port to %04X\n", ld_port); + /* pclog("fdc37c93x: Setting LPT1 port to %04X\n", ld_port); */ if ((ld_port >= 0x0100) && (ld_port <= 0x0FFC)) lpt1_init(ld_port); } @@ -111,7 +111,7 @@ static void fdc37c93x_serial_handler(int uart) if (global_enable && local_enable) { ld_port = make_port(uart_no); - pclog("fdc37c93x: Setting COM%i port to %04X\n", uart, ld_port); + /* pclog("fdc37c93x: Setting COM%i port to %04X\n", uart, ld_port); */ if ((ld_port >= 0x0100) && (ld_port <= 0x0FF8)) serial_setup(uart, ld_port, fdc37c93x_ld_regs[uart_no][0x70]); } @@ -128,7 +128,7 @@ static void fdc37c93x_auxio_handler(void) if (global_enable && local_enable) { fdc37c93x_gpio_base = ld_port = make_port(3); - pclog("fdc37c93x: Setting Auxiliary I/O port to %04X\n", ld_port); + /* pclog("fdc37c93x: Setting Auxiliary I/O port to %04X\n", ld_port); */ if ((ld_port >= 0x0100) && (ld_port <= 0x0FFF)) io_sethandler(fdc37c93x_gpio_base, 0x0001, fdc37c93x_gpio_read, NULL, NULL, fdc37c93x_gpio_write, NULL, NULL, NULL); } @@ -198,7 +198,7 @@ static void fdc37c932fr_access_bus_handler(void) if (global_enable && local_enable) { access_bus.base = ld_port = make_port(9); - pclog("fdc37c93x: Setting Auxiliary I/O port to %04X\n", ld_port); + /* pclog("fdc37c93x: Setting Auxiliary I/O port to %04X\n", ld_port); */ if ((ld_port >= 0x0100) && (ld_port <= 0x0FFC)) io_sethandler(access_bus.base, 0x0004, fdc37c932fr_access_bus_read, NULL, NULL, fdc37c932fr_access_bus_write, NULL, NULL, NULL); } diff --git a/src/sio_w83877f.c b/src/sio_w83877f.c index c1955011b..9d818ef0a 100644 --- a/src/sio_w83877f.c +++ b/src/sio_w83877f.c @@ -11,7 +11,7 @@ * Winbond W83877F Super I/O Chip * Used by the Award 430HX * - * Version: @(#)sio_w83877f.c 1.0.6 2017/11/04 + * Version: @(#)sio_w83877f.c 1.0.7 2017/12/28 * * Author: Miran Grca, * Copyright 2016,2017 Miran Grca. @@ -223,7 +223,7 @@ static void w83877f_remap(void) winbond_port = (HEFRAS ? 0x3f0 : 0x250); winbond_key_times = HEFRAS + 1; winbond_key = (HEFRAS ? 0x86 : 0x88) | HEFERE; - pclog("W83877F: Remapped to port %04X, key %02X\n", winbond_port, winbond_key); + /* pclog("W83877F: Remapped to port %04X, key %02X\n", winbond_port, winbond_key); */ } diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c index ee8eb45a6..12c76d44f 100644 --- a/src/sound/midi_fluidsynth.c +++ b/src/sound/midi_fluidsynth.c @@ -204,7 +204,7 @@ void fluidsynth_msg(uint8_t *msg) case 0xF0: /* SysEx */ break; default: - pclog("fluidsynth: unknown send() command 0x%02X", cmd); + /* pclog("fluidsynth: unknown send() command 0x%02X", cmd); */ break; } } @@ -311,7 +311,7 @@ void* fluidsynth_init(device_t *info) al_set_midi(data->samplerate, data->buf_size); - pclog("fluidsynth (%s) initialized, samplerate %d, buf_size %d\n", f_fluid_version_str(), data->samplerate, data->buf_size); + /* pclog("fluidsynth (%s) initialized, samplerate %d, buf_size %d\n", f_fluid_version_str(), data->samplerate, data->buf_size); */ midi_device_t* dev = malloc(sizeof(midi_device_t)); memset(dev, 0, sizeof(midi_device_t)); @@ -367,7 +367,7 @@ void fluidsynth_close(void* p) fluidsynth_handle = NULL; } - pclog("fluidsynth closed\n"); + /* pclog("fluidsynth closed\n"); */ } static device_config_t fluidsynth_config[] = diff --git a/src/sound/midi_mt32.c b/src/sound/midi_mt32.c index 7e4644f09..a218df8bb 100644 --- a/src/sound/midi_mt32.c +++ b/src/sound/midi_mt32.c @@ -63,7 +63,7 @@ mt32emu_return_code mt32_check(const char* func, mt32emu_return_code ret, mt32em { if (ret != expected) { - pclog("%s() failed, expected %d but returned %d\n", func, expected, ret); + /* pclog("%s() failed, expected %d but returned %d\n", func, expected, ret); */ return 0; } return 1; @@ -201,14 +201,14 @@ void* mt32emu_init(wchar_t *control_rom, wchar_t *pcm_rom) mt32emu_set_reversed_stereo_enabled(context, device_get_config_int("reversed_stereo")); mt32emu_set_nice_amp_ramp_enabled(context, device_get_config_int("nice_ramp")); - pclog("mt32 output gain: %f\n", mt32emu_get_output_gain(context)); + /* pclog("mt32 output gain: %f\n", mt32emu_get_output_gain(context)); pclog("mt32 reverb output gain: %f\n", mt32emu_get_reverb_output_gain(context)); pclog("mt32 reverb: %d\n", mt32emu_is_reverb_enabled(context)); - pclog("mt32 reversed stereo: %d\n", mt32emu_is_reversed_stereo_enabled(context)); + pclog("mt32 reversed stereo: %d\n", mt32emu_is_reversed_stereo_enabled(context)); */ al_set_midi(samplerate, buf_size); - pclog("mt32 (Munt %s) initialized, samplerate %d, buf_size %d\n", mt32emu_get_library_version_string(), samplerate, buf_size); + /* pclog("mt32 (Munt %s) initialized, samplerate %d, buf_size %d\n", mt32emu_get_library_version_string(), samplerate, buf_size); */ midi_device_t* dev = malloc(sizeof(midi_device_t)); memset(dev, 0, sizeof(midi_device_t)); @@ -262,7 +262,7 @@ void mt32_close(void* p) free((midi_device_t*)p); - pclog("mt32 closed\n"); + /* pclog("mt32 closed\n"); */ } static device_config_t mt32_config[] = diff --git a/src/sound/sound.c b/src/sound/sound.c index c6b968f24..d2a74da29 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -8,7 +8,7 @@ * * Sound emulation core. * - * Version: @(#)sound.c 1.0.10 2017/12/09 + * Version: @(#)sound.c 1.0.11 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -333,9 +333,9 @@ void sound_init(void) sound_cd_thread_h = thread_create(sound_cd_thread, NULL); cdaudioon = 1; - pclog("Waiting for CD start event...\n"); + /* pclog("Waiting for CD start event...\n"); */ thread_wait_event(sound_cd_start_event, -1); - pclog("Done!\n"); + /* pclog("Done!\n"); */ } else cdaudioon = 0; @@ -439,10 +439,10 @@ void sound_cd_thread_end(void) if (cdaudioon) { cdaudioon = 0; - pclog("Waiting for CD Audio thread to terminate...\n"); + /* pclog("Waiting for CD Audio thread to terminate...\n"); */ thread_set_event(sound_cd_event); thread_wait(sound_cd_thread_h, -1); - pclog("CD Audio thread terminated...\n"); + /* pclog("CD Audio thread terminated...\n"); */ if (sound_cd_event) { thread_destroy_event(sound_cd_event); diff --git a/src/timer.c b/src/timer.c index e7f525266..bb40b2342 100644 --- a/src/timer.c +++ b/src/timer.c @@ -96,7 +96,7 @@ void timer_update_outstanding(void) void timer_reset(void) { - pclog("timer_reset\n"); + /* pclog("timer_reset\n"); */ timers_present = 0; timer_latch = timer_count = 0; } diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c index f5cc36996..711fa7627 100644 --- a/src/video/vid_cga.c +++ b/src/video/vid_cga.c @@ -8,7 +8,7 @@ * * Emulation of the old and new IBM CGA graphics cards. * - * Version: @(#)vid_cga.c 1.0.10 2017/11/04 + * Version: @(#)vid_cga.c 1.0.11 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -137,7 +137,7 @@ void cga_recalctimings(cga_t *cga) { double disptime; double _dispontime, _dispofftime; - pclog("Recalc - %i %i %i\n", cga->crtc[0], cga->crtc[1], cga->cgamode & 1); + /* pclog("Recalc - %i %i %i\n", cga->crtc[0], cga->crtc[1], cga->cgamode & 1); */ if (cga->cgamode & 1) { disptime = cga->crtc[0] + 1; diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c index f64fa3961..41a1eebe3 100644 --- a/src/video/vid_s3_virge.c +++ b/src/video/vid_s3_virge.c @@ -8,7 +8,7 @@ * * S3 ViRGE emulation. * - * Version: @(#)vid_s3_virge.c 1.0.4 2017/11/04 + * Version: @(#)vid_s3_virge.c 1.0.5 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -3224,7 +3224,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri) dest_pixel = dest_pixel_lit_texture_decal; break; default: - pclog("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf); + /* pclog("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf); */ return; } break; @@ -3233,7 +3233,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri) dest_pixel = dest_pixel_unlit_texture_triangle; break; default: - pclog("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf); + /* pclog("bad triangle type %x\n", (s3d_tri->cmd_set >> 27) & 0xf); */ return; } @@ -3289,7 +3289,7 @@ static void s3_virge_triangle(virge_t *virge, s3d_t *s3d_tri) tex_read = (s3d_tri->cmd_set & CMD_SET_TWE) ? tex_ARGB1555 : tex_ARGB1555_nowrap; break; default: - pclog("bad texture type %i\n", (s3d_tri->cmd_set >> 5) & 7); + /* pclog("bad texture type %i\n", (s3d_tri->cmd_set >> 5) & 7); */ tex_read = (s3d_tri->cmd_set & CMD_SET_TWE) ? tex_ARGB1555 : tex_ARGB1555_nowrap; break; } diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c index ca741cd22..bbfb64d6e 100644 --- a/src/video/vid_svga.c +++ b/src/video/vid_svga.c @@ -11,7 +11,7 @@ * This is intended to be used by another SVGA driver, * and not as a card in it's own right. * - * Version: @(#)vid_svga.c 1.0.12 2017/11/12 + * Version: @(#)vid_svga.c 1.0.13 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -1550,7 +1550,7 @@ void svga_doblit(int y1, int y2, int wx, int wy, svga_t *svga) if (video_force_resize_get()) { - pclog("Scroll: %02X (%i, %i, %i, %i, %i, %i)\n", (svga->crtc[8] & 0x1f), enable_overscan, suppress_overscan, wx, wy + 1, x_add, y_add); + /* pclog("Scroll: %02X (%i, %i, %i, %i, %i, %i)\n", (svga->crtc[8] & 0x1f), enable_overscan, suppress_overscan, wx, wy + 1, x_add, y_add); */ video_force_resize_set(0); } } @@ -1707,7 +1707,7 @@ uint32_t svga_readl(uint32_t addr, void *p) if (!svga->fast) { - if (addr == 0xBF0000) pclog ("%08X\n", svga_read(addr, p) | (svga_read(addr + 1, p) << 8) | (svga_read(addr + 2, p) << 16) | (svga_read(addr + 3, p) << 24)); + /* if (addr == 0xBF0000) pclog ("%08X\n", svga_read(addr, p) | (svga_read(addr + 1, p) << 8) | (svga_read(addr + 2, p) << 16) | (svga_read(addr + 3, p) << 24)); */ return svga_read(addr, p) | (svga_read(addr + 1, p) << 8) | (svga_read(addr + 2, p) << 16) | (svga_read(addr + 3, p) << 24); } diff --git a/src/video/vid_voodoo.c b/src/video/vid_voodoo.c index f8077221d..e3c170614 100644 --- a/src/video/vid_voodoo.c +++ b/src/video/vid_voodoo.c @@ -8,7 +8,7 @@ * * Emulation of the 3DFX Voodoo Graphics controller. * - * Version: @(#)vid_voodoo.c 1.0.10 2017/11/18 + * Version: @(#)vid_voodoo.c 1.0.11 2017/12/28 * * Authors: Sarah Walker, * leilei @@ -1052,6 +1052,26 @@ enum #define TEXTUREMODE_LOCAL_MASK 0x00643000 #define TEXTUREMODE_LOCAL 0x00241000 +#ifdef ENABLE_VOODOO_LOG +int voodoo_do_log = ENABLE_VOODOO_LOG; +#endif + + +static void +voodoo_log(const char *fmt, ...) +{ +#ifdef ENABLE_VOODOO_LOG + va_list ap; + + if (voodoo_do_log) { + va_start(ap, fmt); + pclog_ex(fmt, ap); + va_end(ap); + } +#endif +} + + static void voodoo_threshold_check(voodoo_t *voodoo); static void voodoo_update_ncc(voodoo_t *voodoo, int tmu) @@ -1168,8 +1188,8 @@ static void voodoo_recalc(voodoo_t *voodoo) voodoo->block_width += 32; voodoo->row_width = voodoo->block_width * 32 * 2; -/* pclog("voodoo_recalc : front_offset %08X back_offset %08X aux_offset %08X draw_offset %08x\n", voodoo->params.front_offset, voodoo->back_offset, voodoo->params.aux_offset, voodoo->params.draw_offset); - pclog(" fb_read_offset %08X fb_write_offset %08X row_width %i %08x %08x\n", voodoo->fb_read_offset, voodoo->fb_write_offset, voodoo->row_width, voodoo->lfbMode, voodoo->params.fbzMode);*/ +/* voodoo_log("voodoo_recalc : front_offset %08X back_offset %08X aux_offset %08X draw_offset %08x\n", voodoo->params.front_offset, voodoo->back_offset, voodoo->params.aux_offset, voodoo->params.draw_offset); + voodoo_log(" fb_read_offset %08X fb_write_offset %08X row_width %i %08x %08x\n", voodoo->fb_read_offset, voodoo->fb_write_offset, voodoo->row_width, voodoo->lfbMode, voodoo->params.fbzMode);*/ } static void voodoo_recalc_tex(voodoo_t *voodoo, int tmu) @@ -1345,7 +1365,7 @@ static void use_texture(voodoo_t *voodoo, voodoo_params_t *params, int tmu) lod_min = (params->tLOD[tmu] >> 2) & 15; lod_max = (params->tLOD[tmu] >> 8) & 15; -// pclog(" add new texture to %i tformat=%i %08x LOD=%i-%i tmu=%i\n", c, voodoo->params.tformat[tmu], params->texBaseAddr[tmu], lod_min, lod_max, tmu); +// voodoo_log(" add new texture to %i tformat=%i %08x LOD=%i-%i tmu=%i\n", c, voodoo->params.tformat[tmu], params->texBaseAddr[tmu], lod_min, lod_max, tmu); lod_min = MIN(lod_min, 8); lod_max = MIN(lod_max, 8); @@ -1357,7 +1377,7 @@ static void use_texture(voodoo_t *voodoo, voodoo_params_t *params, int tmu) int shift = 8 - params->tex_lod[tmu][lod]; rgba_u *pal; - //pclog(" LOD %i : %08x - %08x %i %i,%i\n", lod, params->tex_base[tmu][lod] & voodoo->texture_mask, addr, voodoo->params.tformat[tmu], voodoo->params.tex_w_mask[tmu][lod],voodoo->params.tex_h_mask[tmu][lod]); + //voodoo_log(" LOD %i : %08x - %08x %i %i,%i\n", lod, params->tex_base[tmu][lod] & voodoo->texture_mask, addr, voodoo->params.tformat[tmu], voodoo->params.tex_w_mask[tmu][lod],voodoo->params.tex_h_mask[tmu][lod]); switch (params->tformat[tmu]) @@ -1635,7 +1655,7 @@ static void flush_texture_cache(voodoo_t *voodoo, uint32_t dirty_addr, int tmu) int c; memset(voodoo->texture_present[tmu], 0, sizeof(voodoo->texture_present[0])); -// pclog("Evict %08x %i\n", dirty_addr, sizeof(voodoo->texture_present)); +// voodoo_log("Evict %08x %i\n", dirty_addr, sizeof(voodoo->texture_present)); for (c = 0; c < TEX_CACHE_MAX; c++) { if (voodoo->texture_cache[tmu][c].base != -1) @@ -1656,7 +1676,7 @@ static void flush_texture_cache(voodoo_t *voodoo, uint32_t dirty_addr, int tmu) addr_end_masked = voodoo->texture_mask+1; if (dirty_addr >= addr_start_masked && dirty_addr < addr_end_masked) { -// pclog(" Evict texture %i %08x\n", c, voodoo->texture_cache[tmu][c].base); +// voodoo_log(" Evict texture %i %08x\n", c, voodoo->texture_cache[tmu][c].base); if (voodoo->texture_cache[tmu][c].refcount != voodoo->texture_cache[tmu][c].refcount_r[0] || (voodoo->render_threads == 2 && voodoo->texture_cache[tmu][c].refcount != voodoo->texture_cache[tmu][c].refcount_r[1])) @@ -1805,7 +1825,7 @@ static inline int voodoo_fls(uint16_t val) { int num = 0; -//pclog("fls(%04x) = ", val); +//voodoo_log("fls(%04x) = ", val); if (!(val & 0xff00)) { num += 8; @@ -1826,7 +1846,7 @@ static inline int voodoo_fls(uint16_t val) num += 1; val <<= 1; } -//pclog("%i %04x\n", num, val); +//voodoo_log("%i %04x\n", num, val); return num; } @@ -1969,7 +1989,7 @@ static inline void voodoo_get_texture(voodoo_t *voodoo, voodoo_params_t *params, t >>= 4; //if (x == 80) //if (voodoo_output) -// pclog("s=%08x t=%08x _ds=%02x _dt=%02x\n", s, t, _ds, dt); +// voodoo_log("s=%08x t=%08x _ds=%02x _dt=%02x\n", s, t, _ds, dt); d[0] = (16 - _ds) * (16 - dt); d[1] = _ds * (16 - dt); d[2] = (16 - _ds) * dt; @@ -2700,7 +2720,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood state->clamp_s[1] = params->textureMode[1] & TEXTUREMODE_TCLAMPS; state->clamp_t[1] = params->textureMode[1] & TEXTUREMODE_TCLAMPT; // int last_x; -// pclog("voodoo_triangle : bottom-half %X %X %X %X %X %i %i %i %i\n", xstart, xend, dx1, dx2, dx2 * 36, xdir, y, yend, ydir); +// voodoo_log("voodoo_triangle : bottom-half %X %X %X %X %X %i %i %i %i\n", xstart, xend, dx1, dx2, dx2 * 36, xdir, y, yend, ydir); for (c = 0; c <= LOD_MAX; c++) { @@ -2785,8 +2805,8 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood #endif if (voodoo_output) - pclog("dxAB=%08x dxBC=%08x dxAC=%08x\n", state->dxAB, state->dxBC, state->dxAC); -// pclog("Start %i %i\n", ystart, voodoo->fbzMode & (1 << 17)); + voodoo_log("dxAB=%08x dxBC=%08x dxAC=%08x\n", state->dxAB, state->dxBC, state->dxAC); +// voodoo_log("Start %i %i\n", ystart, voodoo->fbzMode & (1 << 17)); for (; state->y < yend; state->y += y_diff) { @@ -2844,7 +2864,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood x2 = (x2 + 0x7000) >> 16; if (voodoo_output) - pclog("%03i:%03i : Ax=%08x start_x=%08x dSdX=%016llx dx=%08x s=%08x -> ", x, state->y, state->vertexAx << 8, start_x, params->tmu[0].dTdX, dx, state->tmu0_t); + voodoo_log("%03i:%03i : Ax=%08x start_x=%08x dSdX=%016llx dx=%08x s=%08x -> ", x, state->y, state->vertexAx << 8, start_x, params->tmu[0].dTdX, dx, state->tmu0_t); state->ir += (params->dRdX * dx); state->ig += (params->dGdX * dx); @@ -2860,7 +2880,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood state->w += (params->dWdX * dx); if (voodoo_output) - pclog("%08llx %lli %lli\n", state->tmu0_t, state->tmu0_t >> (18+state->lod), (state->tmu0_t + (1 << (17+state->lod))) >> (18+state->lod)); + voodoo_log("%08llx %lli %lli\n", state->tmu0_t, state->tmu0_t >> (18+state->lod), (state->tmu0_t + (1 << (17+state->lod))) >> (18+state->lod)); if (params->fbzMode & 1) { @@ -2931,7 +2951,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood } if (voodoo_output) - pclog("%03i: x=%08x x2=%08x xstart=%08x xend=%08x dx=%08x start_x2=%08x\n", state->y, x, x2, state->xstart, state->xend, dx, start_x2); + voodoo_log("%03i: x=%08x x2=%08x xstart=%08x xend=%08x dx=%08x start_x2=%08x\n", state->y, x, x2, state->xstart, state->xend, dx, start_x2); state->pixel_count = 0; state->texel_count = 0; @@ -2953,7 +2973,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood voodoo->fbiPixelsIn++; if (voodoo_output) - pclog(" X=%03i T=%08x\n", x, state->tmu0_t); + voodoo_log(" X=%03i T=%08x\n", x, state->tmu0_t); // if (voodoo->fbzMode & FBZ_RGB_WMASK) { int update = 1; @@ -3415,7 +3435,7 @@ static void voodoo_triangle(voodoo_t *voodoo, voodoo_params_t *params, int odd_e if ((params->vertexAy & 0xf) > 8) dy += 16; -/* pclog("voodoo_triangle %i %i %i : vA %f, %f vB %f, %f vC %f, %f f %i,%i %08x %08x %08x,%08x tex=%i,%i fogMode=%08x\n", odd_even, voodoo->params_read_idx[odd_even], voodoo->params_read_idx[odd_even] & PARAM_MASK, (float)params->vertexAx / 16.0, (float)params->vertexAy / 16.0, +/* voodoo_log("voodoo_triangle %i %i %i : vA %f, %f vB %f, %f vC %f, %f f %i,%i %08x %08x %08x,%08x tex=%i,%i fogMode=%08x\n", odd_even, voodoo->params_read_idx[odd_even], voodoo->params_read_idx[odd_even] & PARAM_MASK, (float)params->vertexAx / 16.0, (float)params->vertexAy / 16.0, (float)params->vertexBx / 16.0, (float)params->vertexBy / 16.0, (float)params->vertexCx / 16.0, (float)params->vertexCy / 16.0, (params->fbzColorPath & FBZCP_TEXTURE_ENABLED) ? params->tformat[0] : 0, @@ -4003,7 +4023,7 @@ static void blit_start(voodoo_t *voodoo) uint32_t dst_base_addr = (voodoo->bltCommand & BLTCMD_DST_TILED) ? ((voodoo->bltDstBaseAddr & 0x3ff) << 12) : (voodoo->bltDstBaseAddr & 0x3ffff8); int x, y; -/* pclog("blit_start: command=%08x srcX=%i srcY=%i dstX=%i dstY=%i sizeX=%i sizeY=%i color=%04x,%04x\n", +/* voodoo_log("blit_start: command=%08x srcX=%i srcY=%i dstX=%i dstY=%i sizeX=%i sizeY=%i color=%04x,%04x\n", voodoo->bltCommand, voodoo->bltSrcX, voodoo->bltSrcY, voodoo->bltDstX, voodoo->bltDstY, voodoo->bltSizeX, voodoo->bltSizeY, voodoo->bltColorFg, voodoo->bltColorBg);*/ wait_for_render_thread_idle(voodoo); @@ -4341,7 +4361,7 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) chip = 0xf; tempif.i = val; -//pclog("voodoo_reg_write_l: addr=%08x val=%08x(%f) chip=%x\n", addr, val, tempif.f, chip); +//voodoo_log("voodoo_reg_write_l: addr=%08x val=%08x(%f) chip=%x\n", addr, val, tempif.f, chip); addr &= 0x3fc; if ((voodoo->fbiInit3 & FBIINIT3_REMAP) && addr < 0x100 && ad21) @@ -4349,7 +4369,7 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) switch (addr) { case SST_swapbufferCMD: -// pclog(" start swap buffer command\n"); +// voodoo_log(" start swap buffer command\n"); if (TRIPLE_BUFFER) { @@ -4365,7 +4385,7 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) voodoo->params.swapbufferCMD = val; - pclog("Swap buffer %08x %d %p %i\n", val, voodoo->swap_count, &voodoo->swap_count, (voodoo == voodoo->set->voodoos[1]) ? 1 : 0); + voodoo_log("Swap buffer %08x %d %p %i\n", val, voodoo->swap_count, &voodoo->swap_count, (voodoo == voodoo->set->voodoos[1]) ? 1 : 0); // voodoo->front_offset = params->front_offset; wait_for_render_thread_idle(voodoo); if (!(val & 1)) @@ -4825,12 +4845,12 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) case SST_sVx: tempif.i = val; voodoo->verts[3].sVx = tempif.f; -// pclog("sVx[%i]=%f\n", voodoo->vertex_num, tempif.f); +// voodoo_log("sVx[%i]=%f\n", voodoo->vertex_num, tempif.f); break; case SST_sVy: tempif.i = val; voodoo->verts[3].sVy = tempif.f; -// pclog("sVy[%i]=%f\n", voodoo->vertex_num, tempif.f); +// voodoo_log("sVy[%i]=%f\n", voodoo->vertex_num, tempif.f); break; case SST_sARGB: voodoo->verts[3].sBlue = (float)(val & 0xff); @@ -4888,13 +4908,13 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) break; case SST_sBeginTriCMD: -// pclog("sBeginTriCMD %i %f\n", voodoo->vertex_num, voodoo->verts[4].sVx); +// voodoo_log("sBeginTriCMD %i %f\n", voodoo->vertex_num, voodoo->verts[4].sVx); voodoo->verts[0] = voodoo->verts[3]; voodoo->vertex_num = 1; voodoo->num_verticies = 1; break; case SST_sDrawTriCMD: -// pclog("sDrawTriCMD %i %i %i\n", voodoo->num_verticies, voodoo->vertex_num, voodoo->sSetupMode & SETUPMODE_STRIP_MODE); +// voodoo_log("sDrawTriCMD %i %i %i\n", voodoo->num_verticies, voodoo->vertex_num, voodoo->sSetupMode & SETUPMODE_STRIP_MODE); if (voodoo->vertex_num == 3) voodoo->vertex_num = (voodoo->sSetupMode & SETUPMODE_STRIP_MODE) ? 1 : 0; voodoo->verts[voodoo->vertex_num] = voodoo->verts[3]; @@ -4903,7 +4923,7 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) voodoo->vertex_num++; if (voodoo->num_verticies == 3) { -// pclog("triangle_setup\n"); +// voodoo_log("triangle_setup\n"); triangle_setup(voodoo); voodoo->num_verticies = 2; @@ -4916,13 +4936,13 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) voodoo->bltSrcBaseAddr = val & 0x3fffff; break; case SST_bltDstBaseAddr: -// pclog("Write bltDstBaseAddr %08x\n", val); +// voodoo_log("Write bltDstBaseAddr %08x\n", val); voodoo->bltDstBaseAddr = val & 0x3fffff; break; case SST_bltXYStrides: voodoo->bltSrcXYStride = val & 0xfff; voodoo->bltDstXYStride = (val >> 16) & 0xfff; -// pclog("Write bltXYStrides %08x\n", val); +// voodoo_log("Write bltXYStrides %08x\n", val); break; case SST_bltSrcChromaRange: voodoo->bltSrcChromaRange = val; @@ -4956,14 +4976,14 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) voodoo->bltSrcY = (val >> 16) & 0x7ff; break; case SST_bltDstXY: -// pclog("Write bltDstXY %08x\n", val); +// voodoo_log("Write bltDstXY %08x\n", val); voodoo->bltDstX = val & 0x7ff; voodoo->bltDstY = (val >> 16) & 0x7ff; if (val & (1 << 31)) blit_start(voodoo); break; case SST_bltSize: -// pclog("Write bltSize %08x\n", val); +// voodoo_log("Write bltSize %08x\n", val); voodoo->bltSizeX = val & 0xfff; if (voodoo->bltSizeX & 0x800) voodoo->bltSizeX |= 0xfffff000; @@ -4980,14 +5000,14 @@ static void voodoo_reg_writel(uint32_t addr, uint32_t val, void *p) voodoo->bltRop[3] = (val >> 12) & 0xf; break; case SST_bltColor: -// pclog("Write bltColor %08x\n", val); +// voodoo_log("Write bltColor %08x\n", val); voodoo->bltColorFg = val & 0xffff; voodoo->bltColorBg = (val >> 16) & 0xffff; break; case SST_bltCommand: voodoo->bltCommand = val; -// pclog("Write bltCommand %08x\n", val); +// voodoo_log("Write bltCommand %08x\n", val); if (val & (1 << 31)) blit_start(voodoo); break; @@ -5471,7 +5491,7 @@ static uint16_t voodoo_fb_readw(uint32_t addr, void *p) temp = *(uint16_t *)(&voodoo->fb_mem[read_addr & voodoo->fb_mask]); -// pclog("voodoo_fb_readw : %08X %08X %i %i %08X %08X %08x:%08x %i\n", addr, temp, x, y, read_addr, *(uint32_t *)(&voodoo->fb_mem[4]), cs, pc, fb_reads++); +// voodoo_log("voodoo_fb_readw : %08X %08X %i %i %08X %08X %08x:%08x %i\n", addr, temp, x, y, read_addr, *(uint32_t *)(&voodoo->fb_mem[4]), cs, pc, fb_reads++); return temp; } static uint32_t voodoo_fb_readl(uint32_t addr, void *p) @@ -5503,7 +5523,7 @@ static uint32_t voodoo_fb_readl(uint32_t addr, void *p) temp = *(uint32_t *)(&voodoo->fb_mem[read_addr & voodoo->fb_mask]); -// pclog("voodoo_fb_readl : %08X %08x %08X x=%i y=%i %08X %08X %08x:%08x %i ro=%08x rw=%i\n", addr, read_addr, temp, x, y, read_addr, *(uint32_t *)(&voodoo->fb_mem[4]), cs, pc, fb_reads++, voodoo->fb_read_offset, voodoo->row_width); +// voodoo_log("voodoo_fb_readl : %08X %08x %08X x=%i y=%i %08X %08X %08x:%08x %i ro=%08x rw=%i\n", addr, read_addr, temp, x, y, read_addr, *(uint32_t *)(&voodoo->fb_mem[4]), cs, pc, fb_reads++, voodoo->fb_read_offset, voodoo->row_width); return temp; } @@ -5555,7 +5575,7 @@ static void voodoo_fb_writew(uint32_t addr, uint16_t val, void *p) // while (!RB_EMPTY) // thread_reset_event(voodoo->not_full_event); -// pclog("voodoo_fb_writew : %08X %04X\n", addr, val); +// voodoo_log("voodoo_fb_writew : %08X %04X\n", addr, val); switch (voodoo->lfbMode & LFB_FORMAT_MASK) @@ -5602,7 +5622,7 @@ static void voodoo_fb_writew(uint32_t addr, uint16_t val, void *p) write_addr = voodoo->fb_write_offset + x + (y * voodoo->row_width); write_addr_aux = voodoo->params.aux_offset + x + (y * voodoo->row_width); -// pclog("fb_writew %08x %i %i %i %08x\n", addr, x, y, voodoo->row_width, write_addr); +// voodoo_log("fb_writew %08x %i %i %i %08x\n", addr, x, y, voodoo->row_width, write_addr); if (voodoo->lfbMode & 0x100) { @@ -5686,7 +5706,7 @@ static void voodoo_fb_writel(uint32_t addr, uint32_t val, void *p) // while (!RB_EMPTY) // thread_reset_event(voodoo->not_full_event); -// pclog("voodoo_fb_writel : %08X %08X\n", addr, val); +// voodoo_log("voodoo_fb_writel : %08X %08X\n", addr, val); switch (voodoo->lfbMode & LFB_FORMAT_MASK) { @@ -5748,7 +5768,7 @@ static void voodoo_fb_writel(uint32_t addr, uint32_t val, void *p) write_addr = voodoo->fb_write_offset + x + (y * voodoo->row_width); write_addr_aux = voodoo->params.aux_offset + x + (y * voodoo->row_width); -// pclog("fb_writel %08x x=%i y=%i rw=%i %08x wo=%08x\n", addr, x, y, voodoo->row_width, write_addr, voodoo->fb_write_offset); +// voodoo_log("fb_writel %08x x=%i y=%i rw=%i %08x wo=%08x\n", addr, x, y, voodoo->row_width, write_addr, voodoo->fb_write_offset); if (voodoo->lfbMode & 0x100) { @@ -5841,7 +5861,7 @@ static void voodoo_tex_writel(uint32_t addr, uint32_t val, void *p) if (tmu && !voodoo->dual_tmus) return; -// pclog("voodoo_tex_writel : %08X %08X %i\n", addr, val, voodoo->params.tformat); +// voodoo_log("voodoo_tex_writel : %08X %08X %i\n", addr, val, voodoo->params.tformat); lod = (addr >> 17) & 0xf; t = (addr >> 9) & 0xff; @@ -5867,7 +5887,7 @@ static void voodoo_tex_writel(uint32_t addr, uint32_t val, void *p) addr = voodoo->params.tex_base[tmu][lod] + s + (t << voodoo->params.tex_shift[tmu][lod]); if (voodoo->texture_present[tmu][(addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT]) { -// pclog("texture_present at %08x %i\n", addr, (addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT); +// voodoo_log("texture_present at %08x %i\n", addr, (addr & voodoo->texture_mask) >> TEX_DIRTY_SHIFT); flush_texture_cache(voodoo, addr & voodoo->texture_mask, tmu); } *(uint32_t *)(&voodoo->tex_mem[tmu][addr & voodoo->texture_mask]) = val; @@ -6219,7 +6239,7 @@ static void voodoo_pixelclock_update(voodoo_t *voodoo) line_length = (voodoo->hSync & 0xff) + ((voodoo->hSync >> 16) & 0x3ff); -// pclog("Pixel clock %f MHz hsync %08x line_length %d\n", t, voodoo->hSync, line_length); +// voodoo_log("Pixel clock %f MHz hsync %08x line_length %d\n", t, voodoo->hSync, line_length); voodoo->pixel_clock = t; @@ -6252,7 +6272,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) } else if ((addr & 0x200000) && (voodoo->fbiInit7 & FBIINIT7_CMDFIFO_ENABLE)) { -// pclog("Write CMDFIFO %08x(%08x) %08x %08x\n", addr, voodoo->cmdfifo_base + (addr & 0x3fffc), val, (voodoo->cmdfifo_base + (addr & 0x3fffc)) & voodoo->fb_mask); +// voodoo_log("Write CMDFIFO %08x(%08x) %08x %08x\n", addr, voodoo->cmdfifo_base + (addr & 0x3fffc), val, (voodoo->cmdfifo_base + (addr & 0x3fffc)) & voodoo->fb_mask); *(uint32_t *)&voodoo->fb_mem[(voodoo->cmdfifo_base + (addr & 0x3fffc)) & voodoo->fb_mask] = val; voodoo->cmdfifo_depth_wr++; if ((voodoo->cmdfifo_depth_wr - voodoo->cmdfifo_depth_rd) < 20) @@ -6315,7 +6335,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) { voodoo->fbiInit4 = val; voodoo->read_time = pci_nonburst_time + pci_burst_time * ((voodoo->fbiInit4 & 1) ? 2 : 1); -// pclog("fbiInit4 write %08x - read_time=%i\n", val, voodoo->read_time); +// voodoo_log("fbiInit4 write %08x - read_time=%i\n", val, voodoo->read_time); } break; case SST_backPorch: @@ -6357,7 +6377,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) voodoo->fbiInit1 = (val & ~5) | (voodoo->fbiInit1 & 5); voodoo->write_time = pci_nonburst_time + pci_burst_time * ((voodoo->fbiInit1 & 2) ? 1 : 0); voodoo->burst_time = pci_burst_time * ((voodoo->fbiInit1 & 2) ? 2 : 1); -// pclog("fbiInit1 write %08x - write_time=%i burst_time=%i\n", val, voodoo->write_time, voodoo->burst_time); +// voodoo_log("fbiInit1 write %08x - write_time=%i burst_time=%i\n", val, voodoo->write_time, voodoo->burst_time); } break; case SST_fbiInit2: @@ -6400,7 +6420,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) voodoo->dac_readdata = 0xff; if (val & 0x800) { -// pclog(" dacData read %i %02X\n", voodoo->dac_reg, voodoo->dac_data[7]); +// voodoo_log(" dacData read %i %02X\n", voodoo->dac_reg, voodoo->dac_data[7]); if (voodoo->dac_reg == 5) { switch (voodoo->dac_data[7]) @@ -6421,7 +6441,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) voodoo->dac_pll_regs[voodoo->dac_data[4] & 0xf] = (voodoo->dac_pll_regs[voodoo->dac_data[4] & 0xf] & 0xff00) | val; else voodoo->dac_pll_regs[voodoo->dac_data[4] & 0xf] = (voodoo->dac_pll_regs[voodoo->dac_data[4] & 0xf] & 0xff) | (val << 8); -// pclog("Write PLL reg %x %04x\n", voodoo->dac_data[4] & 0xf, voodoo->dac_pll_regs[voodoo->dac_data[4] & 0xf]); +// voodoo_log("Write PLL reg %x %04x\n", voodoo->dac_data[4] & 0xf, voodoo->dac_pll_regs[voodoo->dac_data[4] & 0xf]); voodoo->dac_reg_ff = !voodoo->dac_reg_ff; if (!voodoo->dac_reg_ff) voodoo->dac_data[4]++; @@ -6445,7 +6465,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) if (val < 1) voodoo->scrfilterEnabled = 0; voodoo_threshold_check(voodoo); - pclog("Voodoo Filter: %06x\n", val); + voodoo_log("Voodoo Filter: %06x\n", val); } break; @@ -6465,7 +6485,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) case SST_cmdFifoBaseAddr: voodoo->cmdfifo_base = (val & 0x3ff) << 12; voodoo->cmdfifo_end = ((val >> 16) & 0x3ff) << 12; -// pclog("CMDFIFO base=%08x end=%08x\n", voodoo->cmdfifo_base, voodoo->cmdfifo_end); +// voodoo_log("CMDFIFO base=%08x end=%08x\n", voodoo->cmdfifo_base, voodoo->cmdfifo_end); break; case SST_cmdFifoRdPtr: @@ -6485,7 +6505,7 @@ static void voodoo_writel(uint32_t addr, uint32_t val, void *p) default: if (voodoo->fbiInit7 & FBIINIT7_CMDFIFO_ENABLE) { - pclog("Unknown register write in CMDFIFO mode %08x %08x\n", addr, val); + voodoo_log("Unknown register write in CMDFIFO mode %08x %08x\n", addr, val); } else { @@ -6538,7 +6558,7 @@ static uint32_t cmdfifo_get(voodoo_t *voodoo) voodoo->cmdfifo_depth_rd++; voodoo->cmdfifo_rp += 4; -// pclog(" CMDFIFO get %08x\n", val); +// voodoo_log(" CMDFIFO get %08x\n", val); return val; } @@ -6624,12 +6644,12 @@ static void fifo_thread(void *param) int num_verticies; int v_num; -// pclog(" CMDFIFO header %08x at %08x\n", header, voodoo->cmdfifo_rp); +// voodoo_log(" CMDFIFO header %08x at %08x\n", header, voodoo->cmdfifo_rp); switch (header & 7) { case 0: -// pclog("CMDFIFO0\n"); +// voodoo_log("CMDFIFO0\n"); switch ((header >> 3) & 7) { case 0: /*NOP*/ @@ -6637,7 +6657,7 @@ static void fifo_thread(void *param) case 3: /*JMP local frame buffer*/ voodoo->cmdfifo_rp = (header >> 4) & 0xfffffc; -// pclog("JMP to %08x %04x\n", voodoo->cmdfifo_rp, header); +// voodoo_log("JMP to %08x %04x\n", voodoo->cmdfifo_rp, header); break; default: @@ -6648,7 +6668,7 @@ static void fifo_thread(void *param) case 1: num = header >> 16; addr = (header & 0x7ff8) >> 1; -// pclog("CMDFIFO1 addr=%08x\n",addr); +// voodoo_log("CMDFIFO1 addr=%08x\n",addr); while (num--) { uint32_t val = cmdfifo_get(voodoo); @@ -6672,8 +6692,8 @@ static void fifo_thread(void *param) v_num = 0; if (((header >> 3) & 7) == 2) v_num = 1; -// pclog("CMDFIFO3: num=%i verts=%i mask=%02x\n", num, num_verticies, (header >> 10) & 0xff); -// pclog("CMDFIFO3 %02x %i\n", (header >> 10), (header >> 3) & 7); +// voodoo_log("CMDFIFO3: num=%i verts=%i mask=%02x\n", num, num_verticies, (header >> 10) & 0xff); +// voodoo_log("CMDFIFO3 %02x %i\n", (header >> 10), (header >> 3) & 7); while (num_verticies--) { @@ -6730,7 +6750,7 @@ static void fifo_thread(void *param) num = (header >> 29) & 7; mask = (header >> 15) & 0x3fff; addr = (header & 0x7ff8) >> 1; -// pclog("CMDFIFO4 addr=%08x\n",addr); +// voodoo_log("CMDFIFO4 addr=%08x\n",addr); while (mask) { if (mask & 1) @@ -6755,7 +6775,7 @@ static void fifo_thread(void *param) fatal("CMDFIFO packet 5 has byte disables set %08x\n", header); num = (header >> 3) & 0x7ffff; addr = cmdfifo_get(voodoo) & 0xffffff; -// pclog("CMDFIFO5 addr=%08x num=%i\n", addr, num); +// voodoo_log("CMDFIFO5 addr=%08x num=%i\n", addr, num); switch (header >> 30) { case 2: /*Framebuffer*/ @@ -6781,7 +6801,7 @@ static void fifo_thread(void *param) break; default: - pclog("Bad CMDFIFO packet %08x %08x\n", header, voodoo->cmdfifo_rp); + voodoo_log("Bad CMDFIFO packet %08x %08x\n", header, voodoo->cmdfifo_rp); } end_time = plat_timer_read(); @@ -6799,13 +6819,13 @@ static void voodoo_recalcmapping(voodoo_set_t *set) { if (set->voodoos[0]->type == VOODOO_2 && set->voodoos[1]->initEnable & (1 << 23)) { - pclog("voodoo_recalcmapping (pri) with snoop : memBaseAddr %08X\n", set->voodoos[0]->memBaseAddr); + voodoo_log("voodoo_recalcmapping (pri) with snoop : memBaseAddr %08X\n", set->voodoos[0]->memBaseAddr); mem_mapping_disable(&set->voodoos[0]->mapping); mem_mapping_set_addr(&set->snoop_mapping, set->voodoos[0]->memBaseAddr, 0x01000000); } else if (set->voodoos[1]->pci_enable && (set->voodoos[0]->memBaseAddr == set->voodoos[1]->memBaseAddr)) { - pclog("voodoo_recalcmapping (pri) (sec) same addr : memBaseAddr %08X\n", set->voodoos[0]->memBaseAddr); + voodoo_log("voodoo_recalcmapping (pri) (sec) same addr : memBaseAddr %08X\n", set->voodoos[0]->memBaseAddr); mem_mapping_disable(&set->voodoos[0]->mapping); mem_mapping_disable(&set->voodoos[1]->mapping); mem_mapping_set_addr(&set->snoop_mapping, set->voodoos[0]->memBaseAddr, 0x01000000); @@ -6813,25 +6833,25 @@ static void voodoo_recalcmapping(voodoo_set_t *set) } else { - pclog("voodoo_recalcmapping (pri) : memBaseAddr %08X\n", set->voodoos[0]->memBaseAddr); + voodoo_log("voodoo_recalcmapping (pri) : memBaseAddr %08X\n", set->voodoos[0]->memBaseAddr); mem_mapping_disable(&set->snoop_mapping); mem_mapping_set_addr(&set->voodoos[0]->mapping, set->voodoos[0]->memBaseAddr, 0x01000000); } } else { - pclog("voodoo_recalcmapping (pri) : disabled\n"); + voodoo_log("voodoo_recalcmapping (pri) : disabled\n"); mem_mapping_disable(&set->voodoos[0]->mapping); } if (set->voodoos[1]->pci_enable && set->voodoos[1]->memBaseAddr) { - pclog("voodoo_recalcmapping (sec) : memBaseAddr %08X\n", set->voodoos[1]->memBaseAddr); + voodoo_log("voodoo_recalcmapping (sec) : memBaseAddr %08X\n", set->voodoos[1]->memBaseAddr); mem_mapping_set_addr(&set->voodoos[1]->mapping, set->voodoos[1]->memBaseAddr, 0x01000000); } else { - pclog("voodoo_recalcmapping (sec) : disabled\n"); + voodoo_log("voodoo_recalcmapping (sec) : disabled\n"); mem_mapping_disable(&set->voodoos[1]->mapping); } } @@ -6841,12 +6861,12 @@ static void voodoo_recalcmapping(voodoo_set_t *set) if (voodoo->pci_enable && voodoo->memBaseAddr) { - pclog("voodoo_recalcmapping : memBaseAddr %08X\n", voodoo->memBaseAddr); + voodoo_log("voodoo_recalcmapping : memBaseAddr %08X\n", voodoo->memBaseAddr); mem_mapping_set_addr(&voodoo->mapping, voodoo->memBaseAddr, 0x01000000); } else { - pclog("voodoo_recalcmapping : disabled\n"); + voodoo_log("voodoo_recalcmapping : disabled\n"); mem_mapping_disable(&voodoo->mapping); } } @@ -6859,7 +6879,7 @@ uint8_t voodoo_pci_read(int func, int addr, void *p) if (func) return 0; -// pclog("Voodoo PCI read %08X PC=%08x\n", addr, cpu_state.pc); +// voodoo_log("Voodoo PCI read %08X PC=%08x\n", addr, cpu_state.pc); switch (addr) { @@ -6906,7 +6926,7 @@ void voodoo_pci_write(int func, int addr, uint8_t val, void *p) if (func) return; -// pclog("Voodoo PCI write %04X %02X PC=%08x\n", addr, val, cpu_state.pc); +// voodoo_log("Voodoo PCI write %04X %02X PC=%08x\n", addr, val, cpu_state.pc); switch (addr) { @@ -7138,7 +7158,7 @@ static void voodoo_generate_filter_v2(voodoo_t *voodoo) // debug the ones that don't give us much of a difference //if (difference < FILTCAP) - //pclog("Voodoofilter: %ix%i - %f difference, %f average difference, R=%f, G=%f, B=%f\n", g, h, difference, avgdiff, thiscol, thiscolg, thiscolb); + //voodoo_log("Voodoofilter: %ix%i - %f difference, %f average difference, R=%f, G=%f, B=%f\n", g, h, difference, avgdiff, thiscol, thiscolg, thiscolb); } lined = g + 3; @@ -7168,7 +7188,7 @@ static void voodoo_threshold_check(voodoo_t *voodoo) FILTCAPG = g; FILTCAPB = b; - pclog("Voodoo Filter Threshold Check: %06x - RED %i GREEN %i BLUE %i\n", voodoo->scrfilterThreshold, r, g, b); + voodoo_log("Voodoo Filter Threshold Check: %06x - RED %i GREEN %i BLUE %i\n", voodoo->scrfilterThreshold, r, g, b); voodoo->scrfilterThresholdOld = voodoo->scrfilterThreshold; @@ -7384,7 +7404,7 @@ void voodoo_callback(void *p) skip_draw: if (voodoo->line == voodoo->v_disp) { -// pclog("retrace %i %i %08x %i\n", voodoo->retrace_count, voodoo->swap_interval, voodoo->swap_offset, voodoo->swap_pending); +// voodoo_log("retrace %i %i %08x %i\n", voodoo->retrace_count, voodoo->swap_interval, voodoo->swap_offset, voodoo->swap_pending); voodoo->retrace_count++; if (SLI_ENABLED && (voodoo->fbiInit2 & FBIINIT2_SWAP_ALGORITHM_MASK) == FBIINIT2_SWAP_ALGORITHM_SLI_SYNC) { @@ -7565,7 +7585,7 @@ static void voodoo_speed_changed(void *p) voodoo_set->voodoos[1]->write_time = pci_nonburst_time + pci_burst_time * ((voodoo_set->voodoos[1]->fbiInit1 & 2) ? 1 : 0); voodoo_set->voodoos[1]->burst_time = pci_burst_time * ((voodoo_set->voodoos[1]->fbiInit1 & 2) ? 2 : 1); } -// pclog("Voodoo read_time=%i write_time=%i burst_time=%i %08x %08x\n", voodoo->read_time, voodoo->write_time, voodoo->burst_time, voodoo->fbiInit1, voodoo->fbiInit4); +// voodoo_log("Voodoo read_time=%i write_time=%i burst_time=%i %08x %08x\n", voodoo->read_time, voodoo->write_time, voodoo->burst_time, voodoo->fbiInit1, voodoo->fbiInit4); } void *voodoo_card_init() diff --git a/src/win/win.c b/src/win/win.c index a5b55bee4..5b307566c 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -8,7 +8,7 @@ * * Platform main support module for Windows. * - * Version: @(#)win.c 1.0.42 2017/12/15 + * Version: @(#)win.c 1.0.43 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -728,7 +728,7 @@ plat_setfullscreen(int on) device_force_redraw(); /* Finally, handle the host's mouse cursor. */ - pclog("%s full screen, %s cursor\n", on ? "enter" : "leave", on ? "hide" : "show"); + /* pclog("%s full screen, %s cursor\n", on ? "enter" : "leave", on ? "hide" : "show"); */ show_cursor(video_fullscreen ? 0 : -1); } diff --git a/src/win/win_dialog.c b/src/win/win_dialog.c index 9c5e96423..009f4b503 100644 --- a/src/win/win_dialog.c +++ b/src/win/win_dialog.c @@ -8,7 +8,7 @@ * * Several dialogs for the application. * - * Version: @(#)win_dialog.c 1.0.6 2017/12/13 + * Version: @(#)win_dialog.c 1.0.7 2017/12/28 * * Author: Miran Grca, * Fred N. van Kempen, @@ -160,7 +160,7 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, int save) { OPENFILENAME ofn; BOOL r; - DWORD err; + /* DWORD err; */ /* Initialize OPENFILENAME */ ZeroMemory(&ofn, sizeof(ofn)); @@ -201,9 +201,9 @@ file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, int save) return(0); } - pclog("File dialog return false\n"); - err = CommDlgExtendedError(); - pclog("CommDlgExtendedError return %04X\n", err); + /* pclog("File dialog return false\n"); */ + /* err = CommDlgExtendedError(); + pclog("CommDlgExtendedError return %04X\n", err); */ return(1); } diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 05f00b6ae..af6aa4ad6 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -8,7 +8,7 @@ * * user Interface module for WinAPI on Windows. * - * Version: @(#)win_ui.c 1.0.10 2017/12/15 + * Version: @(#)win_ui.c 1.0.11 2017/12/28 * * Authors: Sarah Walker, * Miran Grca, @@ -369,7 +369,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case IDM_VID_FULLSCREEN: - pclog("enter full screen though menu\n"); + /* pclog("enter full screen though menu\n"); */ plat_setfullscreen(1); config_save(); break; @@ -618,7 +618,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_LEAVEFULLSCREEN: - pclog("leave full screen on window message\n"); + /* pclog("leave full screen on window message\n"); */ plat_setfullscreen(0); config_save(); break; @@ -842,7 +842,7 @@ ui_init(int nCmdShow) if (video_fullscreen && keyboard_isfsexit()) { /* Signal "exit fullscreen mode". */ - pclog("leave full screen though key combination\n"); + /* pclog("leave full screen though key combination\n"); */ plat_setfullscreen(0); } } @@ -959,13 +959,13 @@ plat_mouse_capture(int on) GetClipCursor(&oldclip); GetWindowRect(hwndRender, &rect); ClipCursor(&rect); - pclog("mouse capture off, hide cursor\n"); + /* pclog("mouse capture off, hide cursor\n"); */ show_cursor(0); mouse_capture = 1; } else if (!on && mouse_capture) { /* Disable the in-app mouse. */ ClipCursor(&oldclip); - pclog("mouse capture on, show cursor\n"); + /* pclog("mouse capture on, show cursor\n"); */ show_cursor(-1); mouse_capture = 0;