//
// 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
//
// F00028 W ----xxxx xxxxxxxx VMODE - video mode
// W ----xxx- -------- (PWIDTH1-8 - width of pixel in video clock cycles)
// W -------x -------- (VARMOD - enable variable color resolution)
-// W -------- x------- (BGEN - clear line buffere to BG color)
+// W -------- x------- (BGEN - clear line buffer to BG color)
// W -------- -x------ (CSYNC - enable composite sync on VSYNC)
// W -------- --x----- (BINC - local border color if INCEN)
// W -------- ---x---- (INCEN - encrustation enable)
// F0211C W -------- -------x G_DIVCTRL - divide unit control
// W -------- -------x (DIV_OFFSET - 1=16.16 divide, 0=32-bit divide)
// ------------------------------------------------------------
+// BLITTER REGISTERS
+// ------------------------------------------------------------
+// F02200-F022FF R/W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Blitter registers
+// F02200 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_BASE - A1 base register
+// F02204 W -------- ---xxxxx -xxxxxxx xxxxx-xx A1_FLAGS - A1 flags register
+// W -------- ---x---- -------- -------- (YSIGNSUB - invert sign of Y delta)
+// W -------- ----x--- -------- -------- (XSIGNSUB - invert sign of X delta)
+// W -------- -----x-- -------- -------- (Y add control)
+// W -------- ------xx -------- -------- (X add control)
+// W -------- -------- -xxxxxx- -------- (width in 6-bit floating point)
+// W -------- -------- -------x xx------ (ZOFFS1-6 - Z data offset)
+// W -------- -------- -------- --xxx--- (PIXEL - pixel size)
+// W -------- -------- -------- ------xx (PITCH1-4 - data phrase pitch)
+// F02208 W -xxxxxxx xxxxxxxx -xxxxxxx xxxxxxxx A1_CLIP - A1 clipping size
+// W -xxxxxxx xxxxxxxx -------- -------- (height)
+// W -------- -------- -xxxxxxx xxxxxxxx (width)
+// F0220C R/W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_PIXEL - A1 pixel pointer
+// R/W xxxxxxxx xxxxxxxx -------- -------- (Y pixel value)
+// R/W -------- -------- xxxxxxxx xxxxxxxx (X pixel value)
+// F02210 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_STEP - A1 step value
+// W xxxxxxxx xxxxxxxx -------- -------- (Y step value)
+// W -------- -------- xxxxxxxx xxxxxxxx (X step value)
+// F02214 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_FSTEP - A1 step fraction value
+// W xxxxxxxx xxxxxxxx -------- -------- (Y step fraction value)
+// W -------- -------- xxxxxxxx xxxxxxxx (X step fraction value)
+// F02218 R/W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_FPIXEL - A1 pixel pointer fraction
+// R/W xxxxxxxx xxxxxxxx -------- -------- (Y pixel fraction value)
+// R/W -------- -------- xxxxxxxx xxxxxxxx (X pixel fraction value)
+// F0221C W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_INC - A1 increment
+// W xxxxxxxx xxxxxxxx -------- -------- (Y increment)
+// W -------- -------- xxxxxxxx xxxxxxxx (X increment)
+// F02220 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A1_FINC - A1 increment fraction
+// W xxxxxxxx xxxxxxxx -------- -------- (Y increment fraction)
+// W -------- -------- xxxxxxxx xxxxxxxx (X increment fraction)
+// F02224 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A2_BASE - A2 base register
+// F02228 W -------- ---xxxxx -xxxxxxx xxxxx-xx A2_FLAGS - A2 flags register
+// W -------- ---x---- -------- -------- (YSIGNSUB - invert sign of Y delta)
+// W -------- ----x--- -------- -------- (XSIGNSUB - invert sign of X delta)
+// W -------- -----x-- -------- -------- (Y add control)
+// W -------- ------xx -------- -------- (X add control)
+// W -------- -------- -xxxxxx- -------- (width in 6-bit floating point)
+// W -------- -------- -------x xx------ (ZOFFS1-6 - Z data offset)
+// W -------- -------- -------- --xxx--- (PIXEL - pixel size)
+// W -------- -------- -------- ------xx (PITCH1-4 - data phrase pitch)
+// F0222C W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A2_MASK - A2 window mask
+// F02230 R/W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A2_PIXEL - A2 pixel pointer
+// R/W xxxxxxxx xxxxxxxx -------- -------- (Y pixel value)
+// R/W -------- -------- xxxxxxxx xxxxxxxx (X pixel value)
+// F02234 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx A2_STEP - A2 step value
+// W xxxxxxxx xxxxxxxx -------- -------- (Y step value)
+// W -------- -------- xxxxxxxx xxxxxxxx (X step value)
+// F02238 W -xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_CMD - command register
+// W -x------ -------- -------- -------- (SRCSHADE - modify source intensity)
+// W --x----- -------- -------- -------- (BUSHI - hi priority bus)
+// W ---x---- -------- -------- -------- (BKGWREN - writeback destination)
+// W ----x--- -------- -------- -------- (DCOMPEN - write inhibit from data comparator)
+// W -----x-- -------- -------- -------- (BCOMPEN - write inhibit from bit coparator)
+// W ------x- -------- -------- -------- (CMPDST - compare dest instead of src)
+// W -------x xxx----- -------- -------- (logical operation)
+// W -------- ---xxx-- -------- -------- (ZMODE - Z comparator mode)
+// W -------- ------x- -------- -------- (ADDDSEL - select sum of src & dst)
+// W -------- -------x -------- -------- (PATDSEL - select pattern data)
+// W -------- -------- x------- -------- (TOPNEN - enable carry into top intensity nibble)
+// W -------- -------- -x------ -------- (TOPBEN - enable carry into top intensity byte)
+// W -------- -------- --x----- -------- (ZBUFF - enable Z updates in inner loop)
+// W -------- -------- ---x---- -------- (GOURD - enable gouraud shading in inner loop)
+// W -------- -------- ----x--- -------- (DSTA2 - reverses A2/A1 roles)
+// W -------- -------- -----x-- -------- (UPDA2 - add A2 step to A2 in outer loop)
+// W -------- -------- ------x- -------- (UPDA1 - add A1 step to A1 in outer loop)
+// W -------- -------- -------x -------- (UPDA1F - add A1 fraction step to A1 in outer loop)
+// W -------- -------- -------- x------- (diagnostic use)
+// W -------- -------- -------- -x------ (CLIP_A1 - clip A1 to window)
+// W -------- -------- -------- --x----- (DSTWRZ - enable dest Z write in inner loop)
+// W -------- -------- -------- ---x---- (DSTENZ - enable dest Z read in inner loop)
+// W -------- -------- -------- ----x--- (DSTEN - enables dest data read in inner loop)
+// W -------- -------- -------- -----x-- (SRCENX - enable extra src read at start of inner)
+// W -------- -------- -------- ------x- (SRCENZ - enables source Z read in inner loop)
+// W -------- -------- -------- -------x (SRCEN - enables source data read in inner loop)
+// F02238 R xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_CMD - status register
+// R xxxxxxxx xxxxxxxx -------- -------- (inner count)
+// R -------- -------- xxxxxxxx xxxxxx-- (diagnostics)
+// R -------- -------- -------- ------x- (STOPPED - when stopped in collision detect)
+// R -------- -------- -------- -------x (IDLE - when idle)
+// F0223C W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_COUNT - counters register
+// W xxxxxxxx xxxxxxxx -------- -------- (outer loop count)
+// W -------- -------- xxxxxxxx xxxxxxxx (inner loop count)
+// F02240-F02247 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_SRCD - source data register
+// F02248-F0224F W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_DSTD - destination data register
+// F02250-F02257 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_DSTZ - destination Z register
+// F02258-F0225F W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_SRCZ1 - source Z register 1
+// F02260-F02267 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_SRCZ2 - source Z register 2
+// F02268-F0226F W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_PATD - pattern data register
+// F02270 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_IINC - intensity increment
+// F02274 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_ZINC - Z increment
+// F02278 W -------- -------- -------- -----xxx B_STOP - collision control
+// W -------- -------- -------- -----x-- (STOPEN - enable blitter collision stops)
+// W -------- -------- -------- ------x- (ABORT - abort after stop)
+// W -------- -------- -------- -------x (RESUME - resume after stop)
+// F0227C W -------- xxxxxxxx xxxxxxxx xxxxxxxx B_I3 - intensity 3
+// F02280 W -------- xxxxxxxx xxxxxxxx xxxxxxxx B_I2 - intensity 2
+// F02284 W -------- xxxxxxxx xxxxxxxx xxxxxxxx B_I1 - intensity 1
+// F02288 W -------- xxxxxxxx xxxxxxxx xxxxxxxx B_I0 - intensity 0
+// F0228C W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z3 - Z3
+// F02290 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z2 - Z2
+// F02294 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z1 - Z1
+// F02298 W xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx B_Z0 - Z0
+// ------------------------------------------------------------
-#ifndef __PORT__
-#include <windows.h>
-#endif
-#include <SDL.h>
-#include "SDLptc.h"
#include "tom.h"
-#include "gpu.h"
-#include "objectp.h"
-#include "cry2rgb.h"
-
-
-extern uint32 jaguar_mainRom_crc32;
-
-//This can be defined in the makefile as well...
-//#define TOM_DEBUG
-extern Console console;
-extern Surface * surface;
+#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"
-// This makes sense IFF it's being used in an endian friendly way. Currently, it's not.
-//#define SWAP_32_ALL(A) ((SWAP_16(A>>16))|(SWAP_16(A<<16)))
-//#define SWAP_32(A) ((A>>16)|(A<<16))
-//#define SWAP_16(A) ((A>>8)|(A<<8))
-// These are more endian friendly...
-#define SET16(addr, val) tom_ram_8[addr] = ((val) & 0xFF00) >> 8, tom_ram_8[addr+1] = (val) & 0x00FF
-#define GET16(addr) (tom_ram_8[addr] << 8) | tom_ram_8[addr+1]
+#define NEW_TIMER_SYSTEM
-static uint8 * tom_ram_8;
-// This is just braindead and wrong!
-//static uint16 * tom_ram_16;
-//static uint32 * tom_ram_32;
+// TOM registers (offset from $F00000)
-/*
-#define MEMCON1 tom_ram_16[0]
-#define MEMCON2 tom_ram_16[1]
-#define VMODE tom_ram_16[0x28>>1]
-#define VBB tom_ram_16[0x40>>1]
-#define VBE tom_ram_16[0x42>>1]
-#define VDB tom_ram_16[0x46>>1]
-#define VDE tom_ram_16[0x48>>1]
-
-#define BG tom_ram_16[0x58>>1]
-
-#define HBB tom_ram_16[0x30>>1]
-#define HBE tom_ram_16[0x32>>1]
-#define HDB tom_ram_16[0x38>>1]
-#define HDE tom_ram_16[0x3C>>1]
-
-#define HP tom_ram_16[0x2E>>1]
-#define VP tom_ram_16[0x3E>>1]
-#define VS tom_ram_16[0x44>>1]
-
-#define BKGCOLOR tom_ram_16[0x58>>1]
-*/
#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 HP 0x2E
-#define HBB 0x30
+#define MODE 0x0006 // Line buffer to video generator mode
+#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 // Horizontal blank begin
#define HBE 0x32
-#define HDB 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
-#define VBB 0x40
+#define VP 0x3E // Value ranges from 1 - 2048 (value written + 1)
+#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 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
+#define INT2 0xE2
+
+//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)
+// 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
+
+//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
-uint32 tom_width, tom_height, tom_real_internal_width;
-
-static uint32 tom_timer_prescaler;
-static uint32 tom_timer_divider;
-static int32 tom_timer_counter;
+//This can be defined in the makefile as well...
+//(It's easier to do it here, though...)
+//#define TOM_DEBUG
-uint32 tom_scanline;
-uint32 hblankWidthInPixels = 0;
+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;
-static char * videoMode_to_str[8] =
- {"16 bpp CRY", "24 bpp RGB", "16 bpp DIRECT", "16 bpp RGB",
- "Mixed mode", "24 bpp RGB", "16 bpp DIRECT", "16 bpp RGB"};
+// These are set by the "user" of the Jaguar core lib, since these are
+// OS/system dependent.
+uint32_t * screenBuffer;
+uint32_t screenPitch;
-extern uint8 objectp_running;
+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 *);
-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);
+// Private function prototypes
-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_scanline(uint32_t * backbuffer);
+void tom_render_24bpp_scanline(uint32_t * backbuffer);
+void tom_render_16bpp_direct_scanline(uint32_t * backbuffer);
+void tom_render_16bpp_rgb_scanline(uint32_t * backbuffer);
+void tom_render_16bpp_cry_rgb_mix_scanline(uint32_t * backbuffer);
-render_xxx_scanline_fn * scanline_render_normal[]=
+//render_xxx_scanline_fn * scanline_render_normal[] =
+render_xxx_scanline_fn * scanline_render[] =
{
tom_render_16bpp_cry_scanline,
tom_render_24bpp_scanline,
tom_render_16bpp_cry_rgb_mix_scanline,
tom_render_24bpp_scanline,
tom_render_16bpp_direct_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,
+ tom_render_16bpp_rgb_scanline
};
-render_xxx_scanline_fn * scanline_render[8];
-uint16 tom_puck_int_pending;
-uint16 tom_timer_int_pending;
-uint16 tom_object_int_pending;
-uint16 tom_gpu_int_pending;
-uint16 tom_video_int_pending;
+// 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)
-uint16 * tom_cry_rgb_mix_lut;
+*/
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void tom_calc_cry_rgb_mix_lut(void)
-{
- uint32 chrm, chrl, y;
+// 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
+*/
- memory_malloc_secure((void **)&tom_cry_rgb_mix_lut, 0x20000, "cry/rgb mixed mode lut");
+uint32_t RGB16ToRGB32[0x10000];
+uint32_t CRY16ToRGB32[0x10000];
+uint32_t MIX16ToRGB32[0x10000];
- 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 & 0xF800) << 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
- {
- 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);
- 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_puck_int(void)
+
+void TOMSetPendingJERRYInt(void)
{
- tom_puck_int_pending = 1;
+ 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 = SWAP_16(VMODE);
- uint16 vmode = GET16(VMODE);
- return ((vmode >> 1) & 0x03) | ((vmode & 0x100) >> 6);
+ uint16_t vmode = GET16(tomRam8, VMODE);
+ return ((vmode & VARMOD) >> 6) | ((vmode & MODE) >> 1);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-uint16 tom_get_scanline(void)
+
+//Used in only one place (and for debug purposes): OBJECTP.CPP
+#warning "Used in only one place (and for debug purposes): OBJECTP.CPP !!! FIX !!!"
+uint16_t TOMGetVDB(void)
{
- return tom_scanline;
+ return GET16(tomRam8, VDB);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-uint16 tom_get_hdb(void)
+
+
+uint16_t TOMGetHC(void)
{
-// return SWAP_16(HDB);
- return GET16(HDB);
+ return GET16(tomRam8, HC);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-uint16 tom_get_vdb(void)
+
+
+uint16_t TOMGetVP(void)
{
-// return SWAP_16(VBE);
- return GET16(VBE);
+ return GET16(tomRam8, VP);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
+#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)
{
- uint32 chrm, chrl, y;
+//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!
+ // 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
- uint16 width = tom_width;
- uint8 * current_line_buffer=(uint8 *)&tom_ram_8[0x1800];
-
while (width)
{
- uint16 color;
- color = *current_line_buffer++;
- color <<= 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)
{
- uint32 chrm, chrl, y;
+//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 += 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
- 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);
-
-
- *backbuffer++=(red<<10)|(green<<5)|blue;
+ uint16_t color = (*current_line_buffer++) << 8;
+ color |= *current_line_buffer++;
+ *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];
-
- while (width)
+//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
+#ifdef LEFT_BG_FIX
{
- 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;
- width--;
+ 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;
}
-}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void tom_render_16bpp_direct_scanline(int16 *backbuffer)
-{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
+#else
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
+#endif
+
while (width)
{
- uint16 color=*current_line_buffer++;
- color<<=8;
- color|=*current_line_buffer++;
- color>>=1;
- *backbuffer++=color;
+ uint32_t g = *current_line_buffer++;
+ uint32_t r = *current_line_buffer++;
+ current_line_buffer++;
+ uint32_t b = *current_line_buffer++;
+//hm. *backbuffer++ = 0xFF000000 | (b << 16) | (g << 8) | r;
+ *backbuffer++ = 0x000000FF | (r << 24) | (g << 16) | (b << 8);
width--;
}
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
+// Seems to me that this is NOT a valid mode--the JTRM seems to imply that you
+// would need extra hardware outside of the Jaguar console to support this!
//
+// 16 BPP direct mode rendering
//
-//////////////////////////////////////////////////////////////////////////////
-void tom_render_16bpp_rgb_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++;
- color<<=8;
- color|=*current_line_buffer++;
- color>>=1;
- color=(color&0x007c00)|((color&0x00003e0)>>5)|((color&0x0000001f)<<5);
- *backbuffer++=color;
+ uint16_t color = (*current_line_buffer++) << 8;
+ color |= *current_line_buffer++;
+ *backbuffer++ = color >> 1;
width--;
}
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
//
+// 16 BPP RGB mode rendering
//
-//////////////////////////////////////////////////////////////////////////////
-void tom_render_16bpp_cry_rgb_mix_stretch_scanline(int16 *backbuffer)
+void tom_render_16bpp_rgb_scanline(uint32_t * backbuffer)
{
- uint32 chrm, chrl, y;
+//CHANGED TO 32BPP RENDERING
+ // 16 BPP RGB: 0-5 green, 6-10 blue, 11-15 red
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
- while (width)
+ 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 += 2 * -startPos;
+ else
+#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);
+
+ for(int16_t i=0; i<startPos; i++)
+ *backbuffer++ = pixel;
+
+ width -= startPos;
}
-}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void tom_render_16bpp_cry_stretch_scanline(int16 *backbuffer)
-{
- uint32 chrm, chrl, y;
+#else
+//This should likely be 4 instead of 2 (?--not sure)
+ backbuffer += 2 * startPos, width -= startPos;
+#endif
- 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;
+ uint32_t color = (*current_line_buffer++) << 8;
+ color |= *current_line_buffer++;
+ *backbuffer++ = RGB16ToRGB32[color];
width--;
}
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
//
+// Process a single halfline
//
-//////////////////////////////////////////////////////////////////////////////
-void tom_render_24bpp_stretch_scanline(int16 *backbuffer)
+void TOMExecHalfline(uint16_t halfline, bool render)
{
- uint16 width=tom_width;
- uint8 *current_line_buffer=(uint8*)&tom_ram_8[0x1800];
-
- while (width)
+ uint16_t field2 = halfline & 0x0800;
+ halfline &= 0x07FF;
+ bool inActiveDisplayArea = true;
+
+ // Execute OP only on even halflines (skip higher resolutions for now...)
+ if (halfline & 0x01)
+ return;
+
+//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
+*/
+
+ // 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))
{
- 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--;
+ if (render)
+ {
+ 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);
+ }
}
-}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void tom_render_16bpp_direct_stretch_scanline(int16 *backbuffer)
+ else
+ inActiveDisplayArea = false;
+
+ // Take PAL into account...
+
+ 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 = 0;
+
+ // Bit 0 in VP is interlace flag. 0 = interlace, 1 = non-interlaced
+ if (tomRam8[VP + 1] & 0x01)
+ TOMCurrentLine = &(screenBuffer[((halfline - topVisible) / 2) * screenPitch]);//non-interlace
+ else
+ TOMCurrentLine = &(screenBuffer[(((halfline - topVisible) / 2) * screenPitch * 2) + (field2 ? 0 : screenPitch)]);//interlace
+
+ // Here's our virtualized scanline code...
+
+ if ((halfline >= topVisible) && (halfline < bottomVisible))
+ {
+ if (inActiveDisplayArea)
+ {
+#warning "The following doesn't put BORDER color on the sides... !!! FIX !!!"
+ if (vjs.renderType == RT_NORMAL)
+ {
+ 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)
{
- 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_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)
{
- uint16 color=*current_line_buffer++;
- color<<=8;
- color|=*current_line_buffer++;
- color>>=1;
- *backbuffer++=color;
- current_line_buffer+=2;
+ 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--;
}
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-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;
- width--;
+#endif
+
+ }
+ }
+ else
+ {
+ // If outside of VDB & VDE, then display the border color
+ 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_t i=0; i<tomWidth; i++)
+ *currentLineBuffer++ = pixel;
+ }
}
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
//
+// TOM initialization
//
-//////////////////////////////////////////////////////////////////////////////
-void tom_exec_scanline(int16 * backbuffer, int32 scanline, int8 render)
+void TOMInit(void)
{
- UINT16 bg = GET16(BG);
- tom_scanline = scanline;
+ TOMFillLookupTables();
+ OPInit();
+ BlitterInit();
+ TOMReset();
+}
- jaguar_word_write(0xF00004, jaguar_word_read(0xF00004) + 1);
- if (render)
- {
- uint8 * current_line_buffer = (uint8 *)&tom_ram_8[0x1800];
- uint16 * current_line_buffer_16 = (uint16 *)current_line_buffer;
+void TOMDone(void)
+{
+ TOMDumpIORegistersToLog();
+ 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));
+}
- for(int i=0; i<tom_real_internal_width; i++)
- *current_line_buffer_16++ = bg;
- op_process_list(backbuffer, scanline, render);
-
- (scanline_render[tom_getVideoMode()])(backbuffer);
- }
-}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void tom_init(void)
+uint32_t TOMGetVideoModeWidth(void)
{
- op_init();
- blitter_init();
- pcm_init();
-// fprintf(log_get(),"tom_init()\n");
- memory_malloc_secure((void **)&tom_ram_8, 0x4000, "tom ram");
-// tom_ram_16 = (uint16 *)tom_ram_8;
-// tom_ram_32 = (uint32 *)tom_ram_8;
- tom_reset();
- memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
- tom_calc_cry_rgb_mix_lut();
+ //These widths are pretty bogus. Should use HDB1/2 & HDE/HBB & PWIDTH to calc the width...
+// uint32_t width[8] = { 1330, 665, 443, 332, 266, 222, 190, 166 };
+//Temporary, for testing Doom...
+// 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)
+ // PWIDTH = 2 -> 0.50:1 (1:2) pixels
+ // PWIDTH = 3 -> 0.75:1 (3:4) pixels
+ // PWIDTH = 4 -> 1.00:1 (1:1) pixels
+ // PWIDTH = 5 -> 1.25:1 (5:4) pixels
+ // PWIDTH = 6 -> 1.50:1 (3:2) pixels
+ // PWIDTH = 7 -> 1.75:1 (7:4) pixels
+ // PWIDTH = 8 -> 2.00:1 (2:1) pixels
+
+ // Also note that the JTRM says that PWIDTH of 4 gives pixels that are "about" square--
+ // this implies that the other modes have pixels that are *not* square!
+ // Also, I seriously doubt that you will see any games that use PWIDTH = 1!
+
+ // NOTE: Even though the PWIDTH value is + 1, here we're using a zero-based index and
+ // so we don't bother to add one...
+// return width[(GET16(tomRam8, VMODE) & PWIDTH) >> 9];
+
+ // Now, we just calculate it...
+/* 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_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);
+
+// More speculating...
+// According to the JTRM, the number of potential pixels across is given by the
+// Horizontal Period (HP - in NTSC this is 845). The Horizontal Count counts from
+// zero to this value twice per scanline (the high bit is set on the second count).
+// HBE and HBB define the absolute "black" limits of the screen, while HDB1/2 and
+// HDE determine the extent of the OP "on" time. I.e., when the OP is turned on by
+// HDB1, it starts fetching the line from position 0 in LBUF.
+
+// The trick, it would seem, is to figure out how long the typical visible scanline
+// of a TV is in HP ticks and limit the visible area to that (divided by PWIDTH, of
+// course). Using that length, we can establish an "absolute left display limit" with
+// which to measure HBB & HDB1/2 against when rendering LBUF (i.e., if HDB1 is 20 ticks
+// to the right of the ALDL and PWIDTH is 4, then start writing the LBUF starting at
+// backbuffer + 5 pixels).
+
+// That's basically what we're doing now...!
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-uint32 tom_getHBlankWidthInPixels(void)
+
+
+// *** 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_t TOMGetVideoModeHeight(void)
{
- return hblankWidthInPixels;
+// 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 227;//WAS:(vde/*-vdb*/) >> 1;
+ // The video mode height probably works this way:
+ // VC counts from 0 to VP. VDB starts the OP. Either when
+ // VDE is reached or VP, the OP is stopped. Let's try it...
+ // Also note that we're conveniently ignoring interlaced display modes...!
+// return ((vde > vp ? vp : vde) - vdb) >> 1;
+// return ((vde > vbb ? vbb : vde) - vdb) >> 1;
+//Let's try from the Vertical Blank interval...
+//Seems to work OK!
+// return (vbb - vbe) >> 1; // Again, doesn't take interlacing into account...
+// This of course doesn't take interlacing into account. But I haven't seen any
+// Jaguar software that takes advantage of it either...
+//Also, doesn't reflect PAL Jaguar either... !!! FIX !!! [DONE]
+// return 240; // Set virtual screen height to 240 lines...
+ return (vjs.hardwareTypeNTSC ? 240 : 256);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
//
+// TOM reset code
+// Now PAL friendly!
//
-//////////////////////////////////////////////////////////////////////////////
-uint32 tom_getVideoModeWidth(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)
{
- static uint16 onetime = 1;
-
-/* uint16 vmode = SWAP_16(VMODE);
- uint16 hdb = SWAP_16(HDB);
- uint16 hde = SWAP_16(HDE);
- uint16 hbb = SWAP_16(HBB);
- uint16 hbe = SWAP_16(HBE);*/
- uint16 vmode = GET16(VMODE);
- uint16 hdb = GET16(HDB);
- uint16 hde = GET16(HDE);
- uint16 hbb = GET16(HBB);
- uint16 hbe = GET16(HBE);
-
- int clock_cycles_per_pixel = ((vmode >> 9) & 0x07);
-
- uint32 width = 640;
- switch (clock_cycles_per_pixel)
+ OPReset();
+ BlitterReset();
+ memset(tomRam8, 0x00, 0x4000);
+
+ if (vjs.hardwareTypeNTSC)
{
- case 0: width = 640; break;
- case 1: width = 640; break;
- case 2: width = 448; break;
- case 3: width = 320; break;
- case 4: width = 256; break;
- case 5: width = 256; break;
- case 6: width = 256; break;
- case 7: width = 320; break;
-// default: fprintf(log_get(),"%i \n",clock_cycles_per_pixel);
+ SET16(tomRam8, MEMCON1, 0x1861);
+// SET16(tomRam8, MEMCON1, 0x1865);//Bunch of BS
+ SET16(tomRam8, MEMCON2, 0x35CC);
+ SET16(tomRam8, HP, 844); // Horizontal Period (1-based; HP=845)
+ SET16(tomRam8, HBB, 1713); // Horizontal Blank Begin
+ 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);
}
-
- if (jaguar_mainRom_crc32 == 0x3c7bfda8)
+ else // PAL Jaguar
{
- if (width == 320)
- width += 80;
- if (width == 448)
- width -= 16;
+ 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);
}
- if (hdb == 123)
- hblankWidthInPixels = 16;
- else
- hblankWidthInPixels = 0;
-// fprintf(log_get(),"hdb=%i hbe=%i\n",hdb,hbe);
- return width;
+ tomWidth = 0;
+ tomHeight = 0;
+
+ tom_jerry_int_pending = 0;
+ tom_timer_int_pending = 0;
+ tom_object_int_pending = 0;
+ tom_gpu_int_pending = 0;
+ tom_video_int_pending = 0;
+
+ tomTimerPrescaler = 0; // TOM PIT is disabled
+ tomTimerDivider = 0;
+ tomTimerCounter = 0;
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+
//
+// Dump all TOM register values to the log
//
-//////////////////////////////////////////////////////////////////////////////
-uint32 tom_getVideoModeHeight(void)
+void TOMDumpIORegistersToLog(void)
{
-/* uint16 vmode = SWAP_16(VMODE);
- uint16 vdb = SWAP_16(VDB);
- uint16 vde = SWAP_16(VDE);
- uint16 vbb = SWAP_16(VBB);
- uint16 vbe = SWAP_16(VBE);*/
- uint16 vmode = GET16(VMODE);
- uint16 vdb = GET16(VDB);
- uint16 vde = GET16(VDE);
- uint16 vbb = GET16(VBB);
- uint16 vbe = GET16(VBE);
-
- if (vde == 65535)
- vde = vbb;
-
- uint32 screen_height = (vde/*-vdb*/) >> 1;
- return 227;//WAS:screen_height);
+ WriteLog("\n\n---------------------------------------------------------------------\n");
+ WriteLog("TOM I/O Registers\n");
+ WriteLog("---------------------------------------------------------------------\n");
+ WriteLog("F000%02X (MEMCON1): $%04X\n", MEMCON1, GET16(tomRam8, MEMCON1));
+ WriteLog("F000%02X (MEMCON2): $%04X\n", MEMCON2, GET16(tomRam8, MEMCON2));
+ WriteLog("F000%02X (HC): $%04X\n", HC, GET16(tomRam8, HC));
+ WriteLog("F000%02X (VC): $%04X\n", VC, GET16(tomRam8, VC));
+ WriteLog("F000%02X (OLP): $%08X\n", OLP, GET32(tomRam8, OLP));
+ WriteLog("F000%02X (OBF): $%04X\n", OBF, GET16(tomRam8, OBF));
+ WriteLog("F000%02X (VMODE): $%04X\n", VMODE, GET16(tomRam8, VMODE));
+ WriteLog("F000%02X (BORD1): $%04X\n", BORD1, GET16(tomRam8, BORD1));
+ WriteLog("F000%02X (BORD2): $%04X\n", BORD2, GET16(tomRam8, BORD2));
+ WriteLog("F000%02X (HP): $%04X\n", HP, GET16(tomRam8, HP));
+ WriteLog("F000%02X (HBB): $%04X\n", HBB, GET16(tomRam8, HBB));
+ WriteLog("F000%02X (HBE): $%04X\n", HBE, GET16(tomRam8, HBE));
+ WriteLog("F000%02X (HS): $%04X\n", HS, GET16(tomRam8, HS));
+ WriteLog("F000%02X (HVS): $%04X\n", HVS, GET16(tomRam8, HVS));
+ WriteLog("F000%02X (HDB1): $%04X\n", HDB1, GET16(tomRam8, HDB1));
+ WriteLog("F000%02X (HDB2): $%04X\n", HDB2, GET16(tomRam8, HDB2));
+ WriteLog("F000%02X (HDE): $%04X\n", HDE, GET16(tomRam8, HDE));
+ WriteLog("F000%02X (VP): $%04X\n", VP, GET16(tomRam8, VP));
+ WriteLog("F000%02X (VBB): $%04X\n", VBB, GET16(tomRam8, VBB));
+ WriteLog("F000%02X (VBE): $%04X\n", VBE, GET16(tomRam8, VBE));
+ WriteLog("F000%02X (VS): $%04X\n", VS, GET16(tomRam8, VS));
+ WriteLog("F000%02X (VDB): $%04X\n", VDB, GET16(tomRam8, VDB));
+ WriteLog("F000%02X (VDE): $%04X\n", VDE, GET16(tomRam8, VDE));
+ WriteLog("F000%02X (VEB): $%04X\n", VEB, GET16(tomRam8, VEB));
+ WriteLog("F000%02X (VEE): $%04X\n", VEE, GET16(tomRam8, VEE));
+ WriteLog("F000%02X (VI): $%04X\n", VI, GET16(tomRam8, VI));
+ WriteLog("F000%02X (PIT0): $%04X\n", PIT0, GET16(tomRam8, PIT0));
+ WriteLog("F000%02X (PIT1): $%04X\n", PIT1, GET16(tomRam8, PIT1));
+ WriteLog("F000%02X (HEQ): $%04X\n", HEQ, GET16(tomRam8, HEQ));
+ WriteLog("F000%02X (BG): $%04X\n", BG, GET16(tomRam8, BG));
+ WriteLog("F000%02X (INT1): $%04X\n", INT1, GET16(tomRam8, INT1));
+ WriteLog("F000%02X (INT2): $%04X\n", INT2, GET16(tomRam8, INT2));
+ WriteLog("---------------------------------------------------------------------\n\n\n");
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void tom_reset(void)
-{
-// fprintf(log_get(),"tom_reset()\n");
- op_reset();
- blitter_reset();
- pcm_reset();
-
- memset(tom_ram_8, 0x00, 0x4000);
-// tom_ram_8[MEMCON1] = 0x18, tom_ram_8[MEMCON1+1] = 0x61;
- SET16(MEMCON1, 0x1861);
-// tom_ram_8[MEMCON2] = 0x00, tom_ram_8[MEMCON2+1] = 0x00;
- SET16(MEMCON2, 0x0000);
-// tom_ram_8[VMODE] = 0x06, tom_ram_8[VMODE+1] = 0xC1;
- SET16(VMODE, 0x06C1);
-// tom_ram_8[VP] = (523 & 0xFF00) >> 8, tom_ram_8[VP+1] = 523 & 0x00FF; // 525-2
- SET16(VP, 523);
-// tom_ram_8[HP] = SWAP_16(844);
- SET16(HP, 844);
-// tom_ram_8[VS] = SWAP_16(523-6);
- SET16(VS, 523 - 6);
-// tom_ram_8[VBB] = SWAP_16(434);
- SET16(VBB, 434);
-// tom_ram_8[VBE] = SWAP_16(24);
- SET16(VBE, 24);
-// tom_ram_8[HBB] = SWAP_16(689+0x400);
- SET16(HBB, 689 + 0x400);
-// tom_ram_8[HBE] = SWAP_16(125);
- SET16(HBE, 125);
-
-// tom_ram_8[VDE] = SWAP_16(65535);
- SET16(VDE, 65535);
-// tom_ram_8[VDB] = SWAP_16(28);
- SET16(VDB, 28);
-// tom_ram_8[HDB] = SWAP_16(166);
- SET16(HDB, 166);
-// tom_ram_8[HDE] = SWAP_16(65535);
- SET16(HDE, 65535);
-
- tom_width = tom_real_internal_width = 0;
- tom_height = 0;
- tom_scanline = 0;
-
-// hblankWidthInPixels = (tom_ram_8[HDB] << 8) | tom_ram_8[HDB+1];
-// hblankWidthInPixels >>= 1;
- hblankWidthInPixels = (GET16(HDB)) >> 1;
-
- tom_puck_int_pending = 0;
- tom_timer_int_pending = 0;
- tom_object_int_pending = 0;
- tom_gpu_int_pending = 0;
- tom_video_int_pending = 0;
- tom_timer_prescaler = 0;
- tom_timer_divider = 0;
- tom_timer_counter = 0;
- memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
-}
//
// TOM byte access (read)
//
-
-unsigned tom_byte_read(unsigned int offset)
+uint8_t TOMReadByte(uint32_t offset, uint32_t who/*=UNKNOWN*/)
{
- offset &= 0xFF3FFF;
+//???Is this needed???
+// It seems so. Perhaps it's the +$8000 offset being written to (32-bit interface)?
+// However, the 32-bit interface is WRITE ONLY, so that can't be it...
+// Also, the 68K CANNOT make use of the 32-bit interface, since its bus width is only 16-bits...
+// offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
- fprintf(log_get(), "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 gpu_byte_read(offset);
- else if ((offset >= gpu_work_ram_base) && (offset < gpu_work_ram_base+0x1000))
- return gpu_byte_read(offset);
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
- return op_byte_read(offset);
+ 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 >= 0xF02200) && (offset < 0xF022A0))
- return blitter_byte_read(offset);
+ 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)
//
-
-unsigned tom_word_read(unsigned int offset)
+uint16_t TOMReadWord(uint32_t offset, uint32_t who/*=UNKNOWN*/)
{
- offset &= 0xFF3FFF;
+//???Is this needed???
+// offset &= 0xFF3FFF;
#ifdef TOM_DEBUG
- fprintf(log_get(), "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: ReadWord attempted from GPU register file by %s (unimplemented)!\n", whoName[who]);
+
if (offset == 0xF000E0)
{
- uint16 data = (tom_puck_int_pending << 4) | (tom_timer_int_pending << 3)
+ // 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);
- //fprintf(log_get(),"tom: interrupt status is 0x%.4x \n",data);
+ //WriteLog("tom: interrupt status is 0x%.4x \n",data);
return data;
}
- else if (offset == 0xF00006)
- return (tom_scanline << 1) + 1;
- else if ((offset >= gpu_control_ram_base) && (offset < gpu_control_ram_base+0x20))
- return gpu_word_read(offset);
- else if ((offset >= gpu_work_ram_base) && (offset < gpu_work_ram_base+0x1000))
- return gpu_word_read(offset);
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
- return op_word_read(offset);
+//Shoud be handled by the jaguar main loop now... And it is! ;-)
+/* else if (offset == 0xF00006) // VC
+ // What if we're in interlaced mode?
+ // According to docs, in non-interlace mode VC is ALWAYS even...
+// return (tom_scanline << 1);// + 1;
+//But it's causing Rayman to be fucked up... Why???
+//Because VC is even in NI mode when calling the OP! That's why!
+ return (tom_scanline << 1) + 1;//*/
+/*
+// 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))
+ return GPUReadWord(offset, who);
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
+ return OPReadWord(offset, who);*/
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
- return blitter_word_read(offset);
+ return BlitterReadWord(offset, who);
else if (offset == 0xF00050)
- return tom_timer_prescaler;
+ return tomTimerPrescaler;
else if (offset == 0xF00052)
- return tom_timer_divider;
+ return tomTimerDivider;
offset &= 0x3FFF;
-
-// uint16 data = tom_byte_read(offset);
-// data <<= 8;
-// data |= tom_byte_read(offset+1);
-
-// return data;
- return (tom_byte_read(offset) << 8) | tom_byte_read(offset+1);
+ return (TOMReadByte(offset, who) << 8) | TOMReadByte(offset + 1, who);
}
+
+#define TOM_STRICT_MEMORY_ACCESS
//
// TOM byte access (write)
//
-
-void tom_byte_write(unsigned offset, unsigned data)
+void TOMWriteByte(uint32_t offset, uint8_t data, uint32_t who/*=UNKNOWN*/)
{
- offset &= 0xFF3FFF;
+ // Moved here tentatively, so we can see everything written to TOM.
+ tomRam8[offset & 0x3FFF] = data;
#ifdef TOM_DEBUG
- fprintf(log_get(), "TOM: Writing byte %02X at %06X\n", data, offset);
+ 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(" -->[%06X] by %s\n", offset, whoName[who]);
#endif
- if ((offset >= gpu_control_ram_base) && (offset < gpu_control_ram_base+0x20))
+#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))
{
- gpu_byte_write(offset, data);
+ GPUWriteByte(offset, data, who);
return;
}
- 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))
{
- gpu_byte_write(offset, data);
+ GPUWriteByte(offset, data, who);
return;
}
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
{
- op_byte_write(offset, data);
+ OPWriteByte(offset, data, who);
return;
- }
+ }*/
else if ((offset >= 0xF02200) && (offset < 0xF022A0))
{
- blitter_byte_write(offset, data);
+ BlitterWriteByte(offset, data, who);
return;
}
else if (offset == 0xF00050)
{
- tom_timer_prescaler = (tom_timer_prescaler & 0x00FF) | (data << 8);
- tom_reset_timer();
+ 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)
+ tomRam8[offset] = data, tomRam8[offset + 0x200] = data;
+ }
- tom_ram_8[offset & 0x3FFF] = data;
+// tomRam8[offset & 0x3FFF] = data;
}
+
//
// TOM word access (write)
//
-
-void tom_word_write(unsigned offset, unsigned data)
+void TOMWriteWord(uint32_t offset, uint16_t data, uint32_t who/*=UNKNOWN*/)
{
- offset &= 0xFF3FFF;
+ // Moved here tentatively, so we can see everything written to TOM.
+ tomRam8[(offset + 0) & 0x3FFF] = data >> 8;
+ tomRam8[(offset + 1) & 0x3FFF] = data & 0xFF;
#ifdef TOM_DEBUG
- fprintf(log_get(), "TOM: Writing word %04X at %06X\n", data, offset);
+ 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(" -->[%06X] by %s\n", offset, whoName[who]);
+#endif
+
+#ifdef TOM_STRICT_MEMORY_ACCESS
+ // Sanity check
+ if ((offset < 0xF00000) || (offset > 0xF03FFF))
+ return;
#endif
- if ((offset >= gpu_control_ram_base) && (offset < gpu_control_ram_base+0x20))
+//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: WriteWord attempted to GPU register file by %s (unimplemented)!\n", whoName[who]);
+
+ if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
{
- gpu_word_write(offset, data);
+ GPUWriteWord(offset, data, who);
return;
}
- else if ((offset >= gpu_work_ram_base) && (offset < gpu_work_ram_base+0x1000))
+ else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000))
{
- gpu_word_write(offset, data);
+ GPUWriteWord(offset, data, who);
return;
}
- else if ((offset >= 0xF00000) && (offset < 0xF00002))
+//What's so special about this?
+/* else if ((offset >= 0xF00000) && (offset < 0xF00002))
{
- tom_byte_write(offset, (data>>8));
- tom_byte_write(offset+1, (data&0xFF));
- }
- else if ((offset >= 0xF00010) && (offset < 0xF00028))
+ TOMWriteByte(offset, data >> 8);
+ TOMWriteByte(offset+1, data & 0xFF);
+ }*/
+/* else if ((offset >= 0xF00010) && (offset < 0xF00028))
{
- op_word_write(offset, data);
+ OPWriteWord(offset, data, who);
return;
- }
+ }*/
else if (offset == 0xF00050)
{
- tom_timer_prescaler = data;
- tom_reset_timer();
+ tomTimerPrescaler = data;
+ TOMResetPIT();
return;
}
else if (offset == 0xF00052)
{
- tom_timer_divider = data;
- tom_reset_timer();
+ tomTimerDivider = data;
+ TOMResetPIT();
return;
}
else if (offset == 0xF000E0)
{
+//Check this out...
if (data & 0x0100)
tom_video_int_pending = 0;
if (data & 0x0200)
if (data & 0x0800)
tom_timer_int_pending = 0;
if (data & 0x1000)
- tom_puck_int_pending = 0;
+ tom_jerry_int_pending = 0;
+
+// return;
}
- else if ((offset >= 0xF02200) && (offset < 0xF022A0))
+ else if ((offset >= 0xF02200) && (offset <= 0xF0229F))
{
- blitter_word_write(offset, data);
+ BlitterWriteWord(offset, data, who);
return;
}
+ else if (offset >= 0xF00400 && offset <= 0xF007FE) // CLUT (A & B)
+ {
+ // 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)
+#warning "!!! Watch out for unaligned writes here !!! FIX !!!"
+ SET16(tomRam8, offset, data);
+ SET16(tomRam8, offset + 0x200, data);
+ }
offset &= 0x3FFF;
- if (offset == 0x28)
+ 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;
- tom_byte_write(offset, data >> 8);
- tom_byte_write(offset+1, data & 0xFF);
+ if (offset >= 0x30 && offset <= 0x4E)
+ data &= 0x07FF; // These are (mostly) 11-bit registers
+ if (offset == 0x2E || offset == 0x36 || offset == 0x54)
+ data &= 0x03FF; // These are all 10-bit registers
+
+// Fix a lockup bug... :-P
+// TOMWriteByte(0xF00000 | offset, data >> 8, who);
+// TOMWriteByte(0xF00000 | (offset+1), data & 0xFF, who);
+
+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) (M68K PC = %06X)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC), m68k_get_reg(NULL, M68K_REG_PC));
+if (offset == BORD1)
+ WriteLog("TOM: Border 1 written by %s: $%04X\n", whoName[who], data);
+if (offset == BORD2)
+ 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 == 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 == 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.
+// N.B.: It's used in the rendering functions... So...
+#warning "!!! Need to get rid of this dependency !!!"
+#if 1
if ((offset >= 0x28) && (offset <= 0x4F))
{
- int width, height;
- tom_real_internal_width = width = tom_getVideoModeWidth();
- height = tom_getVideoModeHeight();
- if (width == 640)
- {
- memcpy(scanline_render, scanline_render_stretch, sizeof(scanline_render));
- width = 320;
- }
- else
- {
- memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));
- }
+ uint32_t width = TOMGetVideoModeWidth(), height = TOMGetVideoModeHeight();
-
- if ((width != tom_width) || (height != tom_height))
+ if ((width != tomWidth) || (height != tomHeight))
{
- ws_audio_done();
-
- static char window_title[256];
- delete surface;
-
- tom_width = width;
- tom_height = height;
- Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
- surface = new Surface(tom_width, tom_height, format);
- console.close();
- sprintf(window_title, "Virtual Jaguar (%ix%i)", tom_width, tom_height);
- console.open(window_title, width, tom_height, format);
-
- ws_audio_init();
- ws_audio_reset();
+ 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)
-{
- return jaguar_byte_read(0xF000E1) & (1 << irq);
-}
-void tom_set_irq_latch(int irq, int enabled)
+int TOMIRQEnabled(int irq)
{
- tom_ram_8[0xE0] = (tom_ram_8[0xE0] & (~(1<<irq))) | (enabled ? (1<<irq) : 0);
+ // This is the correct byte in big endian... D'oh!
+// return jaguar_byte_read(0xF000E1) & (1 << irq);
+ return tomRam8[INT1 + 1/*0xE1*/] & (1 << irq);
}
-uint16 tom_irq_control_reg(void)
-{
- return (tom_ram_8[0xE0] << 8) | tom_ram_8[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
- tom_timer_counter = (1 + tom_timer_prescaler) * (1 + tom_timer_divider);
-// fprintf(log_get(),"tom: reseting timer to 0x%.8x (%i)\n",tom_timer_counter,tom_timer_counter);
+#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
}
-void tom_pit_exec(uint32 cycles)
+
+//
+// TOM Programmable Interrupt Timer handler
+// NOTE: TOM's PIT is only enabled if the prescaler is != 0
+//
+//NOTE: This is only used by the old execution code... Safe to remove
+// once the timer system is stable.
+void TOMExecPIT(uint32_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();
- gpu_set_irq_line(2, 1);
- if ((tom_irq_enabled(IRQ_TIMER)) && (jaguar_interrupt_handler_is_valid(64)))
- {
-// s68000interrupt(7, 64);
-// s68000flushInterrupts();
- m68k_set_irq(7); // Cause a 68000 NMI...
- }
- tom_reset_timer();
+ 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 tom_done(void)
+
+void TOMPITCallback(void)
{
- fprintf(log_get(),"TOM: done() ...START\n");
- op_done();
- pcm_done();
-//This is killing the log for some reason, even though it doesn't do much of anything...
-// blitter_done();
- fprintf(log_get(), "TOM: resolution %i x %i %s\n", tom_getVideoModeWidth(), tom_getVideoModeHeight(),
- videoMode_to_str[tom_getVideoMode()]);
-// fprintf(log_get(),"\ntom: object processor:\n");
-// fprintf(log_get(),"tom: pointer to object list: 0x%.8x\n",op_get_list_pointer());
-// fprintf(log_get(),"tom: INT1=0x%.2x%.2x\n",tom_byte_read(0xf000e0),tom_byte_read(0xf000e1));
- gpu_done();
- dsp_done();
- memory_free(tom_ram_8);
- fprintf(log_get(),"TOM: done() ...END\n");
+// 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();
}
+
projects / virtualjaguar / blobdiff