X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftom.cpp;h=add3e44f0f0737dd51fd8171a98a67f01ead6a26;hb=67a5f1a40072983cf87ae2093ca95c271d14e706;hp=3cfd290b71b0a6b7f697dbc5ac03b474b7ebbae8;hpb=fa566a2c8ec532eb5325b4d5a663fb2a7d72adc6;p=virtualjaguar diff --git a/src/tom.cpp b/src/tom.cpp index 3cfd290..add3e44 100644 --- a/src/tom.cpp +++ b/src/tom.cpp @@ -245,7 +245,7 @@ // ------------------------------------------------------------ #include -#include "SDLptc.h" +//#include "SDLptc.h" #include "tom.h" #include "gpu.h" #include "objectp.h" @@ -256,6 +256,7 @@ #define MEMCON1 0x00 #define MEMCON2 0x02 #define HC 0x04 +#define VC 0x06 #define VMODE 0x28 #define MODE 0x0006 // Line buffer to video generator mode #define BGEN 0x0080 // Background enable (CRY & RGB16 only) @@ -273,15 +274,16 @@ #define VS 0x44 #define VDB 0x46 #define VDE 0x48 +#define VI 0x4E #define BG 0x58 //This can be defined in the makefile as well... -//(It's easier to do it here...) +//(It's easier to do it here, though...) //#define TOM_DEBUG extern uint32 jaguar_mainRom_crc32; -extern Console console; -extern Surface * surface; +//extern Console console; +//extern Surface * surface; extern uint8 objectp_running; static uint8 * tom_ram_8; @@ -420,7 +422,9 @@ uint16 tom_get_scanline(void) uint16 tom_get_vdb(void) { - return GET16(tom_ram_8, VBE); + // This in NOT VDB!!! +// return GET16(tom_ram_8, VBE); + return GET16(tom_ram_8, VDB); } // @@ -653,8 +657,8 @@ void tom_exec_scanline(int16 * backbuffer, int32 scanline, bool render) { tom_scanline = scanline; - // Increment the horizontal count (why?) - SET16(tom_ram_8, HC, GET16(tom_ram_8, HC) + 1); + // Increment the horizontal count (why? RNG?) +// TOMWriteWord(0xF00004, TOMReadWord(0xF00004) + 1); if (render) { @@ -663,7 +667,7 @@ void tom_exec_scanline(int16 * backbuffer, int32 scanline, bool render) // Clear line buffer with BG if (GET16(tom_ram_8, VMODE) & BGEN) // && (CRY or RGB16)... - for(uint32 i=0; ipitch; +} + // // TOM initialization // @@ -680,7 +691,7 @@ void tom_init(void) { op_init(); blitter_init(); - pcm_init(); +//This should be done by JERRY! pcm_init(); memory_malloc_secure((void **)&tom_ram_8, 0x4000, "TOM RAM"); tom_reset(); // Setup the non-stretchy scanline rendering... @@ -691,15 +702,15 @@ void tom_init(void) void tom_done(void) { op_done(); - pcm_done(); +//This should be done by JERRY! pcm_done(); blitter_done(); WriteLog("TOM: Resolution %i x %i %s\n", tom_getVideoModeWidth(), tom_getVideoModeHeight(), videoMode_to_str[tom_getVideoMode()]); // WriteLog("\ntom: object processor:\n"); // WriteLog("tom: pointer to object list: 0x%.8x\n",op_get_list_pointer()); -// WriteLog("tom: INT1=0x%.2x%.2x\n",tom_byte_read(0xf000e0),tom_byte_read(0xf000e1)); - gpu_done(); - dsp_done(); +// WriteLog("tom: INT1=0x%.2x%.2x\n",TOMReadByte(0xf000e0),TOMReadByte(0xf000e1)); +// gpu_done(); +// dsp_done(); memory_free(tom_ram_8); } @@ -710,44 +721,47 @@ uint32 tom_getHBlankWidthInPixels(void) uint32 tom_getVideoModeWidth(void) { -// static uint16 onetime = 1; - uint16 vmode = GET16(tom_ram_8, VMODE); uint16 hdb1 = GET16(tom_ram_8, HDB1); // uint16 hde = GET16(tom_ram_8, HDE); // uint16 hbb = GET16(tom_ram_8, HBB); // uint16 hbe = GET16(tom_ram_8, HBE); - int clock_cycles_per_pixel = (vmode & PWIDTH) >> 9; + // NOTE: PWIDTH is value + 1...! + int pwidth = ((vmode & PWIDTH) >> 9) + 1; + // 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! uint32 width = 640; - switch (clock_cycles_per_pixel) + switch (pwidth) { - 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 1: width = 640; break; + case 2: width = 640; break; + case 3: width = 448; break; + case 4: width = 320; break; case 5: width = 256; break; case 6: width = 256; break; - case 7: width = 320; break; -// default: WriteLog("%i \n",clock_cycles_per_pixel); + case 7: width = 256; break; + case 8: width = 320; break;//*/ + case 1: width = 1330; break; // 0.25:1 pixels (X:Y ratio) + case 2: width = 665; break; // 0.50:1 pixels + case 3: width = 443; break; // 0.75:1 pixels + case 4: width = 332; break; // 1.00:1 pixels + case 5: width = 266; break; // 1.25:1 pixels + case 6: width = 222; break; // 1.50:1 pixels + case 7: width = 190; break; // 1.75:1 pixels + case 8: width = 166; break; // 2.00:1 pixels +//Temporary, for testing Doom... +// case 8: width = 332; break; // 2.00:1 pixels +//*/ } -/* if (jaguar_mainRom_crc32 == 0x3c7bfda8) // Kludge for what??? - { - if (width == 320) - width += 80; - if (width == 448) - width -= 16; - }//*/ - if (hdb1 == 123) hblankWidthInPixels = 16; else hblankWidthInPixels = 0; -// WriteLog("hdb1=%i hbe=%i\n",hdb1,hbe); +// WriteLog("TOM: HDB1=%i HBE=%i\n", hdb1, hbe); return width; } @@ -759,11 +773,11 @@ uint32 tom_getVideoModeWidth(void) uint32 tom_getVideoModeHeight(void) { // uint16 vmode = GET16(tom_ram_8, VMODE); -// uint16 vbe = GET16(tom_ram_8, VBE); -// uint16 vbb = GET16(tom_ram_8, VBB); - uint16 vdb = GET16(tom_ram_8, VDB); - uint16 vde = GET16(tom_ram_8, VDE); - uint16 vp = GET16(tom_ram_8, VP); + uint16 vbe = GET16(tom_ram_8, VBE); + uint16 vbb = GET16(tom_ram_8, VBB); +// uint16 vdb = GET16(tom_ram_8, VDB); +// uint16 vde = GET16(tom_ram_8, VDE); +// uint16 vp = GET16(tom_ram_8, VP); /* if (vde == 0xFFFF) vde = vbb;//*/ @@ -773,36 +787,61 @@ uint32 tom_getVideoModeHeight(void) // VC counts from 0 to VP. VDB starts the OP. Either when // VDE is reached or VP, the OP is stopped. Let's try it... // Also note that we're conveniently ignoring interlaced display modes...! - return ((vde > vp ? vp : vde) - vdb) >> 1; +// return ((vde > vp ? vp : vde) - vdb) >> 1; +// return ((vde > vbb ? vbb : vde) - vdb) >> 1; +//Let's try from the Vertical Blank interval... + return (vbb - vbe) >> 1; } // // TOM reset code // NOTE: Should set up PAL values here when in PAL mode (use BIOS to find default values) -// for when user starts with -nobios -pal flags... +// for when user starts with -nobios -pal flags... [DONE] // void tom_reset(void) { + extern bool hardwareTypeNTSC; + op_reset(); blitter_reset(); - pcm_reset(); +//This should be done by JERRY! pcm_reset(); memset(tom_ram_8, 0x00, 0x4000); - SET16(tom_ram_8, MEMCON1, 0x1861); - SET16(tom_ram_8, MEMCON2, 0x0000); - SET16(tom_ram_8, VMODE, 0x06C1); - SET16(tom_ram_8, VP, 523); - SET16(tom_ram_8, HP, 844); - SET16(tom_ram_8, VS, 523 - 6); - SET16(tom_ram_8, VBB, 434); - SET16(tom_ram_8, VBE, 24); - SET16(tom_ram_8, HBB, 689 + 0x400); - SET16(tom_ram_8, HBE, 125); - - SET16(tom_ram_8, VDE, 2047);//65535); - SET16(tom_ram_8, VDB, 28); - SET16(tom_ram_8, HDB1, 166); - SET16(tom_ram_8, HDE, 2047);//65535); + + if (hardwareTypeNTSC) + { + SET16(tom_ram_8, MEMCON1, 0x1861); + SET16(tom_ram_8, MEMCON2, 0x35CC); + SET16(tom_ram_8, HP, 844); // Horizontal Period + SET16(tom_ram_8, HBB, 1713); // Horizontal Blank Begin + SET16(tom_ram_8, HBE, 125); // Horizontal Blank End + SET16(tom_ram_8, HDE, 1665); // Horizontal Display End + SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1 + SET16(tom_ram_8, VP, 523); // Vertical Period (1-based; in this case VP = 524) + SET16(tom_ram_8, VBE, 24); // Vertical Blank End + SET16(tom_ram_8, VDB, 38); // Vertical Display Begin + SET16(tom_ram_8, VDE, 518); // Vertical Display End + SET16(tom_ram_8, VBB, 500); // Vertical Blank Begin + SET16(tom_ram_8, VS, 517); // Vertical Sync + SET16(tom_ram_8, VMODE, 0x06C1); + } + else // PAL Jaguar + { + SET16(tom_ram_8, MEMCON1, 0x1861); + SET16(tom_ram_8, MEMCON2, 0x35CC); + SET16(tom_ram_8, HP, 850); // Horizontal Period + SET16(tom_ram_8, HBB, 1711); // Horizontal Blank Begin + SET16(tom_ram_8, HBE, 158); // Horizontal Blank End + SET16(tom_ram_8, HDE, 1665); // Horizontal Display End + SET16(tom_ram_8, HDB1, 203); // Horizontal Display Begin 1 + SET16(tom_ram_8, VP, 623); // Vertical Period (1-based; in this case VP = 624) + SET16(tom_ram_8, VBE, 34); // Vertical Blank End + SET16(tom_ram_8, VDB, 38); // Vertical Display Begin + SET16(tom_ram_8, VDE, 518); // Vertical Display End + SET16(tom_ram_8, VBB, 600); // Vertical Blank Begin + SET16(tom_ram_8, VS, 618); // Vertical Sync + SET16(tom_ram_8, VMODE, 0x06C1); + } tom_width = tom_real_internal_width = 0; tom_height = 0; @@ -820,32 +859,31 @@ void tom_reset(void) tom_timer_divider = 0; tom_timer_counter = 0; memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render)); -} +} // // TOM byte access (read) // - -unsigned tom_byte_read(unsigned int offset) +uint8 TOMReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) { //???Is this needed??? // It seems so. Perhaps it's the +$8000 offset being written to (32-bit interface)? // However, the 32-bit interface is WRITE ONLY, so that can't be it... // Also, the 68K CANNOT make use of the 32-bit interface, since its bus width is only 16-bits... - offset &= 0xFF3FFF; +// offset &= 0xFF3FFF; #ifdef TOM_DEBUG WriteLog("TOM: Reading byte at %06X\n", offset); #endif if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) - return gpu_byte_read(offset); + return GPUReadByte(offset, who); else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000)) - return gpu_byte_read(offset); + return GPUReadByte(offset, who); else if ((offset >= 0xF00010) && (offset < 0xF00028)) - return op_byte_read(offset); + return OPReadByte(offset, who); else if ((offset >= 0xF02200) && (offset < 0xF022A0)) - return blitter_byte_read(offset); + return BlitterReadByte(offset, who); else if (offset == 0xF00050) return tom_timer_prescaler >> 8; else if (offset == 0xF00051) @@ -861,14 +899,16 @@ unsigned tom_byte_read(unsigned int offset) // // TOM word access (read) // - -unsigned tom_word_read(unsigned int offset) +uint16 TOMReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) { //???Is this needed??? - offset &= 0xFF3FFF; +// offset &= 0xFF3FFF; #ifdef TOM_DEBUG WriteLog("TOM: Reading word at %06X\n", offset); #endif +if (offset >= 0xF02000 && offset <= 0xF020FF) + WriteLog("TOM: Read attempted from GPU register file by %s (unimplemented)!\n", whoName[who]); + if (offset == 0xF000E0) { uint16 data = (tom_puck_int_pending << 4) | (tom_timer_int_pending << 3) @@ -877,34 +917,35 @@ unsigned tom_word_read(unsigned int offset) //WriteLog("tom: interrupt status is 0x%.4x \n",data); return data; } - else if (offset == 0xF00006) // VC +//Shoud be handled by the jaguar main loop now... +/* else if (offset == 0xF00006) // VC // What if we're in interlaced mode? // According to docs, in non-interlace mode VC is ALWAYS even... // return (tom_scanline << 1);// + 1; //But it's causing Rayman to be fucked up... Why??? - return (tom_scanline << 1) + 1; +//Because VC is even in NI mode when calling the OP! That's why! + return (tom_scanline << 1) + 1;//*/ else if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) - return gpu_word_read(offset); + return GPUReadWord(offset, who); else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000)) - return gpu_word_read(offset); + return GPUReadWord(offset, who); else if ((offset >= 0xF00010) && (offset < 0xF00028)) - return op_word_read(offset); + return OPReadWord(offset, who); else if ((offset >= 0xF02200) && (offset < 0xF022A0)) - return blitter_word_read(offset); + return BlitterReadWord(offset, who); else if (offset == 0xF00050) return tom_timer_prescaler; else if (offset == 0xF00052) return tom_timer_divider; offset &= 0x3FFF; - return (tom_byte_read(offset) << 8) | tom_byte_read(offset+1); + return (TOMReadByte(offset, who) << 8) | TOMReadByte(offset + 1, who); } // // TOM byte access (write) // - -void tom_byte_write(unsigned offset, unsigned data) +void TOMWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) { //???Is this needed??? // Perhaps on the writes--32-bit writes that is! And masked with FF7FFF... @@ -916,22 +957,22 @@ void tom_byte_write(unsigned offset, unsigned data) if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) { - gpu_byte_write(offset, data); + GPUWriteByte(offset, data, who); return; } else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000)) { - gpu_byte_write(offset, data); + GPUWriteByte(offset, data, who); return; } else if ((offset >= 0xF00010) && (offset < 0xF00028)) { - op_byte_write(offset, data); + OPWriteByte(offset, data, who); return; } else if ((offset >= 0xF02200) && (offset < 0xF022A0)) { - blitter_byte_write(offset, data); + BlitterWriteByte(offset, data, who); return; } else if (offset == 0xF00050) @@ -971,8 +1012,7 @@ void tom_byte_write(unsigned offset, unsigned data) // // TOM word access (write) // - -void tom_word_write(unsigned offset, unsigned data) +void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) { //???Is this needed??? offset &= 0xFF3FFF; @@ -980,25 +1020,32 @@ void tom_word_write(unsigned offset, unsigned data) #ifdef TOM_DEBUG WriteLog("TOM: Writing word %04X at %06X\n", data, offset); #endif +if (offset == 0xF00000 + MEMCON1) + WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data); +if (offset == 0xF00000 + MEMCON2) + WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data); +if (offset >= 0xF02000 && offset <= 0xF020FF) + WriteLog("TOM: Write attempted to GPU register file by %s (unimplemented)!\n", whoName[who]); if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20)) { - gpu_word_write(offset, data); + GPUWriteWord(offset, data, who); return; } else if ((offset >= GPU_WORK_RAM_BASE) && (offset < GPU_WORK_RAM_BASE+0x1000)) { - gpu_word_write(offset, data); + GPUWriteWord(offset, data, who); return; } - else if ((offset >= 0xF00000) && (offset < 0xF00002)) +//What's so special about this? +/* else if ((offset >= 0xF00000) && (offset < 0xF00002)) { - tom_byte_write(offset, data >> 8); - tom_byte_write(offset+1, data & 0xFF); - } + TOMWriteByte(offset, data >> 8); + TOMWriteByte(offset+1, data & 0xFF); + }*/ else if ((offset >= 0xF00010) && (offset < 0xF00028)) { - op_word_write(offset, data); + OPWriteWord(offset, data, who); return; } else if (offset == 0xF00050) @@ -1015,6 +1062,7 @@ void tom_word_write(unsigned offset, unsigned data) } else if (offset == 0xF000E0) { +//Check this out... if (data & 0x0100) tom_video_int_pending = 0; if (data & 0x0200) @@ -1028,7 +1076,7 @@ void tom_word_write(unsigned offset, unsigned data) } 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) @@ -1048,82 +1096,117 @@ void tom_word_write(unsigned offset, unsigned data) if (offset == 0x2E || offset == 0x36 || offset == 0x54) data &= 0x03FF; // These are all 10-bit registers - tom_byte_write(offset, data >> 8); - tom_byte_write(offset+1, data & 0xFF); + TOMWriteByte(offset, data >> 8, who); + TOMWriteByte(offset+1, data & 0xFF, who); - // detect screen resolution changes - if ((offset >= 0x28) && (offset <= 0x4F)) - { if (offset == VDB) - WriteLog("TOM: Vertical Display Begin written: %04X\n", data); + WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data); if (offset == VDE) - WriteLog("TOM: Vertical Display End written: %04X\n", data); + WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data); if (offset == VP) - WriteLog("TOM: Vertical Period written: %04X (%sinterlaced)\n", data, (data & 0x01 ? "non-" : "")); + WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : "")); if (offset == HDB1) - WriteLog("TOM: Horizontal Display Begin 1 written: %04X\n", data); + WriteLog("TOM: Horizontal Display Begin 1 written by %s: %u\n", whoName[who], data); if (offset == HDE) - WriteLog("TOM: Horizontal Display End written: %04X\n", data); + WriteLog("TOM: Horizontal Display End written by %s: %u\n", whoName[who], data); if (offset == HP) - WriteLog("TOM: Horizontal Period written: %04X\n", data); + WriteLog("TOM: Horizontal Period written by %s: %u\n", whoName[who], data); +if (offset == VBB) + WriteLog("TOM: Vertical Blank Begin written by %s: %u\n", whoName[who], data); +if (offset == VBE) + WriteLog("TOM: Vertical Blank End written by %s: %u\n", whoName[who], data); +if (offset == VS) + WriteLog("TOM: Vertical Sync written by %s: %u\n", whoName[who], data); +if (offset == VI) + WriteLog("TOM: Vertical Interrupt written by %s: %u\n", whoName[who], data); +if (offset == HBB) + WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data); +if (offset == HBE) + WriteLog("TOM: Horizontal Blank End written by %s: %u\n", whoName[who], data); if (offset == VMODE) - WriteLog("TOM: Video Mode written: %04X\n", data); + WriteLog("TOM: Video Mode written by %s: %04X (PWIDTH = %u, VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, GET16(tom_ram_8, VC)); + // detect screen resolution changes +//This may go away in the future, if we do the virtualized screen thing... + if ((offset >= 0x28) && (offset <= 0x4F)) + { uint32 width = tom_getVideoModeWidth(), height = tom_getVideoModeHeight(); tom_real_internal_width = width; - if (width == 640) +//This looks like an attempt to render non-square pixels (though wrong...) +/* if (width == 640) { memcpy(scanline_render, scanline_render_stretch, sizeof(scanline_render)); width = 320; } else - memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render)); + memcpy(scanline_render, scanline_render_normal, sizeof(scanline_render));//*/ if ((width != tom_width) || (height != tom_height)) { - ws_audio_done(); - + extern SDL_Surface * surface, * mainSurface; + extern Uint32 mainSurfaceFlags; 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(); + SDL_FreeSurface(surface); + surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_width, tom_height, + 16, 0x7C00, 0x03E0, 0x001F, 0); + if (surface == NULL) + { + WriteLog("TOM: Could not create primary SDL surface: %s", SDL_GetError()); + exit(1); + } + sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)tom_width, (int)tom_height); - console.open(window_title, width, tom_height, format); +//???Should we do this??? No! +// SDL_FreeSurface(mainSurface); + mainSurface = SDL_SetVideoMode(tom_width, tom_height, 16, mainSurfaceFlags); + + if (mainSurface == NULL) + { + WriteLog("Joystick: SDL is unable to set the video mode: %s\n", SDL_GetError()); + exit(1); + } - ws_audio_init(); - ws_audio_reset(); + SDL_WM_SetCaption(window_title, window_title); } } } int tom_irq_enabled(int irq) { - return jaguar_byte_read(0xF000E1) & (1 << irq); + // This is the correct byte in big endian... D'oh! +// return jaguar_byte_read(0xF000E1) & (1 << irq); + return tom_ram_8[0xE1] & (1 << irq); } -void tom_set_irq_latch(int irq, int enabled) +//unused +/*void tom_set_irq_latch(int irq, int enabled) { tom_ram_8[0xE0] = (tom_ram_8[0xE0] & (~(1< 0) @@ -1133,8 +1216,8 @@ void tom_pit_exec(uint32 cycles) if (tom_timer_counter <= 0) { tom_set_pending_timer_int(); - gpu_set_irq_line(2, 1); - if ((tom_irq_enabled(IRQ_TIMER)) && (jaguar_interrupt_handler_is_valid(64))) + GPUSetIRQLine(GPUIRQ_TIMER, ASSERT_LINE); + if (tom_irq_enabled(IRQ_TIMER) && jaguar_interrupt_handler_is_valid(64)) m68k_set_irq(7); // Cause a 68000 NMI... tom_reset_timer();