wavemotion-dave/GimliDS
1
Fork 0
mirror of https://github.com/wavemotion-dave/GimliDS.git synced 2025-06-18 22:05:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanup and slight improvement on border memory copy. Deterministic memory initialization on reset.

Browse Source
This commit is contained in:
Dave Bernazzani 2025-04-29 06:07:55 -04:00
parent dc4a2eb133
commit 152030abc8
5 changed files with 88 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arm9/source/C64.cpp
View File

@ -97,7 +97,21 @@ C64::C64()
TheCIA2 = TheCPU->TheCIA2 = TheCPU1541->TheCIA2 = new MOS6526_2(TheCPU, TheVIC, TheCPU1541); TheCIA2 = TheCPU->TheCIA2 = TheCPU1541->TheCIA2 = new MOS6526_2(TheCPU, TheVIC, TheCPU1541);
TheIEC = TheCPU->TheIEC = new IEC(TheDisplay); TheIEC = TheCPU->TheIEC = new IEC(TheDisplay);
// Initialize RAM with powerup pattern InitMemory();
// Clear joykey
joykey = 0xff;
// System-dependent things
c64_ctor2();
}
void C64::InitMemory(void)
{
// Clear all of memory...
memset(RAM, 0x00, sizeof(myRAM));
// Then Initialize RAM with powerup pattern
// Sampled from a PAL C64 (Assy 250425) with Fujitsu MB8264A-15 DRAM chips // Sampled from a PAL C64 (Assy 250425) with Fujitsu MB8264A-15 DRAM chips
uint8_t *p = RAM; uint8_t *p = RAM;
for (unsigned i = 0; i < 512; ++i) { for (unsigned i = 0; i < 512; ++i) {
@ -138,15 +152,8 @@ C64::C64()
// Clear 1541 RAM // Clear 1541 RAM
memset(RAM1541, 0, DRIVE_RAM_SIZE); memset(RAM1541, 0, DRIVE_RAM_SIZE);
// Clear joykey
joykey = 0xff;
// System-dependent things
c64_ctor2();
} }
/* /*
* Destructor: Delete all objects * Destructor: Delete all objects
*/ */
@ -181,6 +188,7 @@ C64::~C64()
void C64::Reset(void) void C64::Reset(void)
{ {
InitMemory();
TheCPU->AsyncReset(); TheCPU->AsyncReset();
TheCPU1541->AsyncReset(); TheCPU1541->AsyncReset();
TheSID->Reset(); TheSID->Reset();

1
arm9/source/C64.h
View File

@ -47,6 +47,7 @@ public:
C64(); C64();
~C64(); ~C64();
void InitMemory(void);
void Run(void); void Run(void);
void Quit(void); void Quit(void);
void Pause(void); void Pause(void);

4
arm9/source/CPU1541.cpp
View File

@ -746,11 +746,7 @@ handle_int:
} }
#define IS_CPU_1541 #define IS_CPU_1541
#undef PRECISE_CPU_CYCLES
#define PRECISE_CPU_CYCLES 0
#include "CPU_emulline.h" #include "CPU_emulline.h"
#undef PRECISE_CPU_CYCLES
#define PRECISE_CPU_CYCLES 1
return last_cycles; return last_cycles;
} }

2
arm9/source/CPU_emulline.h
View File

@ -950,7 +950,7 @@
case 0x7c: case 0x7c:
case 0xdc: case 0xdc:
case 0xfc: case 0xfc:
#if PRECISE_CPU_CYCLESz #if PRECISE_CPU_CYCLES
read_byte_abs_x(); read_byte_abs_x();
#else #else
pc+=2; pc+=2;

169
arm9/source/VIC.cpp
View File

