//
// TOM Processing
//
-// by cal2
+// Originally by David Raingeard (cal2)
// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups and endian wrongness amelioration by James L. Hammons
+// Cleanups and endian wrongness amelioration by James Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James Hammons <jlhamm@acm.org>
+//
+// Who When What
+// --- ---------- -------------------------------------------------------------
+// JLH 01/16/2010 Created this log ;-)
+// JLH 01/20/2011 Change rendering to RGBA, removed unnecessary code
+//
// Note: Endian wrongness probably stems from the MAME origins of this emu and
-// the braindead way in which MAME handles memory. :-)
+// the braindead way in which MAME used to handle memory. :-}
//
// Note: TOM has only a 16K memory space
//
// F02298 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z0 - Z0
// ------------------------------------------------------------
-//#include <SDL.h>
#include "tom.h"
-#include "video.h"
-#include "gpu.h"
-#include "objectp.h"
+
+#include <string.h> // For memset()
+#include <stdlib.h> // For rand()
+#include "blitter.h"
#include "cry2rgb.h"
+#include "event.h"
+#include "gpu.h"
+#include "jaguar.h"
+#include "log.h"
+#include "m68000/m68kinterface.h"
+//#include "memory.h"
+#include "op.h"
#include "settings.h"
+#define NEW_TIMER_SYSTEM
+
// TOM registers (offset from $F00000)
#define MEMCON1 0x00
#define MEMCON2 0x02
#define HC 0x04
#define VC 0x06
+#define OLP 0x20 // Object list pointer
+#define OBF 0x26 // Object processor flag
#define VMODE 0x28
#define MODE 0x0006 // Line buffer to video generator mode
#define BGEN 0x0080 // Background enable (CRY & RGB16 only)
#define BORD1 0x2A // Border green/red values (8 BPP)
#define BORD2 0x2C // Border blue value (8 BPP)
#define HP 0x2E // Values range from 1 - 1024 (value written + 1)
-#define HBB 0x30
+#define HBB 0x30 // Horizontal blank begin
#define HBE 0x32
-#define HDB1 0x38
+#define HS 0x34 // Horizontal sync
+#define HVS 0x36 // Horizontal vertical sync
+#define HDB1 0x38 // Horizontal display begin 1
#define HDB2 0x3A
#define HDE 0x3C
#define VP 0x3E // Value ranges from 1 - 2048 (value written + 1)
-#define VBB 0x40
+#define VBB 0x40 // Vertical blank begin
#define VBE 0x42
-#define VS 0x44
-#define VDB 0x46
+#define VS 0x44 // Vertical sync
+#define VDB 0x46 // Vertical display begin
#define VDE 0x48
-#define VI 0x4E
-#define BG 0x58
+#define VEB 0x4A // Vertical equalization begin
+#define VEE 0x4C // Vertical equalization end
+#define VI 0x4E // Vertical interrupt
+#define PIT0 0x50
+#define PIT1 0x52
+#define HEQ 0x54 // Horizontal equalization end
+#define BG 0x58 // Background color
#define INT1 0xE0
-//NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!!
+//NOTE: These arbitrary cutoffs are NOT taken into account for PAL jaguar screens. !!! FIX !!! [DONE]
// Arbitrary video cutoff values (i.e., first/last visible spots on a TV, in HC ticks)
-/*#define LEFT_VISIBLE_HC 208
-#define RIGHT_VISIBLE_HC 1528//*/
-#define LEFT_VISIBLE_HC 208
-#define RIGHT_VISIBLE_HC 1488
+// 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//*/
+// 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
-#define BOTTOM_VISIBLE_VC 511
+//#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 - 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
//This can be defined in the makefile as well...
//(It's easier to do it here, though...)
//#define TOM_DEBUG
-extern uint32 jaguar_mainRom_crc32;
-extern uint8 objectp_running;
-
-static uint8 * tom_ram_8;
-uint32 tom_width, tom_height, tom_real_internal_width;
-static uint32 tom_timer_prescaler;
-static uint32 tom_timer_divider;
-static int32 tom_timer_counter;
-//uint32 tom_scanline;
-//uint32 hblankWidthInPixels = 0;
-uint16 tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending,
+uint8_t tomRam8[0x4000];
+uint32_t tomWidth, tomHeight;
+uint32_t tomTimerPrescaler;
+uint32_t tomTimerDivider;
+int32_t tomTimerCounter;
+uint16_t tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending,
tom_gpu_int_pending, tom_video_int_pending;
-uint16 * tom_cry_rgb_mix_lut;
-int16 * TOMBackbuffer;
-static char * videoMode_to_str[8] =
+// These are set by the "user" of the Jaguar core lib, since these are
+// OS/system dependent.
+uint32_t * screenBuffer;
+uint32_t screenPitch;
+
+static const char * videoMode_to_str[8] =
{ "16 BPP CRY", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB",
"Mixed mode", "24 BPP RGB", "16 BPP DIRECT", "16 BPP RGB" };
-typedef void (render_xxx_scanline_fn)(int16 *);
+typedef void (render_xxx_scanline_fn)(uint32_t *);
// Private function prototypes
-void tom_render_16bpp_cry_scanline(int16 * backbuffer);
-void tom_render_24bpp_scanline(int16 * backbuffer);
-void tom_render_16bpp_direct_scanline(int16 * backbuffer);
-void tom_render_16bpp_rgb_scanline(int16 * backbuffer);
-void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer);
+void tom_render_16bpp_cry_scanline(uint32_t * backbuffer);
+void tom_render_24bpp_scanline(uint32_t * backbuffer);
+void tom_render_16bpp_direct_scanline(uint32_t * backbuffer);
+void tom_render_16bpp_rgb_scanline(uint32_t * backbuffer);
+void tom_render_16bpp_cry_rgb_mix_scanline(uint32_t * backbuffer);
-void tom_render_16bpp_cry_stretch_scanline(int16 * backbuffer);
-void tom_render_24bpp_stretch_scanline(int16 * backbuffer);
-void tom_render_16bpp_direct_stretch_scanline(int16 * backbuffer);
-void tom_render_16bpp_rgb_stretch_scanline(int16 * backbuffer);
-void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 * backbuffer);
-
-render_xxx_scanline_fn * scanline_render_normal[]=
+//render_xxx_scanline_fn * scanline_render_normal[] =
+render_xxx_scanline_fn * scanline_render[] =
{
tom_render_16bpp_cry_scanline,
tom_render_24bpp_scanline,
tom_render_16bpp_rgb_scanline
};
-render_xxx_scanline_fn * scanline_render_stretch[]=
-{
- tom_render_16bpp_cry_stretch_scanline,
- tom_render_24bpp_stretch_scanline,
- tom_render_16bpp_direct_stretch_scanline,
- tom_render_16bpp_rgb_stretch_scanline,
- tom_render_16bpp_cry_rgb_mix_stretch_scanline,
- tom_render_24bpp_stretch_scanline,
- tom_render_16bpp_direct_stretch_scanline,
- tom_render_16bpp_rgb_stretch_scanline,
-};
+// 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)
-render_xxx_scanline_fn * scanline_render[8];
+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]...
/*
Vertical resolution: 238 lines
*/
+uint32_t RGB16ToRGB32[0x10000];
+uint32_t CRY16ToRGB32[0x10000];
+uint32_t MIX16ToRGB32[0x10000];
-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++)
+#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_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 & 0x003F) << 18) // Green
+ | ((i & 0x07C0) << 5); // Blue
+
+ for(uint32_t i=0; i<0x10000; i++)
{
- uint16 color = i;
+ uint32_t cyan = (i & 0xF000) >> 12,
+ red = (i & 0x0F00) >> 8,
+ intensity = (i & 0x00FF);
- if (color & 0x01)
- {
- color >>= 1;
- color = (color & 0x007C00) | ((color & 0x00003E0) >> 5) | ((color & 0x0000001F) << 5);
- }
- else
- {
- uint32 chrm = (color & 0xF000) >> 12,
- chrl = (color & 0x0F00) >> 8,
- y = color & 0x00FF;
- uint16 red = (((uint32)redcv[chrm][chrl]) * y) >> 11,
- green = (((uint32)greencv[chrm][chrl]) * y) >> 11,
- blue = (((uint32)bluecv[chrm][chrl]) * y) >> 11;
- color = (red << 10) | (green << 5) | blue;
- }
- tom_cry_rgb_mix_lut[i] = color;
+ 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);
+ MIX16ToRGB32[i] = (i & 0x01 ? RGB16ToRGB32[i] : CRY16ToRGB32[i]);
}
}
-void tom_set_pending_jerry_int(void)
+
+void TOMSetPendingJERRYInt(void)
{
tom_jerry_int_pending = 1;
}
-void tom_set_pending_timer_int(void)
+
+void TOMSetPendingTimerInt(void)
{
tom_timer_int_pending = 1;
}
-void tom_set_pending_object_int(void)
+
+void TOMSetPendingObjectInt(void)
{
tom_object_int_pending = 1;
}
-void tom_set_pending_gpu_int(void)
+
+void TOMSetPendingGPUInt(void)
{
tom_gpu_int_pending = 1;
}
-void tom_set_pending_video_int(void)
+
+void TOMSetPendingVideoInt(void)
{
tom_video_int_pending = 1;
}
-uint8 * tom_get_ram_pointer(void)
+
+uint8_t * TOMGetRamPointer(void)
{
- return tom_ram_8;
+ return tomRam8;
}
-uint8 tom_getVideoMode(void)
+
+uint8_t TOMGetVideoMode(void)
{
- uint16 vmode = GET16(tom_ram_8, VMODE);
+ uint16_t vmode = GET16(tomRam8, VMODE);
return ((vmode & VARMOD) >> 6) | ((vmode & MODE) >> 1);
}
+
//Used in only one place (and for debug purposes): OBJECTP.CPP
-uint16 tom_get_vdb(void)
+#warning "Used in only one place (and for debug purposes): OBJECTP.CPP !!! FIX !!!"
+uint16_t TOMGetVDB(void)
{
-// This in NOT VDB!!!
-// return GET16(tom_ram_8, VBE);
- return GET16(tom_ram_8, VDB);
+ return GET16(tomRam8, VDB);
}
+
+#define LEFT_BG_FIX
//
// 16 BPP CRY/RGB mixed mode rendering
//
-void tom_render_16bpp_cry_rgb_mix_scanline(int16 * backbuffer)
+void tom_render_16bpp_cry_rgb_mix_scanline(uint32_t * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
-
+//CHANGED TO 32BPP RENDERING
+ uint16_t width = tomWidth;
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
+
//New stuff--restrict our drawing...
- uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
//NOTE: May have to check HDB2 as well!
- int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // Get start position in HC ticks
+ // Get start position in HC ticks
+ 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... [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++ = tom_cry_rgb_mix_lut[color];
+ *backbuffer++ = MIX16ToRGB32[color];
width--;
}
}
+
//
// 16 BPP CRY mode rendering
//
-void tom_render_16bpp_cry_scanline(int16 * backbuffer)
+void tom_render_16bpp_cry_scanline(uint32_t * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+//CHANGED TO 32BPP RENDERING
+ uint16_t width = tomWidth;
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
//New stuff--restrict our drawing...
- uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
//NOTE: May have to check HDB2 as well!
- int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // 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++;
-
- uint32 chrm = (color & 0xF000) >> 12,
- chrl = (color & 0x0F00) >> 8,
- y = (color & 0x00FF);
-
- uint16 red = (((uint32)redcv[chrm][chrl]) * y) >> 11,
- green = (((uint32)greencv[chrm][chrl]) * y) >> 11,
- blue = (((uint32)bluecv[chrm][chrl]) * y) >> 11;
-
- *backbuffer++ = (red << 10) | (green << 5) | blue;
+ *backbuffer++ = CRY16ToRGB32[color];
width--;
}
}
+
//
// 24 BPP mode rendering
//
-void tom_render_24bpp_scanline(int16 * backbuffer)
+void tom_render_24bpp_scanline(uint32_t * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
-
+//CHANGED TO 32BPP RENDERING
+ uint16_t width = tomWidth;
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
+
//New stuff--restrict our drawing...
- uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
//NOTE: May have to check HDB2 as well!
- int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // 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)
{
- // 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;
+ uint32_t g = *current_line_buffer++;
+ uint32_t r = *current_line_buffer++;
current_line_buffer++;
- uint16 blue = (*current_line_buffer++) >> 3;
- *backbuffer++ = (red << 10) | (green << 5) | blue;
+ 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(int16 * backbuffer)
+void tom_render_16bpp_direct_scanline(uint32_t * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[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(int16 * backbuffer)
+void tom_render_16bpp_rgb_scanline(uint32_t * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
-
+//CHANGED TO 32BPP RENDERING
+ // 16 BPP RGB: 0-5 green, 6-10 blue, 11-15 red
+
+ uint16_t width = tomWidth;
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
+
//New stuff--restrict our drawing...
- uint8 pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+ uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
//NOTE: May have to check HDB2 as well!
- int16 startPos = GET16(tom_ram_8, HDB1) - LEFT_VISIBLE_HC; // 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
- backbuffer += 2 * startPos, width -= startPos;
-
- while (width)
- {
- uint16 color = (*current_line_buffer++) << 8;
- color = (color | *current_line_buffer++) >> 1;
- color = (color&0x7C00) | ((color&0x03E0) >> 5) | ((color&0x001F) << 5);
- *backbuffer++ = color;
- width--;
- }
-}
-
-// This stuff may just go away by itself, especially if we do some
-// good old OpenGL goodness...
-
-void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 *backbuffer)
-{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
- while (width)
+#ifdef LEFT_BG_FIX
{
- uint16 color;
- color=*current_line_buffer++;
- color<<=8;
- color|=*current_line_buffer++;
- *backbuffer++=tom_cry_rgb_mix_lut[color];
- current_line_buffer+=2;
- width--;
- }
-}
+ uint8_t g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1];
+ uint32_t pixel = 0x000000FF | (r << 24) | (g << 16) | (b << 8);
-void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer)
-{
- uint32 chrm, chrl, y;
-
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
- while (width)
- {
- uint16 color;
- color=*current_line_buffer++;
- color<<=8;
- color|=*current_line_buffer++;
-
- chrm = (color & 0xF000) >> 12;
- chrl = (color & 0x0F00) >> 8;
- y = (color & 0x00FF);
-
- uint16 red = ((((uint32)redcv[chrm][chrl])*y)>>11);
- uint16 green = ((((uint32)greencv[chrm][chrl])*y)>>11);
- uint16 blue = ((((uint32)bluecv[chrm][chrl])*y)>>11);
-
- uint16 color2;
- color2=*current_line_buffer++;
- color2<<=8;
- color2|=*current_line_buffer++;
-
- chrm = (color2 & 0xF000) >> 12;
- chrl = (color2 & 0x0F00) >> 8;
- y = (color2 & 0x00FF);
-
- uint16 red2 = ((((uint32)redcv[chrm][chrl])*y)>>11);
- uint16 green2 = ((((uint32)greencv[chrm][chrl])*y)>>11);
- uint16 blue2 = ((((uint32)bluecv[chrm][chrl])*y)>>11);
-
- red=(red+red2)>>1;
- green=(green+green2)>>1;
- blue=(blue+blue2)>>1;
-
- *backbuffer++=(red<<10)|(green<<5)|blue;
- width--;
- }
-}
+ for(int16_t i=0; i<startPos; i++)
+ *backbuffer++ = pixel;
-void tom_render_24bpp_stretch_scanline(int16 *backbuffer)
-{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
- while (width)
- {
- uint16 green=*current_line_buffer++;
- uint16 red=*current_line_buffer++;
- /*uint16 nc=*/current_line_buffer++;
- uint16 blue=*current_line_buffer++;
- red>>=3;
- green>>=3;
- blue>>=3;
- *backbuffer++=(red<<10)|(green<<5)|blue;
- current_line_buffer+=4;
- width--;
+ width -= startPos;
}
-}
-
-void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer)
-{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
- while (width)
- {
- uint16 color=*current_line_buffer++;
- color<<=8;
- color|=*current_line_buffer++;
- color>>=1;
- *backbuffer++=color;
- current_line_buffer+=2;
- width--;
- }
-}
+#else
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
+#endif
-void tom_render_16bpp_rgb_stretch_scanline(int16 *backbuffer)
-{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
while (width)
{
- uint16 color1=*current_line_buffer++;
- color1<<=8;
- color1|=*current_line_buffer++;
- color1>>=1;
- uint16 color2=*current_line_buffer++;
- color2<<=8;
- color2|=*current_line_buffer++;
- color2>>=1;
- uint16 red=(((color1&0x7c00)>>10)+((color2&0x7c00)>>10))>>1;
- uint16 green=(((color1&0x00003e0)>>5)+((color2&0x00003e0)>>5))>>1;
- uint16 blue=(((color1&0x0000001f))+((color2&0x0000001f)))>>1;
-
- color1=(red<<10)|(blue<<5)|green;
- *backbuffer++=color1;
+ uint32_t color = (*current_line_buffer++) << 8;
+ color |= *current_line_buffer++;
+ *backbuffer++ = RGB16ToRGB32[color];
width--;
}
}
-void TOMResetBackbuffer(int16 * backbuffer)
-{
- TOMBackbuffer = backbuffer;
-}
//
// Process a single scanline
+// (this is bad terminology; each tick of the VC is actually a half-line)
//
-void TOMExecScanline(uint16 scanline, bool render)
+void TOMExecHalfline(uint16_t halfline, bool render)
{
+#warning "!!! Need to handle multiple fields properly !!!"
+ // We ignore the problem for now
+ halfline &= 0x7FF;
+
bool inActiveDisplayArea = true;
//Interlacing is still not handled correctly here... !!! FIX !!!
- if (scanline & 0x01) // Execute OP only on even lines (non-interlaced only!)
+ if (halfline & 0x01) // Execute OP only on even halflines (non-interlaced only!)
return;
- if (scanline >= (uint16)GET16(tom_ram_8, VDB) && scanline < (uint16)GET16(tom_ram_8, VDE))
+//Hm, it seems that the OP needs to execute from zero, so let's try it:
+// And it works! But need to do some optimizations in the OP to keep it from attempting
+// to do a scanline render in the non-display area... [DONE]
+//this seems to cause a regression in certain games, like rayman
+//which means I have to dig thru the asic nets to see what's wrong...
+/*
+No, the OP doesn't start until VDB, that much is certain. The thing is, VDB is the
+HALF line that the OP starts on--which means that it needs to start at VDB / 2!!!
+
+Hrm, doesn't seem to be enough, though it should be... still sticks for 20 frames.
+
+
+What triggers this is writing $FFFF to VDE. This causes the OP start signal in VID to
+latch on, which in effect sets VDB to zero. So that much is correct. But the thing with
+Rayman is that it shouldn't cause the graphical glitches seen there, so still have to
+investigate what's going on there. By all rights, it shouldn't glitch because:
+
+00006C00: 0000000D 82008F73 (BRANCH) YPOS=494, CC=">", link=$00006C10
+00006C08: 000003FF 00008173 (BRANCH) YPOS=46, CC=">", link=$001FF800
+00006C10: 00000000 0000000C (STOP)
+001FF800: 12FC2BFF 02380000 (BITMAP)
+ 00008004 8180CFF1
+
+Even if the OP is running all the time, the link should tell it to stop at the right
+place (which it seems to do). But we still get glitchy screen.
+
+Seems the glitchy screen went away... Maybe the GPU alignment fixes fixed it???
+Just need to add the proper checking here then.
+
+Some numbers, courtesy of the Jaguar BIOS:
+// NTSC:
+VP, 523 // Vertical Period (1-based; in this case VP = 524)
+VBE, 24 // Vertical Blank End
+VDB, 38 // Vertical Display Begin
+VDE, 518 // Vertical Display End
+VBB, 500 // Vertical Blank Begin
+VS, 517 // Vertical Sync
+
+// PAL Jaguar
+VP, 623 // Vertical Period (1-based; in this case VP = 624)
+VBE, 34 // Vertical Blank End
+VDB, 38 // Vertical Display Begin
+VDE, 518 // Vertical Display End
+VBB, 600 // Vertical Blank Begin
+VS, 618 // Vertical Sync
+
+Numbers for KM, NTSC:
+KM: (Note that with VDE <= 507, the OP starts at VDB as expected)
+TOM: Vertical Display Begin written by M68K: 41
+TOM: Vertical Display End written by M68K: 2047
+TOM: Vertical Interrupt written by M68K: 491
+*/
+#if 1
+ // Initial values that "well behaved" programs use
+ uint16_t startingHalfline = GET16(tomRam8, VDB);
+ uint16_t endingHalfline = GET16(tomRam8, VDE);
+
+ // Simulate the OP start bug here!
+ // Really, this value is somewhere around 507 for an NTSC Jaguar. But this
+ // should work in a majority of cases, at least until we can figure it out properly.
+ if (endingHalfline > GET16(tomRam8, VP))
+ startingHalfline = 0;
+
+ if (halfline >= startingHalfline && halfline < endingHalfline)
+// if (halfline >= 0 && halfline < (uint16_t)GET16(tomRam8, VDE))
+// 16 isn't enough, and neither is 32 for raptgun. 32 fucks up Rayman
+// if (halfline >= ((uint16_t)GET16(tomRam8, VDB) / 2) && halfline < ((uint16_t)GET16(tomRam8, VDE) / 2))
+// if (halfline >= ((uint16_t)GET16(tomRam8, VDB) - 16) && halfline < (uint16_t)GET16(tomRam8, VDE))
+// if (halfline >= 20 && halfline < (uint16_t)GET16(tomRam8, VDE))
+// if (halfline >= (uint16_t)GET16(tomRam8, VDB) && halfline < (uint16_t)GET16(tomRam8, VDE))
{
if (render)
{
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
- uint8 bgHI = tom_ram_8[BG], bgLO = tom_ram_8[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(tom_ram_8, VMODE) & BGEN) // && (CRY or RGB16)...
- for(uint32 i=0; i<720; i++)
+ if (GET16(tomRam8, VMODE) & BGEN) // && (CRY or RGB16)...
+ for(uint32_t i=0; i<720; i++)
*current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO;
- OPProcessList(scanline, render);
+ OPProcessList(halfline, render);
}
}
else
inActiveDisplayArea = false;
+#else
+ inActiveDisplayArea =
+ (halfline >= (uint16_t)GET16(tomRam8, VDB) && halfline < (uint16_t)GET16(tomRam8, VDE)
+ ? true : false);
+
+ if (halfline < (uint16_t)GET16(tomRam8, VDE))
+ {
+ if (render)//With JaguarExecuteNew() this is always true...
+ {
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
+ uint8_t bgHI = tomRam8[BG], bgLO = tomRam8[BG + 1];
+
+ // Clear line buffer with BG
+ if (GET16(tomRam8, VMODE) & BGEN) // && (CRY or RGB16)...
+ for(uint32_t i=0; i<720; i++)
+ *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO;
+
+// OPProcessList(halfline, render);
+//This seems to take care of it...
+ OPProcessList(halfline, inActiveDisplayArea);
+ }
+ }
+#endif
+
+ // Try to take PAL into account... [We do now!]
+
+ uint16_t topVisible = (vjs.hardwareTypeNTSC ? TOP_VISIBLE_VC : TOP_VISIBLE_VC_PAL),
+ bottomVisible = (vjs.hardwareTypeNTSC ? BOTTOM_VISIBLE_VC : BOTTOM_VISIBLE_VC_PAL);
+ uint32_t * TOMCurrentLine = &(screenBuffer[((halfline - topVisible) / 2) * screenPitch]);
// Here's our virtualized scanline code...
- if (scanline >= TOP_VISIBLE_VC && scanline < BOTTOM_VISIBLE_VC)
+
+ if (halfline >= topVisible && halfline < bottomVisible)
{
if (inActiveDisplayArea)
- scanline_render[tom_getVideoMode()](TOMBackbuffer);
+ {
+//NOTE: The following doesn't put BORDER color on the sides... !!! FIX !!!
+#warning "The following doesn't put BORDER color on the sides... !!! FIX !!!"
+ if (vjs.renderType == RT_NORMAL)
+// scanline_render[TOMGetVideoMode()](TOMBackbuffer);
+ scanline_render[TOMGetVideoMode()](TOMCurrentLine);
+ else//TV type render
+ {
+/*
+ tom_render_16bpp_cry_scanline,
+ tom_render_24bpp_scanline,
+ tom_render_16bpp_direct_scanline,
+ tom_render_16bpp_rgb_scanline,
+ tom_render_16bpp_cry_rgb_mix_scanline,
+ tom_render_24bpp_scanline,
+ tom_render_16bpp_direct_scanline,
+ tom_render_16bpp_rgb_scanline
+#define VMODE 0x28
+#define MODE 0x0006 // Line buffer to video generator mode
+#define VARMOD 0x0100 // Mixed CRY/RGB16 mode (only works in MODE 0!)
+*/
+ 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
+//as our scaling factor. The way it generates its image on a real TV!
+
+//So, for example, if HDB1 is less than LEFT_VISIBLE_HC, then we have to figure out where
+//in the VTLB that we start writing pixels from the Jaguar line buffer (VTLB start=0,
+//JLB=something).
+#if 0
+//
+// 24 BPP mode rendering
+//
+void tom_render_24bpp_scanline(uint32_t * backbuffer)
+{
+//CHANGED TO 32BPP RENDERING
+ uint16_t width = tomWidth;
+ uint8_t * current_line_buffer = (uint8_t *)&tomRam8[0x1800];
+
+ //New stuff--restrict our drawing...
+ uint8_t pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ 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
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
+
+ while (width)
+ {
+ uint32_t g = *current_line_buffer++;
+ uint32_t r = *current_line_buffer++;
+ current_line_buffer++;
+ uint32_t b = *current_line_buffer++;
+ *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
+ width--;
+ }
+}
+#endif
+
+ }
+ }
else
{
// If outside of VDB & VDE, then display the border color
- int16 * currentLineBuffer = TOMBackbuffer;
- uint8 g = tom_ram_8[BORD1], r = tom_ram_8[BORD1 + 1], b = tom_ram_8[BORD2 + 1];
- uint16 pixel = ((r & 0xF8) << 7) | ((g & 0xF8) << 2) | (b >> 3);
+ uint32_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<tom_width; i++)
+ for(uint32_t i=0; i<tomWidth; i++)
*currentLineBuffer++ = pixel;
}
-
- TOMBackbuffer += GetSDLScreenPitch() / 2; // Returns bytes, but we need words
}
}
+
//
// TOM initialization
//
-void tom_init(void)
+void TOMInit(void)
{
- op_init();
- blitter_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...
- memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
- tom_calc_cry_rgb_mix_lut();
+ TOMFillLookupTables();
+ OPInit();
+ BlitterInit();
+ TOMReset();
}
-void tom_done(void)
+
+void TOMDone(void)
{
- op_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()]);
+ OPDone();
+ BlitterDone();
+ WriteLog("TOM: Resolution %i x %i %s\n", TOMGetVideoModeWidth(), TOMGetVideoModeHeight(),
+ videoMode_to_str[TOMGetVideoMode()]);
// 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",TOMReadByte(0xf000e0),TOMReadByte(0xf000e1));
// gpu_done();
// dsp_done();
- memory_free(tom_ram_8);
+// memory_free(tomRam8);
+// memory_free(tom_cry_rgb_mix_lut);
}
-/*uint32 tom_getHBlankWidthInPixels(void)
-{
- return hblankWidthInPixels;
-}*/
-uint32 tom_getVideoModeWidth(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)
// 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];
+// return width[(GET16(tomRam8, VMODE) & PWIDTH) >> 9];
// Now, we just calculate it...
-/* uint16 hdb1 = GET16(tom_ram_8, HDB1), hde = GET16(tom_ram_8, HDE),
- hbb = GET16(tom_ram_8, HBB), pwidth = ((GET16(tom_ram_8, VMODE) & PWIDTH) >> 9) + 1;
+/* uint16_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...
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 (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / pwidth;
+ 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);
-// return (RIGHT_VISIBLE_HC - LEFT_VISIBLE_HC) / (pwidth == 4 ? 8 : pwidth);
+// 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
// 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 tom_getVideoModeHeight(void)
+uint32_t TOMGetVideoModeHeight(void)
{
-// uint16 vmode = GET16(tom_ram_8, VMODE);
-// uint16 vbe = GET16(tom_ram_8, VBE);
-// uint16 vbb = GET16(tom_ram_8, VBB);
-// uint16 vdb = GET16(tom_ram_8, VDB);
-// uint16 vde = GET16(tom_ram_8, VDE);
-// uint16 vp = GET16(tom_ram_8, VP);
-
+// uint16_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!
//
-void tom_reset(void)
+/*
+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)
{
- op_reset();
- blitter_reset();
-//This should be done by JERRY! pcm_reset();
-
- memset(tom_ram_8, 0x00, 0x4000);
+ OPReset();
+ BlitterReset();
+ memset(tomRam8, 0x00, 0x4000);
if (vjs.hardwareTypeNTSC)
{
- SET16(tom_ram_8, MEMCON1, 0x1861);
- SET16(tom_ram_8, MEMCON2, 0x35CC);
- SET16(tom_ram_8, HP, 844); // Horizontal Period (1-based; HP=845)
- SET16(tom_ram_8, HBB, 1713); // Horizontal Blank Begin
- SET16(tom_ram_8, HBE, 125); // Horizontal Blank End
- SET16(tom_ram_8, HDE, 1665); // Horizontal Display End
- SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1
- SET16(tom_ram_8, VP, 523); // Vertical Period (1-based; in this case VP = 524)
- SET16(tom_ram_8, VBE, 24); // Vertical Blank End
- SET16(tom_ram_8, VDB, 38); // Vertical Display Begin
- SET16(tom_ram_8, VDE, 518); // Vertical Display End
- SET16(tom_ram_8, VBB, 500); // Vertical Blank Begin
- SET16(tom_ram_8, VS, 517); // Vertical Sync
- SET16(tom_ram_8, VMODE, 0x06C1);
+ SET16(tomRam8, MEMCON1, 0x1861);
+ SET16(tomRam8, MEMCON2, 0x35CC);
+ SET16(tomRam8, HP, 844); // Horizontal Period (1-based; HP=845)
+ SET16(tomRam8, HBB, 1713); // Horizontal Blank Begin
+ SET16(tomRam8, HBE, 125); // Horizontal Blank End
+ SET16(tomRam8, HDE, 1665); // Horizontal Display End
+ SET16(tomRam8, HDB1, 203); // Horizontal Display Begin 1
+ SET16(tomRam8, VP, 523); // Vertical Period (1-based; in this case VP = 524)
+ SET16(tomRam8, VBE, 24); // Vertical Blank End
+ SET16(tomRam8, VDB, 38); // Vertical Display Begin
+ SET16(tomRam8, VDE, 518); // Vertical Display End
+ SET16(tomRam8, VBB, 500); // Vertical Blank Begin
+ SET16(tomRam8, VS, 517); // Vertical Sync
+ SET16(tomRam8, VMODE, 0x06C1);
}
else // PAL Jaguar
{
- SET16(tom_ram_8, MEMCON1, 0x1861);
- SET16(tom_ram_8, MEMCON2, 0x35CC);
- SET16(tom_ram_8, HP, 850); // Horizontal Period
- SET16(tom_ram_8, HBB, 1711); // Horizontal Blank Begin
- SET16(tom_ram_8, HBE, 158); // Horizontal Blank End
- SET16(tom_ram_8, HDE, 1665); // Horizontal Display End
- SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1
- SET16(tom_ram_8, VP, 623); // Vertical Period (1-based; in this case VP = 624)
- SET16(tom_ram_8, VBE, 34); // Vertical Blank End
- SET16(tom_ram_8, VDB, 38); // Vertical Display Begin
- SET16(tom_ram_8, VDE, 518); // Vertical Display End
- SET16(tom_ram_8, VBB, 600); // Vertical Blank Begin
- SET16(tom_ram_8, VS, 618); // Vertical Sync
- SET16(tom_ram_8, VMODE, 0x06C1);
+ SET16(tomRam8, MEMCON1, 0x1861);
+ SET16(tomRam8, MEMCON2, 0x35CC);
+ SET16(tomRam8, HP, 850); // Horizontal Period
+ SET16(tomRam8, HBB, 1711); // Horizontal Blank Begin
+ SET16(tomRam8, HBE, 158); // Horizontal Blank End
+ SET16(tomRam8, HDE, 1665); // Horizontal Display End
+ SET16(tomRam8, HDB1, 203); // Horizontal Display Begin 1
+ SET16(tomRam8, VP, 623); // Vertical Period (1-based; in this case VP = 624)
+ SET16(tomRam8, VBE, 34); // Vertical Blank End
+ SET16(tomRam8, VDB, 38); // Vertical Display Begin
+ SET16(tomRam8, VDE, 518); // Vertical Display End
+ SET16(tomRam8, VBB, 600); // Vertical Blank Begin
+ SET16(tomRam8, VS, 618); // Vertical Sync
+ SET16(tomRam8, VMODE, 0x06C1);
}
- tom_width = tom_real_internal_width = 0;
- tom_height = 0;
+ tomWidth = 0;
+ tomHeight = 0;
tom_jerry_int_pending = 0;
tom_timer_int_pending = 0;
tom_gpu_int_pending = 0;
tom_video_int_pending = 0;
- tom_timer_prescaler = 0;
- tom_timer_divider = 0;
- tom_timer_counter = 0;
- memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
+ tomTimerPrescaler = 0; // TOM PIT is disabled
+ tomTimerDivider = 0;
+ tomTimerCounter = 0;
}
+
//
// 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)?
// offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
- WriteLog("TOM: Reading byte at %06X\n", offset);
+ WriteLog("TOM: Reading byte at %06X for %s\n", offset, whoName[who]);
#endif
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
return GPUReadByte(offset, who);
else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
return GPUReadByte(offset, who);
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
- return OPReadByte(offset, who);
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
+ return OPReadByte(offset, who);*/
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
return BlitterReadByte(offset, who);
else if (offset == 0xF00050)
- return tom_timer_prescaler >> 8;
+ return tomTimerPrescaler >> 8;
else if (offset == 0xF00051)
- return tom_timer_prescaler & 0xFF;
+ return tomTimerPrescaler & 0xFF;
else if (offset == 0xF00052)
- return tom_timer_divider >> 8;
+ return tomTimerDivider >> 8;
else if (offset == 0xF00053)
- return tom_timer_divider & 0xFF;
+ return tomTimerDivider & 0xFF;
- return tom_ram_8[offset & 0x3FFF];
+ return tomRam8[offset & 0x3FFF];
}
+
//
// TOM word access (read)
//
-uint16 TOMReadWord(uint32 offset, uint32 who/*=UNKNOWN*/)
+uint16_t TOMReadWord(uint32_t offset, uint32_t who/*=UNKNOWN*/)
{
//???Is this needed???
// offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
- WriteLog("TOM: Reading word at %06X\n", offset);
+ WriteLog("TOM: Reading word at %06X for %s\n", offset, whoName[who]);
#endif
if (offset >= 0xF02000 && offset <= 0xF020FF)
- WriteLog("TOM: Read attempted from GPU register file by %s (unimplemented)!\n", whoName[who]);
+ WriteLog("TOM: ReadWord attempted from GPU register file by %s (unimplemented)!\n", whoName[who]);
if (offset == 0xF000E0)
{
- uint16 data = (tom_jerry_int_pending << 4) | (tom_timer_int_pending << 3)
+ // For reading, should only return the lower 5 bits...
+ uint16_t data = (tom_jerry_int_pending << 4) | (tom_timer_int_pending << 3)
| (tom_object_int_pending << 2) | (tom_gpu_int_pending << 1)
| (tom_video_int_pending << 0);
//WriteLog("tom: interrupt status is 0x%.4x \n",data);
//But it's causing Rayman to be fucked up... Why???
//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))
+/*
+// F00004 R/W -----xxx xxxxxxxx HC - horizontal count
+// -----x-- -------- (which half of the display)
+// ------xx xxxxxxxx (10-bit counter)
+*/
+// This is a kludge to get the HC working somewhat... What we really should do here
+// is check what the global time is at the time of the read and calculate the correct HC...
+// !!! FIX !!!
+ else if (offset == 0xF00004)
+ return rand() & 0x03FF;
+ else if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE + 0x20))
return GPUReadWord(offset, who);
- else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
+ else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE + 0x1000))
return GPUReadWord(offset, who);
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
- return OPReadWord(offset, who);
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
+ return OPReadWord(offset, who);*/
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
return BlitterReadWord(offset, who);
else if (offset == 0xF00050)
- return tom_timer_prescaler;
+ return tomTimerPrescaler;
else if (offset == 0xF00052)
- return tom_timer_divider;
+ return tomTimerDivider;
offset &= 0x3FFF;
return (TOMReadByte(offset, who) << 8) | TOMReadByte(offset + 1, who);
}
+
+#define TOM_STRICT_MEMORY_ACCESS
//
// TOM byte access (write)
//
-void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/)
+void TOMWriteByte(uint32_t offset, uint8_t data, uint32_t who/*=UNKNOWN*/)
{
+#ifdef TOM_DEBUG
+ WriteLog("TOM: Writing byte %02X at %06X", data, offset);
+#endif
//???Is this needed???
// Perhaps on the writes--32-bit writes that is! And masked with FF7FFF...
+#ifndef TOM_STRICT_MEMORY_ACCESS
offset &= 0xFF3FFF;
-
+#else
+ // "Fast" (32-bit only) write access to the GPU
+// if ((offset >= 0xF0A100) && (offset <= 0xF0BFFF))
+ if ((offset >= 0xF08000) && (offset <= 0xF0BFFF))
+ offset &= 0xFF7FFF;
+#endif
#ifdef TOM_DEBUG
- WriteLog("TOM: Writing byte %02X at %06X\n", data, offset);
+ WriteLog(" -->[%06X] by %s\n", offset, whoName[who]);
+#endif
+
+#ifdef TOM_STRICT_MEMORY_ACCESS
+ // Sanity check ("Aww, there ain't no Sanity Clause...")
+ if ((offset < 0xF00000) || (offset > 0xF03FFF))
+ return;
#endif
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
GPUWriteByte(offset, data, who);
return;
}
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
{
OPWriteByte(offset, data, who);
return;
- }
+ }*/
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
{
BlitterWriteByte(offset, data, who);
}
else if (offset == 0xF00050)
{
- tom_timer_prescaler = (tom_timer_prescaler & 0x00FF) | (data << 8);
+ tomTimerPrescaler = (tomTimerPrescaler & 0x00FF) | (data << 8);
TOMResetPIT();
return;
}
else if (offset == 0xF00051)
{
- tom_timer_prescaler = (tom_timer_prescaler & 0xFF00) | data;
+ tomTimerPrescaler = (tomTimerPrescaler & 0xFF00) | data;
TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
- tom_timer_divider = (tom_timer_divider & 0x00FF) | (data << 8);
+ tomTimerDivider = (tomTimerDivider & 0x00FF) | (data << 8);
TOMResetPIT();
return;
}
else if (offset == 0xF00053)
{
- tom_timer_divider = (tom_timer_divider & 0xFF00) | data;
+ tomTimerDivider = (tomTimerDivider & 0xFF00) | data;
TOMResetPIT();
return;
}
{
// Writing to one CLUT writes to the other
offset &= 0x5FF; // Mask out $F00600 (restrict to $F00400-5FF)
- tom_ram_8[offset] = data, tom_ram_8[offset + 0x200] = data;
+ tomRam8[offset] = data, tomRam8[offset + 0x200] = data;
}
- tom_ram_8[offset & 0x3FFF] = data;
+ tomRam8[offset & 0x3FFF] = data;
}
+
//
// TOM word access (write)
//
-void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
+void TOMWriteWord(uint32_t offset, uint16_t data, uint32_t who/*=UNKNOWN*/)
{
-//???Is this needed???
+#ifdef TOM_DEBUG
+ WriteLog("TOM: Writing byte %04X at %06X", data, offset);
+#endif
+//???Is this needed??? Yes, but we need to be more vigilant than this.
+#ifndef TOM_STRICT_MEMORY_ACCESS
offset &= 0xFF3FFF;
-
+#else
+ // "Fast" (32-bit only) write access to the GPU
+// if ((offset >= 0xF0A100) && (offset <= 0xF0BFFF))
+ if ((offset >= 0xF08000) && (offset <= 0xF0BFFF))
+ offset &= 0xFF7FFF;
+#endif
#ifdef TOM_DEBUG
- WriteLog("TOM: Writing word %04X at %06X\n", data, offset);
+ WriteLog(" -->[%06X] by %s\n", offset, whoName[who]);
+#endif
+
+#ifdef TOM_STRICT_MEMORY_ACCESS
+ // Sanity check
+ if ((offset < 0xF00000) || (offset > 0xF03FFF))
+ return;
#endif
-if (offset == 0xF00000 + MEMCON1)
- WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data);
-if (offset == 0xF00000 + MEMCON2)
- WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data);
+
+//if (offset == 0xF00000 + MEMCON1)
+// WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data);
+//if (offset == 0xF00000 + MEMCON2)
+// WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data);
if (offset >= 0xF02000 && offset <= 0xF020FF)
- WriteLog("TOM: Write attempted to GPU register file by %s (unimplemented)!\n", whoName[who]);
+ WriteLog("TOM: WriteWord attempted to GPU register file by %s (unimplemented)!\n", whoName[who]);
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
{
TOMWriteByte(offset, data >> 8);
TOMWriteByte(offset+1, data & 0xFF);
}*/
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
{
OPWriteWord(offset, data, who);
return;
- }
+ }*/
else if (offset == 0xF00050)
{
- tom_timer_prescaler = data;
+ tomTimerPrescaler = data;
TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
- tom_timer_divider = data;
+ tomTimerDivider = data;
TOMResetPIT();
return;
}
tom_timer_int_pending = 0;
if (data & 0x1000)
tom_jerry_int_pending = 0;
+
+// return;
}
else if ((offset >= 0xF02200) && (offset <= 0xF0229F))
{
// Writing to one CLUT writes to the other
offset &= 0x5FF; // Mask out $F00600 (restrict to $F00400-5FF)
// Watch out for unaligned writes here! (Not fixed yet)
- SET16(tom_ram_8, offset, data), SET16(tom_ram_8, offset + 0x200, data);
+#warning "!!! Watch out for unaligned writes here !!! FIX !!!"
+ SET16(tomRam8, offset, data);
+ SET16(tomRam8, offset + 0x200, data);
}
offset &= 0x3FFF;
if (offset == 0x28) // VMODE (Why? Why not OBF?)
+//Actually, we should check to see if the Enable bit of VMODE is set before doing this... !!! FIX !!!
+#warning "Actually, we should check to see if the Enable bit of VMODE is set before doing this... !!! FIX !!!"
objectp_running = 1;
if (offset >= 0x30 && offset <= 0x4E)
if (offset == 0x2E || offset == 0x36 || offset == 0x54)
data &= 0x03FF; // These are all 10-bit registers
- TOMWriteByte(offset, data >> 8, who);
- TOMWriteByte(offset+1, data & 0xFF, who);
-
-if (offset == VDB)
- WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data);
-if (offset == VDE)
- WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data);
-if (offset == VP)
- WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : ""));
+// Fix a lockup bug... :-P
+ TOMWriteByte(0xF00000 | offset, data >> 8, who);
+ TOMWriteByte(0xF00000 | (offset+1), data & 0xFF, who);
+
+if (offset == MEMCON1)
+ WriteLog("TOM: Memory Config 1 written by %s: $%04X\n", whoName[who], data);
+if (offset == MEMCON2)
+ WriteLog("TOM: Memory Config 2 written by %s: $%04X\n", whoName[who], data);
+//if (offset == OLP)
+// WriteLog("TOM: Object List Pointer written by %s: $%04X\n", whoName[who], data);
+//if (offset == OLP + 2)
+// WriteLog("TOM: Object List Pointer +2 written by %s: $%04X\n", whoName[who], data);
+//if (offset == OBF)
+// WriteLog("TOM: Object Processor Flag written by %s: %u\n", whoName[who], data);
+if (offset == VMODE)
+ WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC));
+if (offset == BORD1)
+ WriteLog("TOM: Border 1 written by %s: $%04X\n", whoName[who], data);
+if (offset == BORD2)
+ WriteLog("TOM: Border 2 written by %s: $%04X\n", whoName[who], data);
+if (offset == HP)
+ WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2);
+if (offset == HBB)
+ WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data);
+if (offset == HBE)
+ WriteLog("TOM: Horizontal Blank End written by %s: %u\n", whoName[who], data);
+if (offset == HS)
+ WriteLog("TOM: Horizontal Sync written by %s: %u\n", whoName[who], data);
+if (offset == HVS)
+ WriteLog("TOM: Horizontal Vertical Sync written by %s: %u\n", whoName[who], data);
if (offset == HDB1)
WriteLog("TOM: Horizontal Display Begin 1 written by %s: %u\n", whoName[who], data);
+if (offset == HDB2)
+ WriteLog("TOM: Horizontal Display Begin 2 written by %s: %u\n", whoName[who], data);
if (offset == HDE)
WriteLog("TOM: Horizontal Display End written by %s: %u\n", whoName[who], data);
-if (offset == HP)
- WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2);
+if (offset == VP)
+ WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : ""));
if (offset == VBB)
WriteLog("TOM: Vertical Blank Begin written by %s: %u\n", whoName[who], data);
if (offset == VBE)
WriteLog("TOM: Vertical Blank End written by %s: %u\n", whoName[who], data);
if (offset == VS)
WriteLog("TOM: Vertical Sync written by %s: %u\n", whoName[who], data);
+if (offset == VDB)
+ WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data);
+if (offset == VDE)
+ WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data);
+if (offset == VEB)
+ WriteLog("TOM: Vertical Equalization Begin written by %s: %u\n", whoName[who], data);
+if (offset == VEE)
+ WriteLog("TOM: Vertical Equalization End written by %s: %u\n", whoName[who], data);
if (offset == VI)
WriteLog("TOM: Vertical Interrupt written by %s: %u\n", whoName[who], data);
-if (offset == HBB)
- WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data);
-if (offset == HBE)
- WriteLog("TOM: Horizontal Blank End written by %s: %u\n", whoName[who], data);
-if (offset == VMODE)
- WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tom_ram_8, VC));
+if (offset == PIT0)
+ WriteLog("TOM: PIT0 written by %s: %u\n", whoName[who], data);
+if (offset == PIT1)
+ WriteLog("TOM: PIT1 written by %s: %u\n", whoName[who], data);
+if (offset == HEQ)
+ WriteLog("TOM: Horizontal Equalization End written by %s: %u\n", whoName[who], data);
+//if (offset == BG)
+// WriteLog("TOM: Background written by %s: %u\n", whoName[who], data);
+//if (offset == INT1)
+// WriteLog("TOM: CPU Interrupt Control written by %s: $%04X (%s%s%s%s%s)\n", whoName[who], data, (data & 0x01 ? "Video" : ""), (data & 0x02 ? " GPU" : ""), (data & 0x04 ? " OP" : ""), (data & 0x08 ? " TOMPIT" : ""), (data & 0x10 ? " Jerry" : ""));
// detect screen resolution changes
//This may go away in the future, if we do the virtualized screen thing...
//This may go away soon!
+// TOM Shouldn't be mucking around with this, it's up to the host system to properly
+// handle this kind of crap.
+// NOTE: This is needed somehow, need to get rid of the dependency on this crap.
+#warning "!!! Need to get rid of this dependency !!!"
+#if 1
if ((offset >= 0x28) && (offset <= 0x4F))
{
- uint32 width = tom_getVideoModeWidth(), height = tom_getVideoModeHeight();
- tom_real_internal_width = width;
+ uint32_t width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight();
- if ((width != tom_width) || (height != tom_height))
+ if ((width != tomWidth) || (height != tomHeight))
{
- tom_width = width, tom_height = height;
- ResizeScreen(tom_width, tom_height);
+ tomWidth = width, tomHeight = height;
+
+#warning "!!! TOM: ResizeScreen commented out !!!"
+// No need to resize anything, since we're prepared for this...
+// if (vjs.renderType == RT_NORMAL)
+// ResizeScreen(tomWidth, tomHeight);
}
}
+#endif
}
-int tom_irq_enabled(int irq)
+
+int TOMIRQEnabled(int irq)
{
// This is the correct byte in big endian... D'oh!
// return jaguar_byte_read(0xF000E1) & (1 << irq);
- return tom_ram_8[INT1 + 1/*0xE1*/] & (1 << irq);
+ return tomRam8[INT1 + 1/*0xE1*/] & (1 << irq);
}
-//unused
-/*void tom_set_irq_latch(int irq, int enabled)
-{
- tom_ram_8[0xE0] = (tom_ram_8[0xE0] & (~(1<<irq))) | (enabled ? (1<<irq) : 0);
-}*/
-//unused
-/*uint16 tom_irq_control_reg(void)
-{
- return (tom_ram_8[0xE0] << 8) | tom_ram_8[0xE1];
-}*/
+// NEW:
+// TOM Programmable Interrupt Timer handler
+// NOTE: TOM's PIT is only enabled if the prescaler is != 0
+// The PIT only generates an interrupt when it counts down to zero, not when loaded!
+
+void TOMPITCallback(void);
+
void TOMResetPIT(void)
{
- if (!tom_timer_prescaler || !tom_timer_divider)
- tom_timer_counter = 0;
- else
-//Probably should *add* this amount to the counter to retain cycle accuracy! !!! FIX !!!
-//Also, why +1???
- tom_timer_counter = (1 + tom_timer_prescaler) * (1 + tom_timer_divider);
+#ifndef NEW_TIMER_SYSTEM
+//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);
+#else
+ // Need to remove previous timer from the queue, if it exists...
+ RemoveCallback(TOMPITCallback);
+
+ if (tomTimerPrescaler)
+ {
+ double usecs = (float)(tomTimerPrescaler + 1) * (float)(tomTimerDivider + 1) * RISC_CYCLE_IN_USEC;
+ SetCallbackTime(TOMPITCallback, usecs);
+ }
+#endif
}
+
//
// TOM Programmable Interrupt Timer handler
+// NOTE: TOM's PIT is only enabled if the prescaler is != 0
//
-void TOMExecPIT(uint32 cycles)
+//NOTE: This is only used by the old execution code... Safe to remove
+// once the timer system is stable.
+void TOMExecPIT(uint32_t cycles)
{
- if (tom_timer_counter > 0)
+ if (tomTimerPrescaler)
{
- tom_timer_counter -= cycles;
+ tomTimerCounter -= cycles;
- if (tom_timer_counter <= 0)
+ if (tomTimerCounter <= 0)
{
- tom_set_pending_timer_int();
- GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE);
- if (tom_irq_enabled(IRQ_TIMER) && jaguar_interrupt_handler_is_valid(64))
- m68k_set_irq(7); // Cause a 68000 NMI...
+ TOMSetPendingTimerInt();
+ GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // GPUSetIRQLine does the 'IRQ enabled' checking
+
+ if (TOMIRQEnabled(IRQ_TIMER))
+ m68k_set_irq(2); // Cause a 68000 IPL 2...
TOMResetPIT();
}
}
}
+
+
+void TOMPITCallback(void)
+{
+// INT1_RREG |= 0x08; // Set TOM PIT interrupt pending
+ TOMSetPendingTimerInt();
+ GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // It does the 'IRQ enabled' checking
+
+// if (INT1_WREG & 0x08)
+ if (TOMIRQEnabled(IRQ_TIMER))
+ m68k_set_irq(2); // Generate a 68K IPL 2...
+
+ TOMResetPIT();
+}
+