X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjerry.cpp;h=484fe01558d612194157ff90803ed8c240aaee40;hb=bae593a9f2f6557d271d8b2eacc5d4a825cf4b0a;hp=43651d2c3d18d1d9b13f2d7aca90ad190eaca95d;hpb=a00a7a1c45d9e5dcd5e149e9e49204aeddf125be;p=virtualjaguar diff --git a/src/jerry.cpp b/src/jerry.cpp index 43651d2..484fe01 100644 --- a/src/jerry.cpp +++ b/src/jerry.cpp @@ -5,183 +5,222 @@ // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Carwin Jones (BeOS) // Cleanups/rewrites/fixes by James L. Hammons // -// ------------------------------------------------------------ -// JERRY REGISTERS (Mapped by Aaron Giles) -// ------------------------------------------------------------ -// F10000-F13FFF R/W xxxxxxxx xxxxxxxx Jerry -// F10000 W xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler -// F10002 W xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider -// F10004 W xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler -// F10008 W xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider -// F10010 W ------xx xxxxxxxx CLK1 - processor clock divider -// F10012 W ------xx xxxxxxxx CLK2 - video clock divider -// F10014 W -------- --xxxxxx CLK3 - chroma clock divider -// F10020 R/W ---xxxxx ---xxxxx JINTCTRL - interrupt control register -// W ---x---- -------- (J_SYNCLR - clear synchronous serial intf ints) -// W ----x--- -------- (J_ASYNCLR - clear asynchronous serial intf ints) -// W -----x-- -------- (J_TIM2CLR - clear timer 2 [tempo] interrupts) -// W ------x- -------- (J_TIM1CLR - clear timer 1 [sample] interrupts) -// W -------x -------- (J_EXTCLR - clear external interrupts) -// R/W -------- ---x---- (J_SYNENA - enable synchronous serial intf ints) -// R/W -------- ----x--- (J_ASYNENA - enable asynchronous serial intf ints) -// R/W -------- -----x-- (J_TIM2ENA - enable timer 2 [tempo] interrupts) -// R/W -------- ------x- (J_TIM1ENA - enable timer 1 [sample] interrupts) -// R/W -------- -------x (J_EXTENA - enable external interrupts) -// F10030 R/W -------- xxxxxxxx ASIDATA - asynchronous serial data -// F10032 W -x------ -xxxxxxx ASICTRL - asynchronous serial control -// W -x------ -------- (TXBRK - transmit break) -// W -------- -x------ (CLRERR - clear error) -// W -------- --x----- (RINTEN - enable receiver interrupts) -// W -------- ---x---- (TINTEN - enable transmitter interrupts) -// W -------- ----x--- (RXIPOL - receiver input polarity) -// W -------- -----x-- (TXOPOL - transmitter output polarity) -// W -------- ------x- (PAREN - parity enable) -// W -------- -------x (ODD - odd parity select) -// F10032 R xxx-xxxx x-xxxxxx ASISTAT - asynchronous serial status -// R x------- -------- (ERROR - OR of PE,FE,OE) -// R -x------ -------- (TXBRK - transmit break) -// R --x----- -------- (SERIN - serial input) -// R ----x--- -------- (OE - overrun error) -// R -----x-- -------- (FE - framing error) -// R ------x- -------- (PE - parity error) -// R -------x -------- (TBE - transmit buffer empty) -// R -------- x------- (RBF - receive buffer full) -// R -------- ---x---- (TINTEN - enable transmitter interrupts) -// R -------- ----x--- (RXIPOL - receiver input polarity) -// R -------- -----x-- (TXOPOL - transmitter output polarity) -// R -------- ------x- (PAREN - parity enable) -// R -------- -------x (ODD - odd parity) -// F10034 R/W xxxxxxxx xxxxxxxx ASICLK - asynchronous serial interface clock -// F10036 R xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler -// F10038 R xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider -// F1003A R xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler -// F1003C R xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider -// ------------------------------------------------------------ -// F14000-F17FFF R/W xxxxxxxx xxxxxxxx Joysticks and GPIO0-5 -// F14000 R xxxxxxxx xxxxxxxx JOYSTICK - read joystick state -// F14000 W x------- xxxxxxxx JOYSTICK - latch joystick output -// W x------- -------- (enable joystick outputs) -// W -------- xxxxxxxx (joystick output data) -// F14002 R xxxxxxxx xxxxxxxx JOYBUTS - button register -// F14800-F14FFF R/W xxxxxxxx xxxxxxxx GPI00 - reserved (CD-ROM?) -// F15000-F15FFF R/W xxxxxxxx xxxxxxxx GPI01 - reserved -// F16000-F16FFF R/W xxxxxxxx xxxxxxxx GPI02 - reserved -// F17000-F177FF R/W xxxxxxxx xxxxxxxx GPI03 - reserved -// F17800-F17BFF R/W xxxxxxxx xxxxxxxx GPI04 - reserved -// F17C00-F17FFF R/W xxxxxxxx xxxxxxxx GPI05 - reserved -// ------------------------------------------------------------ -// F18000-F1FFFF R/W xxxxxxxx xxxxxxxx Jerry DSP -// F1A100 R/W xxxxxxxx xxxxxxxx D_FLAGS - DSP flags register -// R/W x------- -------- (DMAEN - DMA enable) -// R/W -x------ -------- (REGPAGE - register page) -// W --x----- -------- (D_EXT0CLR - clear external interrupt 0) -// W ---x---- -------- (D_TIM2CLR - clear timer 2 interrupt) -// W ----x--- -------- (D_TIM1CLR - clear timer 1 interrupt) -// W -----x-- -------- (D_I2SCLR - clear I2S interrupt) -// W ------x- -------- (D_CPUCLR - clear CPU interrupt) -// R/W -------x -------- (D_EXT0ENA - enable external interrupt 0) -// R/W -------- x------- (D_TIM2ENA - enable timer 2 interrupt) -// R/W -------- -x------ (D_TIM1ENA - enable timer 1 interrupt) -// R/W -------- --x----- (D_I2SENA - enable I2S interrupt) -// R/W -------- ---x---- (D_CPUENA - enable CPU interrupt) -// R/W -------- ----x--- (IMASK - interrupt mask) -// R/W -------- -----x-- (NEGA_FLAG - ALU negative) -// R/W -------- ------x- (CARRY_FLAG - ALU carry) -// R/W -------- -------x (ZERO_FLAG - ALU zero) -// F1A102 R/W -------- ------xx D_FLAGS - upper DSP flags -// R/W -------- ------x- (D_EXT1ENA - enable external interrupt 1) -// R/W -------- -------x (D_EXT1CLR - clear external interrupt 1) -// F1A104 W -------- ----xxxx D_MTXC - matrix control register -// W -------- ----x--- (MATCOL - column/row major) -// W -------- -----xxx (MATRIX3-15 - matrix width) -// F1A108 W ----xxxx xxxxxx-- D_MTXA - matrix address register -// F1A10C W -------- -----x-x D_END - data organization register -// W -------- -----x-- (BIG_INST - big endian instruction fetch) -// W -------- -------x (BIG_IO - big endian I/O) -// F1A110 R/W xxxxxxxx xxxxxxxx D_PC - DSP program counter -// F1A114 R/W xxxxxxxx xx-xxxxx D_CTRL - DSP control/status register -// R xxxx---- -------- (VERSION - DSP version code) -// R/W ----x--- -------- (BUS_HOG - hog the bus!) -// R/W -----x-- -------- (D_EXT0LAT - external interrupt 0 latch) -// R/W ------x- -------- (D_TIM2LAT - timer 2 interrupt latch) -// R/W -------x -------- (D_TIM1LAT - timer 1 interrupt latch) -// R/W -------- x------- (D_I2SLAT - I2S interrupt latch) -// R/W -------- -x------ (D_CPULAT - CPU interrupt latch) -// R/W -------- ---x---- (SINGLE_GO - single step one instruction) -// R/W -------- ----x--- (SINGLE_STEP - single step mode) -// R/W -------- -----x-- (FORCEINT0 - cause interrupt 0 on GPU) -// R/W -------- ------x- (CPUINT - send GPU interrupt to CPU) -// R/W -------- -------x (DSPGO - enable DSP execution) -// F1A116 R/W -------- -------x D_CTRL - upper DSP control/status register -// R/W -------- -------x (D_EXT1LAT - external interrupt 1 latch) -// F1A118-F1A11B W xxxxxxxx xxxxxxxx D_MOD - modulo instruction mask -// F1A11C-F1A11F R xxxxxxxx xxxxxxxx D_REMAIN - divide unit remainder -// F1A11C W -------- -------x D_DIVCTRL - divide unit control -// W -------- -------x (DIV_OFFSET - 1=16.16 divide, 0=32-bit divide) -// F1A120-F1A123 R xxxxxxxx xxxxxxxx D_MACHI - multiply & accumulate high bits -// F1A148 W xxxxxxxx xxxxxxxx R_DAC - right transmit data -// F1A14C W xxxxxxxx xxxxxxxx L_DAC - left transmit data -// F1A150 W -------- xxxxxxxx SCLK - serial clock frequency -// F1A150 R -------- ------xx SSTAT -// R -------- ------x- (left - no description) -// R -------- -------x (WS - word strobe status) -// F1A154 W -------- --xxxx-x SMODE - serial mode -// W -------- --x----- (EVERYWORD - interrupt on MSB of every word) -// W -------- ---x---- (FALLING - interrupt on falling edge) -// W -------- ----x--- (RISING - interrupt of rising edge) -// W -------- -----x-- (WSEN - enable word strobes) -// W -------- -------x (INTERNAL - enables serial clock) -// ------------------------------------------------------------ -// F1B000-F1CFFF R/W xxxxxxxx xxxxxxxx Local DSP RAM -// ------------------------------------------------------------ -// F1D000 R xxxxxxxx xxxxxxxx ROM_TRI - triangle wave -// F1D200 R xxxxxxxx xxxxxxxx ROM_SINE - full sine wave -// F1D400 R xxxxxxxx xxxxxxxx ROM_AMSINE - amplitude modulated sine wave -// F1D600 R xxxxxxxx xxxxxxxx ROM_12W - sine wave and second order harmonic -// F1D800 R xxxxxxxx xxxxxxxx ROM_CHIRP16 - chirp -// F1DA00 R xxxxxxxx xxxxxxxx ROM_NTRI - traingle wave with noise -// F1DC00 R xxxxxxxx xxxxxxxx ROM_DELTA - spike -// F1DE00 R xxxxxxxx xxxxxxxx ROM_NOISE - white noise -// ------------------------------------------------------------ +// JLH = James L. Hammons +// +// WHO WHEN WHAT +// --- ---------- ----------------------------------------------------------- +// JLH 11/25/2009 Major rewrite of memory subsystem and handlers +// + +// ------------------------------------------------------------ +// JERRY REGISTERS (Mapped by Aaron Giles) +// ------------------------------------------------------------ +// F10000-F13FFF R/W xxxxxxxx xxxxxxxx Jerry +// F10000 W xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler +// F10002 W xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider +// F10004 W xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler +// F10008 W xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider +// F10010 W ------xx xxxxxxxx CLK1 - processor clock divider +// F10012 W ------xx xxxxxxxx CLK2 - video clock divider +// F10014 W -------- --xxxxxx CLK3 - chroma clock divider +// F10020 R/W ---xxxxx ---xxxxx JINTCTRL - interrupt control register +// W ---x---- -------- (J_SYNCLR - clear synchronous serial intf ints) +// W ----x--- -------- (J_ASYNCLR - clear asynchronous serial intf ints) +// W -----x-- -------- (J_TIM2CLR - clear timer 2 [tempo] interrupts) +// W ------x- -------- (J_TIM1CLR - clear timer 1 [sample] interrupts) +// W -------x -------- (J_EXTCLR - clear external interrupts) +// R/W -------- ---x---- (J_SYNENA - enable synchronous serial intf ints) +// R/W -------- ----x--- (J_ASYNENA - enable asynchronous serial intf ints) +// R/W -------- -----x-- (J_TIM2ENA - enable timer 2 [tempo] interrupts) +// R/W -------- ------x- (J_TIM1ENA - enable timer 1 [sample] interrupts) +// R/W -------- -------x (J_EXTENA - enable external interrupts) +// F10030 R/W -------- xxxxxxxx ASIDATA - asynchronous serial data +// F10032 W -x------ -xxxxxxx ASICTRL - asynchronous serial control +// W -x------ -------- (TXBRK - transmit break) +// W -------- -x------ (CLRERR - clear error) +// W -------- --x----- (RINTEN - enable receiver interrupts) +// W -------- ---x---- (TINTEN - enable transmitter interrupts) +// W -------- ----x--- (RXIPOL - receiver input polarity) +// W -------- -----x-- (TXOPOL - transmitter output polarity) +// W -------- ------x- (PAREN - parity enable) +// W -------- -------x (ODD - odd parity select) +// F10032 R xxx-xxxx x-xxxxxx ASISTAT - asynchronous serial status +// R x------- -------- (ERROR - OR of PE,FE,OE) +// R -x------ -------- (TXBRK - transmit break) +// R --x----- -------- (SERIN - serial input) +// R ----x--- -------- (OE - overrun error) +// R -----x-- -------- (FE - framing error) +// R ------x- -------- (PE - parity error) +// R -------x -------- (TBE - transmit buffer empty) +// R -------- x------- (RBF - receive buffer full) +// R -------- ---x---- (TINTEN - enable transmitter interrupts) +// R -------- ----x--- (RXIPOL - receiver input polarity) +// R -------- -----x-- (TXOPOL - transmitter output polarity) +// R -------- ------x- (PAREN - parity enable) +// R -------- -------x (ODD - odd parity) +// F10034 R/W xxxxxxxx xxxxxxxx ASICLK - asynchronous serial interface clock +// F10036 R xxxxxxxx xxxxxxxx JPIT1 - timer 1 pre-scaler +// F10038 R xxxxxxxx xxxxxxxx JPIT2 - timer 1 divider +// F1003A R xxxxxxxx xxxxxxxx JPIT3 - timer 2 pre-scaler +// F1003C R xxxxxxxx xxxxxxxx JPIT4 - timer 2 divider +// ------------------------------------------------------------ +// F14000-F17FFF R/W xxxxxxxx xxxxxxxx Joysticks and GPIO0-5 +// F14000 R xxxxxxxx xxxxxxxx JOYSTICK - read joystick state +// F14000 W x------- xxxxxxxx JOYSTICK - latch joystick output +// W x------- -------- (enable joystick outputs) +// W -------- xxxxxxxx (joystick output data) +// F14002 R xxxxxxxx xxxxxxxx JOYBUTS - button register +// F14800-F14FFF R/W xxxxxxxx xxxxxxxx GPI00 - reserved (CD-ROM? no.) +// F15000-F15FFF R/W xxxxxxxx xxxxxxxx GPI01 - reserved +// F16000-F16FFF R/W xxxxxxxx xxxxxxxx GPI02 - reserved +// F17000-F177FF R/W xxxxxxxx xxxxxxxx GPI03 - reserved +// F17800-F17BFF R/W xxxxxxxx xxxxxxxx GPI04 - reserved +// F17C00-F17FFF R/W xxxxxxxx xxxxxxxx GPI05 - reserved +// ------------------------------------------------------------ +// F18000-F1FFFF R/W xxxxxxxx xxxxxxxx Jerry DSP +// F1A100 R/W xxxxxxxx xxxxxxxx D_FLAGS - DSP flags register +// R/W x------- -------- (DMAEN - DMA enable) +// R/W -x------ -------- (REGPAGE - register page) +// W --x----- -------- (D_EXT0CLR - clear external interrupt 0) +// W ---x---- -------- (D_TIM2CLR - clear timer 2 interrupt) +// W ----x--- -------- (D_TIM1CLR - clear timer 1 interrupt) +// W -----x-- -------- (D_I2SCLR - clear I2S interrupt) +// W ------x- -------- (D_CPUCLR - clear CPU interrupt) +// R/W -------x -------- (D_EXT0ENA - enable external interrupt 0) +// R/W -------- x------- (D_TIM2ENA - enable timer 2 interrupt) +// R/W -------- -x------ (D_TIM1ENA - enable timer 1 interrupt) +// R/W -------- --x----- (D_I2SENA - enable I2S interrupt) +// R/W -------- ---x---- (D_CPUENA - enable CPU interrupt) +// R/W -------- ----x--- (IMASK - interrupt mask) +// R/W -------- -----x-- (NEGA_FLAG - ALU negative) +// R/W -------- ------x- (CARRY_FLAG - ALU carry) +// R/W -------- -------x (ZERO_FLAG - ALU zero) +// F1A102 R/W -------- ------xx D_FLAGS - upper DSP flags +// R/W -------- ------x- (D_EXT1ENA - enable external interrupt 1) +// R/W -------- -------x (D_EXT1CLR - clear external interrupt 1) +// F1A104 W -------- ----xxxx D_MTXC - matrix control register +// W -------- ----x--- (MATCOL - column/row major) +// W -------- -----xxx (MATRIX3-15 - matrix width) +// F1A108 W ----xxxx xxxxxx-- D_MTXA - matrix address register +// F1A10C W -------- -----x-x D_END - data organization register +// W -------- -----x-- (BIG_INST - big endian instruction fetch) +// W -------- -------x (BIG_IO - big endian I/O) +// F1A110 R/W xxxxxxxx xxxxxxxx D_PC - DSP program counter +// F1A114 R/W xxxxxxxx xx-xxxxx D_CTRL - DSP control/status register +// R xxxx---- -------- (VERSION - DSP version code) +// R/W ----x--- -------- (BUS_HOG - hog the bus!) +// R/W -----x-- -------- (D_EXT0LAT - external interrupt 0 latch) +// R/W ------x- -------- (D_TIM2LAT - timer 2 interrupt latch) +// R/W -------x -------- (D_TIM1LAT - timer 1 interrupt latch) +// R/W -------- x------- (D_I2SLAT - I2S interrupt latch) +// R/W -------- -x------ (D_CPULAT - CPU interrupt latch) +// R/W -------- ---x---- (SINGLE_GO - single step one instruction) +// R/W -------- ----x--- (SINGLE_STEP - single step mode) +// R/W -------- -----x-- (FORCEINT0 - cause interrupt 0 on GPU) +// R/W -------- ------x- (CPUINT - send GPU interrupt to CPU) +// R/W -------- -------x (DSPGO - enable DSP execution) +// F1A116 R/W -------- -------x D_CTRL - upper DSP control/status register +// R/W -------- -------x (D_EXT1LAT - external interrupt 1 latch) +// F1A118-F1A11B W xxxxxxxx xxxxxxxx D_MOD - modulo instruction mask +// F1A11C-F1A11F R xxxxxxxx xxxxxxxx D_REMAIN - divide unit remainder +// F1A11C W -------- -------x D_DIVCTRL - divide unit control +// W -------- -------x (DIV_OFFSET - 1=16.16 divide, 0=32-bit divide) +// F1A120-F1A123 R xxxxxxxx xxxxxxxx D_MACHI - multiply & accumulate high bits +// F1A148 W xxxxxxxx xxxxxxxx R_DAC - right transmit data +// F1A14C W xxxxxxxx xxxxxxxx L_DAC - left transmit data +// F1A150 W -------- xxxxxxxx SCLK - serial clock frequency +// F1A150 R -------- ------xx SSTAT +// R -------- ------x- (left - no description) +// R -------- -------x (WS - word strobe status) +// F1A154 W -------- --xxxx-x SMODE - serial mode +// W -------- --x----- (EVERYWORD - interrupt on MSB of every word) +// W -------- ---x---- (FALLING - interrupt on falling edge) +// W -------- ----x--- (RISING - interrupt of rising edge) +// W -------- -----x-- (WSEN - enable word strobes) +// W -------- -------x (INTERNAL - enables serial clock) +// ------------------------------------------------------------ +// F1B000-F1CFFF R/W xxxxxxxx xxxxxxxx Local DSP RAM +// ------------------------------------------------------------ +// F1D000 R xxxxxxxx xxxxxxxx ROM_TRI - triangle wave +// F1D200 R xxxxxxxx xxxxxxxx ROM_SINE - full sine wave +// F1D400 R xxxxxxxx xxxxxxxx ROM_AMSINE - amplitude modulated sine wave +// F1D600 R xxxxxxxx xxxxxxxx ROM_12W - sine wave and second order harmonic +// F1D800 R xxxxxxxx xxxxxxxx ROM_CHIRP16 - chirp +// F1DA00 R xxxxxxxx xxxxxxxx ROM_NTRI - traingle wave with noise +// F1DC00 R xxxxxxxx xxxxxxxx ROM_DELTA - spike +// F1DE00 R xxxxxxxx xxxxxxxx ROM_NOISE - white noise +// ------------------------------------------------------------ + +#include "jerry.h" +#include // For memcpy //#include +#include "cdrom.h" +#include "dac.h" +#include "dsp.h" +#include "eeprom.h" +#include "event.h" +#include "jaguar.h" +#include "joystick.h" +#include "log.h" +#include "m68k.h" +#include "tom.h" +//#include "memory.h" #include "wavetable.h" -#include "jerry.h" +//Note that 44100 Hz requires samples every 22.675737 usec. +#define NEW_TIMER_SYSTEM //#define JERRY_DEBUG -/*static*/ uint8 * jerry_ram_8; +/*static*/ uint8 jerry_ram_8[0x10000]; //#define JERRY_CONFIG 0x4002 // ??? What's this ??? uint8 analog_x, analog_y; -static uint32 jerry_timer_1_prescaler; -static uint32 jerry_timer_2_prescaler; -static uint32 jerry_timer_1_divider; -static uint32 jerry_timer_2_divider; +static uint32 JERRYPIT1Prescaler; +static uint32 JERRYPIT1Divider; +static uint32 JERRYPIT2Prescaler; +static uint32 JERRYPIT2Divider; static int32 jerry_timer_1_counter; static int32 jerry_timer_2_counter; -static uint32 jerry_i2s_interrupt_divide = 8; -static int32 jerry_i2s_interrupt_timer = -1; +uint32 JERRYI2SInterruptDivide = 8; +int32 JERRYI2SInterruptTimer = -1; uint32 jerryI2SCycles; uint32 jerryIntPending; +static uint16 jerryInterruptMask = 0; +static uint16 jerryPendingInterrupt = 0; +// Private function prototypes + +void JERRYResetPIT1(void); +void JERRYResetPIT2(void); +void JERRYResetI2S(void); + +void JERRYPIT1Callback(void); +void JERRYPIT2Callback(void); +void JERRYI2SCallback(void); + //This approach is probably wrong, since the timer is continuously counting down, though //it might only be a problem if the # of interrupts generated is greater than 1--the M68K's //timeslice should be running during that phase... (The DSP needs to be aware of this!) -void jerry_i2s_exec(uint32 cycles) + +//This is only used by the old system, so once the new timer system is working this +//should be safe to nuke. +void JERRYI2SExec(uint32 cycles) { +#ifndef NEW_TIMER_SYSTEM +#warning "externed var in source--should be in header file. !!! FIX !!!" extern uint16 serialMode; // From DAC.CPP if (serialMode & 0x01) // INTERNAL flag (JERRY is master) { // Why is it called this? Instead of SCLK? Shouldn't this be read from DAC.CPP??? //Yes, it should. !!! FIX !!! - jerry_i2s_interrupt_divide &= 0xFF; + JERRYI2SInterruptDivide &= 0xFF; - if (jerry_i2s_interrupt_timer == -1) + if (JERRYI2SInterruptTimer == -1) { // We don't have to divide the RISC clock rate by this--the reason is a bit // convoluted. Will put explanation here later... @@ -189,18 +228,18 @@ void jerry_i2s_exec(uint32 cycles) // in one second. For example, if the sample rate is 44100, we divide the clock rate by // this: 26590906 / 44100 = 602 cycles. // Which means, every 602 cycles that go by we have to generate an interrupt. - jerryI2SCycles = 32 * (2 * (jerry_i2s_interrupt_divide + 1)); + jerryI2SCycles = 32 * (2 * (JERRYI2SInterruptDivide + 1)); } - jerry_i2s_interrupt_timer -= cycles; - if (jerry_i2s_interrupt_timer <= 0) + JERYI2SInterruptTimer -= cycles; + if (JERRYI2SInterruptTimer <= 0) { //This is probably wrong as well (i.e., need to check enable lines)... !!! FIX !!! DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); - jerry_i2s_interrupt_timer += jerryI2SCycles; + JERRYI2SInterruptTimer += jerryI2SCycles; #ifdef JERRY_DEBUG - if (jerry_i2s_interrupt_timer < 0) - WriteLog("JERRY: Missed generating an interrupt (missed %u)!\n", (-jerry_i2s_interrupt_timer / jerryI2SCycles) + 1); + if (JERRYI2SInterruptTimer < 0) + WriteLog("JERRY: Missed generating an interrupt (missed %u)!\n", (-JERRYI2SInterruptTimer / jerryI2SCycles) + 1); #endif } } @@ -211,8 +250,8 @@ void jerry_i2s_exec(uint32 cycles) // The whole interrupt system is pretty much borked and is need of an overhaul. // What we need is a way of handling these interrupts when they happen instead of // scanline boundaries the way it is now. - jerry_i2s_interrupt_timer -= cycles; - if (jerry_i2s_interrupt_timer <= 0) + JERRYI2SInterruptTimer -= cycles; + if (JERRYI2SInterruptTimer <= 0) { //This is probably wrong as well (i.e., need to check enable lines)... !!! FIX !!! [DONE] if (ButchIsReadyToSend())//Not sure this is right spot to check... @@ -221,123 +260,251 @@ void jerry_i2s_exec(uint32 cycles) SetSSIWordsXmittedFromButch(); DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); } - jerry_i2s_interrupt_timer += 602; + JERRYI2SInterruptTimer += 602; } } +#else + RemoveCallback(JERRYI2SCallback); + JERRYI2SCallback(); +#endif +} + +//NOTE: This is only used by the old execution core. Safe to nuke once it's stable. +void JERRYExecPIT(uint32 cycles) +{ +//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE] +// if (jerry_timer_1_counter) + jerry_timer_1_counter -= cycles; + + if (jerry_timer_1_counter <= 0) + { +//Also, it can generate a CPU interrupt as well... !!! FIX !!! or does it? Maybe it goes Timer->GPU->CPU? + DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); // This does the 'IRQ enabled' checking... +// JERRYResetPIT1(); + jerry_timer_1_counter += (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); + } + +//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE] +// if (jerry_timer_2_counter) + jerry_timer_2_counter -= cycles; + + if (jerry_timer_2_counter <= 0) + { +//Also, it can generate a CPU interrupt as well... !!! FIX !!! or does it? Maybe it goes Timer->GPU->CPU? + DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); // This does the 'IRQ enabled' checking... +// JERRYResetPIT2(); + jerry_timer_2_counter += (JERRYPIT2Prescaler + 1) * (JERRYPIT2Divider + 1); + } } -void jerry_reset_i2s_timer(void) +void JERRYResetI2S(void) { //WriteLog("i2s: reseting\n"); //This is really SCLK... !!! FIX !!! - jerry_i2s_interrupt_divide = 8; - jerry_i2s_interrupt_timer = -1; + JERRYI2SInterruptDivide = 8; + JERRYI2SInterruptTimer = -1; } -void jerry_reset_timer_1(void) +void JERRYResetPIT1(void) { -/* if (!jerry_timer_1_prescaler || !jerry_timer_1_divider) +#ifndef NEW_TIMER_SYSTEM +/* if (!JERRYPIT1Prescaler || !JERRYPIT1Divider) jerry_timer_1_counter = 0; else//*/ //Small problem with this approach: Overflow if both are = $FFFF. !!! FIX !!! - jerry_timer_1_counter = (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1); + jerry_timer_1_counter = (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); // if (jerry_timer_1_counter) // WriteLog("jerry: reseting timer 1 to 0x%.8x (%i)\n",jerry_timer_1_counter,jerry_timer_1_counter); + +#else + RemoveCallback(JERRYPIT1Callback); + + if (JERRYPIT1Prescaler | JERRYPIT1Divider) + { + double usecs = (float)(JERRYPIT1Prescaler + 1) * (float)(JERRYPIT1Divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYPIT1Callback, usecs); + } +#endif } -void jerry_reset_timer_2(void) +void JERRYResetPIT2(void) { -/* if (!jerry_timer_2_prescaler || !jerry_timer_2_divider) +#ifndef NEW_TIMER_SYSTEM +/* if (!JERRYPIT2Prescaler || !JERRYPIT2Divider) { jerry_timer_2_counter = 0; return; } else//*/ - jerry_timer_2_counter = (jerry_timer_2_prescaler + 1) * (jerry_timer_2_divider + 1); + jerry_timer_2_counter = (JERRYPIT2Prescaler + 1) * (JERRYPIT2Divider + 1); // if (jerry_timer_2_counter) // WriteLog("jerry: reseting timer 2 to 0x%.8x (%i)\n",jerry_timer_2_counter,jerry_timer_2_counter); + +#else + RemoveCallback(JERRYPIT2Callback); + + if (JERRYPIT1Prescaler | JERRYPIT1Divider) + { + double usecs = (float)(JERRYPIT2Prescaler + 1) * (float)(JERRYPIT2Divider + 1) * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYPIT2Callback, usecs); + } +#endif } -void JERRYExecPIT(uint32 cycles) +// This is the cause of the regressions in Cybermorph and Missile Command 3D... +// Solution: Probably have to check the DSP enable bit before sending these thru. +//#define JERRY_NO_IRQS +void JERRYPIT1Callback(void) { -//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE] -// if (jerry_timer_1_counter) - jerry_timer_1_counter -= cycles; +#ifndef JERRY_NO_IRQS +//WriteLog("JERRY: In PIT1 callback, IRQM=$%04X\n", jerryInterruptMask); + if (TOMIRQEnabled(IRQ_DSP)) + { + if (jerryInterruptMask & IRQ2_TIMER1) // CPU Timer 1 IRQ + { +// Not sure, but I think we don't generate another IRQ if one's already going... +// But this seems to work... :-/ + jerryPendingInterrupt |= IRQ2_TIMER1; + m68k_set_irq(2); // Generate 68K IPL 2 + } + } +#endif - if (jerry_timer_1_counter <= 0) + DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); // This does the 'IRQ enabled' checking... + JERRYResetPIT1(); +} + +void JERRYPIT2Callback(void) +{ +#ifndef JERRY_NO_IRQS + if (TOMIRQEnabled(IRQ_DSP)) { -//Also, it can generate a CPU interrupt as well... !!! FIX !!! or does it? Maybe it goes Timer->GPU->CPU? - DSPSetIRQLine(DSPIRQ_TIMER0, ASSERT_LINE); // This does the 'IRQ enabled' checking... -// jerry_reset_timer_1(); - jerry_timer_1_counter += (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1); +//WriteLog("JERRY: In PIT2 callback, IRQM=$%04X\n", jerryInterruptMask); + if (jerryInterruptMask & IRQ2_TIMER2) // CPU Timer 2 IRQ + { + jerryPendingInterrupt |= IRQ2_TIMER2; + m68k_set_irq(2); // Generate 68K IPL 2 + } } +#endif -//This is wrong too: Counters are *always* spinning! !!! FIX !!! [DONE] -// if (jerry_timer_2_counter) - jerry_timer_2_counter -= cycles; + DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); // This does the 'IRQ enabled' checking... + JERRYResetPIT2(); +} - if (jerry_timer_2_counter <= 0) +void JERRYI2SCallback(void) +{ + // Why is it called this? Instead of SCLK? Shouldn't this be read from DAC.CPP??? +//Yes, it should. !!! FIX !!! +#warning "Why is it called this? Instead of SCLK? Shouldn't this be read from DAC.CPP??? Yes, it should. !!! FIX !!!" + JERRYI2SInterruptDivide &= 0xFF; + // We don't have to divide the RISC clock rate by this--the reason is a bit + // convoluted. Will put explanation here later... +// What's needed here is to find the ratio of the frequency to the number of clock cycles +// in one second. For example, if the sample rate is 44100, we divide the clock rate by +// this: 26590906 / 44100 = 602 cycles. +// Which means, every 602 cycles that go by we have to generate an interrupt. + jerryI2SCycles = 32 * (2 * (JERRYI2SInterruptDivide + 1)); + +//This should be in this file with an extern reference in the header file so that +//DAC.CPP can see it... !!! FIX !!! + extern uint16 serialMode; // From DAC.CPP + + if (serialMode & 0x01) // INTERNAL flag (JERRY is master) { -//Also, it can generate a CPU interrupt as well... !!! FIX !!! or does it? Maybe it goes Timer->GPU->CPU? - DSPSetIRQLine(DSPIRQ_TIMER1, ASSERT_LINE); // This does the 'IRQ enabled' checking... -// jerry_reset_timer_2(); - jerry_timer_2_counter += (jerry_timer_2_prescaler + 1) * (jerry_timer_2_divider + 1); + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); // This does the 'IRQ enabled' checking... + double usecs = (float)jerryI2SCycles * RISC_CYCLE_IN_USEC; + SetCallbackTime(JERRYI2SCallback, usecs); + } + else // JERRY is slave to external word clock + { +//Note that 44100 Hz requires samples every 22.675737 usec. +//When JERRY is slave to the word clock, we need to do interrupts either at 44.1K +//sample rate or at a 88.2K sample rate (11.332... usec). +/* // This is just a temporary kludge to see if the CD bus mastering works + // I.e., this is totally faked...! +// The whole interrupt system is pretty much borked and is need of an overhaul. +// What we need is a way of handling these interrupts when they happen instead of +// scanline boundaries the way it is now. + jerry_i2s_interrupt_timer -= cycles; + if (jerry_i2s_interrupt_timer <= 0) + { +//This is probably wrong as well (i.e., need to check enable lines)... !!! FIX !!! [DONE] + if (ButchIsReadyToSend())//Not sure this is right spot to check... + { +// return GetWordFromButchSSI(offset, who); + SetSSIWordsXmittedFromButch(); + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); + } + jerry_i2s_interrupt_timer += 602; + }*/ + + if (ButchIsReadyToSend())//Not sure this is right spot to check... + { +// return GetWordFromButchSSI(offset, who); + SetSSIWordsXmittedFromButch(); + DSPSetIRQLine(DSPIRQ_SSI, ASSERT_LINE); + } + + SetCallbackTime(JERRYI2SCallback, 22.675737); } } -void jerry_init(void) + +void JERRYInit(void) { - clock_init(); - anajoy_init(); - joystick_init(); + JoystickInit(); DACInit(); -//This should be handled with the cart initialization... -// eeprom_init(); - memory_malloc_secure((void **)&jerry_ram_8, 0x10000, "JERRY RAM/ROM"); - memcpy(&jerry_ram_8[0xD000], wave_table, 0x1000); + memcpy(&jerry_ram_8[0xD000], waveTableROM, 0x1000); + + JERRYPIT1Prescaler = 0xFFFF; + JERRYPIT2Prescaler = 0xFFFF; + JERRYPIT1Divider = 0xFFFF; + JERRYPIT2Divider = 0xFFFF; + jerryInterruptMask = 0x0000; + jerryPendingInterrupt = 0x0000; } -void jerry_reset(void) +void JERRYReset(void) { - clock_reset(); - anajoy_reset(); - joystick_reset(); - eeprom_reset(); - jerry_reset_i2s_timer(); + JoystickReset(); + EepromReset(); + JERRYResetI2S(); DACReset(); memset(jerry_ram_8, 0x00, 0xD000); // Don't clear out the Wavetable ROM...! - jerry_timer_1_prescaler = 0xFFFF; - jerry_timer_2_prescaler = 0xFFFF; - jerry_timer_1_divider = 0xFFFF; - jerry_timer_2_divider = 0xFFFF; + JERRYPIT1Prescaler = 0xFFFF; + JERRYPIT2Prescaler = 0xFFFF; + JERRYPIT1Divider = 0xFFFF; + JERRYPIT2Divider = 0xFFFF; jerry_timer_1_counter = 0; jerry_timer_2_counter = 0; + jerryInterruptMask = 0x0000; + jerryPendingInterrupt = 0x0000; } -void jerry_done(void) +void JERRYDone(void) { WriteLog("JERRY: M68K Interrupt control ($F10020) = %04X\n", GET16(jerry_ram_8, 0x20)); - memory_free(jerry_ram_8); - clock_done(); - anajoy_done(); - joystick_done(); + JoystickDone(); DACDone(); - eeprom_done(); + EepromDone(); } bool JERRYIRQEnabled(int irq) { - // Read the word @ $F10020 - return jerry_ram_8[0x21] & (1 << irq); + // Read the word @ $F10020 +// return jerry_ram_8[0x21] & (1 << irq); + return jerryInterruptMask & irq; } void JERRYSetPendingIRQ(int irq) { // This is the shadow of INT (it's a split RO/WO register) - jerryIntPending |= (1 << irq); +// jerryIntPending |= (1 << irq); + jerryPendingInterrupt |= irq; } // @@ -363,51 +530,58 @@ uint8 JERRYReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) // else if (offset >= 0xF10000 && offset <= 0xF10007) //This is still wrong. What needs to be returned here are the values being counted down //in the jerry_timer_n_counter variables... !!! FIX !!! [DONE] + +//This is probably the problem with the new timer code... This is invalid +//under the new system... !!! FIX !!! else if ((offset >= 0xF10036) && (offset <= 0xF1003D)) { -// jerry_timer_1_counter = (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1); - uint32 counter1Hi = (jerry_timer_1_counter / (jerry_timer_1_divider + 1)) - 1; - uint32 counter1Lo = (jerry_timer_1_counter % (jerry_timer_1_divider + 1)) - 1; - uint32 counter2Hi = (jerry_timer_2_counter / (jerry_timer_2_divider + 1)) - 1; - uint32 counter2Lo = (jerry_timer_2_counter % (jerry_timer_2_divider + 1)) - 1; +#ifndef NEW_TIMER_SYSTEM +// jerry_timer_1_counter = (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); + uint32 counter1Hi = (jerry_timer_1_counter / (JERRYPIT1Divider + 1)) - 1; + uint32 counter1Lo = (jerry_timer_1_counter % (JERRYPIT1Divider + 1)) - 1; + uint32 counter2Hi = (jerry_timer_2_counter / (JERRYPIT2Divider + 1)) - 1; + uint32 counter2Lo = (jerry_timer_2_counter % (JERRYPIT2Divider + 1)) - 1; switch(offset & 0x0F) { case 6: -// return jerry_timer_1_prescaler >> 8; +// return JERRYPIT1Prescaler >> 8; return counter1Hi >> 8; case 7: -// return jerry_timer_1_prescaler & 0xFF; +// return JERRYPIT1Prescaler & 0xFF; return counter1Hi & 0xFF; case 8: -// return jerry_timer_1_divider >> 8; +// return JERRYPIT1Divider >> 8; return counter1Lo >> 8; case 9: -// return jerry_timer_1_divider & 0xFF; +// return JERRYPIT1Divider & 0xFF; return counter1Lo & 0xFF; case 10: -// return jerry_timer_2_prescaler >> 8; +// return JERRYPIT2Prescaler >> 8; return counter2Hi >> 8; case 11: -// return jerry_timer_2_prescaler & 0xFF; +// return JERRYPIT2Prescaler & 0xFF; return counter2Hi & 0xFF; case 12: -// return jerry_timer_2_divider >> 8; +// return JERRYPIT2Divider >> 8; return counter2Lo >> 8; case 13: -// return jerry_timer_2_divider & 0xFF; +// return JERRYPIT2Divider & 0xFF; return counter2Lo & 0xFF; } +#else +WriteLog("JERRY: Unhandled timer read (BYTE) at %08X...\n", offset); +#endif } - else if (offset >= 0xF10010 && offset <= 0xF10015) - return clock_byte_read(offset); - else if (offset >= 0xF17C00 && offset <= 0xF17C01) - return anajoy_byte_read(offset); +// else if (offset >= 0xF10010 && offset <= 0xF10015) +// return clock_byte_read(offset); +// else if (offset >= 0xF17C00 && offset <= 0xF17C01) +// return anajoy_byte_read(offset); else if (offset >= 0xF14000 && offset <= 0xF14003) - return joystick_byte_read(offset) | eeprom_byte_read(offset); + return JoystickReadByte(offset) | EepromReadByte(offset); else if (offset >= 0xF14000 && offset <= 0xF1A0FF) - return eeprom_byte_read(offset); - + return EepromReadByte(offset); + return jerry_ram_8[offset & 0xFFFF]; } @@ -437,41 +611,46 @@ uint16 JERRYReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) //in the jerry_timer_n_counter variables... !!! FIX !!! [DONE] else if ((offset >= 0xF10036) && (offset <= 0xF1003D)) { -// jerry_timer_1_counter = (jerry_timer_1_prescaler + 1) * (jerry_timer_1_divider + 1); - uint32 counter1Hi = (jerry_timer_1_counter / (jerry_timer_1_divider + 1)) - 1; - uint32 counter1Lo = (jerry_timer_1_counter % (jerry_timer_1_divider + 1)) - 1; - uint32 counter2Hi = (jerry_timer_2_counter / (jerry_timer_2_divider + 1)) - 1; - uint32 counter2Lo = (jerry_timer_2_counter % (jerry_timer_2_divider + 1)) - 1; +#ifndef NEW_TIMER_SYSTEM +// jerry_timer_1_counter = (JERRYPIT1Prescaler + 1) * (JERRYPIT1Divider + 1); + uint32 counter1Hi = (jerry_timer_1_counter / (JERRYPIT1Divider + 1)) - 1; + uint32 counter1Lo = (jerry_timer_1_counter % (JERRYPIT1Divider + 1)) - 1; + uint32 counter2Hi = (jerry_timer_2_counter / (JERRYPIT2Divider + 1)) - 1; + uint32 counter2Lo = (jerry_timer_2_counter % (JERRYPIT2Divider + 1)) - 1; switch(offset & 0x0F) { case 6: -// return jerry_timer_1_prescaler; +// return JERRYPIT1Prescaler; return counter1Hi; case 8: -// return jerry_timer_1_divider; +// return JERRYPIT1Divider; return counter1Lo; case 10: -// return jerry_timer_2_prescaler; +// return JERRYPIT2Prescaler; return counter2Hi; case 12: -// return jerry_timer_2_divider; +// return JERRYPIT2Divider; return counter2Lo; } // Unaligned word reads??? +#else +WriteLog("JERRY: Unhandled timer read (WORD) at %08X...\n", offset); +#endif } - else if ((offset >= 0xF10010) && (offset <= 0xF10015)) - return clock_word_read(offset); +// else if ((offset >= 0xF10010) && (offset <= 0xF10015)) +// return clock_word_read(offset); else if (offset == 0xF10020) - return jerryIntPending; - else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) - return anajoy_word_read(offset); +// return jerryIntPending; + return jerryPendingInterrupt; +// else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) +// return anajoy_word_read(offset); else if (offset == 0xF14000) - return (joystick_word_read(offset) & 0xFFFE) | eeprom_word_read(offset); + return (JoystickReadWord(offset) & 0xFFFE) | EepromReadWord(offset); else if ((offset >= 0xF14002) && (offset < 0xF14003)) - return joystick_word_read(offset); + return JoystickReadWord(offset); else if ((offset >= 0xF14000) && (offset <= 0xF1A0FF)) - return eeprom_word_read(offset); + return EepromReadWord(offset); /*if (offset >= 0xF1D000) WriteLog("JERRY: Reading word at %08X [%04X]...\n", offset, ((uint16)jerry_ram_8[(offset+0)&0xFFFF] << 8) | jerry_ram_8[(offset+1)&0xFFFF]);//*/ @@ -499,86 +678,104 @@ void JERRYWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) return; } // SCLK ($F1A150--8 bits wide) +//NOTE: This should be taken care of in DAC... else if ((offset >= 0xF1A152) && (offset <= 0xF1A153)) { // WriteLog("JERRY: Writing %02X to SCLK...\n", data); if ((offset & 0x03) == 2) - jerry_i2s_interrupt_divide = (jerry_i2s_interrupt_divide & 0x00FF) | ((uint32)data << 8); + JERRYI2SInterruptDivide = (JERRYI2SInterruptDivide & 0x00FF) | ((uint32)data << 8); else - jerry_i2s_interrupt_divide = (jerry_i2s_interrupt_divide & 0xFF00) | (uint32)data; + JERRYI2SInterruptDivide = (JERRYI2SInterruptDivide & 0xFF00) | (uint32)data; - jerry_i2s_interrupt_timer = -1; + JERRYI2SInterruptTimer = -1; +#ifndef NEW_TIMER_SYSTEM jerry_i2s_exec(0); +#else + RemoveCallback(JERRYI2SCallback); + JERRYI2SCallback(); +#endif // return; } // LTXD/RTXD/SCLK/SMODE $F1A148/4C/50/54 (really 16-bit registers...) else if (offset >= 0xF1A148 && offset <= 0xF1A157) - { + { DACWriteByte(offset, data, who); - return; + return; } else if (offset >= 0xF10000 && offset <= 0xF10007) { +#ifndef NEW_TIMER_SYSTEM switch (offset & 0x07) { case 0: - jerry_timer_1_prescaler = (jerry_timer_1_prescaler & 0x00FF) | (data << 8); - jerry_reset_timer_1(); + JERRYPIT1Prescaler = (JERRYPIT1Prescaler & 0x00FF) | (data << 8); + JERRYResetPIT1(); break; case 1: - jerry_timer_1_prescaler = (jerry_timer_1_prescaler & 0xFF00) | data; - jerry_reset_timer_1(); + JERRYPIT1Prescaler = (JERRYPIT1Prescaler & 0xFF00) | data; + JERRYResetPIT1(); break; case 2: - jerry_timer_1_divider = (jerry_timer_1_divider & 0x00FF) | (data << 8); - jerry_reset_timer_1(); + JERRYPIT1Divider = (JERRYPIT1Divider & 0x00FF) | (data << 8); + JERRYResetPIT1(); break; case 3: - jerry_timer_1_divider = (jerry_timer_1_divider & 0xFF00) | data; - jerry_reset_timer_1(); + JERRYPIT1Divider = (JERRYPIT1Divider & 0xFF00) | data; + JERRYResetPIT1(); break; case 4: - jerry_timer_2_prescaler = (jerry_timer_2_prescaler & 0x00FF) | (data << 8); - jerry_reset_timer_2(); + JERRYPIT2Prescaler = (JERRYPIT2Prescaler & 0x00FF) | (data << 8); + JERRYResetPIT2(); break; case 5: - jerry_timer_2_prescaler = (jerry_timer_2_prescaler & 0xFF00) | data; - jerry_reset_timer_2(); + JERRYPIT2Prescaler = (JERRYPIT2Prescaler & 0xFF00) | data; + JERRYResetPIT2(); break; case 6: - jerry_timer_2_divider = (jerry_timer_2_divider & 0x00FF) | (data << 8); - jerry_reset_timer_2(); + JERRYPIT2Divider = (JERRYPIT2Divider & 0x00FF) | (data << 8); + JERRYResetPIT2(); break; case 7: - jerry_timer_2_divider = (jerry_timer_2_divider & 0xFF00) | data; - jerry_reset_timer_2(); + JERRYPIT2Divider = (JERRYPIT2Divider & 0xFF00) | data; + JERRYResetPIT2(); } +#else +WriteLog("JERRY: Unhandled timer write (BYTE) at %08X...\n", offset); +#endif return; } - else if ((offset >= 0xF10010) && (offset <= 0xF10015)) +/* else if ((offset >= 0xF10010) && (offset <= 0xF10015)) { clock_byte_write(offset, data); return; - } + }//*/ // JERRY -> 68K interrupt enables/latches (need to be handled!) - else if (offset >= 0xF10020 && offset <= 0xF10023) + else if (offset >= 0xF10020 && offset <= 0xF10021)//WAS:23) { -WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%02X to $%08X!\n", data, offset); + if (offset == 0xF10020) + { + // Clear pending interrupts... + jerryPendingInterrupt &= ~data; + } + else if (offset == 0xF10021) + jerryInterruptMask = data; +//WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%02X to $%08X!\n", data, offset); +//WriteLog("JERRY: (Previous is partially handled... IRQMask=$%04X)\n", jerryInterruptMask); } - else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) +/* else if ((offset >= 0xF17C00) && (offset <= 0xF17C01)) { anajoy_byte_write(offset, data); return; - } + }*/ else if ((offset >= 0xF14000) && (offset <= 0xF14003)) { - joystick_byte_write(offset, data); - eeprom_byte_write(offset, data); + JoystickWriteByte(offset, data); + EepromWriteByte(offset, data); return; } else if ((offset >= 0xF14000) && (offset <= 0xF1A0FF)) { - eeprom_byte_write(offset, data); + EepromWriteByte(offset, data); return; } @@ -596,6 +793,24 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) { #ifdef JERRY_DEBUG WriteLog( "JERRY: Writing word %04X at %06X\n", data, offset); +#endif +#if 1 +if (offset == 0xF10000) + WriteLog("JERRY: JPIT1 word written by %s: %u\n", whoName[who], data); +else if (offset == 0xF10002) + WriteLog("JERRY: JPIT2 word written by %s: %u\n", whoName[who], data); +else if (offset == 0xF10004) + WriteLog("JERRY: JPIT3 word written by %s: %u\n", whoName[who], data); +else if (offset == 0xF10006) + WriteLog("JERRY: JPIT4 word written by %s: %u\n", whoName[who], data); +else if (offset == 0xF10010) + WriteLog("JERRY: CLK1 word written by %s: %u\n", whoName[who], data); +else if (offset == 0xF10012) + WriteLog("JERRY: CLK2 word written by %s: %u\n", whoName[who], data); +else if (offset == 0xF10014) + WriteLog("JERRY: CLK3 word written by %s: %u\n", whoName[who], data); +//else if (offset == 0xF10020) +// WriteLog("JERRY: JINTCTRL word written by %s: $%04X\n", whoName[who], data); #endif if ((offset >= DSP_CONTROL_RAM_BASE) && (offset < DSP_CONTROL_RAM_BASE+0x20)) @@ -608,71 +823,86 @@ void JERRYWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) DSPWriteWord(offset, data, who); return; } +//NOTE: This should be taken care of in DAC... else if (offset == 0xF1A152) // Bottom half of SCLK ($F1A150) { WriteLog("JERRY: Writing %04X to SCLK (by %s)...\n", data, whoName[who]); //This should *only* be enabled when SMODE has its INTERNAL bit set! !!! FIX !!! - jerry_i2s_interrupt_divide = (uint8)data; - jerry_i2s_interrupt_timer = -1; + JERRYI2SInterruptDivide = (uint8)data; + JERRYI2SInterruptTimer = -1; +#ifndef NEW_TIMER_SYSTEM jerry_i2s_exec(0); +#else + RemoveCallback(JERRYI2SCallback); + JERRYI2SCallback(); +#endif DACWriteWord(offset, data, who); - return; + return; } // LTXD/RTXD/SCLK/SMODE $F1A148/4C/50/54 (really 16-bit registers...) else if (offset >= 0xF1A148 && offset <= 0xF1A156) - { + { DACWriteWord(offset, data, who); - return; + return; } else if (offset >= 0xF10000 && offset <= 0xF10007) { +//#ifndef NEW_TIMER_SYSTEM +#if 1 switch(offset & 0x07) { case 0: - jerry_timer_1_prescaler = data; - jerry_reset_timer_1(); + JERRYPIT1Prescaler = data; + JERRYResetPIT1(); break; case 2: - jerry_timer_1_divider = data; - jerry_reset_timer_1(); + JERRYPIT1Divider = data; + JERRYResetPIT1(); break; case 4: - jerry_timer_2_prescaler = data; - jerry_reset_timer_2(); + JERRYPIT2Prescaler = data; + JERRYResetPIT2(); break; case 6: - jerry_timer_2_divider = data; - jerry_reset_timer_2(); + JERRYPIT2Divider = data; + JERRYResetPIT2(); } // Need to handle (unaligned) cases??? +#else +WriteLog("JERRY: Unhandled timer write %04X (WORD) at %08X by %s...\n", data, offset, whoName[who]); +#endif return; } - else if (offset >= 0xF10010 && offset < 0xF10016) +/* else if (offset >= 0xF10010 && offset < 0xF10016) { clock_word_write(offset, data); return; - } + }//*/ // JERRY -> 68K interrupt enables/latches (need to be handled!) else if (offset >= 0xF10020 && offset <= 0xF10022) { -WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%04X to $%08X!\n", data, offset); + jerryInterruptMask = data & 0xFF; + jerryPendingInterrupt &= ~(data >> 8); +//WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%04X to $%08X!\n", data, offset); +//WriteLog("JERRY: (Previous is partially handled... IRQMask=$%04X)\n", jerryInterruptMask); + return; } - else if (offset >= 0xF17C00 && offset < 0xF17C02) +/* else if (offset >= 0xF17C00 && offset < 0xF17C02) { //I think this was removed from the Jaguar. If so, then we don't need this...! anajoy_word_write(offset, data); return; - } + }*/ else if (offset >= 0xF14000 && offset < 0xF14003) { - joystick_word_write(offset, data); - eeprom_word_write(offset, data); + JoystickWriteWord(offset, data); + EepromWriteWord(offset, data); return; } else if (offset >= 0xF14000 && offset <= 0xF1A0FF) { - eeprom_word_write(offset, data); + EepromWriteWord(offset, data); return; }