X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=be4972a56debe876ef22c1070eabe8e4dd733a84;hb=0c0dea5b5411ef9be8c6d5159faf0d2226db4452;hp=49da93e377c45e6767b87bc3e78d03a916993e0a;hpb=70a54a68244ca80111cf2c9b2230072051a9f839;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index 49da93e..be4972a 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -307,6 +307,7 @@ #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 !!! [DONE] @@ -323,7 +324,10 @@ // 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). -#define LEFT_VISIBLE_HC (208 - 16 - (8 * 4)) +//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 @@ -334,7 +338,9 @@ //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 - 16 - (4 * 4)) +//#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 @@ -344,32 +350,32 @@ //(It's easier to do it here, though...) //#define TOM_DEBUG -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, +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; // These are set by the "user" of the Jaguar core lib, since these are // OS/system dependent. -uint32 * screenBuffer; -uint32 screenPitch; +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); //render_xxx_scanline_fn * scanline_render_normal[] = render_xxx_scanline_fn * scanline_render[] = @@ -554,34 +560,36 @@ 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) { // NOTE: Jaguar 16-bit (non-CRY) color is RBG 556 like so: // RRRR RBBB BBGG GGGG - for(uint32 i=0; i<0x10000; i++) + 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 & 0xF100) << 16) // Red + | ((i & 0xF800) << 16) // Red | ((i & 0x003F) << 18) // Green | ((i & 0x07C0) << 5); // Blue - for(uint32 i=0; i<0x10000; i++) + for(uint32_t i=0; i<0x10000; i++) { - uint32 cyan = (i & 0xF000) >> 12, + uint32_t cyan = (i & 0xF000) >> 12, red = (i & 0x0F00) >> 8, intensity = (i & 0x00FF); - uint32 r = (((uint32)redcv[cyan][red]) * intensity) >> 8, - g = (((uint32)greencv[cyan][red]) * intensity) >> 8, - b = (((uint32)bluecv[cyan][red]) * intensity) >> 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; //hm. CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r; CRY16ToRGB32[i] = 0x000000FF | (r << 24) | (g << 16) | (b << 8); @@ -589,188 +597,255 @@ void TOMFillLookupTables(void) } } + 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 #warning "Used in only one place (and for debug purposes): OBJECTP.CPP !!! FIX !!!" -uint16 TOMGetVDB(void) +uint16_t TOMGetVDB(void) { 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 +#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= startingHalfline && halfline < endingHalfline) -// if (halfline >= 0 && halfline < (uint16)GET16(tomRam8, VDE)) +// 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)GET16(tomRam8, VDB) / 2) && halfline < ((uint16)GET16(tomRam8, VDE) / 2)) -// if (halfline >= ((uint16)GET16(tomRam8, VDB) - 16) && halfline < (uint16)GET16(tomRam8, VDE)) -// if (halfline >= 20 && halfline < (uint16)GET16(tomRam8, VDE)) -// if (halfline >= (uint16)GET16(tomRam8, VDB) && halfline < (uint16)GET16(tomRam8, VDE)) +// 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(halfline, render); @@ -887,19 +957,19 @@ TOM: Vertical Interrupt written by M68K: 491 inActiveDisplayArea = false; #else inActiveDisplayArea = - (halfline >= (uint16)GET16(tomRam8, VDB) && halfline < (uint16)GET16(tomRam8, VDE) + (halfline >= (uint16_t)GET16(tomRam8, VDB) && halfline < (uint16_t)GET16(tomRam8, VDE) ? true : false); - if (halfline < (uint16)GET16(tomRam8, VDE)) + if (halfline < (uint16_t)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]; + 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(halfline, render); @@ -911,9 +981,9 @@ TOM: Vertical Interrupt written by M68K: 491 // Try to take PAL into account... [We do now!] - uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), + uint16_t topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL), bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL); - uint32 * TOMCurrentLine = &(screenBuffer[((halfline - topVisible) / 2) * screenPitch]); + uint32_t * TOMCurrentLine = &(screenBuffer[((halfline - topVisible) / 2) * screenPitch]); // Here's our virtualized scanline code... @@ -941,8 +1011,8 @@ TOM: Vertical Interrupt written by M68K: 491 #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 @@ -955,16 +1025,16 @@ TOM: Vertical Interrupt written by M68K: 491 // // 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; @@ -974,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--; } @@ -989,17 +1059,18 @@ void tom_render_24bpp_scanline(uint32 * backbuffer) else { // If outside of VDB & VDE, then display the border color - uint32 * currentLineBuffer = TOMCurrentLine; - 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); + 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) @@ -1052,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... @@ -1060,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); @@ -1084,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;//*/ @@ -1119,6 +1190,7 @@ uint32 TOMGetVideoModeHeight(void) return (vjs.hardwareTypeNTSC ? 240 : 256); } + // // TOM reset code // Now PAL friendly! @@ -1176,6 +1248,7 @@ 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, HBB, 1713); // Horizontal Blank Begin @@ -1222,10 +1295,55 @@ void TOMReset(void) 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)? @@ -1257,10 +1375,11 @@ uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) 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; @@ -1268,12 +1387,12 @@ uint16 TOMReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) 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) { // For reading, should only return the lower 5 bits... - uint16 data = (tom_jerry_int_pending << 4) | (tom_timer_int_pending << 3) + 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); @@ -1314,12 +1433,16 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) 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 @@ -1394,14 +1517,19 @@ 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*/) { + // 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 byte %04X at %06X", data, offset); #endif @@ -1429,7 +1557,7 @@ void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) //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)) { @@ -1507,8 +1635,8 @@ if (offset >= 0xF02000 && offset <= 0xF020FF) data &= 0x03FF; // These are all 10-bit registers // Fix a lockup bug... :-P - TOMWriteByte(0xF00000 | offset, data >> 8, who); - TOMWriteByte(0xF00000 | (offset+1), data & 0xFF, who); +// 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); @@ -1521,7 +1649,7 @@ if (offset == MEMCON2) //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)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC)); + 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) @@ -1577,11 +1705,12 @@ if (offset == HEQ) // 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)) { @@ -1596,6 +1725,7 @@ if (offset == HEQ) #endif } + int TOMIRQEnabled(int irq) { // This is the correct byte in big endian... D'oh! @@ -1603,6 +1733,7 @@ int TOMIRQEnabled(int irq) return tomRam8[INT1 + 1/*0xE1*/] & (1 << irq); } + // NEW: // TOM Programmable Interrupt Timer handler // NOTE: TOM's PIT is only enabled if the prescaler is != 0 @@ -1610,6 +1741,7 @@ int TOMIRQEnabled(int irq) void TOMPITCallback(void); + void TOMResetPIT(void) { #ifndef NEW_TIMER_SYSTEM @@ -1632,13 +1764,14 @@ void TOMResetPIT(void) #endif } + // // TOM Programmable Interrupt Timer handler // NOTE: TOM's PIT is only enabled if the prescaler is != 0 // //NOTE: This is only used by the old execution code... Safe to remove // once the timer system is stable. -void TOMExecPIT(uint32 cycles) +void TOMExecPIT(uint32_t cycles) { if (tomTimerPrescaler) { @@ -1657,6 +1790,7 @@ void TOMExecPIT(uint32 cycles) } } + void TOMPITCallback(void) { // INT1_RREG |= 0x08; // Set TOM PIT interrupt pending @@ -1669,3 +1803,4 @@ void TOMPITCallback(void) TOMResetPIT(); } +