X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=ed47bf8043f79ac42a76052ab70aca2d8297811e;hb=34c2f4526d11f2139130c4c94920dd7b1c7a6124;hp=7bd954e8dba8cb761ebbcc1665e7e5a5977642fb;hpb=05f71597d412da12d980427bcebcc5f045250874;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index 7bd954e..ed47bf8 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -4,8 +4,17 @@ // 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 ;-) +// JLH 01/20/2011 Change rendering to RGBA, removed unnecessary code +// // Note: Endian wrongness probably stems from the MAME origins of this emu and -// the braindead way in which MAME handles memory. :-) +// the braindead way in which MAME used to handle memory. :-} // // Note: TOM has only a 16K memory space // @@ -244,14 +253,20 @@ // F02298 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z0 - Z0 // ------------------------------------------------------------ -//#include #include "tom.h" -#include "video.h" -#include "gpu.h" -#include "objectp.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 "op.h" #include "settings.h" -#include "clock.h" #define NEW_TIMER_SYSTEM @@ -281,6 +296,8 @@ #define VDB 0x46 #define VDE 0x48 #define VI 0x4E +#define PIT0 0x50 +#define PIT1 0x52 #define BG 0x58 #define INT1 0xE0 @@ -308,22 +325,16 @@ //(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; -static uint32 tom_timer_prescaler; -static uint32 tom_timer_divider; -static int32 tom_timer_counter; -//uint32 tom_scanline; -//uint32 hblankWidthInPixels = 0; +uint8 tomRam8[0x4000]; +uint32 tomWidth, tomHeight; +uint32 tomTimerPrescaler; +uint32 tomTimerDivider; +int32 tomTimerCounter; 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; -//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" }; @@ -337,13 +348,8 @@ void tom_render_16bpp_direct_scanline(uint32 * backbuffer); void tom_render_16bpp_rgb_scanline(uint32 * backbuffer); void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer); -void tom_render_16bpp_cry_stretch_scanline(uint32 * backbuffer); -void tom_render_24bpp_stretch_scanline(uint32 * backbuffer); -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[] = +render_xxx_scanline_fn * scanline_render[] = { tom_render_16bpp_cry_scanline, tom_render_24bpp_scanline, @@ -355,21 +361,6 @@ render_xxx_scanline_fn * scanline_render_normal[] = tom_render_16bpp_rgb_scanline }; -render_xxx_scanline_fn * scanline_render_stretch[] = -{ - tom_render_16bpp_cry_stretch_scanline, - tom_render_24bpp_stretch_scanline, - tom_render_16bpp_direct_stretch_scanline, - tom_render_16bpp_rgb_stretch_scanline, - tom_render_16bpp_cry_rgb_mix_stretch_scanline, - tom_render_24bpp_stretch_scanline, - tom_render_16bpp_direct_stretch_scanline, - tom_render_16bpp_rgb_stretch_scanline, -}; - -render_xxx_scanline_fn * scanline_render[8]; - - // Screen info for various games [PAL]... /* BIOS @@ -544,76 +535,78 @@ uint32 RGB16ToRGB32[0x10000]; uint32 CRY16ToRGB32[0x10000]; uint32 MIX16ToRGB32[0x10000]; +#warning "This is not endian-safe. !!! FIX !!!" void TOMFillLookupTables(void) { + // NOTE: Jaguar 16-bit (non-CRY) color is RBG 556 like so: + // RRRR RBBB BBGG GGGG for(uint32 i=0; i<0x10000; i++) - RGB16ToRGB32[i] = 0xFF000000 - | ((i & 0xF100) >> 8) | ((i & 0xE000) >> 13) - | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8) - | ((i & 0x003F) << 10) | ((i & 0x0030) << 4); - +//hm. RGB16ToRGB32[i] = 0xFF000000 +// | ((i & 0xF100) >> 8) | ((i & 0xE000) >> 13) +// | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8) +// | ((i & 0x003F) << 10) | ((i & 0x0030) << 4); + RGB16ToRGB32[i] = 0x000000FF + | ((i & 0xF100) << 16) // Red + | ((i & 0x003F) << 18) // Green + | ((i & 0x07C0) << 5); // Blue for(uint32 i=0; i<0x10000; i++) { - 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]; - } + uint32 cyan = (i & 0xF000) >> 12, + red = (i & 0x0F00) >> 8, + intensity = (i & 0x00FF); - for(uint32 i=0; i<0x10000; i++) - if (i & 0x01) - MIX16ToRGB32[i] = RGB16ToRGB32[i]; + uint32 r = (((uint32)redcv[cyan][red]) * intensity) >> 8, + g = (((uint32)greencv[cyan][red]) * intensity) >> 8, + b = (((uint32)bluecv[cyan][red]) * intensity) >> 8; + +//hm. CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r; + CRY16ToRGB32[i] = 0x000000FF | (r << 24) | (g << 16) | (b << 8); + MIX16ToRGB32[i] = (i & 0x01 ? RGB16ToRGB32[i] : CRY16ToRGB32[i]); + } } -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); } // @@ -622,14 +615,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; @@ -655,13 +648,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; @@ -684,13 +677,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; @@ -704,7 +697,8 @@ void tom_render_24bpp_scanline(uint32 * backbuffer) uint32 r = *current_line_buffer++; current_line_buffer++; uint32 b = *current_line_buffer++; - *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r; +//hm. *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r; + *backbuffer++ = 0x000000FF | (r << 24) | (g << 16) | (b << 8); width--; } } @@ -716,9 +710,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; @@ -736,13 +730,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) @@ -760,132 +754,6 @@ void tom_render_16bpp_rgb_scanline(uint32 * backbuffer) } } -///////////////////////////////////////////////////////////////////// -// This stuff may just go away by itself, especially if we do some // -// good old OpenGL goodness... // -///////////////////////////////////////////////////////////////////// - -void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 *backbuffer) -{ - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - - while (width) - { - uint16 color = *current_line_buffer++; - color <<= 8; - color |= *current_line_buffer++; - *backbuffer++ = MIX16ToRGB32[color]; - current_line_buffer += 2; - width--; - } -} - -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]; - - while (width) - { - uint16 color; - color=*current_line_buffer++; - color<<=8; - color|=*current_line_buffer++; - - 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; - 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; - - *backbuffer++=(red<<10)|(green<<5)|blue; - width--; - } -} - -void tom_render_24bpp_stretch_scanline(uint32 *backbuffer) -{ - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - - while (width) - { - uint16 green=*current_line_buffer++; - uint16 red=*current_line_buffer++; - /*uint16 nc=*/current_line_buffer++; - uint16 blue=*current_line_buffer++; - red>>=3; - green>>=3; - blue>>=3; - *backbuffer++=(red<<10)|(green<<5)|blue; - current_line_buffer+=4; - width--; - } -} - -void tom_render_16bpp_direct_stretch_scanline(uint32 *backbuffer) -{ - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - - while (width) - { - uint16 color=*current_line_buffer++; - color<<=8; - color|=*current_line_buffer++; - color>>=1; - *backbuffer++=color; - current_line_buffer+=2; - width--; - } -} - -void tom_render_16bpp_rgb_stretch_scanline(uint32 *backbuffer) -{ - uint16 width=tom_width; - uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800]; - - while (width) - { - uint16 color1=*current_line_buffer++; - color1<<=8; - color1|=*current_line_buffer++; - color1>>=1; - uint16 color2=*current_line_buffer++; - color2<<=8; - color2|=*current_line_buffer++; - color2>>=1; - uint16 red=(((color1&0x7c00)>>10)+((color2&0x7c00)>>10))>>1; - uint16 green=(((color1&0x00003e0)>>5)+((color2&0x00003e0)>>5))>>1; - uint16 blue=(((color1&0x0000001f))+((color2&0x0000001f)))>>1; - - color1=(red<<10)|(blue<<5)|green; - *backbuffer++=color1; - width--; - } -} void TOMResetBackbuffer(uint32 * backbuffer) { @@ -895,23 +763,31 @@ void TOMResetBackbuffer(uint32 * backbuffer) // // Process a single scanline // +uint32 tomDeviceWidth;//kludge void TOMExecScanline(uint16 scanline, bool render) { bool inActiveDisplayArea = true; //Interlacing is still not handled correctly here... !!! FIX !!! if (scanline & 0x01) // Execute OP only on even lines (non-interlaced only!) +// 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)) +//Hm, it seems that the OP needs to execute from zero, so let's try it: +// And it works! But need to do some optimizations in the OP to keep it from attempting +// to do a scanline render in the non-display area... [DONE] +//this seems to cause a regression in certain games, like rayman +//which means I have to dig thru the asic nets to see what's wrong... +#if 1 + 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; @@ -920,6 +796,29 @@ void TOMExecScanline(uint16 scanline, bool render) } else inActiveDisplayArea = false; +#else + inActiveDisplayArea = + (scanline >= (uint16)GET16(tomRam8, VDB) && scanline < (uint16)GET16(tomRam8, VDE) + ? true : false); + + if (scanline < (uint16)GET16(tomRam8, VDE)) + { + if (render)//With JaguarExecuteNew() this is always true... + { + uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + uint8 bgHI = tomRam8[BG], bgLO = tomRam8[BG + 1]; + + // Clear line buffer with BG + if (GET16(tomRam8, VMODE) & BGEN) // && (CRY or RGB16)... + for(uint32 i=0; i<720; i++) + *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO; + +// OPProcessList(scanline, render); +//This seems to take care of it... + OPProcessList(scanline, inActiveDisplayArea); + } + } +#endif // Try to take PAL into account... @@ -933,8 +832,9 @@ void TOMExecScanline(uint16 scanline, bool render) if (inActiveDisplayArea) { //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[tom_getVideoMode()](TOMBackbuffer); + scanline_render[TOMGetVideoMode()](TOMBackbuffer); else//TV type render { /* @@ -950,77 +850,96 @@ void TOMExecScanline(uint16 scanline, bool render) #define MODE 0x0006 // Line buffer to video generator mode #define VARMOD 0x0100 // Mixed CRY/RGB16 mode (only works in MODE 0!) */ - uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1; - uint8 mode = ((GET16(tom_ram_8, VMODE) & MODE) >> 1); - bool varmod = GET16(tom_ram_8, 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! + 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; -//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). + 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]; - uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r; + uint8 g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; +//Hm. uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r; + uint32 pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8); - 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); @@ -1084,15 +1003,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;//*/ @@ -1117,49 +1036,49 @@ uint32 tom_getVideoModeHeight(void) // TOM reset code // Now PAL friendly! // -void tom_reset(void) +void TOMReset(void) { - op_reset(); - blitter_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 = 0; - tom_height = 0; + tomWidth = 0; + tomHeight = 0; tom_jerry_int_pending = 0; tom_timer_int_pending = 0; @@ -1167,10 +1086,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; - memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render)); + tomTimerPrescaler = 0; // TOM PIT is disabled + tomTimerDivider = 0; + tomTimerCounter = 0; } // @@ -1185,27 +1103,27 @@ uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) // offset &= 0xFF3FFF; #ifdef TOM_DEBUG - WriteLog("TOM: Reading byte at %06X\n", offset); + WriteLog("TOM: Reading byte at %06X for %s\n", offset, whoName[who]); #endif if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) 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]; } // @@ -1216,13 +1134,14 @@ uint16 TOMReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) //???Is this needed??? // offset &= 0xFF3FFF; #ifdef TOM_DEBUG - WriteLog("TOM: Reading word at %06X\n", offset); + WriteLog("TOM: Reading word at %06X for %s\n", offset, whoName[who]); #endif if (offset >= 0xF02000 && offset <= 0xF020FF) WriteLog("TOM: Read attempted from GPU register file by %s (unimplemented)!\n", whoName[who]); if (offset == 0xF000E0) { + // For reading, should only return the lower 5 bits... uint16 data = (tom_jerry_int_pending << 4) | (tom_timer_int_pending << 3) | (tom_object_int_pending << 2) | (tom_gpu_int_pending << 1) | (tom_video_int_pending << 0); @@ -1251,30 +1170,46 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) return GPUReadWord(offset, who); 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); } +#define TOM_STRICT_MEMORY_ACCESS // // TOM byte access (write) // void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) { +#ifdef TOM_DEBUG + WriteLog("TOM: Writing byte %02X at %06X", data, offset); +#endif //???Is this needed??? // Perhaps on the writes--32-bit writes that is! And masked with FF7FFF... +#ifndef TOM_STRICT_MEMORY_ACCESS offset &= 0xFF3FFF; - +#else + // "Fast" (32-bit only) write access to the GPU +// if ((offset >= 0xF0A100) && (offset <= 0xF0BFFF)) + if ((offset >= 0xF08000) && (offset <= 0xF0BFFF)) + offset &= 0xFF7FFF; +#endif #ifdef TOM_DEBUG - WriteLog("TOM: Writing byte %02X at %06X\n", data, offset); + WriteLog(" -->[%06X] by %s\n", offset, whoName[who]); +#endif + +#ifdef TOM_STRICT_MEMORY_ACCESS + // Sanity check ("Aww, there ain't no Sanity Clause...") + if ((offset < 0xF00000) || (offset > 0xF03FFF)) + return; #endif if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) @@ -1287,11 +1222,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); @@ -1299,25 +1234,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; } @@ -1325,10 +1260,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; } // @@ -1336,12 +1271,28 @@ void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) // void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) { -//???Is this needed??? +#ifdef TOM_DEBUG + WriteLog("TOM: Writing byte %04X at %06X", data, offset); +#endif +//???Is this needed??? Yes, but we need to be more vigilant than this. +#ifndef TOM_STRICT_MEMORY_ACCESS offset &= 0xFF3FFF; - +#else + // "Fast" (32-bit only) write access to the GPU +// if ((offset >= 0xF0A100) && (offset <= 0xF0BFFF)) + if ((offset >= 0xF08000) && (offset <= 0xF0BFFF)) + offset &= 0xFF7FFF; +#endif #ifdef TOM_DEBUG - WriteLog("TOM: Writing word %04X at %06X\n", data, offset); + WriteLog(" -->[%06X] by %s\n", offset, whoName[who]); #endif + +#ifdef TOM_STRICT_MEMORY_ACCESS + // Sanity check + if ((offset < 0xF00000) || (offset > 0xF03FFF)) + return; +#endif + if (offset == 0xF00000 + MEMCON1) WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data); if (offset == 0xF00000 + MEMCON2) @@ -1365,20 +1316,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; } @@ -1395,6 +1346,8 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) tom_timer_int_pending = 0; if (data & 0x1000) tom_jerry_int_pending = 0; + +// return; } else if ((offset >= 0xF02200) && (offset <= 0xF0229F)) { @@ -1406,12 +1359,15 @@ 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); +#warning "!!! Watch out for unaligned writes here !!! FIX !!!" + 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) @@ -1419,8 +1375,9 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) if (offset == 0x2E || offset == 0x36 || offset == 0x54) data &= 0x03FF; // These are all 10-bit registers - TOMWriteByte(offset, data >> 8, who); - TOMWriteByte(offset+1, data & 0xFF, who); +// Fix a lockup bug... :-P + TOMWriteByte(0xF00000 | offset, data >> 8, who); + TOMWriteByte(0xF00000 | (offset+1), data & 0xFF, who); if (offset == VDB) WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data); @@ -1430,6 +1387,8 @@ if (offset == VP) WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : "")); if (offset == HDB1) WriteLog("TOM: Horizontal Display Begin 1 written by %s: %u\n", whoName[who], data); +if (offset == HDB2) + WriteLog("TOM: Horizontal Display Begin 2 written by %s: %u\n", whoName[who], data); if (offset == HDE) WriteLog("TOM: Horizontal Display End written by %s: %u\n", whoName[who], data); if (offset == HP) @@ -1447,44 +1406,46 @@ 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)); +if (offset == PIT0) + WriteLog("TOM: PIT0 written by %s: %u\n", whoName[who], data); +if (offset == PIT1) + WriteLog("TOM: PIT1 written by %s: %u\n", whoName[who], data); +//if (offset == INT1) +// WriteLog("TOM: CPU Interrupt Control written by %s: $%04X (%s%s%s%s%s)\n", whoName[who], data, (data & 0x01 ? "Video" : ""), (data & 0x02 ? " GPU" : ""), (data & 0x04 ? " OP" : ""), (data & 0x08 ? " TOMPIT" : ""), (data & 0x10 ? " Jerry" : "")); // detect screen resolution changes //This may go away in the future, if we do the virtualized screen thing... //This may go away soon! +// TOM Shouldn't be mucking around with this, it's up to the host system to properly +// handle this kind of crap. +// NOTE: This is needed somehow, need to get rid of the dependency on this crap. +#warning "!!! Need to get rid of this dependency !!!" +#if 1 if ((offset >= 0x28) && (offset <= 0x4F)) { - uint32 width = tom_getVideoModeWidth(), height = tom_getVideoModeHeight(); + uint32 width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight(); - if ((width != tom_width) || (height != tom_height)) + if ((width != tomWidth) || (height != tomHeight)) { - tom_width = width, tom_height = height; + tomWidth = width, tomHeight = height; - if (vjs.renderType == RT_NORMAL) - ResizeScreen(tom_width, tom_height); +#warning "!!! TOM: ResizeScreen commented out !!!" +// No need to resize anything, since we're prepared for this... +// if (vjs.renderType == RT_NORMAL) +// ResizeScreen(tomWidth, tomHeight); } } +#endif } -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<