@ -225,6 +225,7 @@ static uint8 b0c_color __attribute__((section(".dtcm")));
static uint8 b1c_color __attribute__((section(".dtcm"))); static uint8 b1c_color __attribute__((section(".dtcm")));
static uint8 b2c_color __attribute__((section(".dtcm"))); static uint8 b2c_color __attribute__((section(".dtcm")));
static uint8 b3c_color __attribute__((section(".dtcm"))); static uint8 b3c_color __attribute__((section(".dtcm")));
static uint32 b0c_color32 __attribute__((section(".dtcm")));
static uint8 mm0_color __attribute__((section(".dtcm"))); static uint8 mm0_color __attribute__((section(".dtcm")));
static uint8 mm1_color __attribute__((section(".dtcm"))); // Indices for MOB multicolors static uint8 mm1_color __attribute__((section(".dtcm"))); // Indices for MOB multicolors
@ -313,6 +314,7 @@ MOS6569::MOS6569(C64 *c64, C64Display *disp, MOS6510 *CPU, uint8 *RAM, uint8 *Ch
clx_spr = clx_bgr = 0; clx_spr = clx_bgr = 0;
cia_vabase = 0; cia_vabase = 0;
ec = b0c = b1c = b2c = b3c = mm0 = mm1 = 0; ec = b0c = b1c = b2c = b3c = mm0 = mm1 = 0;
b0c_color32 = 0;
for (i=0; i<8; i++) mx[i] = my[i] = sc[i] = 0; for (i=0; i<8; i++) mx[i] = my[i] = sc[i] = 0;
// Initialize other variables // Initialize other variables
@ -522,6 +524,7 @@ void MOS6569::SetState(MOS6569State *vd)
b1c_color = colors[b1c]; b1c_color = colors[b1c];
b2c_color = colors[b2c]; b2c_color = colors[b2c];
b3c_color = colors[b3c]; b3c_color = colors[b3c];
b0c_color32 = (b0c_color << 24) | (b0c_color << 16) | (b0c_color << 8) | (b0c_color << 0);
make_mc_table(); make_mc_table();
mm0 = vd->mm0; mm1 = vd->mm1; mm0 = vd->mm0; mm1 = vd->mm1;
@ -776,6 +779,7 @@ ITCM_CODE void MOS6569::WriteRegister(uint16 adr, uint8 byte)
case 0x21: case 0x21:
if (b0c != byte) { if (b0c != byte) {
b0c_color = colors[b0c = byte & 0xF]; b0c_color = colors[b0c = byte & 0xF];
b0c_color32 = (b0c_color << 24) | (b0c_color << 16) | (b0c_color << 8) | (b0c_color << 0);
make_mc_table(); make_mc_table();
} }
break; break;
@ -885,7 +889,6 @@ inline void MOS6569::el_std_text(uint8 *p, uint8 *q, uint8 *r)
uint32 *lp = (uint32 *)p; uint32 *lp = (uint32 *)p;
uint8 *cp = color_line; uint8 *cp = color_line;
uint8 *mp = matrix_line; uint8 *mp = matrix_line;
u32 bgcolor = (b0cc << 24) | (b0cc << 16) | (b0cc << 8) | (b0cc << 0);
// Loop for 40 characters // Loop for 40 characters
for (int i=0; i<40; i++) for (int i=0; i<40; i++)
@ -894,8 +897,8 @@ inline void MOS6569::el_std_text(uint8 *p, uint8 *q, uint8 *r)
if (!data) if (!data)
{ {
*lp++ = bgcolor; *lp++ = b0c_color32;
*lp++ = bgcolor; *lp++ = b0c_color32;
} }
else else
{ {
@ -913,12 +916,9 @@ ITCM_CODE void el_mc_text(uint8 *p, uint8 *q, uint8 *r)
inline void MOS6569::el_mc_text(uint8 *p, uint8 *q, uint8 *r) inline void MOS6569::el_mc_text(uint8 *p, uint8 *q, uint8 *r)
#endif #endif
{ {
uint16 *wp = (uint16 *)p; uint32 *wp = (uint32 *)p;
uint8 *cp = color_line; uint8 *cp = color_line;
uint8 *mp = matrix_line; uint8 *mp = matrix_line;
uint16 *mclp = mc_color_lookup;
u32 bgcolor = (mclp[0] << 24) | (mclp[0] << 16) | (mclp[0] << 8) | (mclp[0] << 0);
u32 bgcolor2 = (b0c << 24) | (b0c << 16) | (b0c << 8) | (b0c << 0);
// Loop for 40 characters // Loop for 40 characters
for (int i=0; i<40; i++) for (int i=0; i<40; i++)
@ -929,37 +929,29 @@ inline void MOS6569::el_mc_text(uint8 *p, uint8 *q, uint8 *r)
r[i] = (data & 0xaa) | (data & 0xaa) >> 1; r[i] = (data & 0xaa) | (data & 0xaa) >> 1;
if (!data) if (!data)
{ {
*(uint32 *)wp = bgcolor; *wp++ = b0c_color32;
wp += 2; *wp++ = b0c_color32;
*(uint32 *)wp = bgcolor;
wp += 2;
} }
else else
{ {
uint8 color = colors[cp[i] & 7]; uint8 color = colors[cp[i] & 7];
mclp[3] = color | (color << 8); mc_color_lookup[3] = color | (color << 8);
*wp++ = mclp[(data >> 6) & 3]; *wp++ = mc_color_lookup[(data >> 6) & 3] | (mc_color_lookup[(data >> 4) & 3] << 16);
*wp++ = mclp[(data >> 4) & 3]; *wp++ = mc_color_lookup[(data >> 2) & 3] | (mc_color_lookup[(data >> 0) & 3] << 16);
*wp++ = mclp[(data >> 2) & 3];
*wp++ = mclp[(data >> 0) & 3];
} }
} else { // Standard mode in multicolor mode } else { // Standard mode in multicolor mode
r[i] = data; r[i] = data;
if (!data) if (!data)
{ {
*(uint32 *)wp = bgcolor2; *wp++ = b0c_color32;
wp += 2; *wp++ = b0c_color32;
*(uint32 *)wp = bgcolor2;
wp += 2;
} }
else else
{ {
uint8 color = cp[i]; uint8 color = cp[i];
*(uint32 *)wp = TextColorTable[color][b0c][data>>4].b; *wp++ = TextColorTable[color][b0c][data>>4].b;
wp += 2; *wp++ = TextColorTable[color][b0c][data&0xf].b;
*(uint32 *)wp = TextColorTable[color][b0c][data&0xf].b;
wp += 2;
} }
} }
} }
@ -995,31 +987,38 @@ inline void MOS6569::el_mc_bitmap(uint8 *p, uint8 *q, uint8 *r)
#endif #endif
{ {
uint16 lookup[4]; uint16 lookup[4];
uint16 *wp = (uint16 *)p - 1; uint32 *wp = (uint32 *)p;
uint8 *cp = color_line; uint8 *cp = color_line;
uint8 *mp = matrix_line; uint8 *mp = matrix_line;
lookup[0] = (b0c_color << 8) | b0c_color; lookup[0] = (b0c_color << 8) | b0c_color;
uint32 bg32 = (b0c_color << 24) | (b0c_color << 16) | (b0c_color << 8) | b0c_color;
// Loop for 40 characters // Loop for 40 characters
for (int i=0; i<40; i++, q+=8) for (int i=0; i<40; i++, q+=8)
{ {
uint8 color, acolor, bcolor; uint8 color, acolor, bcolor;
color = colors[mp[i] >> 4];
lookup[1] = (color << 8) | color;
bcolor = colors[mp[i]];
lookup[2] = (bcolor << 8) | bcolor;
acolor = colors[cp[i]];
lookup[3] = (acolor << 8) | acolor;
uint8 data = *q; uint8 data = *q;
r[i] = (data & 0xaa) | (data & 0xaa) >> 1; r[i] = (data & 0xaa) | (data & 0xaa) >> 1;
if (!data)
{
*wp++ = bg32;
*wp++ = bg32;
}
else
{
color = mp[i] >> 4;
lookup[1] = (color << 8) | color;
bcolor = mp[i] & 0xf;
lookup[2] = (bcolor << 8) | bcolor;
acolor = cp[i] & 0xf;
lookup[3] = (acolor << 8) | acolor;
*++wp = lookup[(data >> 6) & 3]; *wp++ = lookup[(data >> 6) & 3] | (lookup[(data >> 4) & 3] << 16);
*++wp = lookup[(data >> 4) & 3]; *wp++ = lookup[(data >> 2) & 3] | (lookup[(data >> 0) & 3] << 16);
*++wp = lookup[(data >> 2) & 3]; }
*++wp = lookup[(data >> 0) & 3];
} }
} }
@ -1490,98 +1489,68 @@ int MOS6569::EmulateLine(void)
switch (display_idx) { switch (display_idx) {
case 0: // Standard text case 0: // Standard text
#ifndef CAN_ACCESS_UNALIGNED if (x_scroll & 3)
#ifdef ALIGNMENT_CHECK {
el_std_text(use_p, char_base + rc, r);
if (use_p != p)
memcpy(p, use_p, 8*40);
#else
if (x_scroll & 3) {
el_std_text(text_chunky_buf, char_base + rc, r); el_std_text(text_chunky_buf, char_base + rc, r);
// Experimentally, this is slightly faster than memcpy() // Experimentally, this is slightly faster than memcpy()
u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++; u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++;
} else }
else
{
el_std_text(p, char_base + rc, r); el_std_text(p, char_base + rc, r);
#endif }
#else
el_std_text(p, char_base + rc, r);
#endif
break; break;
case 1: // Multicolor text case 1: // Multicolor text
#ifndef CAN_ACCESS_UNALIGNED if (x_scroll & 3)
#ifdef ALIGNMENT_CHECK {
el_mc_text(use_p, char_base + rc, r);
if (use_p != p)
memcpy(p, use_p, 8*40);
#else
if (x_scroll & 3) {
el_mc_text(text_chunky_buf, char_base + rc, r); el_mc_text(text_chunky_buf, char_base + rc, r);
// Experimentally, this is slightly faster than memcpy() // Experimentally, this is slightly faster than memcpy()
u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++; u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++;
} else }
else
{
el_mc_text(p, char_base + rc, r); el_mc_text(p, char_base + rc, r);
#endif }
#else
el_mc_text(p, char_base + rc, r);
#endif
break; break;
case 2: // Standard bitmap case 2: // Standard bitmap
#ifndef CAN_ACCESS_UNALIGNED if (x_scroll & 3)
#ifdef ALIGNMENT_CHECK {
el_std_bitmap(use_p, bitmap_base + (vc << 3) + rc, r);
if (use_p != p)
memcpy(p, use_p, 8*40);
#else
if (x_scroll & 3) {
el_std_bitmap(text_chunky_buf, bitmap_base + (vc << 3) + rc, r); el_std_bitmap(text_chunky_buf, bitmap_base + (vc << 3) + rc, r);
// Experimentally, this is slightly faster than memcpy() // Experimentally, this is slightly faster than memcpy()
u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++; u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++;
} else }
else
{
el_std_bitmap(p, bitmap_base + (vc << 3) + rc, r); el_std_bitmap(p, bitmap_base + (vc << 3) + rc, r);
#endif }
#else
el_std_bitmap(p, bitmap_base + (vc << 3) + rc, r);
#endif
break; break;
case 3: // Multicolor bitmap case 3: // Multicolor bitmap
#ifndef CAN_ACCESS_UNALIGNED if (x_scroll & 3)
#ifdef ALIGNMENT_CHECK {
el_mc_bitmap(use_p, bitmap_base + (vc << 3) + rc, r);
if (use_p != p)
memcpy(p, use_p, 8*40);
#else
if (x_scroll & 3) {
el_mc_bitmap(text_chunky_buf, bitmap_base + (vc << 3) + rc, r); el_mc_bitmap(text_chunky_buf, bitmap_base + (vc << 3) + rc, r);
// Experimentally, this is slightly faster than memcpy() // Experimentally, this is slightly faster than memcpy()
u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++; u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++;
} else }
else
{
el_mc_bitmap(p, bitmap_base + (vc << 3) + rc, r); el_mc_bitmap(p, bitmap_base + (vc << 3) + rc, r);
#endif }
#else
el_mc_bitmap(p, bitmap_base + (vc << 3) + rc, r);
#endif
break; break;
case 4: // ECM text case 4: // ECM text
#ifndef CAN_ACCESS_UNALIGNED if (x_scroll & 3)
#ifdef ALIGNMENT_CHECK {
el_ecm_text(use_p, char_base + rc, r);
if (use_p != p)
memcpy(p, use_p, 8*40);
#else
if (x_scroll & 3) {
el_ecm_text(text_chunky_buf, char_base + rc, r); el_ecm_text(text_chunky_buf, char_base + rc, r);
// Experimentally, this is slightly faster than memcpy() // Experimentally, this is slightly faster than memcpy()
u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++; u32 *dest=(u32*)p; u32 *src=(u32*)text_chunky_buf; for (int i=0; i<80; i++) *dest++ = *src++;
} else }
else
{
el_ecm_text(p, char_base + rc, r); el_ecm_text(p, char_base + rc, r);
#endif }
#else
el_ecm_text(p, char_base + rc, r);
#endif
break; break;
default: // Invalid mode (all black) default: // Invalid mode (all black)
@ -1591,9 +1560,11 @@ int MOS6569::EmulateLine(void)
} }
vc += 40; vc += 40;
} else { // Idle state graphics }
switch (display_idx) { else
{ // Idle state graphics
switch (display_idx)
{
case 0: // Standard text case 0: // Standard text
case 1: // Multicolor text case 1: // Multicolor text
case 4: // ECM text case 4: // ECM text