X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=be4972a56debe876ef22c1070eabe8e4dd733a84;hb=0c0dea5b5411ef9be8c6d5159faf0d2226db4452;hp=36f3d8bbe6c3f1ec6767a60cf66e193e854b5d26;hpb=dd520b965a1e6531bd1d285494b223ab04c5368b;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index 36f3d8b..be4972a 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -3,9 +3,18 @@ // // 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 +// Cleanups and endian wrongness amelioration by James Hammons +// (C) 2010 Underground Software +// +// JLH = James 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 // @@ -254,10 +263,10 @@ #include "gpu.h" #include "jaguar.h" #include "log.h" -#include "m68k.h" -#include "objectp.h" +#include "m68000/m68kinterface.h" +//#include "memory.h" +#include "op.h" #include "settings.h" -#include "video.h" #define NEW_TIMER_SYSTEM @@ -267,6 +276,8 @@ #define MEMCON2 0x02 #define HC 0x04 #define VC 0x06 +#define OLP 0x20 // Object list pointer +#define OBF 0x26 // Object processor flag #define VMODE 0x28 #define MODE 0x0006 // Line buffer to video generator mode #define BGEN 0x0080 // Background enable (CRY & RGB16 only) @@ -275,28 +286,50 @@ #define BORD1 0x2A // Border green/red values (8 BPP) #define BORD2 0x2C // Border blue value (8 BPP) #define HP 0x2E // Values range from 1 - 1024 (value written + 1) -#define HBB 0x30 +#define HBB 0x30 // Horizontal blank begin #define HBE 0x32 +#define HS 0x34 // Horizontal sync +#define HVS 0x36 // Horizontal vertical sync #define HDB1 0x38 // Horizontal display begin 1 #define HDB2 0x3A #define HDE 0x3C #define VP 0x3E // Value ranges from 1 - 2048 (value written + 1) -#define VBB 0x40 +#define VBB 0x40 // Vertical blank begin #define VBE 0x42 -#define VS 0x44 -#define VDB 0x46 +#define VS 0x44 // Vertical sync +#define VDB 0x46 // Vertical display begin #define VDE 0x48 -#define VI 0x4E -#define BG 0x58 +#define VEB 0x4A // Vertical equalization begin +#define VEE 0x4C // Vertical equalization end +#define VI 0x4E // Vertical interrupt +#define PIT0 0x50 +#define PIT1 0x52 +#define HEQ 0x54 // Horizontal equalization end +#define BG 0x58 // Background color #define INT1 0xE0 +#define INT2 0xE2 -//NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!! +//NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!! [DONE] // Arbitrary video cutoff values (i.e., first/last visible spots on a TV, in HC ticks) +// Also note that VC is in *half* lines, i.e. divide by 2 to get the scanline /*#define LEFT_VISIBLE_HC 208 #define RIGHT_VISIBLE_HC 1528//*/ -#define LEFT_VISIBLE_HC 208 -#define RIGHT_VISIBLE_HC 1488 +// These were right for Rayman, but that one is offset on a real TV too. +//#define LEFT_VISIBLE_HC 208 +//#define RIGHT_VISIBLE_HC 1488 +// This is more like a real TV display... +//#define LEFT_VISIBLE_HC (208 - 32) +//#define RIGHT_VISIBLE_HC (1488 - 32) +// Split the difference? (Seems to be OK for the most part...) + +// (-10 +10)*4 is for opening up the display by 16 pixels (may go to 20). Need to change VIRTUAL_SCREEN_WIDTH to match this as well (went from 320 to 340; this is 4 HCs per one of those pixels). +//NB: Went back to 330. May shrink more. :-) +//#define LEFT_VISIBLE_HC (208 - 16 - (8 * 4)) +//#define LEFT_VISIBLE_HC (208 - 16 - (3 * 4)) +#define LEFT_VISIBLE_HC (208 - 16 - (1 * 4)) +//#define RIGHT_VISIBLE_HC (1488 - 16 + (10 * 4)) +#define RIGHT_VISIBLE_HC (LEFT_VISIBLE_HC + (VIRTUAL_SCREEN_WIDTH * 4)) //#define TOP_VISIBLE_VC 25 //#define BOTTOM_VISIBLE_VC 503 #define TOP_VISIBLE_VC 31 @@ -305,8 +338,11 @@ //Are these PAL horizontals correct? //They seem to be for the most part, but there are some games that seem to be //shifted over to the right from this "window". -#define LEFT_VISIBLE_HC_PAL 208 -#define RIGHT_VISIBLE_HC_PAL 1488 +//#define LEFT_VISIBLE_HC_PAL (208 - 16 - (4 * 4)) +//#define LEFT_VISIBLE_HC_PAL (208 - 16 - (-1 * 4)) +#define LEFT_VISIBLE_HC_PAL (208 - 16 - (-3 * 4)) +//#define RIGHT_VISIBLE_HC_PAL (1488 - 16 + (10 * 4)) +#define RIGHT_VISIBLE_HC_PAL (LEFT_VISIBLE_HC_PAL + (VIRTUAL_SCREEN_WIDTH * 4)) #define TOP_VISIBLE_VC_PAL 67 #define BOTTOM_VISIBLE_VC_PAL 579 @@ -314,40 +350,35 @@ //(It's easier to do it here, though...) //#define TOM_DEBUG -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, +uint8_t tomRam8[0x4000]; +uint32_t tomWidth, tomHeight; +uint32_t tomTimerPrescaler; +uint32_t tomTimerDivider; +int32_t tomTimerCounter; +uint16_t 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; + +// These are set by the "user" of the Jaguar core lib, since these are +// OS/system dependent. +uint32_t * screenBuffer; +uint32_t screenPitch; 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" }; -typedef void (render_xxx_scanline_fn)(uint32 *); +typedef void (render_xxx_scanline_fn)(uint32_t *); // Private function prototypes -void tom_render_16bpp_cry_scanline(uint32 * backbuffer); -void tom_render_24bpp_scanline(uint32 * backbuffer); -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_scanline(uint32_t * backbuffer); +void tom_render_24bpp_scanline(uint32_t * backbuffer); +void tom_render_16bpp_direct_scanline(uint32_t * backbuffer); +void tom_render_16bpp_rgb_scanline(uint32_t * backbuffer); +void tom_render_16bpp_cry_rgb_mix_scanline(uint32_t * 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, @@ -359,21 +390,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,402 +560,442 @@ Trevor McFur Vertical resolution: 238 lines */ -uint32 RGB16ToRGB32[0x10000]; -uint32 CRY16ToRGB32[0x10000]; -uint32 MIX16ToRGB32[0x10000]; +uint32_t RGB16ToRGB32[0x10000]; +uint32_t CRY16ToRGB32[0x10000]; +uint32_t MIX16ToRGB32[0x10000]; + +#warning "This is not endian-safe. !!! FIX !!!" void TOMFillLookupTables(void) { - 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); - - - for(uint32 i=0; i<0x10000; i++) + // NOTE: Jaguar 16-bit (non-CRY) color is RBG 556 like so: + // RRRR RBBB BBGG GGGG + for(uint32_t i=0; i<0x10000; i++) +//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 & 0xF800) << 16) // Red + | ((i & 0x003F) << 18) // Green + | ((i & 0x07C0) << 5); // Blue + + for(uint32_t i=0; i<0x10000; i++) { - uint32 chrm = (i & 0xF000) >> 12, - chrl = (i & 0x0F00) >> 8, - y = (i & 0x00FF); + uint32_t cyan = (i & 0xF000) >> 12, + red = (i & 0x0F00) >> 8, + intensity = (i & 0x00FF); - uint32 r = (((uint32)redcv[chrm][chrl]) * y) >> 8, - g = (((uint32)greencv[chrm][chrl]) * y) >> 8, - b = (((uint32)bluecv[chrm][chrl]) * y) >> 8; + uint32_t r = (((uint32_t)redcv[cyan][red]) * intensity) >> 8, + g = (((uint32_t)greencv[cyan][red]) * intensity) >> 8, + b = (((uint32_t)bluecv[cyan][red]) * intensity) >> 8; - CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r; - MIX16ToRGB32[i] = CRY16ToRGB32[i]; +//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]); } - - for(uint32 i=0; i<0x10000; i++) - if (i & 0x01) - MIX16ToRGB32[i] = RGB16ToRGB32[i]; } + void TOMSetPendingJERRYInt(void) { tom_jerry_int_pending = 1; } + void TOMSetPendingTimerInt(void) { tom_timer_int_pending = 1; } + void TOMSetPendingObjectInt(void) { tom_object_int_pending = 1; } + void TOMSetPendingGPUInt(void) { tom_gpu_int_pending = 1; } + void TOMSetPendingVideoInt(void) { tom_video_int_pending = 1; } -uint8 * TOMGetRamPointer(void) + +uint8_t * TOMGetRamPointer(void) { return tomRam8; } -uint8 TOMGetVideoMode(void) + +uint8_t TOMGetVideoMode(void) { - uint16 vmode = GET16(tomRam8, VMODE); + uint16_t vmode = GET16(tomRam8, VMODE); return ((vmode & VARMOD) >> 6) | ((vmode & MODE) >> 1); } + //Used in only one place (and for debug purposes): OBJECTP.CPP -uint16 TOMGetVDB(void) +#warning "Used in only one place (and for debug purposes): OBJECTP.CPP !!! FIX !!!" +uint16_t TOMGetVDB(void) { -// This in NOT VDB!!! -// return GET16(tomRam8, VBE); return GET16(tomRam8, VDB); } + +#define LEFT_BG_FIX // // 16 BPP CRY/RGB mixed mode rendering // -void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer) +void tom_render_16bpp_cry_rgb_mix_scanline(uint32_t * backbuffer) { //CHANGED TO 32BPP RENDERING - uint16 width = tomWidth; - uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + uint16_t width = tomWidth; + uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800]; //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; //NOTE: May have to check HDB2 as well! // Get start position in HC ticks - int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); + int16_t startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); + // Convert to pixels startPos /= pwidth; + if (startPos < 0) + // This is x2 because current_line_buffer is uint8_t & we're in a 16bpp mode current_line_buffer += 2 * -startPos; else //This case doesn't properly handle the "start on the right side of virtual screen" case //Dunno why--looks Ok... -//What *is* for sure wrong is that it doesn't copy the linebuffer's BG pixels... +//What *is* for sure wrong is that it doesn't copy the linebuffer's BG pixels... [FIXED NOW] //This should likely be 4 instead of 2 (?--not sure) +// Actually, there should be NO multiplier, as startPos is expressed in PIXELS +// and so is the backbuffer. +#ifdef LEFT_BG_FIX + { + uint8_t g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; + uint32_t pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8); + + for(int16_t i=0; i> 9) + 1; + uint8_t 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 + int16_t 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; else +#ifdef LEFT_BG_FIX + { + uint8_t g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; + uint32_t pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8); + + for(int16_t i=0; i> 9) + 1; + uint8_t 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 + int16_t 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 +#ifdef LEFT_BG_FIX + { + uint8_t g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; + uint32_t pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8); + + for(int16_t i=0; i> 1; width--; } } + // // 16 BPP RGB mode rendering // -void tom_render_16bpp_rgb_scanline(uint32 * backbuffer) +void tom_render_16bpp_rgb_scanline(uint32_t * backbuffer) { //CHANGED TO 32BPP RENDERING // 16 BPP RGB: 0-5 green, 6-10 blue, 11-15 red - uint16 width = tomWidth; - uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + uint16_t width = tomWidth; + uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800]; //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + uint8_t 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 + int16_t 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; else -//This should likely be 4 instead of 2 (?--not sure) - backbuffer += 2 * startPos, width -= startPos; - - while (width) +#ifdef LEFT_BG_FIX { - uint32 color = (*current_line_buffer++) << 8; - color |= *current_line_buffer++; - *backbuffer++ = RGB16ToRGB32[color]; - width--; - } -} - -///////////////////////////////////////////////////////////////////// -// This stuff may just go away by itself, especially if we do some // -// good old OpenGL goodness... // -///////////////////////////////////////////////////////////////////// + uint8_t g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; + uint32_t pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8); -void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 *backbuffer) -{ - uint16 width=tomWidth; - uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; + for(int16_t i=0; i> 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=tomWidth; - uint8 *current_line_buffer=(uint8*)&tomRam8[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=tomWidth; - uint8 *current_line_buffer=(uint8*)&tomRam8[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=tomWidth; - uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800]; +#else +//This should likely be 4 instead of 2 (?--not sure) + backbuffer += 2 * startPos, width -= startPos; +#endif 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; + uint32_t color = (*current_line_buffer++) << 8; + color |= *current_line_buffer++; + *backbuffer++ = RGB16ToRGB32[color]; width--; } } -void TOMResetBackbuffer(uint32 * backbuffer) -{ - TOMBackbuffer = backbuffer; -} // // Process a single scanline +// (this is bad terminology; each tick of the VC is actually a half-line) // -void TOMExecScanline(uint16 scanline, bool render) +void TOMExecHalfline(uint16_t halfline, bool render) { +#warning "!!! Need to handle multiple fields properly !!!" + // We ignore the problem for now + halfline &= 0x7FF; + bool inActiveDisplayArea = true; //Interlacing is still not handled correctly here... !!! FIX !!! - if (scanline & 0x01) // Execute OP only on even lines (non-interlaced only!) + if (halfline & 0x01) // Execute OP only on even halflines (non-interlaced only!) return; - if (scanline >= (uint16)GET16(tomRam8, VDB) && scanline < (uint16)GET16(tomRam8, 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... +/* +No, the OP doesn't start until VDB, that much is certain. The thing is, VDB is the +HALF line that the OP starts on--which means that it needs to start at VDB / 2!!! + +Hrm, doesn't seem to be enough, though it should be... still sticks for 20 frames. + + +What triggers this is writing $FFFF to VDE. This causes the OP start signal in VID to +latch on, which in effect sets VDB to zero. So that much is correct. But the thing with +Rayman is that it shouldn't cause the graphical glitches seen there, so still have to +investigate what's going on there. By all rights, it shouldn't glitch because: + +00006C00: 0000000D 82008F73 (BRANCH) YPOS=494, CC=">", link=$00006C10 +00006C08: 000003FF 00008173 (BRANCH) YPOS=46, CC=">", link=$001FF800 +00006C10: 00000000 0000000C (STOP) +001FF800: 12FC2BFF 02380000 (BITMAP) + 00008004 8180CFF1 + +Even if the OP is running all the time, the link should tell it to stop at the right +place (which it seems to do). But we still get glitchy screen. + +Seems the glitchy screen went away... Maybe the GPU alignment fixes fixed it??? +Just need to add the proper checking here then. + +Some numbers, courtesy of the Jaguar BIOS: +// NTSC: +VP, 523 // Vertical Period (1-based; in this case VP = 524) +VBE, 24 // Vertical Blank End +VDB, 38 // Vertical Display Begin +VDE, 518 // Vertical Display End +VBB, 500 // Vertical Blank Begin +VS, 517 // Vertical Sync + +// PAL Jaguar +VP, 623 // Vertical Period (1-based; in this case VP = 624) +VBE, 34 // Vertical Blank End +VDB, 38 // Vertical Display Begin +VDE, 518 // Vertical Display End +VBB, 600 // Vertical Blank Begin +VS, 618 // Vertical Sync + +Numbers for KM, NTSC: +KM: (Note that with VDE <= 507, the OP starts at VDB as expected) +TOM: Vertical Display Begin written by M68K: 41 +TOM: Vertical Display End written by M68K: 2047 +TOM: Vertical Interrupt written by M68K: 491 +*/ +#if 1 + // Initial values that "well behaved" programs use + uint16_t startingHalfline = GET16(tomRam8, VDB); + uint16_t endingHalfline = GET16(tomRam8, VDE); + + // Simulate the OP start bug here! + // Really, this value is somewhere around 507 for an NTSC Jaguar. But this + // should work in a majority of cases, at least until we can figure it out properly. + if (endingHalfline > GET16(tomRam8, VP)) + startingHalfline = 0; + + if (halfline >= startingHalfline && halfline < endingHalfline) +// if (halfline >= 0 && halfline < (uint16_t)GET16(tomRam8, VDE)) +// 16 isn't enough, and neither is 32 for raptgun. 32 fucks up Rayman +// if (halfline >= ((uint16_t)GET16(tomRam8, VDB) / 2) && halfline < ((uint16_t)GET16(tomRam8, VDE) / 2)) +// if (halfline >= ((uint16_t)GET16(tomRam8, VDB) - 16) && halfline < (uint16_t)GET16(tomRam8, VDE)) +// if (halfline >= 20 && halfline < (uint16_t)GET16(tomRam8, VDE)) +// if (halfline >= (uint16_t)GET16(tomRam8, VDB) && halfline < (uint16_t)GET16(tomRam8, VDE)) { if (render) { - uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; - uint8 bgHI = tomRam8[BG], bgLO = tomRam8[BG + 1]; + uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800]; + uint8_t 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++) + for(uint32_t i=0; i<720; i++) *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO; - OPProcessList(scanline, render); + OPProcessList(halfline, render); } } else inActiveDisplayArea = false; +#else + inActiveDisplayArea = + (halfline >= (uint16_t)GET16(tomRam8, VDB) && halfline < (uint16_t)GET16(tomRam8, VDE) + ? true : false); + + if (halfline < (uint16_t)GET16(tomRam8, VDE)) + { + if (render)//With JaguarExecuteNew() this is always true... + { + uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800]; + uint8_t bgHI = tomRam8[BG], bgLO = tomRam8[BG + 1]; - // Try to take PAL into account... + // Clear line buffer with BG + if (GET16(tomRam8, VMODE) & BGEN) // && (CRY or RGB16)... + for(uint32_t i=0; i<720; i++) + *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO; + +// OPProcessList(halfline, render); +//This seems to take care of it... + OPProcessList(halfline, inActiveDisplayArea); + } + } +#endif - uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), + // Try to take PAL into account... [We do now!] + + uint16_t topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL); + uint32_t * TOMCurrentLine = &(screenBuffer[((halfline - topVisible) / 2) * screenPitch]); // Here's our virtualized scanline code... - if (scanline >= topVisible && scanline < bottomVisible) + if (halfline >= topVisible && halfline < bottomVisible) { 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 !!! +#warning "The following doesn't put BORDER color on the sides... !!! FIX !!!" if (vjs.renderType == RT_NORMAL) - scanline_render[TOMGetVideoMode()](TOMBackbuffer); +// scanline_render[TOMGetVideoMode()](TOMBackbuffer); + scanline_render[TOMGetVideoMode()](TOMCurrentLine); else//TV type render { /* @@ -955,8 +1011,8 @@ 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(tomRam8, VMODE) & PWIDTH) >> 9) + 1; - uint8 mode = ((GET16(tomRam8, VMODE) & MODE) >> 1); + uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + uint8_t 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 @@ -969,16 +1025,16 @@ void TOMExecScanline(uint16 scanline, bool render) // // 24 BPP mode rendering // -void tom_render_24bpp_scanline(uint32 * backbuffer) +void tom_render_24bpp_scanline(uint32_t * backbuffer) { //CHANGED TO 32BPP RENDERING - uint16 width = tomWidth; - uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800]; + uint16_t width = tomWidth; + uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800]; //New stuff--restrict our drawing... - uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + uint8_t 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 + int16_t 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; @@ -988,10 +1044,10 @@ void tom_render_24bpp_scanline(uint32 * backbuffer) while (width) { - uint32 g = *current_line_buffer++; - uint32 r = *current_line_buffer++; + uint32_t g = *current_line_buffer++; + uint32_t r = *current_line_buffer++; current_line_buffer++; - uint32 b = *current_line_buffer++; + uint32_t b = *current_line_buffer++; *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r; width--; } @@ -1003,33 +1059,33 @@ void tom_render_24bpp_scanline(uint32 * backbuffer) else { // If outside of VDB & VDE, then display the border color - uint32 * currentLineBuffer = TOMBackbuffer; - uint8 g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; - uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r; + uint32_t * currentLineBuffer = TOMCurrentLine; + uint8_t g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1]; +//Hm. uint32_t pixel = 0xFF000000 | (b << 16) | (g << 8) | r; + uint32_t pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8); - for(uint32 i=0; i 0.25:1 (1:4) pixels (X:Y ratio) @@ -1074,7 +1122,7 @@ uint32 TOMGetVideoModeWidth(void) // return width[(GET16(tomRam8, VMODE) & PWIDTH) >> 9]; // Now, we just calculate it... -/* uint16 hdb1 = GET16(tomRam8, HDB1), hde = GET16(tomRam8, HDE), +/* uint16_t 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... @@ -1082,7 +1130,7 @@ uint32 TOMGetVideoModeWidth(void) // 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(tomRam8, VMODE) & PWIDTH) >> 9) + 1; + uint16_t 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); @@ -1106,20 +1154,21 @@ uint32 TOMGetVideoModeWidth(void) // That's basically what we're doing now...! } + // *** SPECULATION *** // It might work better to virtualize the height settings, i.e., set the vertical // height at 240 lines and clip using the VDB and VDE/VP registers... // Same with the width... [Width is pretty much virtualized now.] // Now that that the width is virtualized, let's virtualize the height. :-) -uint32 TOMGetVideoModeHeight(void) +uint32_t TOMGetVideoModeHeight(void) { -// 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); +// uint16_t vmode = GET16(tomRam8, VMODE); +// uint16_t vbe = GET16(tomRam8, VBE); +// uint16_t vbb = GET16(tomRam8, VBB); +// uint16_t vdb = GET16(tomRam8, VDB); +// uint16_t vde = GET16(tomRam8, VDE); +// uint16_t vp = GET16(tomRam8, VP); /* if (vde == 0xFFFF) vde = vbb;//*/ @@ -1141,10 +1190,55 @@ uint32 TOMGetVideoModeHeight(void) return (vjs.hardwareTypeNTSC ? 240 : 256); } + // // TOM reset code // Now PAL friendly! // +/* +The values in TOMReset come from the Jaguar BIOS. +These values are from BJL: + +NSTC: +CLK2 181 +HP 844 +HBB 1713 +HBE 125 +HS 1741 +HVS 651 +HEQ 784 +HDE 1696 +HDB1 166 +HDB2 166 +VP 523 +VEE 6 +VBE 24 +VDB 46 +VDE 496 +VBB 500 +VEB 511 +VS 517 + +PAL: +CLK2 226 +HP 850 +HBB 1711 +HBE 158 +HS 1749 +HVS 601 +HEQ 787 +HDE 1696 +HDB1 166 +HDB2 166 +VP 625 +VEE 6 +VBE 34 +VDB 46 +VDE 429 +VBB 600 +VEB 613 +VS 618 +*/ void TOMReset(void) { OPReset(); @@ -1154,35 +1248,36 @@ void TOMReset(void) if (vjs.hardwareTypeNTSC) { SET16(tomRam8, MEMCON1, 0x1861); +// SET16(tomRam8, MEMCON1, 0x1865);//Bunch of BS SET16(tomRam8, MEMCON2, 0x35CC); - SET16(tomRam8, HP, 844); // Horizontal Period (1-based; HP=845) + 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, 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, 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(tomRam8, MEMCON1, 0x1861); SET16(tomRam8, MEMCON2, 0x35CC); - SET16(tomRam8, HP, 850); // Horizontal Period + SET16(tomRam8, HP, 850); // Horizontal Period SET16(tomRam8, HBB, 1711); // Horizontal Blank Begin - SET16(tomRam8, HBE, 158); // Horizontal Blank End + 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, 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); } @@ -1195,16 +1290,60 @@ void TOMReset(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; } + +// +// Dump all TOM register values to the log +// +void TOMDumpIORegistersToLog(void) +{ + WriteLog("\n\n---------------------------------------------------------------------\n"); + WriteLog("TOM I/O Registers\n"); + WriteLog("---------------------------------------------------------------------\n"); + WriteLog("F000%02X (MEMCON1): $%04X\n", MEMCON1, GET16(tomRam8, MEMCON1)); + WriteLog("F000%02X (MEMCON2): $%04X\n", MEMCON2, GET16(tomRam8, MEMCON2)); + WriteLog("F000%02X (HC): $%04X\n", HC, GET16(tomRam8, HC)); + WriteLog("F000%02X (VC): $%04X\n", VC, GET16(tomRam8, VC)); + WriteLog("F000%02X (OLP): $%08X\n", OLP, GET32(tomRam8, OLP)); + WriteLog("F000%02X (OBF): $%04X\n", OBF, GET16(tomRam8, OBF)); + WriteLog("F000%02X (VMODE): $%04X\n", VMODE, GET16(tomRam8, VMODE)); + WriteLog("F000%02X (BORD1): $%04X\n", BORD1, GET16(tomRam8, BORD1)); + WriteLog("F000%02X (BORD2): $%04X\n", BORD2, GET16(tomRam8, BORD2)); + WriteLog("F000%02X (HP): $%04X\n", HP, GET16(tomRam8, HP)); + WriteLog("F000%02X (HBB): $%04X\n", HBB, GET16(tomRam8, HBB)); + WriteLog("F000%02X (HBE): $%04X\n", HBE, GET16(tomRam8, HBE)); + WriteLog("F000%02X (HS): $%04X\n", HS, GET16(tomRam8, HS)); + WriteLog("F000%02X (HVS): $%04X\n", HVS, GET16(tomRam8, HVS)); + WriteLog("F000%02X (HDB1): $%04X\n", HDB1, GET16(tomRam8, HDB1)); + WriteLog("F000%02X (HDB2): $%04X\n", HDB2, GET16(tomRam8, HDB2)); + WriteLog("F000%02X (HDE): $%04X\n", HDE, GET16(tomRam8, HDE)); + WriteLog("F000%02X (VP): $%04X\n", VP, GET16(tomRam8, VP)); + WriteLog("F000%02X (VBB): $%04X\n", VBB, GET16(tomRam8, VBB)); + WriteLog("F000%02X (VBE): $%04X\n", VBE, GET16(tomRam8, VBE)); + WriteLog("F000%02X (VS): $%04X\n", VS, GET16(tomRam8, VS)); + WriteLog("F000%02X (VDB): $%04X\n", VDB, GET16(tomRam8, VDB)); + WriteLog("F000%02X (VDE): $%04X\n", VDE, GET16(tomRam8, VDE)); + WriteLog("F000%02X (VEB): $%04X\n", VEB, GET16(tomRam8, VEB)); + WriteLog("F000%02X (VEE): $%04X\n", VEE, GET16(tomRam8, VEE)); + WriteLog("F000%02X (VI): $%04X\n", VI, GET16(tomRam8, VI)); + WriteLog("F000%02X (PIT0): $%04X\n", PIT0, GET16(tomRam8, PIT0)); + WriteLog("F000%02X (PIT1): $%04X\n", PIT1, GET16(tomRam8, PIT1)); + WriteLog("F000%02X (HEQ): $%04X\n", HEQ, GET16(tomRam8, HEQ)); + WriteLog("F000%02X (BG): $%04X\n", BG, GET16(tomRam8, BG)); + WriteLog("F000%02X (INT1): $%04X\n", INT1, GET16(tomRam8, INT1)); + WriteLog("F000%02X (INT2): $%04X\n", INT2, GET16(tomRam8, INT2)); + WriteLog("---------------------------------------------------------------------\n\n\n"); +} + + // // TOM byte access (read) // -uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) +uint8_t TOMReadByte(uint32_t offset, uint32_t who/*=UNKNOWN*/) { //???Is this needed??? // It seems so. Perhaps it's the +$8000 offset being written to (32-bit interface)? @@ -1213,7 +1352,7 @@ 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)) @@ -1225,33 +1364,35 @@ uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) 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 tomRam8[offset & 0x3FFF]; } + // // TOM word access (read) // -uint16 TOMReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) +uint16_t TOMReadWord(uint32_t offset, uint32_t 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]); + WriteLog("TOM: ReadWord attempted from GPU register file by %s (unimplemented)!\n", whoName[who]); if (offset == 0xF000E0) { - uint16 data = (tom_jerry_int_pending << 4) | (tom_timer_int_pending << 3) + // For reading, should only return the lower 5 bits... + uint16_t 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); //WriteLog("tom: interrupt status is 0x%.4x \n",data); @@ -1284,25 +1425,45 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) 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*/) +void TOMWriteByte(uint32_t offset, uint8_t data, uint32_t who/*=UNKNOWN*/) { + // Moved here tentatively, so we can see everything written to TOM. + tomRam8[offset & 0x3FFF] = data; + +#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)) @@ -1327,25 +1488,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; } @@ -1356,26 +1517,47 @@ void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) tomRam8[offset] = data, tomRam8[offset + 0x200] = data; } - tomRam8[offset & 0x3FFF] = data; +// tomRam8[offset & 0x3FFF] = data; } + // // TOM word access (write) // -void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) +void TOMWriteWord(uint32_t offset, uint16_t data, uint32_t who/*=UNKNOWN*/) { -//???Is this needed??? - offset &= 0xFF3FFF; + // Moved here tentatively, so we can see everything written to TOM. + tomRam8[(offset + 0) & 0x3FFF] = data >> 8; + tomRam8[(offset + 1) & 0x3FFF] = data & 0xFF; #ifdef TOM_DEBUG - WriteLog("TOM: Writing word %04X at %06X\n", data, offset); + WriteLog("TOM: Writing byte %04X at %06X", data, offset); #endif -if (offset == 0xF00000 + MEMCON1) - WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data); -if (offset == 0xF00000 + MEMCON2) - WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data); +//???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(" -->[%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) +// WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data); if (offset >= 0xF02000 && offset <= 0xF020FF) - WriteLog("TOM: Write attempted to GPU register file by %s (unimplemented)!\n", whoName[who]); + WriteLog("TOM: WriteWord attempted to GPU register file by %s (unimplemented)!\n", whoName[who]); if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) { @@ -1400,13 +1582,13 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) }*/ else if (offset == 0xF00050) { - tom_timer_prescaler = data; + tomTimerPrescaler = data; TOMResetPIT(); return; } else if (offset == 0xF00052) { - tom_timer_divider = data; + tomTimerDivider = data; TOMResetPIT(); return; } @@ -1423,6 +1605,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)) { @@ -1434,6 +1618,7 @@ 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) +#warning "!!! Watch out for unaligned writes here !!! FIX !!!" SET16(tomRam8, offset, data); SET16(tomRam8, offset + 0x200, data); } @@ -1441,7 +1626,7 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) 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 !!! +#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) @@ -1449,53 +1634,98 @@ 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); - -if (offset == VDB) - WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data); -if (offset == VDE) - WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data); -if (offset == VP) - WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : "")); +// Fix a lockup bug... :-P +// TOMWriteByte(0xF00000 | offset, data >> 8, who); +// TOMWriteByte(0xF00000 | (offset+1), data & 0xFF, who); + +if (offset == MEMCON1) + WriteLog("TOM: Memory Config 1 written by %s: $%04X\n", whoName[who], data); +if (offset == MEMCON2) + WriteLog("TOM: Memory Config 2 written by %s: $%04X\n", whoName[who], data); +//if (offset == OLP) +// WriteLog("TOM: Object List Pointer written by %s: $%04X\n", whoName[who], data); +//if (offset == OLP + 2) +// WriteLog("TOM: Object List Pointer +2 written by %s: $%04X\n", whoName[who], data); +//if (offset == OBF) +// WriteLog("TOM: Object Processor Flag 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) (M68K PC = %06X)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC), m68k_get_reg(NULL, M68K_REG_PC)); +if (offset == BORD1) + WriteLog("TOM: Border 1 written by %s: $%04X\n", whoName[who], data); +if (offset == BORD2) + WriteLog("TOM: Border 2 written by %s: $%04X\n", whoName[who], data); +if (offset == HP) + WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2); +if (offset == HBB) + WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data); +if (offset == HBE) + WriteLog("TOM: Horizontal Blank End written by %s: %u\n", whoName[who], data); +if (offset == HS) + WriteLog("TOM: Horizontal Sync written by %s: %u\n", whoName[who], data); +if (offset == HVS) + WriteLog("TOM: Horizontal Vertical Sync written by %s: %u\n", whoName[who], data); 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) - WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2); +if (offset == VP) + WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : "")); if (offset == VBB) WriteLog("TOM: Vertical Blank Begin written by %s: %u\n", whoName[who], data); if (offset == VBE) WriteLog("TOM: Vertical Blank End written by %s: %u\n", whoName[who], data); if (offset == VS) WriteLog("TOM: Vertical Sync written by %s: %u\n", whoName[who], data); +if (offset == VDB) + WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data); +if (offset == VDE) + WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data); +if (offset == VEB) + WriteLog("TOM: Vertical Equalization Begin written by %s: %u\n", whoName[who], data); +if (offset == VEE) + WriteLog("TOM: Vertical Equalization End written by %s: %u\n", whoName[who], data); if (offset == VI) WriteLog("TOM: Vertical Interrupt written by %s: %u\n", whoName[who], data); -if (offset == HBB) - WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data); -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(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 == HEQ) + WriteLog("TOM: Horizontal Equalization End written by %s: %u\n", whoName[who], data); +//if (offset == BG) +// WriteLog("TOM: Background 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. +// N.B.: It's used in the rendering functions... So... +#warning "!!! Need to get rid of this dependency !!!" +#if 1 if ((offset >= 0x28) && (offset <= 0x4F)) { - uint32 width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight(); + uint32_t width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight(); if ((width != tomWidth) || (height != tomHeight)) { tomWidth = width, tomHeight = height; - if (vjs.renderType == RT_NORMAL) - ResizeScreen(tomWidth, tomHeight); +#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 TOMIRQEnabled(int irq) { // This is the correct byte in big endian... D'oh! @@ -1503,17 +1733,6 @@ int TOMIRQEnabled(int irq) return tomRam8[INT1 + 1/*0xE1*/] & (1 << irq); } -//unused -/*void tom_set_irq_latch(int irq, int enabled) -{ - tomRam8[0xE0] = (tomRam8[0xE0] & (~(1<