claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled DA2 debug logging by default

Browse Source
This commit is contained in:
Akamaki
2025-02-15 11:05:16 +09:00
parent c2cf7e1462
commit dc7e6c2d7f
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/video/vid_ps55da2.c
View File

@@ -228,10 +228,11 @@
#define LG_SET_RESET_2 0x10 #define LG_SET_RESET_2 0x10
#ifndef RELEASE_BUILD #ifndef RELEASE_BUILD
#define ENABLE_DA2_LOG 1 //#define ENABLE_DA2_LOG 1
#endif #endif
#ifdef ENABLE_DA2_LOG #ifdef ENABLE_DA2_LOG
#define ENABLE_DA2_DEBUGBLT 1
int da2_do_log = ENABLE_DA2_LOG; int da2_do_log = ENABLE_DA2_LOG;
static void static void
@@ -248,9 +249,6 @@ da2_log(const char* fmt, ...)
#else #else
# define da2_log(fmt, ...) # define da2_log(fmt, ...)
#endif #endif
#ifndef RELEASE_BUILD
# define ENABLE_DA2_DEBUGBLT 1
#endif
typedef struct da2_t typedef struct da2_t
{ {
@@ -710,31 +708,35 @@ void da2_bitblt_load(da2_t* da2)
// da2->bitblt.destpitch += 2; // da2->bitblt.destpitch += 2;
// da2->bitblt.srcpitch += 2; // da2->bitblt.srcpitch += 2;
//} //}
uint32_t sjis_h = IBMJtoSJIS(da2->bitblt.reg[0x12]) >> 8;
uint32_t sjis_l = IBMJtoSJIS(da2->bitblt.reg[0x12]) & 0xff;
da2->bitblt.srcaddr = da2->bitblt.reg[0x12] * 72 + 2; da2->bitblt.srcaddr = da2->bitblt.reg[0x12] * 72 + 2;
da2->bitblt.destaddr += 2; da2->bitblt.destaddr += 2;
da2->bitblt.srcpitch = 0; da2->bitblt.srcpitch = 0;
da2->bitblt.raster_op = da2->bitblt.reg[0x05] & 0x03; /* XOR */ da2->bitblt.raster_op = da2->bitblt.reg[0x05] & 0x03; /* XOR */
da2->bitblt.bitshift_destr += 1; da2->bitblt.bitshift_destr += 1;
#ifdef ENABLE_DA2_DEBUGBLT
uint32_t sjis_h = IBMJtoSJIS(da2->bitblt.reg[0x12]) >> 8;
uint32_t sjis_l = IBMJtoSJIS(da2->bitblt.reg[0x12]) & 0xff;
da2_log("put char src=%x, dest=%x, x=%d, y=%d, w=%d, h=%d, c=%c%c\n", da2_log("put char src=%x, dest=%x, x=%d, y=%d, w=%d, h=%d, c=%c%c\n",
da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.srcaddr, da2->bitblt.destaddr,
da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2), da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
da2->bitblt.size_x, da2->bitblt.size_y, sjis_h, sjis_l); da2->bitblt.size_x, da2->bitblt.size_y, sjis_h, sjis_l);
#endif
} }
else if (da2->bitblt.reg[0x10] == 0x0004 || da2->bitblt.reg[0x10] == 0x0E04) { else if (da2->bitblt.reg[0x10] == 0x0004 || da2->bitblt.reg[0x10] == 0x0E04) {
da2->bitblt.exec = DA2_BLT_CPUTCHAR; da2->bitblt.exec = DA2_BLT_CPUTCHAR;
uint32_t sjis_h = IBMJtoSJIS(da2->bitblt.reg[0x12]) >> 8;
uint32_t sjis_l = IBMJtoSJIS(da2->bitblt.reg[0x12]) & 0xff;
da2->bitblt.srcaddr = da2->bitblt.reg[0x12] * 64 + 2 + DA2_FONTROM_BASESBCS; da2->bitblt.srcaddr = da2->bitblt.reg[0x12] * 64 + 2 + DA2_FONTROM_BASESBCS;
da2->bitblt.destaddr += 2; da2->bitblt.destaddr += 2;
da2->bitblt.srcpitch = 0; da2->bitblt.srcpitch = 0;
da2->bitblt.raster_op = da2->bitblt.reg[0x05] & 0x03; /* XOR */ da2->bitblt.raster_op = da2->bitblt.reg[0x05] & 0x03; /* XOR */
da2->bitblt.bitshift_destr += 1; da2->bitblt.bitshift_destr += 1;
#ifdef ENABLE_DA2_DEBUGBLT
uint32_t sjis_h = IBMJtoSJIS(da2->bitblt.reg[0x12]) >> 8;
uint32_t sjis_l = IBMJtoSJIS(da2->bitblt.reg[0x12]) & 0xff;
da2_log("put char src=%x, dest=%x, x=%d, y=%d, w=%d, h=%d, c=%c%c\n", da2_log("put char src=%x, dest=%x, x=%d, y=%d, w=%d, h=%d, c=%c%c\n",
da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.srcaddr, da2->bitblt.destaddr,
da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2), da2->bitblt.reg[0x29] % (da2->rowoffset * 2), da2->bitblt.reg[0x29] / (da2->rowoffset * 2),
da2->bitblt.size_x, da2->bitblt.size_y, sjis_h, sjis_l); da2->bitblt.size_x, da2->bitblt.size_y, sjis_h, sjis_l);
#endif
} }
else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x40 && da2->bitblt.reg[0x3D] == 0) {/* Fill a rectangle(or draw a line) */ else if ((da2->bitblt.reg[0x5] & 0xfff0) == 0x40 && da2->bitblt.reg[0x3D] == 0) {/* Fill a rectangle(or draw a line) */
da2_log("fillrect x=%d, y=%d, w=%d, h=%d, c=%d, 2f=%x, rowcount=%x\n", da2_log("fillrect x=%d, y=%d, w=%d, h=%d, c=%d, 2f=%x, rowcount=%x\n",
@@ -898,15 +900,15 @@ void da2_bitblt_exec(void* p)
case DA2_BLT_CPUTCHAR: case DA2_BLT_CPUTCHAR:
//da2->bitblt.y += 2; //da2->bitblt.y += 2;
da2->bitblt.destaddr = da2->bitblt.reg[0x29] + da2->bitblt.x * 2 + da2->bitblt.y * 130 + 0 + 260; da2->bitblt.destaddr = da2->bitblt.reg[0x29] + da2->bitblt.x * 2 + da2->bitblt.y * 130 + 0 + 260;
pclog("scr %x dest %x :", da2->bitblt.srcaddr, da2->bitblt.destaddr); //pclog("scr %x dest %x :", da2->bitblt.srcaddr, da2->bitblt.destaddr);
//da2->bitblt.srcaddr += 2; //da2->bitblt.srcaddr += 2;
if(da2->bitblt.reg[0x12] < 0x100) if(da2->bitblt.reg[0x12] < 0x100)
da2->bitblt.srcaddr = DA2_FONTROM_BASESBCS + da2->bitblt.reg[0x12] * 64 + (da2->bitblt.x * 2) + (da2->bitblt.y * 2) - 2; da2->bitblt.srcaddr = DA2_FONTROM_BASESBCS + da2->bitblt.reg[0x12] * 64 + (da2->bitblt.x * 2) + (da2->bitblt.y * 2) - 2;
else else
da2->bitblt.srcaddr = da2->bitblt.reg[0x12] * 72 + (da2->bitblt.x * 2) + (da2->bitblt.y * 3) - 2; da2->bitblt.srcaddr = da2->bitblt.reg[0x12] * 72 + (da2->bitblt.x * 2) + (da2->bitblt.y * 3) - 2;
print_bytetobin(da2->mmio.font[da2->bitblt.srcaddr + 2]); //print_bytetobin(da2->mmio.font[da2->bitblt.srcaddr + 2]);
print_bytetobin(da2->mmio.font[da2->bitblt.srcaddr + 3]); //print_bytetobin(da2->mmio.font[da2->bitblt.srcaddr + 3]);
pclog("\n"); //pclog("\n");
if (da2->bitblt.x >= da2->bitblt.size_x - 1) { if (da2->bitblt.x >= da2->bitblt.size_x - 1) {
//if (1) { //if (1) {
DA2_PutcharWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.maskr, da2); DA2_PutcharWithBitmask(da2->bitblt.srcaddr, da2->bitblt.destaddr, da2->bitblt.maskr, da2);
@@ -3059,7 +3061,7 @@ void da2_close(void *p)
da2_t *da2 = (da2_t *)p; da2_t *da2 = (da2_t *)p;
/* dump mem for debug */ /* dump mem for debug */
#ifndef RELEASE_BUILD #ifdef ENABLE_DA2_LOG
FILE* f; FILE* f;
f = fopen("da2_cram.dmp", "wb"); f = fopen("da2_cram.dmp", "wb");
if (f != NULL) { if (f != NULL) {