//
// 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 L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
//
// Who When What
// --- ---------- -------------------------------------------------------------
#include "gpu.h"
#include "jaguar.h"
#include "log.h"
-#include "m68k.h"
+#include "m68000/m68kinterface.h"
//#include "memory.h"
#include "op.h"
#include "settings.h"
// 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
//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
//(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[] =
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) << 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);
}
}
+
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<startPos; i++)
+ *backbuffer++ = pixel;
+
+ width -= startPos;
+ }
+#else
backbuffer += 2 * startPos, width -= startPos;
+#endif
while (width)
{
- uint16 color = (*current_line_buffer++) << 8;
+ uint16_t color = (*current_line_buffer++) << 8;
color |= *current_line_buffer++;
*backbuffer++ = MIX16ToRGB32[color];
width--;
}
}
+
//
// 16 BPP CRY mode rendering
//
-void tom_render_16bpp_cry_scanline(uint32 * backbuffer)
+void tom_render_16bpp_cry_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 += 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<startPos; i++)
+ *backbuffer++ = pixel;
+
+ width -= startPos;
+ }
+#else
//This should likely be 4 instead of 2 (?--not sure)
backbuffer += 2 * startPos, width -= startPos;
+#endif
while (width)
{
- uint16 color = (*current_line_buffer++) << 8;
+ uint16_t color = (*current_line_buffer++) << 8;
color |= *current_line_buffer++;
*backbuffer++ = CRY16ToRGB32[color];
width--;
}
}
+
//
// 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;
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<startPos; i++)
+ *backbuffer++ = pixel;
+
+ width -= startPos;
+ }
+#else
//This should likely be 4 instead of 2 (?--not sure)
backbuffer += 2 * startPos, width -= startPos;
+#endif
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++;
//hm. *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
*backbuffer++ = 0x000000FF | (r << 24) | (g << 16) | (b << 8);
width--;
}
}
+
//Seems to me that this is NOT a valid mode--the JTRM seems to imply that you would need
//extra hardware outside of the Jaguar console to support this!
//
// 16 BPP direct mode rendering
//
-void tom_render_16bpp_direct_scanline(uint32 * backbuffer)
+void tom_render_16bpp_direct_scanline(uint32_t * backbuffer)
{
- uint16 width = tomWidth;
- uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+ uint16_t width = tomWidth;
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
while (width)
{
- uint16 color = (*current_line_buffer++) << 8;
+ uint16_t color = (*current_line_buffer++) << 8;
color |= *current_line_buffer++;
*backbuffer++ = color >> 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<startPos; i++)
+ *backbuffer++ = pixel;
+
+ width -= startPos;
+ }
+#else
//This should likely be 4 instead of 2 (?--not sure)
backbuffer += 2 * startPos, width -= startPos;
+#endif
while (width)
{
- uint32 color = (*current_line_buffer++) << 8;
+ 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 TOMExecHalfline(uint16 halfline, 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 (halfline & 0x01) // Execute OP only on even lines (non-interlaced only!)
+ if (halfline & 0x01) // Execute OP only on even halflines (non-interlaced only!)
return;
//Hm, it seems that the OP needs to execute from zero, so let's try it:
*/
#if 1
// Initial values that "well behaved" programs use
- uint16 startingHalfline = GET16(tomRam8, VDB);
- uint16 endingHalfline = GET16(tomRam8, VDE);
+ 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
startingHalfline = 0;
if (halfline >= 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);
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);
// 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...
#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
//
// 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;
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--;
}
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<tomWidth; i++)
+ for(uint32_t i=0; i<tomWidth; i++)
*currentLineBuffer++ = pixel;
}
}
}
+
//
// TOM initialization
//
TOMReset();
}
+
void TOMDone(void)
{
OPDone();
// memory_free(tom_cry_rgb_mix_lut);
}
-uint32 TOMGetVideoModeWidth(void)
+
+uint32_t TOMGetVideoModeWidth(void)
{
//These widths are pretty bogus. Should use HDB1/2 & HDE/HBB & PWIDTH to calc the width...
-// uint32 width[8] = { 1330, 665, 443, 332, 266, 222, 190, 166 };
+// uint32_t width[8] = { 1330, 665, 443, 332, 266, 222, 190, 166 };
//Temporary, for testing Doom...
-// uint32 width[8] = { 1330, 665, 443, 332, 266, 222, 190, 332 };
+// uint32_t width[8] = { 1330, 665, 443, 332, 266, 222, 190, 332 };
// Note that the following PWIDTH values have the following pixel aspect ratios:
// PWIDTH = 1 -> 0.25:1 (1:4) pixels (X:Y ratio)
// 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...
// 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);
// 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;//*/
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();
tomTimerCounter = 0;
}
+
//
// 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)?
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;
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);
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*/)
{
#ifdef TOM_DEBUG
WriteLog("TOM: Writing byte %02X at %06X", data, offset);
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*/)
{
#ifdef TOM_DEBUG
WriteLog("TOM: Writing byte %04X at %06X", data, offset);
//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))
{
#if 1
if ((offset >= 0x28) && (offset <= 0x4F))
{
- uint32 width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight();
+ uint32_t width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight();
if ((width != tomWidth) || (height != tomHeight))
{
#endif
}
+
int TOMIRQEnabled(int irq)
{
// This is the correct byte in big endian... D'oh!
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
void TOMPITCallback(void);
+
void TOMResetPIT(void)
{
#ifndef NEW_TIMER_SYSTEM
#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)
{
}
}
+
void TOMPITCallback(void)
{
// INT1_RREG |= 0x08; // Set TOM PIT interrupt pending
TOMResetPIT();
}
+
projects / virtualjaguar / blobdiff