// F02298 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z0 - Z0
// ------------------------------------------------------------
-#include <SDL.h>
-#include "SDLptc.h"
+//#include <SDL.h>
#include "tom.h"
+#include "video.h"
#include "gpu.h"
#include "objectp.h"
#include "cry2rgb.h"
+#include "settings.h"
// TOM registers (offset from $F00000)
#define MEMCON1 0x00
#define MEMCON2 0x02
#define HC 0x04
+#define VC 0x06
#define VMODE 0x28
#define MODE 0x0006 // Line buffer to video generator mode
#define BGEN 0x0080 // Background enable (CRY & RGB16 only)
-#define VARMOD 0x0100 // Mixed CRY/RGB16 mode
-#define PWIDTH 0x0E00 // Pixel width in video clock cycles
+#define VARMOD 0x0100 // Mixed CRY/RGB16 mode (only works in MODE 0!)
+#define PWIDTH 0x0E00 // Pixel width in video clock cycles (value written + 1)
+#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 HBE 0x32
#define VS 0x44
#define VDB 0x46
#define VDE 0x48
+#define VI 0x4E
#define BG 0x58
+#define INT1 0xE0
+
+//NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!!
+
+// Arbitrary video cutoff values (i.e., first/last visible spots on a TV, in HC ticks)
+/*#define LEFT_VISIBLE_HC 208
+#define RIGHT_VISIBLE_HC 1528//*/
+#define LEFT_VISIBLE_HC 208
+#define RIGHT_VISIBLE_HC 1488
+//#define TOP_VISIBLE_VC 25
+//#define BOTTOM_VISIBLE_VC 503
+#define TOP_VISIBLE_VC 31
+#define BOTTOM_VISIBLE_VC 511
+
+//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 TOP_VISIBLE_VC_PAL 67
+#define BOTTOM_VISIBLE_VC_PAL 579
//This can be defined in the makefile as well...
-//(It's easier to do it here...)
+//(It's easier to do it here, though...)
//#define TOM_DEBUG
-extern uint32 jaguar_mainRom_crc32;
-extern Console console;
-extern Surface * surface;
extern uint8 objectp_running;
static uint8 * tom_ram_8;
static uint32 tom_timer_prescaler;
static uint32 tom_timer_divider;
static int32 tom_timer_counter;
-uint32 tom_scanline;
-uint32 hblankWidthInPixels = 0;
-uint16 tom_puck_int_pending;
-uint16 tom_timer_int_pending;
-uint16 tom_object_int_pending;
-uint16 tom_gpu_int_pending;
-uint16 tom_video_int_pending;
+//uint32 tom_scanline;
+//uint32 hblankWidthInPixels = 0;
+uint16 tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending,
+ tom_gpu_int_pending, tom_video_int_pending;
uint16 * tom_cry_rgb_mix_lut;
+int16 * TOMBackbuffer;
static 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" };
+ { "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)(int16 *);
tom_render_16bpp_cry_rgb_mix_scanline,
tom_render_24bpp_scanline,
tom_render_16bpp_direct_scanline,
- tom_render_16bpp_rgb_scanline,
+ tom_render_16bpp_rgb_scanline
};
render_xxx_scanline_fn * scanline_render_stretch[]=
render_xxx_scanline_fn * scanline_render[8];
+// Screen info for various games [PAL]...
+/*
+BIOS
+TOM: Horizontal Period written by M68K: 850 (+1*2 = 1702)
+TOM: Horizontal Blank Begin written by M68K: 1711
+TOM: Horizontal Blank End written by M68K: 158
+TOM: Horizontal Display End written by M68K: 1696
+TOM: Horizontal Display Begin 1 written by M68K: 166
+TOM: Vertical Period written by M68K: 623 (non-interlaced)
+TOM: Vertical Blank End written by M68K: 34
+TOM: Vertical Display Begin written by M68K: 46
+TOM: Vertical Display End written by M68K: 526
+TOM: Vertical Blank Begin written by M68K: 600
+TOM: Vertical Sync written by M68K: 618
+TOM: Horizontal Display End written by M68K: 1665
+TOM: Horizontal Display Begin 1 written by M68K: 203
+TOM: Vertical Display Begin written by M68K: 38
+TOM: Vertical Display End written by M68K: 518
+TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 151)
+TOM: Horizontal Display End written by M68K: 1713
+TOM: Horizontal Display Begin 1 written by M68K: 157
+TOM: Vertical Display Begin written by M68K: 35
+TOM: Vertical Display End written by M68K: 2047
+Horizontal range: 157 - 1713 (width: 1557 / 4 = 389.25, / 5 = 315.4)
+
+Asteroid
+TOM: Horizontal Period written by M68K: 845 (+1*2 = 1692)
+TOM: Horizontal Blank Begin written by M68K: 1700
+TOM: Horizontal Blank End written by M68K: 122
+TOM: Horizontal Display End written by M68K: 1600
+TOM: Horizontal Display Begin 1 written by M68K: 268
+TOM: Vertical Period written by M68K: 523 (non-interlaced)
+TOM: Vertical Blank End written by M68K: 40
+TOM: Vertical Display Begin written by M68K: 44
+TOM: Vertical Display End written by M68K: 492
+TOM: Vertical Blank Begin written by M68K: 532
+TOM: Vertical Sync written by M68K: 513
+TOM: Video Mode written by M68K: 04C7. PWIDTH = 3, MODE = 16 BPP RGB, flags: BGEN (VC = 461)
+
+Rayman
+TOM: Horizontal Display End written by M68K: 1713
+TOM: Horizontal Display Begin 1 written by M68K: 157
+TOM: Vertical Display Begin written by M68K: 35
+TOM: Vertical Display End written by M68K: 2047
+TOM: Video Mode written by M68K: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 89)
+TOM: Horizontal Display Begin 1 written by M68K: 208
+TOM: Horizontal Display End written by M68K: 1662
+TOM: Vertical Display Begin written by M68K: 100
+TOM: Vertical Display End written by M68K: 2047
+TOM: Video Mode written by M68K: 07C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN VARMOD (VC = 205)
+Horizontal range: 208 - 1662 (width: 1455 / 4 = 363.5)
+
+Alien vs Predator
+TOM: Vertical Display Begin written by M68K: 96
+TOM: Vertical Display End written by M68K: 2047
+TOM: Horizontal Display Begin 1 written by M68K: 239
+TOM: Horizontal Display End written by M68K: 1692
+TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 378)
+TOM: Vertical Display Begin written by M68K: 44
+TOM: Vertical Display End written by M68K: 2047
+TOM: Horizontal Display Begin 1 written by M68K: 239
+TOM: Horizontal Display End written by M68K: 1692
+TOM: Video Mode written by M68K: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 559)
+TOM: Vertical Display Begin written by M68K: 84
+TOM: Vertical Display End written by M68K: 2047
+TOM: Horizontal Display Begin 1 written by M68K: 239
+TOM: Horizontal Display End written by M68K: 1692
+TOM: Vertical Display Begin written by M68K: 44
+TOM: Vertical Display End written by M68K: 2047
+TOM: Horizontal Display Begin 1 written by M68K: 239
+TOM: Horizontal Display End written by M68K: 1692
+Horizontal range: 239 - 1692 (width: 1454 / 4 = 363.5)
+
+*/
+
+// Screen info for various games [NTSC]...
+/*
+Doom
+TOM: Horizontal Display End written by M68K: 1727
+TOM: Horizontal Display Begin 1 written by M68K: 123
+TOM: Vertical Display Begin written by M68K: 25
+TOM: Vertical Display End written by M68K: 2047
+TOM: Video Mode written by M68K: 0EC1. PWIDTH = 8, MODE = 16 BPP CRY, flags: BGEN (VC = 5)
+Also does PWIDTH = 4...
+Vertical resolution: 238 lines
+
+Rayman
+TOM: Horizontal Display End written by M68K: 1727
+TOM: Horizontal Display Begin 1 written by M68K: 123
+TOM: Vertical Display Begin written by M68K: 25
+TOM: Vertical Display End written by M68K: 2047
+TOM: Vertical Interrupt written by M68K: 507
+TOM: Video Mode written by M68K: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 92)
+TOM: Horizontal Display Begin 1 written by M68K: 208
+TOM: Horizontal Display End written by M68K: 1670
+Display starts at 31, then 52!
+Vertical resolution: 238 lines
+
+Atari Karts
+TOM: Horizontal Display End written by M68K: 1727
+TOM: Horizontal Display Begin 1 written by M68K: 123
+TOM: Vertical Display Begin written by M68K: 25
+TOM: Vertical Display End written by M68K: 2047
+TOM: Video Mode written by GPU: 08C7. PWIDTH = 5, MODE = 16 BPP RGB, flags: BGEN (VC = 4)
+TOM: Video Mode written by GPU: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 508)
+Display starts at 31 (PWIDTH = 4), 24 (PWIDTH = 5)
+
+Iron Soldier
+TOM: Vertical Interrupt written by M68K: 2047
+TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 0)
+TOM: Horizontal Display End written by M68K: 1727
+TOM: Horizontal Display Begin 1 written by M68K: 123
+TOM: Vertical Display Begin written by M68K: 25
+TOM: Vertical Display End written by M68K: 2047
+TOM: Vertical Interrupt written by M68K: 507
+TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 369)
+TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 510)
+TOM: Video Mode written by M68K: 06C3. PWIDTH = 4, MODE = 24 BPP RGB, flags: BGEN (VC = 510)
+Display starts at 31
+Vertical resolution: 238 lines
+[Seems to be a problem between the horizontal positioning of the 16-bit CRY & 24-bit RGB]
+
+JagMania
+TOM: Horizontal Period written by M68K: 844 (+1*2 = 1690)
+TOM: Horizontal Blank Begin written by M68K: 1713
+TOM: Horizontal Blank End written by M68K: 125
+TOM: Horizontal Display End written by M68K: 1696
+TOM: Horizontal Display Begin 1 written by M68K: 166
+TOM: Vertical Period written by M68K: 523 (non-interlaced)
+TOM: Vertical Blank End written by M68K: 24
+TOM: Vertical Display Begin written by M68K: 46
+TOM: Vertical Display End written by M68K: 496
+TOM: Vertical Blank Begin written by M68K: 500
+TOM: Vertical Sync written by M68K: 517
+TOM: Vertical Interrupt written by M68K: 497
+TOM: Video Mode written by M68K: 04C1. PWIDTH = 3, MODE = 16 BPP CRY, flags: BGEN (VC = 270)
+Display starts at 55
+
+Double Dragon V
+TOM: Horizontal Display End written by M68K: 1727
+TOM: Horizontal Display Begin 1 written by M68K: 123
+TOM: Vertical Display Begin written by M68K: 25
+TOM: Vertical Display End written by M68K: 2047
+TOM: Vertical Interrupt written by M68K: 507
+TOM: Video Mode written by M68K: 06C7. PWIDTH = 4, MODE = 16 BPP RGB, flags: BGEN (VC = 9)
+
+Dino Dudes
+TOM: Horizontal Display End written by M68K: 1823
+TOM: Horizontal Display Begin 1 written by M68K: 45
+TOM: Vertical Display Begin written by M68K: 40
+TOM: Vertical Display End written by M68K: 2047
+TOM: Vertical Interrupt written by M68K: 491
+TOM: Video Mode written by M68K: 06C1. PWIDTH = 4, MODE = 16 BPP CRY, flags: BGEN (VC = 398)
+Display starts at 11 (123 - 45 = 78, 78 / 4 = 19 pixels to skip)
+Width is 417, so maybe width of 379 would be good (starting at 123, ending at 1639)
+Vertical resolution: 238 lines
+
+Flashback
+TOM: Horizontal Display End written by M68K: 1727
+TOM: Horizontal Display Begin 1 written by M68K: 188
+TOM: Vertical Display Begin written by M68K: 1
+TOM: Vertical Display End written by M68K: 2047
+TOM: Vertical Interrupt written by M68K: 483
+TOM: Video Mode written by M68K: 08C7. PWIDTH = 5, MODE = 16 BPP RGB, flags: BGEN (VC = 99)
+Width would be 303 with above scheme, but border width would be 13 pixels
+
+Trevor McFur
+Vertical resolution: 238 lines
+*/
+
+
void tom_calc_cry_rgb_mix_lut(void)
{
- memory_malloc_secure((void **)&tom_cry_rgb_mix_lut, 2 * 0x10000, "CRY/RGB mixed mode LUT");
-
for (uint32 i=0; i<0x10000; i++)
{
uint16 color = i;
blue = (((uint32)bluecv[chrm][chrl]) * y) >> 11;
color = (red << 10) | (green << 5) | blue;
}
+
tom_cry_rgb_mix_lut[i] = color;
}
}
-void tom_set_pending_puck_int(void)
+void tom_set_pending_jerry_int(void)
{
- tom_puck_int_pending = 1;
+ tom_jerry_int_pending = 1;
}
void tom_set_pending_timer_int(void)
return ((vmode & VARMOD) >> 6) | ((vmode & MODE) >> 1);
}
-uint16 tom_get_scanline(void)
-{
- return tom_scanline;
-}
-
-/*uint16 tom_get_hdb(void)
-{
- return GET16(tom_ram_8, HDB);
-}*/
-
+//Used in only one place (and for debug purposes): OBJECTP.CPP
uint16 tom_get_vdb(void)
{
- return GET16(tom_ram_8, VBE);
+// This in NOT VDB!!!
+// return GET16(tom_ram_8, VBE);
+ return GET16(tom_ram_8, VDB);
}
//
uint16 width = tom_width;
uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ // Get start position in HC ticks
+ int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);
+ startPos /= pwidth;
+ if (startPos < 0)
+ 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...
+ backbuffer += 2 * startPos, width -= startPos;
+
while (width)
{
uint16 color = (*current_line_buffer++) << 8;
uint16 width = tom_width;
uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);// Get start position in HC ticks
+ startPos /= pwidth;
+ if (startPos < 0)
+ current_line_buffer += 2 * -startPos;
+ else
+ backbuffer += 2 * startPos, width -= startPos;
+
while (width)
{
uint16 color = (*current_line_buffer++) << 8;
uint16 width = tom_width;
uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks
+ startPos /= pwidth;
+ if (startPos < 0)
+ current_line_buffer += 4 * -startPos;
+ else
+ backbuffer += 2 * startPos, width -= startPos;
+
while (width)
{
+ // This is NOT a good 8 -> 5 bit RGB conversion! (It saturates values below 8
+ // to zero and throws away almost *half* the color resolution!)
uint16 green = (*current_line_buffer++) >> 3;
uint16 red = (*current_line_buffer++) >> 3;
current_line_buffer++;
}
}
+//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
//
uint16 width = tom_width;
uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tom_ram_8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks
+ startPos /= pwidth;
+ if (startPos < 0)
+ current_line_buffer += 2 * -startPos;
+ else
+ backbuffer += 2 * startPos, width -= startPos;
+
while (width)
{
uint16 color = (*current_line_buffer++) << 8;
}
}
+void TOMResetBackbuffer(int16 * backbuffer)
+{
+ TOMBackbuffer = backbuffer;
+}
+
//
// Process a single scanline
//
-void tom_exec_scanline(int16 * backbuffer, int32 scanline, bool render)
+void TOMExecScanline(uint16 scanline, bool render)
{
- tom_scanline = scanline;
+ bool inActiveDisplayArea = true;
- // Increment the horizontal count (why?)
- SET16(tom_ram_8, HC, GET16(tom_ram_8, HC) + 1);
+//Interlacing is still not handled correctly here... !!! FIX !!!
+ if (scanline & 0x01) // Execute OP only on even lines (non-interlaced only!)
+ return;
- if (render)
+ if (scanline >= (uint16)GET16(tom_ram_8, VDB) && scanline < (uint16)GET16(tom_ram_8, VDE))
{
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
- uint8 bgHI = tom_ram_8[BG], bgLO = tom_ram_8[BG+1];
+ if (render)
+ {
+ uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+ uint8 bgHI = tom_ram_8[BG], bgLO = tom_ram_8[BG + 1];
- // Clear line buffer with BG
- if (GET16(tom_ram_8, VMODE) & BGEN) // && (CRY or RGB16)...
- for(uint32 i=0; i<tom_real_internal_width; i++)
- *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO;
+ // Clear line buffer with BG
+ if (GET16(tom_ram_8, VMODE) & BGEN) // && (CRY or RGB16)...
+ for(uint32 i=0; i<720; i++)
+ *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO;
-// op_process_list(backbuffer, scanline, render);
- OPProcessList(scanline, render);
-
- scanline_render[tom_getVideoMode()](backbuffer);
+ OPProcessList(scanline, render);
+ }
+ }
+ else
+ inActiveDisplayArea = false;
+
+//Try to take PAL into account...
+uint16 topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL),
+ bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL);
+ // Here's our virtualized scanline code...
+ if (scanline >= topVisible && scanline < bottomVisible)
+ {
+ if (inActiveDisplayArea)
+ scanline_render[tom_getVideoMode()](TOMBackbuffer);
+ else
+ {
+ // If outside of VDB & VDE, then display the border color
+ int16 * currentLineBuffer = TOMBackbuffer;
+ uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1];
+ uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3);
+
+ for(uint32 i=0; i<tom_width; i++)
+ *currentLineBuffer++ = pixel;
+ }
+
+ TOMBackbuffer += GetSDLScreenPitch() / 2; // Returns bytes, but we need words
}
}
//
void tom_init(void)
{
+ memory_malloc_secure((void **)&tom_cry_rgb_mix_lut, 2 * 0x10000, "CRY/RGB mixed mode LUT");
+
op_init();
blitter_init();
- pcm_init();
+//This should be done by JERRY! pcm_init();
memory_malloc_secure((void **)&tom_ram_8, 0x4000, "TOM RAM");
tom_reset();
// Setup the non-stretchy scanline rendering...
void tom_done(void)
{
op_done();
- pcm_done();
+//This should be done by JERRY! pcm_done();
blitter_done();
WriteLog("TOM: Resolution %i x %i %s\n", tom_getVideoModeWidth(), tom_getVideoModeHeight(),
videoMode_to_str[tom_getVideoMode()]);
// WriteLog("\ntom: object processor:\n");
// WriteLog("tom: pointer to object list: 0x%.8x\n",op_get_list_pointer());
-// WriteLog("tom: INT1=0x%.2x%.2x\n",tom_byte_read(0xf000e0),tom_byte_read(0xf000e1));
- gpu_done();
- dsp_done();
+// WriteLog("tom: INT1=0x%.2x%.2x\n",TOMReadByte(0xf000e0),TOMReadByte(0xf000e1));
+// gpu_done();
+// dsp_done();
memory_free(tom_ram_8);
+ memory_free(tom_cry_rgb_mix_lut);
}
-uint32 tom_getHBlankWidthInPixels(void)
+/*uint32 tom_getHBlankWidthInPixels(void)
{
return hblankWidthInPixels;
-}
+}*/
uint32 tom_getVideoModeWidth(void)
{
-// static uint16 onetime = 1;
-
- uint16 vmode = GET16(tom_ram_8, VMODE);
- uint16 hdb1 = GET16(tom_ram_8, HDB1);
-// uint16 hde = GET16(tom_ram_8, HDE);
-// uint16 hbb = GET16(tom_ram_8, HBB);
-// uint16 hbe = GET16(tom_ram_8, HBE);
-
- int clock_cycles_per_pixel = (vmode & PWIDTH) >> 9;
-
- uint32 width = 640;
- switch (clock_cycles_per_pixel)
- {
- case 0: width = 640; break;
- case 1: width = 640; break;
- case 2: width = 448; break;
- case 3: width = 320; break;
- case 4: width = 256; break;
- case 5: width = 256; break;
- case 6: width = 256; break;
- case 7: width = 320; break;
-// default: WriteLog("%i \n",clock_cycles_per_pixel);
- }
-
-/* if (jaguar_mainRom_crc32 == 0x3c7bfda8) // Kludge for what???
- {
- if (width == 320)
- width += 80;
- if (width == 448)
- width -= 16;
- }//*/
-
- if (hdb1 == 123)
- hblankWidthInPixels = 16;
- else
- hblankWidthInPixels = 0;
-
-// WriteLog("hdb1=%i hbe=%i\n",hdb1,hbe);
- return width;
+ //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 };
+//Temporary, for testing Doom...
+// uint32 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)
+ // PWIDTH = 2 -> 0.50:1 (1:2) pixels
+ // PWIDTH = 3 -> 0.75:1 (3:4) pixels
+ // PWIDTH = 4 -> 1.00:1 (1:1) pixels
+ // PWIDTH = 5 -> 1.25:1 (5:4) pixels
+ // PWIDTH = 6 -> 1.50:1 (3:2) pixels
+ // PWIDTH = 7 -> 1.75:1 (7:4) pixels
+ // PWIDTH = 8 -> 2.00:1 (2:1) pixels
+
+ // Also note that the JTRM says that PWIDTH of 4 gives pixels that are "about" square--
+ // this implies that the other modes have pixels that are *not* square!
+ // Also, I seriously doubt that you will see any games that use PWIDTH = 1!
+
+ // NOTE: Even though the PWIDTH value is + 1, here we're using a zero-based index and
+ // so we don't bother to add one...
+// return width[(GET16(tom_ram_8, VMODE) & PWIDTH) >> 9];
+
+ // Now, we just calculate it...
+/* uint16 hdb1 = GET16(tom_ram_8, HDB1), hde = GET16(tom_ram_8, HDE),
+ hbb = GET16(tom_ram_8, HBB), pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+// return ((hbb < hde ? hbb : hde) - hdb1) / pwidth;
+//Temporary, for testing Doom...
+ return ((hbb < hde ? hbb : hde) - hdb1) / (pwidth == 8 ? 4 : pwidth);*/
+
+ // To make it easier to make a quasi-fixed display size, we restrict the viewing
+ // area to an arbitrary range of the Horizontal Count.
+ uint16 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ 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);
+//// return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 4 ? 8 : pwidth);
+
+// More speculating...
+// According to the JTRM, the number of potential pixels across is given by the
+// Horizontal Period (HP - in NTSC this is 845). The Horizontal Count counts from
+// zero to this value twice per scanline (the high bit is set on the second count).
+// HBE and HBB define the absolute "black" limits of the screen, while HDB1/2 and
+// HDE determine the extent of the OP "on" time. I.e., when the OP is turned on by
+// HDB1, it starts fetching the line from position 0 in LBUF.
+
+// The trick, it would seem, is to figure out how long the typical visible scanline
+// of a TV is in HP ticks and limit the visible area to that (divided by PWIDTH, of
+// course). Using that length, we can establish an "absolute left display limit" with
+// which to measure HBB & HDB1/2 against when rendering LBUF (i.e., if HDB1 is 20 ticks
+// to the right of the ALDL and PWIDTH is 4, then start writing the LBUF starting at
+// backbuffer + 5 pixels).
+
+// 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...
+// Same with the width... [Width is pretty much virtualized now.]
+// Now that that the width is virtualized, let's virtualize the height. :-)
uint32 tom_getVideoModeHeight(void)
{
// uint16 vmode = GET16(tom_ram_8, VMODE);
// uint16 vbe = GET16(tom_ram_8, VBE);
// uint16 vbb = GET16(tom_ram_8, VBB);
- uint16 vdb = GET16(tom_ram_8, VDB);
- uint16 vde = GET16(tom_ram_8, VDE);
- uint16 vp = GET16(tom_ram_8, VP);
+// uint16 vdb = GET16(tom_ram_8, VDB);
+// uint16 vde = GET16(tom_ram_8, VDE);
+// uint16 vp = GET16(tom_ram_8, VP);
/* if (vde == 0xFFFF)
vde = vbb;//*/
// VC counts from 0 to VP. VDB starts the OP. Either when
// VDE is reached or VP, the OP is stopped. Let's try it...
// Also note that we're conveniently ignoring interlaced display modes...!
- return ((vde > vp ? vp : vde) - vdb) >> 1;
+// return ((vde > vp ? vp : vde) - vdb) >> 1;
+// return ((vde > vbb ? vbb : vde) - vdb) >> 1;
+//Let's try from the Vertical Blank interval...
+//Seems to work OK!
+// return (vbb - vbe) >> 1; // Again, doesn't take interlacing into account...
+// This of course doesn't take interlacing into account. But I haven't seen any
+// Jaguar software that takes advantage of it either...
+//Also, doesn't reflect PAL Jaguar either... !!! FIX !!! [DONE]
+// return 240; // Set virtual screen height to 240 lines...
+ return (vjs.hardwareTypeNTSC ? 240 : 256);
}
//
// TOM reset code
-// NOTE: Should set up PAL values here when in PAL mode (use BIOS to find default values)
-// for when user starts with -nobios -pal flags...
+// Now PAL friendly!
//
void tom_reset(void)
{
op_reset();
blitter_reset();
- pcm_reset();
+//This should be done by JERRY! pcm_reset();
memset(tom_ram_8, 0x00, 0x4000);
- SET16(tom_ram_8, MEMCON1, 0x1861);
- SET16(tom_ram_8, MEMCON2, 0x0000);
- SET16(tom_ram_8, VMODE, 0x06C1);
- SET16(tom_ram_8, VP, 523);
- SET16(tom_ram_8, HP, 844);
- SET16(tom_ram_8, VS, 523 - 6);
- SET16(tom_ram_8, VBB, 434);
- SET16(tom_ram_8, VBE, 24);
- SET16(tom_ram_8, HBB, 689 + 0x400);
- SET16(tom_ram_8, HBE, 125);
-
- SET16(tom_ram_8, VDE, 2047);//65535);
- SET16(tom_ram_8, VDB, 28);
- SET16(tom_ram_8, HDB1, 166);
- SET16(tom_ram_8, HDE, 2047);//65535);
+
+ if (vjs.hardwareTypeNTSC)
+ {
+ SET16(tom_ram_8, MEMCON1, 0x1861);
+ SET16(tom_ram_8, MEMCON2, 0x35CC);
+ SET16(tom_ram_8, HP, 844); // Horizontal Period (1-based; HP=845)
+ SET16(tom_ram_8, HBB, 1713); // Horizontal Blank Begin
+ SET16(tom_ram_8, HBE, 125); // Horizontal Blank End
+ SET16(tom_ram_8, HDE, 1665); // Horizontal Display End
+ SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1
+ SET16(tom_ram_8, VP, 523); // Vertical Period (1-based; in this case VP = 524)
+ SET16(tom_ram_8, VBE, 24); // Vertical Blank End
+ SET16(tom_ram_8, VDB, 38); // Vertical Display Begin
+ SET16(tom_ram_8, VDE, 518); // Vertical Display End
+ SET16(tom_ram_8, VBB, 500); // Vertical Blank Begin
+ SET16(tom_ram_8, VS, 517); // Vertical Sync
+ SET16(tom_ram_8, VMODE, 0x06C1);
+ }
+ else // PAL Jaguar
+ {
+ SET16(tom_ram_8, MEMCON1, 0x1861);
+ SET16(tom_ram_8, MEMCON2, 0x35CC);
+ SET16(tom_ram_8, HP, 850); // Horizontal Period
+ SET16(tom_ram_8, HBB, 1711); // Horizontal Blank Begin
+ SET16(tom_ram_8, HBE, 158); // Horizontal Blank End
+ SET16(tom_ram_8, HDE, 1665); // Horizontal Display End
+ SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1
+ SET16(tom_ram_8, VP, 623); // Vertical Period (1-based; in this case VP = 624)
+ SET16(tom_ram_8, VBE, 34); // Vertical Blank End
+ SET16(tom_ram_8, VDB, 38); // Vertical Display Begin
+ SET16(tom_ram_8, VDE, 518); // Vertical Display End
+ SET16(tom_ram_8, VBB, 600); // Vertical Blank Begin
+ SET16(tom_ram_8, VS, 618); // Vertical Sync
+ SET16(tom_ram_8, VMODE, 0x06C1);
+ }
tom_width = tom_real_internal_width = 0;
tom_height = 0;
- tom_scanline = 0;
-
- hblankWidthInPixels = GET16(tom_ram_8, HDB1) >> 1;
- tom_puck_int_pending = 0;
+ tom_jerry_int_pending = 0;
tom_timer_int_pending = 0;
tom_object_int_pending = 0;
tom_gpu_int_pending = 0;
tom_video_int_pending = 0;
- tom_timer_prescaler = 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));
-}
+}
//
// TOM byte access (read)
//
-
-unsigned tom_byte_read(unsigned int offset)
+uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/)
{
//???Is this needed???
// It seems so. Perhaps it's the +$8000 offset being written to (32-bit interface)?
// However, the 32-bit interface is WRITE ONLY, so that can't be it...
// Also, the 68K CANNOT make use of the 32-bit interface, since its bus width is only 16-bits...
- offset &= 0xFF3FFF;
+// offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
WriteLog("TOM: Reading byte at %06X\n", offset);
#endif
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
- return gpu_byte_read(offset);
+ return GPUReadByte(offset, who);
else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
- return gpu_byte_read(offset);
+ return GPUReadByte(offset, who);
else if ((offset >= 0xF00010) && (offset < 0xF00028))
- return op_byte_read(offset);
+ return OPReadByte(offset, who);
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
- return blitter_byte_read(offset);
+ return BlitterReadByte(offset, who);
else if (offset == 0xF00050)
return tom_timer_prescaler >> 8;
else if (offset == 0xF00051)
//
// TOM word access (read)
//
-
-unsigned tom_word_read(unsigned int offset)
+uint16 TOMReadWord(uint32 offset, uint32 who/*=UNKNOWN*/)
{
//???Is this needed???
- offset &= 0xFF3FFF;
+// offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
WriteLog("TOM: Reading word at %06X\n", offset);
#endif
+if (offset >= 0xF02000 && offset <= 0xF020FF)
+ WriteLog("TOM: Read attempted from GPU register file by %s (unimplemented)!\n", whoName[who]);
+
if (offset == 0xF000E0)
{
- uint16 data = (tom_puck_int_pending << 4) | (tom_timer_int_pending << 3)
+ uint16 data = (tom_jerry_int_pending << 4) | (tom_timer_int_pending << 3)
| (tom_object_int_pending << 2) | (tom_gpu_int_pending << 1)
| (tom_video_int_pending << 0);
//WriteLog("tom: interrupt status is 0x%.4x \n",data);
return data;
}
- else if (offset == 0xF00006) // VC
+//Shoud be handled by the jaguar main loop now... And it is! ;-)
+/* else if (offset == 0xF00006) // VC
// What if we're in interlaced mode?
// According to docs, in non-interlace mode VC is ALWAYS even...
// return (tom_scanline << 1);// + 1;
//But it's causing Rayman to be fucked up... Why???
- return (tom_scanline << 1) + 1;
+//Because VC is even in NI mode when calling the OP! That's why!
+ return (tom_scanline << 1) + 1;//*/
else if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
- return gpu_word_read(offset);
+ return GPUReadWord(offset, who);
else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
- return gpu_word_read(offset);
+ return GPUReadWord(offset, who);
else if ((offset >= 0xF00010) && (offset < 0xF00028))
- return op_word_read(offset);
+ return OPReadWord(offset, who);
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
- return blitter_word_read(offset);
+ return BlitterReadWord(offset, who);
else if (offset == 0xF00050)
return tom_timer_prescaler;
else if (offset == 0xF00052)
return tom_timer_divider;
offset &= 0x3FFF;
- return (tom_byte_read(offset) << 8) | tom_byte_read(offset+1);
+ return (TOMReadByte(offset, who) << 8) | TOMReadByte(offset + 1, who);
}
//
// TOM byte access (write)
//
-
-void tom_byte_write(unsigned offset, unsigned data)
+void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/)
{
//???Is this needed???
// Perhaps on the writes--32-bit writes that is! And masked with FF7FFF...
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
{
- gpu_byte_write(offset, data);
+ GPUWriteByte(offset, data, who);
return;
}
else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
{
- gpu_byte_write(offset, data);
+ GPUWriteByte(offset, data, who);
return;
}
else if ((offset >= 0xF00010) && (offset < 0xF00028))
{
- op_byte_write(offset, data);
+ OPWriteByte(offset, data, who);
return;
}
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
{
- blitter_byte_write(offset, data);
+ BlitterWriteByte(offset, data, who);
return;
}
else if (offset == 0xF00050)
{
tom_timer_prescaler = (tom_timer_prescaler & 0x00FF) | (data << 8);
- tom_reset_timer();
+ TOMResetPIT();
return;
}
else if (offset == 0xF00051)
{
tom_timer_prescaler = (tom_timer_prescaler & 0xFF00) | data;
- tom_reset_timer();
+ TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
tom_timer_divider = (tom_timer_divider & 0x00FF) | (data << 8);
- tom_reset_timer();
+ TOMResetPIT();
return;
}
else if (offset == 0xF00053)
{
tom_timer_divider = (tom_timer_divider & 0xFF00) | data;
- tom_reset_timer();
+ TOMResetPIT();
return;
}
else if (offset >= 0xF00400 && offset <= 0xF007FF) // CLUT (A & B)
//
// TOM word access (write)
//
-
-void tom_word_write(unsigned offset, unsigned data)
+void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
{
//???Is this needed???
offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
WriteLog("TOM: Writing word %04X at %06X\n", 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);
+if (offset >= 0xF02000 && offset <= 0xF020FF)
+ WriteLog("TOM: Write attempted to GPU register file by %s (unimplemented)!\n", whoName[who]);
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
{
- gpu_word_write(offset, data);
+ GPUWriteWord(offset, data, who);
return;
}
else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
{
- gpu_word_write(offset, data);
+ GPUWriteWord(offset, data, who);
return;
}
- else if ((offset >= 0xF00000) && (offset < 0xF00002))
+//What's so special about this?
+/* else if ((offset >= 0xF00000) && (offset < 0xF00002))
{
- tom_byte_write(offset, data >> 8);
- tom_byte_write(offset+1, data & 0xFF);
- }
+ TOMWriteByte(offset, data >> 8);
+ TOMWriteByte(offset+1, data & 0xFF);
+ }*/
else if ((offset >= 0xF00010) && (offset < 0xF00028))
{
- op_word_write(offset, data);
+ OPWriteWord(offset, data, who);
return;
}
else if (offset == 0xF00050)
{
tom_timer_prescaler = data;
- tom_reset_timer();
+ TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
tom_timer_divider = data;
- tom_reset_timer();
+ TOMResetPIT();
return;
}
else if (offset == 0xF000E0)
{
+//Check this out...
if (data & 0x0100)
tom_video_int_pending = 0;
if (data & 0x0200)
if (data & 0x0800)
tom_timer_int_pending = 0;
if (data & 0x1000)
- tom_puck_int_pending = 0;
+ tom_jerry_int_pending = 0;
}
else if ((offset >= 0xF02200) && (offset <= 0xF0229F))
{
- blitter_word_write(offset, data);
+ BlitterWriteWord(offset, data, who);
return;
}
else if (offset >= 0xF00400 && offset <= 0xF007FE) // CLUT (A & B)
if (offset == 0x2E || offset == 0x36 || offset == 0x54)
data &= 0x03FF; // These are all 10-bit registers
- tom_byte_write(offset, data >> 8);
- tom_byte_write(offset+1, data & 0xFF);
+ TOMWriteByte(offset, data >> 8, who);
+ TOMWriteByte(offset+1, data & 0xFF, who);
- // detect screen resolution changes
- if ((offset >= 0x28) && (offset <= 0x4F))
- {
if (offset == VDB)
- WriteLog("TOM: Vertical Display Begin written: %04X\n", data);
+ WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data);
if (offset == VDE)
- WriteLog("TOM: Vertical Display End written: %04X\n", data);
+ WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data);
if (offset == VP)
- WriteLog("TOM: Vertical Period written: %04X (%sinterlaced)\n", data, (data & 0x01 ? "non-" : ""));
+ WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : ""));
if (offset == HDB1)
- WriteLog("TOM: Horizontal Display Begin 1 written: %04X\n", data);
+ WriteLog("TOM: Horizontal Display Begin 1 written by %s: %u\n", whoName[who], data);
if (offset == HDE)
- WriteLog("TOM: Horizontal Display End written: %04X\n", data);
+ WriteLog("TOM: Horizontal Display End written by %s: %u\n", whoName[who], data);
if (offset == HP)
- WriteLog("TOM: Horizontal Period written: %04X\n", data);
+ WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2);
+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 == 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: %04X\n", data);
+ WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tom_ram_8, VC));
+ // detect screen resolution changes
+//This may go away in the future, if we do the virtualized screen thing...
+//This may go away soon!
+ if ((offset >= 0x28) && (offset <= 0x4F))
+ {
uint32 width = tom_getVideoModeWidth(), height = tom_getVideoModeHeight();
tom_real_internal_width = width;
- if (width == 640)
- {
- memcpy(scanline_render, scanline_render_stretch, sizeof(scanline_render));
- width = 320;
- }
- else
- memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
-
if ((width != tom_width) || (height != tom_height))
{
- ws_audio_done();
-
- static char window_title[256];
- delete surface;
-
tom_width = width, tom_height = height;
- Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
- surface = new Surface(tom_width, tom_height, format);
- console.close();
- sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)tom_width, (int)tom_height);
- console.open(window_title, width, tom_height, format);
-
- ws_audio_init();
- ws_audio_reset();
+ ResizeScreen(tom_width, tom_height);
}
}
}
int tom_irq_enabled(int irq)
{
- return jaguar_byte_read(0xF000E1) & (1 << irq);
+ // This is the correct byte in big endian... D'oh!
+// return jaguar_byte_read(0xF000E1) & (1 << irq);
+ return tom_ram_8[INT1 + 1/*0xE1*/] & (1 << irq);
}
-void tom_set_irq_latch(int irq, int enabled)
+//unused
+/*void tom_set_irq_latch(int irq, int enabled)
{
tom_ram_8[0xE0] = (tom_ram_8[0xE0] & (~(1<<irq))) | (enabled ? (1<<irq) : 0);
-}
+}*/
-uint16 tom_irq_control_reg(void)
+//unused
+/*uint16 tom_irq_control_reg(void)
{
return (tom_ram_8[0xE0] << 8) | tom_ram_8[0xE1];
-}
+}*/
-void tom_reset_timer(void)
+void TOMResetPIT(void)
{
- if ((!tom_timer_prescaler) || (!tom_timer_divider))
- tom_timer_counter = 0;
- else
- tom_timer_counter = (1 + tom_timer_prescaler) * (1 + tom_timer_divider);
+//Probably should *add* this amount to the counter to retain cycle accuracy! !!! FIX !!! [DONE]
+//Also, why +1??? 'Cause that's what it says in the JTRM...!
+//There is a small problem with this approach: If both the prescaler and the divider are equal
+//to $FFFF then the counter won't be large enough to handle it. !!! FIX !!!
+ if (tom_timer_prescaler)
+ tom_timer_counter += (1 + tom_timer_prescaler) * (1 + tom_timer_divider);
// WriteLog("tom: reseting timer to 0x%.8x (%i)\n",tom_timer_counter,tom_timer_counter);
}
-void tom_pit_exec(uint32 cycles)
+//
+// TOM Programmable Interrupt Timer handler
+// NOTE: TOM's PIT is only enabled if the prescaler is != 0
+//
+void TOMExecPIT(uint32 cycles)
{
- if (tom_timer_counter > 0)
+ if (tom_timer_prescaler)
{
tom_timer_counter -= cycles;
if (tom_timer_counter <= 0)
{
tom_set_pending_timer_int();
- gpu_set_irq_line(2, 1);
- if ((tom_irq_enabled(IRQ_TIMER)) && (jaguar_interrupt_handler_is_valid(64)))
- m68k_set_irq(7); // Cause a 68000 NMI...
+ GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // GPUSetIRQLine does the 'IRQ enabled' checking
+ if (tom_irq_enabled(IRQ_TIMER))//get rid of this crap -> && jaguar_interrupt_handler_is_valid(64))
+ m68k_set_irq(7); // Cause a 68000 NMI...
- tom_reset_timer();
+ TOMResetPIT();
}
}
}
projects / virtualjaguar / blobdiff