//
// 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
+// (C) 2010 Underground Software
+//
+// JLH = James L. Hammons <jlhamm@acm.org>
+//
+// Who When What
+// --- ---------- -------------------------------------------------------------
+// JLH 01/16/2010 Created this log ;-)
+//
// Note: Endian wrongness probably stems from the MAME origins of this emu and
// the braindead way in which MAME handles memory. :-)
//
// F02298 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z0 - Z0
// ------------------------------------------------------------
-#include <SDL.h>
#include "tom.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 "m68k.h"
+//#include "memory.h"
#include "objectp.h"
-#include "cry2rgb.h"
+#include "settings.h"
+#include "video.h"
+
+#define NEW_TIMER_SYSTEM
// TOM registers (offset from $F00000)
#define BGEN 0x0080 // Background enable (CRY & RGB16 only)
#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 HDB1 0x38
+#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 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, 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;
+uint8 tomRam8[0x4000];
+uint32 tomWidth, tomHeight;
+uint32 tomTimerPrescaler;
+uint32 tomTimerDivider;
+int32 tomTimerCounter;
//uint32 tom_scanline;
//uint32 hblankWidthInPixels = 0;
uint16 tom_jerry_int_pending, tom_timer_int_pending, tom_object_int_pending,
tom_gpu_int_pending, tom_video_int_pending;
-uint16 * tom_cry_rgb_mix_lut;
+//uint16 * tom_cry_rgb_mix_lut;
+//int16 * TOMBackbuffer;
+uint32 * TOMBackbuffer;
-static char * videoMode_to_str[8] =
+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 *);
// 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 * backbuffer);
+void tom_render_24bpp_scanline(uint32 * backbuffer);
+void tom_render_16bpp_direct_scanline(uint32 * backbuffer);
+void tom_render_16bpp_rgb_scanline(uint32 * backbuffer);
+void tom_render_16bpp_cry_rgb_mix_scanline(uint32 * backbuffer);
-void tom_render_16bpp_cry_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);
+void tom_render_16bpp_cry_stretch_scanline(uint32 * backbuffer);
+void tom_render_24bpp_stretch_scanline(uint32 * backbuffer);
+void tom_render_16bpp_direct_stretch_scanline(uint32 * backbuffer);
+void tom_render_16bpp_rgb_stretch_scanline(uint32 * backbuffer);
+void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 * backbuffer);
-render_xxx_scanline_fn * scanline_render_normal[]=
+render_xxx_scanline_fn * scanline_render_normal[] =
{
tom_render_16bpp_cry_scanline,
tom_render_24bpp_scanline,
tom_render_16bpp_rgb_scanline
};
-render_xxx_scanline_fn * scanline_render_stretch[]=
+render_xxx_scanline_fn * scanline_render_stretch[] =
{
tom_render_16bpp_cry_stretch_scanline,
tom_render_24bpp_stretch_scanline,
render_xxx_scanline_fn * scanline_render[8];
-void tom_calc_cry_rgb_mix_lut(void)
+// 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
+*/
+
+uint32 RGB16ToRGB32[0x10000];
+uint32 CRY16ToRGB32[0x10000];
+uint32 MIX16ToRGB32[0x10000];
+
+#warning "This is not endian-safe. !!! FIX !!!"
+void TOMFillLookupTables(void)
{
- memory_malloc_secure((void **)&tom_cry_rgb_mix_lut, 2 * 0x10000, "CRY/RGB mixed mode LUT");
+ for(uint32 i=0; i<0x10000; i++)
+ RGB16ToRGB32[i] = 0xFF000000
+ | ((i & 0xF100) >> 8) | ((i & 0xE000) >> 13)
+ | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8)
+ | ((i & 0x003F) << 10) | ((i & 0x0030) << 4);
- for (uint32 i=0; i<0x10000; i++)
+
+ for(uint32 i=0; i<0x10000; i++)
{
- uint16 color = i;
+ uint32 chrm = (i & 0xF000) >> 12,
+ chrl = (i & 0x0F00) >> 8,
+ y = (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 r = (((uint32)redcv[chrm][chrl]) * y) >> 8,
+ g = (((uint32)greencv[chrm][chrl]) * y) >> 8,
+ b = (((uint32)bluecv[chrm][chrl]) * y) >> 8;
+
+ CRY16ToRGB32[i] = 0xFF000000 | (b << 16) | (g << 8) | r;
+ MIX16ToRGB32[i] = (i & 0x01 ? RGB16ToRGB32[i] : CRY16ToRGB32[i]);
}
+
+// for(uint32 i=0; i<0x10000; i++)
+// if (i & 0x01)
+// MIX16ToRGB32[i] = RGB16ToRGB32[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 * TOMGetRamPointer(void)
{
- return tom_ram_8;
+ return tomRam8;
}
-uint8 tom_getVideoMode(void)
+uint8 TOMGetVideoMode(void)
{
- uint16 vmode = GET16(tom_ram_8, VMODE);
+ uint16 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 TOMGetVDB(void)
{
-// This in NOT VDB!!!
-// return GET16(tom_ram_8, VBE);
- return GET16(tom_ram_8, VDB);
+ return GET16(tomRam8, VDB);
}
//
// 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 * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
-
+//CHANGED TO 32BPP RENDERING
+ uint16 width = tomWidth;
+ uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ // Get start position in HC ticks
+ int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);
+ 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...
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
+
while (width)
{
uint16 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 * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
+//CHANGED TO 32BPP RENDERING
+ uint16 width = tomWidth;
+ uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL);// Get start position in HC ticks
+ startPos /= pwidth;
+ if (startPos < 0)
+ current_line_buffer += 2 * -startPos;
+ else
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
while (width)
{
uint16 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 * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
-
+//CHANGED TO 32BPP RENDERING
+ uint16 width = tomWidth;
+ uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks
+ 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)
{
- uint16 green = (*current_line_buffer++) >> 3;
- uint16 red = (*current_line_buffer++) >> 3;
+ uint32 g = *current_line_buffer++;
+ uint32 r = *current_line_buffer++;
current_line_buffer++;
- uint16 blue = (*current_line_buffer++) >> 3;
- *backbuffer++ = (red << 10) | (green << 5) | blue;
+ uint32 b = *current_line_buffer++;
+ *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
width--;
}
}
//
// 16 BPP direct mode rendering
//
-void tom_render_16bpp_direct_scanline(int16 * backbuffer)
+void tom_render_16bpp_direct_scanline(uint32 * backbuffer)
{
- uint16 width = tom_width;
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
-
+ uint16 width = tomWidth;
+ uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+
while (width)
{
uint16 color = (*current_line_buffer++) << 8;
//
// 16 BPP RGB mode rendering
//
-void tom_render_16bpp_rgb_scanline(int16 * backbuffer)
+void tom_render_16bpp_rgb_scanline(uint32 * 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 width = tomWidth;
+ uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks
+ startPos /= pwidth;
+
+ if (startPos < 0)
+ current_line_buffer += 2 * -startPos;
+ else
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
+
while (width)
{
- uint16 color = (*current_line_buffer++) << 8;
- color = (color | *current_line_buffer++) >> 1;
- color = (color&0x7C00) | ((color&0x03E0) >> 5) | ((color&0x001F) << 5);
- *backbuffer++ = color;
+ uint32 color = (*current_line_buffer++) << 8;
+ color |= *current_line_buffer++;
+ *backbuffer++ = RGB16ToRGB32[color];
width--;
}
}
-// This stuff may just go away by itself, especially if we do some
-// good old OpenGL goodness...
+/////////////////////////////////////////////////////////////////////
+// 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)
+void tom_render_16bpp_cry_rgb_mix_stretch_scanline(uint32 *backbuffer)
{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
+ uint16 width=tomWidth;
+ uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800];
+
while (width)
{
- uint16 color;
- color=*current_line_buffer++;
- color<<=8;
- color|=*current_line_buffer++;
- *backbuffer++=tom_cry_rgb_mix_lut[color];
- current_line_buffer+=2;
+ uint16 color = *current_line_buffer++;
+ color <<= 8;
+ color |= *current_line_buffer++;
+ *backbuffer++ = MIX16ToRGB32[color];
+ current_line_buffer += 2;
width--;
}
}
-void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_cry_stretch_scanline(uint32 *backbuffer)
{
uint32 chrm, chrl, y;
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
+ uint16 width=tomWidth;
+ uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800];
+
while (width)
{
uint16 color;
color=*current_line_buffer++;
color<<=8;
color|=*current_line_buffer++;
-
- chrm = (color & 0xF000) >> 12;
+
+ 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;
+
+ 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;
}
}
-void tom_render_24bpp_stretch_scanline(int16 *backbuffer)
+void tom_render_24bpp_stretch_scanline(uint32 *backbuffer)
{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
+ uint16 width=tomWidth;
+ uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800];
+
while (width)
{
uint16 green=*current_line_buffer++;
}
}
-void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_direct_stretch_scanline(uint32 *backbuffer)
{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
+ uint16 width=tomWidth;
+ uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800];
+
while (width)
{
uint16 color=*current_line_buffer++;
}
}
-void tom_render_16bpp_rgb_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_rgb_stretch_scanline(uint32 *backbuffer)
{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
+ uint16 width=tomWidth;
+ uint8 *current_line_buffer=(uint8*)&tomRam8[0x1800];
+
while (width)
{
uint16 color1=*current_line_buffer++;
}
}
+void TOMResetBackbuffer(uint32 * backbuffer)
+{
+ TOMBackbuffer = backbuffer;
+}
+
//
// Process a single scanline
//
-void tom_exec_scanline(int16 * backbuffer, int32 scanline, bool render)
+void TOMExecScanline(uint16 scanline, bool render)
{
- if (render)
+ bool inActiveDisplayArea = true;
+
+//Interlacing is still not handled correctly here... !!! FIX !!!
+ if (scanline & 0x01) // Execute OP only on even lines (non-interlaced only!)
+ return;
+
+ if (scanline >= (uint16)GET16(tomRam8, VDB) && scanline < (uint16)GET16(tomRam8, 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 *)&tomRam8[0x1800];
+ uint8 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++)
- *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO;
+ // Clear line buffer with BG
+ if (GET16(tomRam8, VMODE) & BGEN) // && (CRY or RGB16)...
+ for(uint32 i=0; i<720; i++)
+ *current_line_buffer++ = bgHI, *current_line_buffer++ = bgLO;
- 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...
-uint32 TOMGetSDLScreenPitch(void)
+ if (scanline >= topVisible && scanline < bottomVisible)
+ {
+ if (inActiveDisplayArea)
+ {
+//NOTE: The following doesn't put BORDER color on the sides... !!! FIX !!!
+#warning "The following doesn't put BORDER color on the sides... !!! FIX !!!"
+ if (vjs.renderType == RT_NORMAL)
+ scanline_render[TOMGetVideoMode()](TOMBackbuffer);
+ 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 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ uint8 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 * backbuffer)
{
- extern SDL_Surface * surface;
+//CHANGED TO 32BPP RENDERING
+ uint16 width = tomWidth;
+ uint8 * current_line_buffer = (uint8 *)&tomRam8[0x1800];
+
+ //New stuff--restrict our drawing...
+ uint8 pwidth = ((GET16(tomRam8, VMODE) & PWIDTH) >> 9) + 1;
+ //NOTE: May have to check HDB2 as well!
+ int16 startPos = GET16(tomRam8, HDB1) - (vjs.hardwareTypeNTSC ? LEFT_VISIBLE_HC : LEFT_VISIBLE_HC_PAL); // Get start position in HC ticks
+ 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 g = *current_line_buffer++;
+ uint32 r = *current_line_buffer++;
+ current_line_buffer++;
+ uint32 b = *current_line_buffer++;
+ *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
+ width--;
+ }
+}
+#endif
- return surface->pitch;
+ }
+ }
+ else
+ {
+ // If outside of VDB & VDE, then display the border color
+ uint32 * currentLineBuffer = TOMBackbuffer;
+ uint8 g = tomRam8[BORD1], r = tomRam8[BORD1 + 1], b = tomRam8[BORD2 + 1];
+ uint32 pixel = 0xFF000000 | (b << 16) | (g << 8) | r;
+
+ for(uint32 i=0; i<tomWidth; i++)
+ *currentLineBuffer++ = pixel;
+ }
+
+ TOMBackbuffer += GetSDLScreenWidthInPixels();
+ }
}
//
// 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();
+ OPInit();
+ BlitterInit();
+ TOMReset();
// Setup the non-stretchy scanline rendering...
memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
- tom_calc_cry_rgb_mix_lut();
+ TOMFillLookupTables();
}
-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 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 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 pixels (X:Y ratio)
- // PWIDTH = 2 -> 0.50:1 pixels
- // PWIDTH = 3 -> 0.75:1 pixels
- // PWIDTH = 4 -> 1.00:1 pixels
- // PWIDTH = 5 -> 1.25:1 pixels
- // PWIDTH = 6 -> 1.50:1 pixels
- // PWIDTH = 7 -> 1.75:1 pixels
- // PWIDTH = 8 -> 2.00:1 pixels
+ // 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!
// 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;
- return ((hbb < hde ? hbb : hde) - hdb1) / pwidth;
+/* uint16 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(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);
// More speculating...
// According to the JTRM, the number of potential pixels across is given by the
// 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.]
-uint32 tom_getVideoModeHeight(void)
+// Now that that the width is virtualized, let's virtualize the height. :-)
+uint32 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 vmode = GET16(tomRam8, VMODE);
+// uint16 vbe = GET16(tomRam8, VBE);
+// uint16 vbb = GET16(tomRam8, VBB);
+// uint16 vdb = GET16(tomRam8, VDB);
+// uint16 vde = GET16(tomRam8, VDE);
+// uint16 vp = GET16(tomRam8, VP);
+
/* if (vde == 0xFFFF)
vde = vbb;//*/
// 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...
+// 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
// Now PAL friendly!
//
-void tom_reset(void)
+void TOMReset(void)
{
- extern bool hardwareTypeNTSC;
-
- op_reset();
- blitter_reset();
-//This should be done by JERRY! pcm_reset();
+ OPReset();
+ BlitterReset();
+ memset(tomRam8, 0x00, 0x4000);
- memset(tom_ram_8, 0x00, 0x4000);
-
- if (hardwareTypeNTSC)
+ 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;
-// tom_scanline = 0;
-
-//This is WRONG
-// hblankWidthInPixels = GET16(tom_ram_8, HDB1) >> 1;
+ 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;
+ tomTimerPrescaler = 0; // TOM PIT is disabled
+ tomTimerDivider = 0;
+ tomTimerCounter = 0;
memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
}
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];
}
//
//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);
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);
- tom_reset_timer();
+ tomTimerPrescaler = (tomTimerPrescaler & 0x00FF) | (data << 8);
+ TOMResetPIT();
return;
}
else if (offset == 0xF00051)
{
- tom_timer_prescaler = (tom_timer_prescaler & 0xFF00) | data;
- tom_reset_timer();
+ tomTimerPrescaler = (tomTimerPrescaler & 0xFF00) | data;
+ TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
- tom_timer_divider = (tom_timer_divider & 0x00FF) | (data << 8);
- tom_reset_timer();
+ tomTimerDivider = (tomTimerDivider & 0x00FF) | (data << 8);
+ TOMResetPIT();
return;
}
else if (offset == 0xF00053)
{
- tom_timer_divider = (tom_timer_divider & 0xFF00) | data;
- tom_reset_timer();
+ tomTimerDivider = (tomTimerDivider & 0xFF00) | data;
+ TOMResetPIT();
return;
}
else if (offset >= 0xF00400 && offset <= 0xF007FF) // CLUT (A & B)
{
// 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;
}
//
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;
- tom_reset_timer();
+ tomTimerPrescaler = data;
+ TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
- tom_timer_divider = data;
- tom_reset_timer();
+ tomTimerDivider = data;
+ TOMResetPIT();
return;
}
else if (offset == 0xF000E0)
// 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);
+ 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 == 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));
-/*#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 (value written + 1)*/
+ 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));
// 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;
+ uint32 width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight();
-//This looks like an attempt to render non-square pixels (though wrong...)
-/* if (width == 640)
+ if ((width != tomWidth) || (height != tomHeight))
{
- 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))
- {
- extern SDL_Surface * surface, * mainSurface;
- extern Uint32 mainSurfaceFlags;
- static char window_title[256];
-
- tom_width = width, tom_height = height;
- SDL_FreeSurface(surface);
- surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_width, tom_height,
- 16, 0x7C00, 0x03E0, 0x001F, 0);
- if (surface == NULL)
- {
- WriteLog("TOM: Could not create primary SDL surface: %s", SDL_GetError());
- exit(1);
- }
-
- sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)tom_width, (int)tom_height);
-//???Should we do this??? No!
-// SDL_FreeSurface(mainSurface);
- mainSurface = SDL_SetVideoMode(tom_width, tom_height, 16, mainSurfaceFlags);
+ tomWidth = width, tomHeight = height;
- if (mainSurface == NULL)
- {
- WriteLog("Joystick: SDL is unable to set the video mode: %s\n", SDL_GetError());
- exit(1);
- }
-
- SDL_WM_SetCaption(window_title, window_title);
+ if (vjs.renderType == RT_NORMAL)
+ ResizeScreen(tomWidth, tomHeight);
}
}
}
-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);
+ tomRam8[0xE0] = (tomRam8[0xE0] & (~(1<<irq))) | (enabled ? (1<<irq) : 0);
}*/
//unused
/*uint16 tom_irq_control_reg(void)
{
- return (tom_ram_8[0xE0] << 8) | tom_ram_8[0xE1];
+ return (tomRam8[0xE0] << 8) | tomRam8[0xE1];
}*/
-void tom_reset_timer(void)
+// 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 tom_pit_exec(uint32 cycles)
+//NOTE: This is only used by the old execution code... Safe to remove
+// once the timer system is stable.
+void TOMExecPIT(uint32 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))
+ TOMSetPendingTimerInt();
+ GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); // GPUSetIRQLine does the 'IRQ enabled' checking
+
+ if (TOMIRQEnabled(IRQ_TIMER))
m68k_set_irq(7); // Cause a 68000 NMI...
- tom_reset_timer();
+ 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(7); // Generate 68K NMI
+
+ TOMResetPIT();
+}
projects / virtualjaguar / blobdiff