X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=b3882a09f3fbe645e4b1b17ba6d6c2aaf21f9483;hb=3e68f33188872d5754d3765ff140811bcb696c6f;hp=ca38c13c54fb879b52ac6d78b29f177d458c9d25;hpb=3580a9ef98432ed54f065f2d537d588fdc083592;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index ca38c13..b3882a0 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -1,9 +1,17 @@ // // TOM Processing // -// by cal2 +// Originally by David Raingeard (cal2) // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) // Cleanups and endian wrongness amelioration by James L. Hammons +// (C) 2010 Underground Software +// +// JLH = James L. Hammons +// +// Who When What +// --- ---------- ------------------------------------------------------------- +// JLH 01/16/2010 Created this log ;-) +// // Note: Endian wrongness probably stems from the MAME origins of this emu and // the braindead way in which MAME handles memory. :-) // @@ -244,14 +252,21 @@ // F02298 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z0 - Z0 // ------------------------------------------------------------ -//#include #include "tom.h" -#include "video.h" + +#include // For memset() +#include // For rand() +#include "blitter.h" +#include "cry2rgb.h" +#include "event.h" #include "gpu.h" +#include "jaguar.h" +#include "log.h" +#include "m68k.h" +//#include "memory.h" #include "objectp.h" -#include "cry2rgb.h" #include "settings.h" -#include "clock.h" +#include "video.h" #define NEW_TIMER_SYSTEM @@ -271,7 +286,7 @@ #define HP 0x2E // Values range from 1 - 1024 (value written + 1) #define HBB 0x30 #define HBE 0x32 -#define HDB1 0x38 +#define HDB1 0x38 // Horizontal display begin 1 #define HDB2 0x3A #define HDE 0x3C #define VP 0x3E // Value ranges from 1 - 2048 (value written + 1) @@ -308,22 +323,20 @@ //(It's easier to do it here, though...) //#define TOM_DEBUG -extern uint8 objectp_running; - -static uint8 * tom_ram_8; -uint32 tom_width, tom_height, tom_real_internal_width; -static uint32 tom_timer_prescaler; -static uint32 tom_timer_divider; -static int32 tom_timer_counter; +uint8 tomRam8[0x4000]; +uint32 tomWidth, tomHeight; +uint32 tomTimerPrescaler; +uint32 tomTimerDivider; +int32 tomTimerCounter; //uint32 tom_scanline; //uint32 hblankWidthInPixels = 0; uint16 tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending, tom_gpu_int_pending, tom_video_int_pending; -uint16 * tom_cry_rgb_mix_lut; +//uint16 * tom_cry_rgb_mix_lut; //int16 * TOMBackbuffer; uint32 * TOMBackbuffer; -static char * videoMode_to_str[8] = +static const char * videoMode_to_str[8] = { "16 BPP CRY", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB", "Mixed mode", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB" }; @@ -343,7 +356,7 @@ void tom_render_16bpp_direct_stretch_scanline(uint32 * backbuffer); void tom_render_16bpp_rgb_stretch_scanline(uint32 * backbuffer); void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 * backbuffer); -render_xxx_scanline_fn * scanline_render_normal[]= +render_xxx_scanline_fn * scanline_render_normal[] = { tom_render_16bpp_cry_scanline, tom_render_24bpp_scanline, @@ -355,7 +368,7 @@ render_xxx_scanline_fn * scanline_render_normal[]= tom_render_16bpp_rgb_scanline }; -render_xxx_scanline_fn * scanline_render_stretch[]= +render_xxx_scanline_fn * scanline_render_stretch[] = { tom_render_16bpp_cry_stretch_scanline, tom_render_24bpp_stretch_scanline, @@ -544,6 +557,7 @@ uint32 RGB16ToRGB32[0x10000]; uint32 CRY16ToRGB32[0x10000]; uint32 MIX16ToRGB32[0x10000]; +#warning "This is not endian-safe. !!! FIX !!!" void TOMFillLookupTables(void) { for(uint32 i=0; i<0x10000; i++) @@ -558,88 +572,61 @@ void TOMFillLookupTables(void) uint32 chrm = (i & 0xF000) >> 12, chrl = (i & 0x0F00) >> 8, y = (i & 0x00FF); - + uint32 r = (((uint32)redcv[chrm][chrl]) * y) >> 8, g = (((uint32)greencv[chrm][chrl]) * y) >> 8, b = (((uint32)bluecv[chrm][chrl]) * y) >> 8; - + CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r; - MIX16ToRGB32[i] = CRY16ToRGB32[i]; + MIX16ToRGB32[i] = (i & 0x01 ? RGB16ToRGB32[i] : CRY16ToRGB32[i]); } - for(uint32 i=0; i<0x10000; i++) - if (i & 0x01) - MIX16ToRGB32[i] = RGB16ToRGB32[i]; +// for(uint32 i=0; i<0x10000; i++) +// if (i & 0x01) +// MIX16ToRGB32[i] = RGB16ToRGB32[i]; } -/*void tom_calc_cry_rgb_mix_lut(void) -{ - for (uint32 i=0; i<0x10000; i++) - { - uint16 color = i; - - if (color & 0x01) - { - color >>= 1; - color = (color & 0x007C00) | ((color & 0x00003E0) >> 5) | ((color & 0x0000001F) << 5); - } - else - { - uint32 chrm = (color & 0xF000) >> 12, - chrl = (color & 0x0F00) >> 8, - y = color & 0x00FF; - uint16 red = (((uint32)redcv[chrm][chrl]) * y) >> 11, - green = (((uint32)greencv[chrm][chrl]) * y) >> 11, - blue = (((uint32)bluecv[chrm][chrl]) * y) >> 11; - color = (red << 10) | (green << 5) | blue; - } - - tom_cry_rgb_mix_lut[i] = color; - } -}*/ - -void tom_set_pending_jerry_int(void) +void TOMSetPendingJERRYInt(void) { tom_jerry_int_pending = 1; } -void tom_set_pending_timer_int(void) +void TOMSetPendingTimerInt(void) { tom_timer_int_pending = 1; } -void tom_set_pending_object_int(void) +void TOMSetPendingObjectInt(void) { tom_object_int_pending = 1; } -void tom_set_pending_gpu_int(void) +void TOMSetPendingGPUInt(void) { tom_gpu_int_pending = 1; } -void tom_set_pending_video_int(void) +void TOMSetPendingVideoInt(void) { tom_video_int_pending = 1; } -uint8 * tom_get_ram_pointer(void) +uint8 * TOMGetRamPointer(void) { - return tom_ram_8; + return tomRam8; } -uint8 tom_getVideoMode(void) +uint8 TOMGetVideoMode(void) { - uint16 vmode = GET16(tom_ram_8, VMODE); + uint16 vmode = GET16(tomRam8, VMODE); return ((vmode & VARMOD) >> 6) | ((vmode & MODE) >> 1); } //Used in only one place (and for debug purposes): OBJECTP.CPP -uint16 tom_get_vdb(void) +#warning "Used in only one place (and for debug purposes): OBJECTP.CPP !!! FIX !!!" +uint16 TOMGetVDB(void) { -// This in NOT VDB!!! -// return GET16(tom_ram_8, VBE); - return GET16(tom_ram_8, VDB); + return GET16(tomRam8, VDB); } // @@ -648,14 +635,14 @@ uint16 tom_get_vdb(void) void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer) { //CHANGED TO 32BPP RENDERING - uint16 width = tom_width; - uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; - + uint16 width = tomWidth; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; + uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! // Get start position in HC ticks - int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); + int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); startPos /= pwidth; if (startPos < 0) current_line_buffer += 2 * -startPos; @@ -670,7 +657,6 @@ void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer) { uint16 color = (*current_line_buffer++) << 8; color |= *current_line_buffer++; -// *backbuffer++ = tom_cry_rgb_mix_lut[color]; *backbuffer++ = MIX16ToRGB32[color]; width--; } @@ -682,13 +668,13 @@ void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer) void tom_render_16bpp_cry_scanline(uint32 * backbuffer) { //CHANGED TO 32BPP RENDERING - uint16 width = tom_width; - uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; + uint16 width = tomWidth; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; + uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);// Get start position in HC ticks + int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);// Get start position in HC ticks startPos /= pwidth; if (startPos < 0) current_line_buffer += 2 * -startPos; @@ -711,13 +697,13 @@ void tom_render_16bpp_cry_scanline(uint32 * backbuffer) void tom_render_24bpp_scanline(uint32 * backbuffer) { //CHANGED TO 32BPP RENDERING - uint16 width = tom_width; - uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; - + uint16 width = tomWidth; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; + uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks + int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks startPos /= pwidth; if (startPos < 0) current_line_buffer += 4 * -startPos; @@ -743,9 +729,9 @@ void tom_render_24bpp_scanline(uint32 * backbuffer) // void tom_render_16bpp_direct_scanline(uint32 * backbuffer) { - uint16 width = tom_width; - uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; - + uint16 width = tomWidth; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + while (width) { uint16 color = (*current_line_buffer++) << 8; @@ -763,13 +749,13 @@ void tom_render_16bpp_rgb_scanline(uint32 * backbuffer) //CHANGED TO 32BPP RENDERING // 16 BPP RGB: 0-5 green, 6-10 blue, 11-15 red - uint16 width = tom_width; - uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; - + uint16 width = tomWidth; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; + uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! - int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks + int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks startPos /= pwidth; if (startPos < 0) @@ -794,17 +780,16 @@ void tom_render_16bpp_rgb_scanline(uint32 * backbuffer) void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 *backbuffer) { - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - + uint16 width=tomWidth; + uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; + while (width) { - uint16 color; - color=*current_line_buffer++; - color<<=8; - color|=*current_line_buffer++; - *backbuffer++=tom_cry_rgb_mix_lut[color]; - current_line_buffer+=2; + uint16 color = *current_line_buffer++; + color <<= 8; + color |= *current_line_buffer++; + *backbuffer++ = MIX16ToRGB32[color]; + current_line_buffer += 2; width--; } } @@ -813,37 +798,37 @@ void tom_render_16bpp_cry_stretch_scanline(uint32 *backbuffer) { uint32 chrm, chrl, y; - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - + uint16 width=tomWidth; + uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; + while (width) { uint16 color; color=*current_line_buffer++; color<<=8; color|=*current_line_buffer++; - - chrm = (color & 0xF000) >> 12; + + chrm = (color & 0xF000) >> 12; chrl = (color & 0x0F00) >> 8; y = (color & 0x00FF); - + uint16 red = ((((uint32)redcv[chrm][chrl])*y)>>11); uint16 green = ((((uint32)greencv[chrm][chrl])*y)>>11); uint16 blue = ((((uint32)bluecv[chrm][chrl])*y)>>11); - + uint16 color2; color2=*current_line_buffer++; color2<<=8; color2|=*current_line_buffer++; - - chrm = (color2 & 0xF000) >> 12; + + chrm = (color2 & 0xF000) >> 12; chrl = (color2 & 0x0F00) >> 8; y = (color2 & 0x00FF); - + uint16 red2 = ((((uint32)redcv[chrm][chrl])*y)>>11); uint16 green2 = ((((uint32)greencv[chrm][chrl])*y)>>11); uint16 blue2 = ((((uint32)bluecv[chrm][chrl])*y)>>11); - + red=(red+red2)>>1; green=(green+green2)>>1; blue=(blue+blue2)>>1; @@ -855,9 +840,9 @@ void tom_render_16bpp_cry_stretch_scanline(uint32 *backbuffer) void tom_render_24bpp_stretch_scanline(uint32 *backbuffer) { - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - + uint16 width=tomWidth; + uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; + while (width) { uint16 green=*current_line_buffer++; @@ -875,9 +860,9 @@ void tom_render_24bpp_stretch_scanline(uint32 *backbuffer) void tom_render_16bpp_direct_stretch_scanline(uint32 *backbuffer) { - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - + uint16 width=tomWidth; + uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; + while (width) { uint16 color=*current_line_buffer++; @@ -892,9 +877,9 @@ void tom_render_16bpp_direct_stretch_scanline(uint32 *backbuffer) void tom_render_16bpp_rgb_stretch_scanline(uint32 *backbuffer) { - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - + uint16 width=tomWidth; + uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; + while (width) { uint16 color1=*current_line_buffer++; @@ -931,15 +916,15 @@ void TOMExecScanline(uint16 scanline, bool render) if (scanline & 0x01) // Execute OP only on even lines (non-interlaced only!) return; - if (scanline >= (uint16)GET16(tom_ram_8, VDB) && scanline < (uint16)GET16(tom_ram_8, VDE)) + if (scanline >= (uint16)GET16(tomRam8, VDB) && scanline < (uint16)GET16(tomRam8, VDE)) { if (render) { - uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800]; - uint8 bgHI = tom_ram_8[BG], bgLO = tom_ram_8[BG + 1]; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + uint8 bgHI = tomRam8[BG], bgLO = tomRam8[BG + 1]; // Clear line buffer with BG - if (GET16(tom_ram_8, VMODE) & BGEN) // && (CRY or RGB16)... + if (GET16(tomRam8, VMODE) & BGEN) // && (CRY or RGB16)... for(uint32 i=0; i<720; i++) *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO; @@ -949,29 +934,92 @@ void TOMExecScanline(uint16 scanline, bool render) else inActiveDisplayArea = false; -//Try to take PAL into account... -uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), - bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL); + // Try to take PAL into account... + + uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), + bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL); + // Here's our virtualized scanline code... + if (scanline >= topVisible && scanline < bottomVisible) { if (inActiveDisplayArea) - scanline_render[tom_getVideoMode()](TOMBackbuffer); + { +//NOTE: The following doesn't put BORDER color on the sides... !!! FIX !!! +#warning "The following doesn't put BORDER color on the sides... !!! FIX !!!" + if (vjs.renderType == RT_NORMAL) + scanline_render[TOMGetVideoMode()](TOMBackbuffer); + else//TV type render + { +/* + tom_render_16bpp_cry_scanline, + tom_render_24bpp_scanline, + tom_render_16bpp_direct_scanline, + tom_render_16bpp_rgb_scanline, + tom_render_16bpp_cry_rgb_mix_scanline, + tom_render_24bpp_scanline, + tom_render_16bpp_direct_scanline, + tom_render_16bpp_rgb_scanline +#define VMODE 0x28 +#define MODE 0x0006 // Line buffer to video generator mode +#define VARMOD 0x0100 // Mixed CRY/RGB16 mode (only works in MODE 0!) +*/ + uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + uint8 mode = ((GET16(tomRam8, VMODE) & MODE) >> 1); + bool varmod = GET16(tomRam8, VMODE) & VARMOD; +//The video texture line buffer ranges from 0 to 1279, with its left edge starting at +//LEFT_VISIBLE_HC. So, we need to start writing into the backbuffer at HDB1, using pwidth +//as our scaling factor. The way it generates its image on a real TV! + +//So, for example, if HDB1 is less than LEFT_VISIBLE_HC, then we have to figure out where +//in the VTLB that we start writing pixels from the Jaguar line buffer (VTLB start=0, +//JLB=something). +#if 0 +// +// 24 BPP mode rendering +// +void tom_render_24bpp_scanline(uint32 * backbuffer) +{ +//CHANGED TO 32BPP RENDERING + uint16 width = tomWidth; + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + + //New stuff--restrict our drawing... + uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + //NOTE: May have to check HDB2 as well! + int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks + startPos /= pwidth; + if (startPos < 0) + current_line_buffer += 4 * -startPos; + else +//This should likely be 4 instead of 2 (?--not sure) + backbuffer += 2 * startPos, width -= startPos; + + while (width) + { + uint32 g = *current_line_buffer++; + uint32 r = *current_line_buffer++; + current_line_buffer++; + uint32 b = *current_line_buffer++; + *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r; + width--; + } +} +#endif + + } + } else { // If outside of VDB & VDE, then display the border color -/* int16 * currentLineBuffer = TOMBackbuffer; - uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1]; - uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3);//*/ uint32 * currentLineBuffer = TOMBackbuffer; - uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1]; + uint8 g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r; - for(uint32 i=0; i> 9]; +// return width[(GET16(tomRam8, VMODE) & PWIDTH) >> 9]; // Now, we just calculate it... -/* uint16 hdb1 = GET16(tom_ram_8, HDB1), hde = GET16(tom_ram_8, HDE), - hbb = GET16(tom_ram_8, HBB), pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; +/* uint16 hdb1 = GET16(tomRam8, HDB1), hde = GET16(tomRam8, HDE), + hbb = GET16(tomRam8, HBB), pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; // return ((hbb < hde ? hbb : hde) - hdb1) / pwidth; //Temporary, for testing Doom... return ((hbb < hde ? hbb : hde) - hdb1) / (pwidth == 8 ? 4 : pwidth);*/ // To make it easier to make a quasi-fixed display size, we restrict the viewing // area to an arbitrary range of the Horizontal Count. - uint16 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; + uint16 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; return (vjs.hardwareTypeNTSC ? RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC : RIGHT_VISIBLE_HC_PAL - LEFT_VISIBLE_HC_PAL) / pwidth; //Temporary, for testing Doom... // return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 8 ? 4 : pwidth); @@ -1079,15 +1121,15 @@ uint32 tom_getVideoModeWidth(void) // Same with the width... [Width is pretty much virtualized now.] // Now that that the width is virtualized, let's virtualize the height. :-) -uint32 tom_getVideoModeHeight(void) +uint32 TOMGetVideoModeHeight(void) { -// uint16 vmode = GET16(tom_ram_8, VMODE); -// uint16 vbe = GET16(tom_ram_8, VBE); -// uint16 vbb = GET16(tom_ram_8, VBB); -// uint16 vdb = GET16(tom_ram_8, VDB); -// uint16 vde = GET16(tom_ram_8, VDE); -// uint16 vp = GET16(tom_ram_8, VP); - +// uint16 vmode = GET16(tomRam8, VMODE); +// uint16 vbe = GET16(tomRam8, VBE); +// uint16 vbb = GET16(tomRam8, VBB); +// uint16 vdb = GET16(tomRam8, VDB); +// uint16 vde = GET16(tomRam8, VDE); +// uint16 vp = GET16(tomRam8, VP); + /* if (vde == 0xFFFF) vde = vbb;//*/ @@ -1112,51 +1154,49 @@ uint32 tom_getVideoModeHeight(void) // TOM reset code // Now PAL friendly! // -void tom_reset(void) +void TOMReset(void) { - op_reset(); - blitter_reset(); -//This should be done by JERRY! pcm_reset(); - - memset(tom_ram_8, 0x00, 0x4000); + OPReset(); + BlitterReset(); + memset(tomRam8, 0x00, 0x4000); if (vjs.hardwareTypeNTSC) { - SET16(tom_ram_8, MEMCON1, 0x1861); - SET16(tom_ram_8, MEMCON2, 0x35CC); - SET16(tom_ram_8, HP, 844); // Horizontal Period (1-based; HP=845) - SET16(tom_ram_8, HBB, 1713); // Horizontal Blank Begin - SET16(tom_ram_8, HBE, 125); // Horizontal Blank End - SET16(tom_ram_8, HDE, 1665); // Horizontal Display End - SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1 - SET16(tom_ram_8, VP, 523); // Vertical Period (1-based; in this case VP = 524) - SET16(tom_ram_8, VBE, 24); // Vertical Blank End - SET16(tom_ram_8, VDB, 38); // Vertical Display Begin - SET16(tom_ram_8, VDE, 518); // Vertical Display End - SET16(tom_ram_8, VBB, 500); // Vertical Blank Begin - SET16(tom_ram_8, VS, 517); // Vertical Sync - SET16(tom_ram_8, VMODE, 0x06C1); + SET16(tomRam8, MEMCON1, 0x1861); + SET16(tomRam8, MEMCON2, 0x35CC); + SET16(tomRam8, HP, 844); // Horizontal Period (1-based; HP=845) + SET16(tomRam8, HBB, 1713); // Horizontal Blank Begin + SET16(tomRam8, HBE, 125); // Horizontal Blank End + SET16(tomRam8, HDE, 1665); // Horizontal Display End + SET16(tomRam8, HDB1, 203); // Horizontal Display Begin 1 + SET16(tomRam8, VP, 523); // Vertical Period (1-based; in this case VP = 524) + SET16(tomRam8, VBE, 24); // Vertical Blank End + SET16(tomRam8, VDB, 38); // Vertical Display Begin + SET16(tomRam8, VDE, 518); // Vertical Display End + SET16(tomRam8, VBB, 500); // Vertical Blank Begin + SET16(tomRam8, VS, 517); // Vertical Sync + SET16(tomRam8, VMODE, 0x06C1); } else // PAL Jaguar { - SET16(tom_ram_8, MEMCON1, 0x1861); - SET16(tom_ram_8, MEMCON2, 0x35CC); - SET16(tom_ram_8, HP, 850); // Horizontal Period - SET16(tom_ram_8, HBB, 1711); // Horizontal Blank Begin - SET16(tom_ram_8, HBE, 158); // Horizontal Blank End - SET16(tom_ram_8, HDE, 1665); // Horizontal Display End - SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1 - SET16(tom_ram_8, VP, 623); // Vertical Period (1-based; in this case VP = 624) - SET16(tom_ram_8, VBE, 34); // Vertical Blank End - SET16(tom_ram_8, VDB, 38); // Vertical Display Begin - SET16(tom_ram_8, VDE, 518); // Vertical Display End - SET16(tom_ram_8, VBB, 600); // Vertical Blank Begin - SET16(tom_ram_8, VS, 618); // Vertical Sync - SET16(tom_ram_8, VMODE, 0x06C1); + SET16(tomRam8, MEMCON1, 0x1861); + SET16(tomRam8, MEMCON2, 0x35CC); + SET16(tomRam8, HP, 850); // Horizontal Period + SET16(tomRam8, HBB, 1711); // Horizontal Blank Begin + SET16(tomRam8, HBE, 158); // Horizontal Blank End + SET16(tomRam8, HDE, 1665); // Horizontal Display End + SET16(tomRam8, HDB1, 203); // Horizontal Display Begin 1 + SET16(tomRam8, VP, 623); // Vertical Period (1-based; in this case VP = 624) + SET16(tomRam8, VBE, 34); // Vertical Blank End + SET16(tomRam8, VDB, 38); // Vertical Display Begin + SET16(tomRam8, VDE, 518); // Vertical Display End + SET16(tomRam8, VBB, 600); // Vertical Blank Begin + SET16(tomRam8, VS, 618); // Vertical Sync + SET16(tomRam8, VMODE, 0x06C1); } - tom_width = tom_real_internal_width = 0; - tom_height = 0; + tomWidth = 0; + tomHeight = 0; tom_jerry_int_pending = 0; tom_timer_int_pending = 0; @@ -1164,9 +1204,9 @@ void tom_reset(void) tom_gpu_int_pending = 0; tom_video_int_pending = 0; - tom_timer_prescaler = 0; // TOM PIT is disabled - tom_timer_divider = 0; - tom_timer_counter = 0; + tomTimerPrescaler = 0; // TOM PIT is disabled + tomTimerDivider = 0; + tomTimerCounter = 0; memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render)); } @@ -1189,20 +1229,20 @@ uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) return GPUReadByte(offset, who); else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000)) return GPUReadByte(offset, who); - else if ((offset >= 0xF00010) && (offset < 0xF00028)) - return OPReadByte(offset, who); +/* else if ((offset >= 0xF00010) && (offset < 0xF00028)) + return OPReadByte(offset, who);*/ else if ((offset >= 0xF02200) && (offset < 0xF022A0)) return BlitterReadByte(offset, who); else if (offset == 0xF00050) - return tom_timer_prescaler >> 8; + return tomTimerPrescaler >> 8; else if (offset == 0xF00051) - return tom_timer_prescaler & 0xFF; + return tomTimerPrescaler & 0xFF; else if (offset == 0xF00052) - return tom_timer_divider >> 8; + return tomTimerDivider >> 8; else if (offset == 0xF00053) - return tom_timer_divider & 0xFF; + return tomTimerDivider & 0xFF; - return tom_ram_8[offset & 0x3FFF]; + return tomRam8[offset & 0x3FFF]; } // @@ -1234,18 +1274,28 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) //But it's causing Rayman to be fucked up... Why??? //Because VC is even in NI mode when calling the OP! That's why! return (tom_scanline << 1) + 1;//*/ - else if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) +/* +// F00004 R/W -----xxx xxxxxxxx HC - horizontal count +// -----x-- -------- (which half of the display) +// ------xx xxxxxxxx (10-bit counter) +*/ +// This is a kludge to get the HC working somewhat... What we really should do here +// is check what the global time is at the time of the read and calculate the correct HC... +// !!! FIX !!! + else if (offset == 0xF00004) + return rand() & 0x03FF; + else if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE + 0x20)) return GPUReadWord(offset, who); - else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000)) + else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE + 0x1000)) return GPUReadWord(offset, who); - else if ((offset >= 0xF00010) && (offset < 0xF00028)) - return OPReadWord(offset, who); +/* else if ((offset >= 0xF00010) && (offset < 0xF00028)) + return OPReadWord(offset, who);*/ else if ((offset >= 0xF02200) && (offset < 0xF022A0)) return BlitterReadWord(offset, who); else if (offset == 0xF00050) - return tom_timer_prescaler; + return tomTimerPrescaler; else if (offset == 0xF00052) - return tom_timer_divider; + return tomTimerDivider; offset &= 0x3FFF; return (TOMReadByte(offset, who) << 8) | TOMReadByte(offset + 1, who); @@ -1274,11 +1324,11 @@ void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) GPUWriteByte(offset, data, who); return; } - else if ((offset >= 0xF00010) && (offset < 0xF00028)) +/* else if ((offset >= 0xF00010) && (offset < 0xF00028)) { OPWriteByte(offset, data, who); return; - } + }*/ else if ((offset >= 0xF02200) && (offset < 0xF022A0)) { BlitterWriteByte(offset, data, who); @@ -1286,25 +1336,25 @@ void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) } else if (offset == 0xF00050) { - tom_timer_prescaler = (tom_timer_prescaler & 0x00FF) | (data << 8); + tomTimerPrescaler = (tomTimerPrescaler & 0x00FF) | (data << 8); TOMResetPIT(); return; } else if (offset == 0xF00051) { - tom_timer_prescaler = (tom_timer_prescaler & 0xFF00) | data; + tomTimerPrescaler = (tomTimerPrescaler & 0xFF00) | data; TOMResetPIT(); return; } else if (offset == 0xF00052) { - tom_timer_divider = (tom_timer_divider & 0x00FF) | (data << 8); + tomTimerDivider = (tomTimerDivider & 0x00FF) | (data << 8); TOMResetPIT(); return; } else if (offset == 0xF00053) { - tom_timer_divider = (tom_timer_divider & 0xFF00) | data; + tomTimerDivider = (tomTimerDivider & 0xFF00) | data; TOMResetPIT(); return; } @@ -1312,10 +1362,10 @@ void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) { // Writing to one CLUT writes to the other offset &= 0x5FF; // Mask out $F00600 (restrict to $F00400-5FF) - tom_ram_8[offset] = data, tom_ram_8[offset + 0x200] = data; + tomRam8[offset] = data, tomRam8[offset + 0x200] = data; } - tom_ram_8[offset & 0x3FFF] = data; + tomRam8[offset & 0x3FFF] = data; } // @@ -1352,20 +1402,20 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) TOMWriteByte(offset, data >> 8); TOMWriteByte(offset+1, data & 0xFF); }*/ - else if ((offset >= 0xF00010) && (offset < 0xF00028)) +/* else if ((offset >= 0xF00010) && (offset < 0xF00028)) { OPWriteWord(offset, data, who); return; - } + }*/ else if (offset == 0xF00050) { - tom_timer_prescaler = data; + tomTimerPrescaler = data; TOMResetPIT(); return; } else if (offset == 0xF00052) { - tom_timer_divider = data; + tomTimerDivider = data; TOMResetPIT(); return; } @@ -1393,11 +1443,14 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) // Writing to one CLUT writes to the other offset &= 0x5FF; // Mask out $F00600 (restrict to $F00400-5FF) // Watch out for unaligned writes here! (Not fixed yet) - SET16(tom_ram_8, offset, data), SET16(tom_ram_8, offset + 0x200, data); + SET16(tomRam8, offset, data); + SET16(tomRam8, offset + 0x200, data); } offset &= 0x3FFF; if (offset == 0x28) // VMODE (Why? Why not OBF?) +//Actually, we should check to see if the Enable bit of VMODE is set before doing this... !!! FIX !!! +#warning "Actually, we should check to see if the Enable bit of VMODE is set before doing this... !!! FIX !!!" objectp_running = 1; if (offset >= 0x30 && offset <= 0x4E) @@ -1433,41 +1486,42 @@ if (offset == HBB) if (offset == HBE) WriteLog("TOM: Horizontal Blank End written by %s: %u\n", whoName[who], data); if (offset == VMODE) - WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tom_ram_8, VC)); + WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC)); // detect screen resolution changes //This may go away in the future, if we do the virtualized screen thing... //This may go away soon! if ((offset >= 0x28) && (offset <= 0x4F)) { - uint32 width = tom_getVideoModeWidth(), height = tom_getVideoModeHeight(); - tom_real_internal_width = width; + uint32 width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight(); - if ((width != tom_width) || (height != tom_height)) + if ((width != tomWidth) || (height != tomHeight)) { - tom_width = width, tom_height = height; - ResizeScreen(tom_width, tom_height); + tomWidth = width, tomHeight = height; + + if (vjs.renderType == RT_NORMAL) + ResizeScreen(tomWidth, tomHeight); } } } -int tom_irq_enabled(int irq) +int TOMIRQEnabled(int irq) { // This is the correct byte in big endian... D'oh! // return jaguar_byte_read(0xF000E1) & (1 << irq); - return tom_ram_8[INT1 + 1/*0xE1*/] & (1 << irq); + return tomRam8[INT1 + 1/*0xE1*/] & (1 << irq); } //unused /*void tom_set_irq_latch(int irq, int enabled) { - tom_ram_8[0xE0] = (tom_ram_8[0xE0] & (~(1< && jaguar_interrupt_handler_is_valid(64)) - m68k_set_irq(7); // Cause a 68000 NMI... + + if (TOMIRQEnabled(IRQ_TIMER)) + m68k_set_irq(7); // Cause a 68000 NMI... TOMResetPIT(); } @@ -1525,11 +1582,11 @@ void TOMExecPIT(uint32 cycles) void TOMPITCallback(void) { // INT1_RREG |= 0x08; // Set TOM PIT interrupt pending - tom_set_pending_timer_int(); + TOMSetPendingTimerInt(); GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // It does the 'IRQ enabled' checking // if (INT1_WREG & 0x08) - if (tom_irq_enabled(IRQ_TIMER)) + if (TOMIRQEnabled(IRQ_TIMER)) m68k_set_irq(7); // Generate 68K NMI TOMResetPIT();